Changeset 1db5673 for FarmatikoData/Models

Timestamp:

11/14/20 12:27:30 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

68454c6

Parents:

ad60966

Message:

Fix bugs, add some more

Location:

FarmatikoData/Models

Files:

• Medicine.cs (modified) (3 diffs)
• MedicineList.cs (deleted)
• Pharmacy.cs (modified) (1 diff)
• PharmacyHead.cs (modified) (2 diffs)
• PharmacyHeadMedicine.cs (added)
• RequestPharmacyHead.cs (modified) (2 diffs)

FarmatikoData/Models/Medicine.cs

@@ -1 +1 @@
 using FarmatikoData.Base;
+using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
 
 namespace FarmatikoData.Models
@@ -18 +22 @@
         public float Price { get; set; }
         public string Packaging { get; set; }
+        //[JsonPropertyName("PHMedicineList")]
+        public ICollection<PharmacyHeadMedicine> MedicineList { get; set; }
         public Medicine(string Name, string Strength, string Form, string WayOfIssuing, string Manufacturer, float Price, string Packaging)
         {
@@ -28 +34 @@
             this.Packaging = Packaging;
         }
-
     }
 }

FarmatikoData/Models/Pharmacy.cs

@@ -26 +26 @@
             this.WorkAllTime = WorkAllTime;
         }
+        public int PheadId { get; set; }
+        public PharmacyHead PHead { get; set; }
     }
 }

FarmatikoData/Models/PharmacyHead.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using FarmatikoData.Base;
+using Newtonsoft.Json;
 
 namespace FarmatikoData.Models
@@ -11 +13 @@
         }
         [Required]
+        [JsonProperty("Email")]
         public string Email { get; set; }
         [Required]
+        [JsonProperty("Name")]
         public string Name { get; set; }
         [Required]
+        [JsonProperty("Passwd")]
         public string Password { get; set; }
-        public List<MedicineList> MedicineLists { get; set; }
-        public List<Pharmacy> PharmaciesList { get; set; }
+        [JsonProperty("PharmacyMedicines")]
+        public List<Medicine> MedicineList { get; set; }
+        [Required]
+        [JsonProperty("Pharmacy")]
+        public ICollection<Pharmacy> PharmaciesList { get; set; }
+        //[JsonProperty("PHMedicineList")]
+        public ICollection<PharmacyHeadMedicine> PHMedicineList { get; set; }
 
     }

FarmatikoData/Models/RequestPharmacyHead.cs

@@ -4 +4 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace FarmatikoData.Models
@@ -13 +14 @@
         }
         [Required]
+        [JsonPropertyName("PharmacyHead")]
         public PharmacyHead Head { get; set; }
         [Required]
+        [JsonPropertyName("Pharmacy")]
         public Pharmacy Pharmacy { get; set; }