Changeset db484c9 for FarmatikoData/Models

Timestamp:

01/26/21 10:33:09 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

7d80751

Parents:

8e74e2f

Message:

Fix bugs

Location:

FarmatikoData/Models

Files:

• Medicine.cs (modified) (1 diff)
• Pharmacy.cs (modified) (1 diff)
• PharmacyHead.cs (modified) (1 diff)

FarmatikoData/Models/Medicine.cs

@@ -23 +23 @@
         public string Packaging { get; set; }
         //[JsonPropertyName("PHMedicineList")]
-        public ICollection<PharmacyHeadMedicine> MedicineList { get; set; }
+        public ICollection<PharmacyHeadMedicine> Medicines { get; set; }
         public Medicine(string Name, string Strength, string Form, string WayOfIssuing, string Manufacturer, float Price, string Packaging)
         {

FarmatikoData/Models/Pharmacy.cs

@@ -27 +27 @@
         }
         public int PheadId { get; set; }
-        public PharmacyHead PHead { get; internal set; }
+        public PharmacyHead PharmacyHead { get; set; }
     }
 }

FarmatikoData/Models/PharmacyHead.cs

@@ -21 +21 @@
         [JsonProperty("Passwd")]
         public string Password { get; set; }
+        [JsonProperty("PharmacyList")]
+        public virtual List<Pharmacy> Pharmacies { get; set; }
+        public virtual List<PharmacyHeadMedicine> Medicines { get; set; }
+        
+        public User User { get; set; }
 
-        [JsonProperty("PharmacyMedicines")]
-        public List<Medicine> MedicineList { get; set; }
-        [JsonProperty("Pharmacy")]
-        public ICollection<Pharmacy> PharmaciesList { get; set; }
-        //[JsonProperty("PHMedicineList")]
-        public ICollection<PharmacyHeadMedicine> PHMedicineList { get; set; }
 
     }