Changeset 63d885e for FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs

Timestamp:

08/07/20 11:01:25 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

5d02859

Parents:

ee137aa (diff), c406ae5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

File:

• FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs (modified) (2 diffs)

FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs

@@ -2 +2 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -23 +24 @@
         public IQueryable<HealthcareWorkers> GetAll()
         {
-            return _context.HealthcareWorkers.OrderBy(x => x.Name);
+            return _context.HealthcareWorkers.Take(50).Select(x => new HealthcareWorkers
+            { 
+                Name = x.Name,
+                Branch = x.Branch,
+                Facility = x.Facility,
+                Title = x.Title
+            }).OrderBy(x => x.Name);
         }
 
         public void Remove(HealthcareWorkers healthcareWorker)
         {
-            var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name));
-            _context.HealthcareWorkers.Remove((HealthcareWorkers)healthCareWorker);
+            var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name)).FirstOrDefault();
+            if (healthCareWorker != null)
+            {
+                _context.HealthcareWorkers.Remove(healthCareWorker);
+                _context.SaveChangesAsync();
+            }
+            
         }
     }