Index: Farmatiko/ClientApp/src/app/admin/admin.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/admin/admin.component.ts	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ Farmatiko/ClientApp/src/app/admin/admin.component.ts	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -19,5 +19,4 @@
   public requests: IPharmacyHeadRequest[] = [];
   public head: IPharmacyHead = {
-    id: '',
     PharmacyMedicines: null,
     Pharmacy: null,
@@ -58,5 +57,4 @@
         () => console.log("PharmacyHead inserted"));
     this.head = {
-      id: '',
       PharmacyMedicines: null,
       Pharmacy: null,
Index: Farmatiko/ClientApp/src/app/shared/data.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/data.service.ts	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ Farmatiko/ClientApp/src/app/shared/data.service.ts	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -180,5 +180,5 @@
     //PharmacyHead PUT
     updatePharmacyHead(head: IPharmacyHead) : Observable<IPharmacyHead> {
-        return this.http.put<IPharmacyHead>(this.basePharmacyHead, head)
+        return this.http.put<IPharmacyHead>(this.basePharmacyHead + '/update', head)
                    .pipe(
                         map((data) => {
Index: Farmatiko/Controllers/PharmacyHeadController.cs
===================================================================
--- Farmatiko/Controllers/PharmacyHeadController.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ Farmatiko/Controllers/PharmacyHeadController.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -9,5 +9,5 @@
 {
     [ApiController]
-    [Authorize(Roles = "PharmacyHead")]
+    [Authorize(Roles = "PharmacyHead,Admin")]
     public class PharmacyHeadController : Controller
     {
@@ -36,8 +36,8 @@
         }
         //POST
-        /*
+/*
         [HttpPost]
         [Route("api/pharmacyhead/add")]
-        public async Task<IActionResult> AddPharmacyHead([FromBody]PharmacyHead pharmacyHead)
+        public async Task<IActionResult> AddPharmacyHead([FromBody] PharmacyHead pharmacyHead)
         {
             bool Success = await _PHService.Add(pharmacyHead);
@@ -52,7 +52,5 @@
         }*/
         [HttpPut]
-        [Route("api/pharmacyhead")]
-        [Authorize(Roles = "Admin")]
-        [Authorize(Roles = "PharmacyHead")]
+        [Route("api/pharmacyhead/update")]
         public async Task UpdatePharmacyHead([FromBody]PharmacyHead pharmacyHead)
         {
Index: FarmatikoData/FarmatikoDataContext.cs
===================================================================
--- FarmatikoData/FarmatikoDataContext.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoData/FarmatikoDataContext.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -27,4 +27,7 @@
                 .ToTable("Medicines");
 
+            modelBuilder.Entity<Pharmacy>()
+                .ToTable("Pharmacies");
+
             modelBuilder.Entity<PharmacyHeadMedicine>()
                 .HasKey(phm => new { phm.PheadId, phm.MedicineId });
@@ -44,4 +47,21 @@
                 .HasForeignKey(k => k.PheadId);
 
+            /*
+                modelBuilder.Entity<CarDetails>()
+            .ToTable("CarDetails");
+
+        modelBuilder.Entity<CarDetails>()
+            .Property(x => x.Type)
+            .HasConversion<int>();
+
+        modelBuilder.Entity<CarDetails>()
+            .HasMany(x => x.ImageUrls)
+            .WithOne(y => y.Car)
+            .HasForeignKey(y => y.CarId);                 
+             */
+
+            /*modelBuilder.Entity<PharmacyHead>()
+                .HasMany(x => x.PharmaciesList);*/
+
             base.OnModelCreating(modelBuilder);
         }
Index: FarmatikoData/FarmatikoRepo/PHRepo.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/PHRepo.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoData/FarmatikoRepo/PHRepo.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -119,4 +119,13 @@
             return pharms;
         }
+
+        public void DeletePHMedicine(int id, int phId, int medId)
+        {
+            var PH = _context.PharmacyHeadMedicines.Where(x => x.PheadId == phId).Single();
+            var PHMed = _context.PharmacyHeadMedicines.Where(x => x.MedicineId == medId).Single();
+            var PHID = _context.PharmacyHeadMedicines.Where(x => x.Id == id).Single();
+            _context.PharmacyHeadMedicines.Remove(PHID);
+            _context.SaveChanges();
+        }
     }
 }
Index: FarmatikoData/FarmatikoRepo/Repository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/Repository.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoData/FarmatikoRepo/Repository.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -259,5 +259,5 @@
 
             }).ToList();
-            return Medicines;
+            return Medicines; 
         }
 
Index: FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -22,4 +22,5 @@
         PharmacyHead GetPharmacyHead(string head);
         List<Pharmacy> GetPharmacies();
+        void DeletePHMedicine(int id, int phId, int medId);
     }
 }
Index: FarmatikoData/Models/Pharmacy.cs
===================================================================
--- FarmatikoData/Models/Pharmacy.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoData/Models/Pharmacy.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -27,5 +27,5 @@
         }
         public int PheadId { get; set; }
-        public PharmacyHead PHead { get; set; }
+        public PharmacyHead PHead { get; internal set; }
     }
 }
Index: FarmatikoData/Models/PharmacyHead.cs
===================================================================
--- FarmatikoData/Models/PharmacyHead.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoData/Models/PharmacyHead.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -21,7 +21,8 @@
         [JsonProperty("Passwd")]
         public string Password { get; set; }
+
+
         [JsonProperty("PharmacyMedicines")]
         public List<Medicine> MedicineList { get; set; }
-        [Required]
         [JsonProperty("Pharmacy")]
         public ICollection<Pharmacy> PharmaciesList { get; set; }
Index: FarmatikoServices/Services/PHService.cs
===================================================================
--- FarmatikoServices/Services/PHService.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoServices/Services/PHService.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -66,6 +66,5 @@
                 if (pharmacyHead.PharmaciesList.Count() == 0)
                     pharmacyHead.PharmaciesList = null;
-                if (pharmacyHead.MedicineList.Count() == 0)
-                    pharmacyHead.MedicineList = null;
+
 
                 phead.PHMedicineList = _repository.GetPHMedicines(phead.Email);
@@ -75,5 +74,13 @@
                     phead.MedicineList = pharmacyHead.MedicineList;
                     List<PharmacyHeadMedicine> list = new List<PharmacyHeadMedicine>();
-
+                    if (pharmacyHead.MedicineList.Count() == 0)
+                    {
+                        phead.MedicineList = null;
+                        int PHMId = phead.PHMedicineList.Select(x => x.Id).Single();
+                        int phId = phead.PHMedicineList.Select(x => x.PheadId).Single();
+                        int medId = phead.PHMedicineList.Select(x => x.MedicineId).Single();
+                        _iPHRepo.DeletePHMedicine(PHMId, phId, medId);
+                        return;
+                    }
                     foreach (var med in phead.MedicineList)
                     {
Index: FarmatikoServices/Services/Service.cs
===================================================================
--- FarmatikoServices/Services/Service.cs	(revision 1db5673118cc86d7338dc9f97d8323cc9c620ab8)
+++ FarmatikoServices/Services/Service.cs	(revision 68454c67309bbccebb3cfc5bff2a853caf8b9582)
@@ -132,9 +132,9 @@
             if (pharmacyHead != null)
             {
-                var Medicines = await _repository.GetMedicinesAsync();
+                /*var Medicines = await _repository.GetMedicinesAsync();
                 foreach (var med in Medicines)
                 {
                     pharmacyHead.MedicineList.Add(med);
-                }
+                }*/
                 
                 await _repository.AddPharmacyHead(pharmacyHead);