Ignore:
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

Location:
Farmatiko/Controllers
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • Farmatiko/Controllers/HealthFacilitiesController.cs

    ree137aa r63d885e  
    2626        }
    2727        [HttpGet]
    28         public IQueryable<HealthFacilities> Get()
     28        public Task<IQueryable<HealthFacilities>> Get()
    2929        {
    3030            return _healthFacilitiesService.GetAll();
  • Farmatiko/Controllers/HealthcareWorkerController.cs

    ree137aa r63d885e  
    11using System.Linq;
     2using System.Threading.Tasks;
    23using FarmatikoData.Models;
    34using FarmatikoServices.FarmatikoServiceInterfaces;
     
    1718
    1819        [HttpGet]
    19         public IQueryable<HealthcareWorkers> Get()
     20        public Task<IQueryable<HealthcareWorkers>> Get()
    2021        {
    2122            return _healthcareWorkerService.GetAll();
  • Farmatiko/Controllers/MedicineController.cs

    ree137aa r63d885e  
    11using System.Linq;
     2using System.Threading.Tasks;
    23using FarmatikoData.Models;
    34using FarmatikoServices.FarmatikoServiceInterfaces;
     
    1617        }
    1718        [HttpGet]
    18         public IQueryable<Medicine> Get()
     19        public Task<IQueryable<Medicine>> Get()
    1920        {
    2021            return _medicineService.GetAll();
  • Farmatiko/Controllers/MedicineListController.cs

    ree137aa r63d885e  
    11using System.Collections.Generic;
    22using System.Linq;
     3using System.Threading.Tasks;
    34using FarmatikoData.Models;
    45using FarmatikoServices.FarmatikoServiceInterfaces;
     
    1718        }
    1819        [HttpGet]
    19         public IQueryable<MedicineList> Get()
     20        public Task<IQueryable<MedicineList>> Get()
    2021        {
    2122            return _medicineListService.GetAll();
    2223        }
    2324        [HttpGet]
    24         public ICollection<MedicineList> GetByName(string Name)
     25        public Task<ICollection<MedicineList>> GetByName(string Name)
    2526        {
    2627            return _medicineListService.GetByName(Name);
    2728        }
    2829        [HttpGet]
    29         public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
     30        public Task<ICollection<MedicineList>> GetByManufacturer(string Manufacturer)
    3031        {
    3132            return _medicineListService.GetByManufacturer(Manufacturer);
  • Farmatiko/Controllers/PandemicController.cs

    ree137aa r63d885e  
    11using System.Linq;
     2using System.Threading.Tasks;
    23using FarmatikoData.Models;
    34using FarmatikoServices.FarmatikoServiceInterfaces;
     
    1617        }
    1718        [HttpGet]
    18         public IQueryable<Pandemic> Get()
     19        public Task<IQueryable<Pandemic>> Get()
    1920        {
    2021            return _pandemicService.GetAll();
  • Farmatiko/Controllers/PharmacyController.cs

    ree137aa r63d885e  
    11using System.Collections.Generic;
    22using System.Linq;
     3using System.Threading.Tasks;
    34using FarmatikoData.Models;
    45using FarmatikoServices.FarmatikoServiceInterfaces;
     
    1718        }
    1819        [HttpGet]
    19         public IQueryable<Pharmacy> Get()
     20        public Task<IQueryable<Pharmacy>> Get()
    2021        {
    2122            return _pharmacyService.GetAll();
    2223        }
    2324        [HttpGet]
    24         public ICollection<Pharmacy> GetPharmacies()
     25        public Task<ICollection<Pharmacy>> GetPharmacies()
    2526        {
    2627            return _pharmacyService.GetPharmacies();
    2728        }
    2829        [HttpPost]
    29         public void UpdatePharmacy(Pharmacy pharmacy, string Name)
     30        public void UpdatePharmacy(Pharmacy pharmacy)
    3031        {
    31             _pharmacyService.UpdatePharmacy(pharmacy,Name);
     32            _pharmacyService.UpdatePharmacy(pharmacy);
    3233        }
    3334        [HttpPost]
  • Farmatiko/Controllers/PharmacyHeadController.cs

    ree137aa r63d885e  
    3636        }
    3737        [HttpPost]
    38         public void Remove(PharmacyHead pharmacyHead, string Name)
     38        public void Remove(PharmacyHead pharmacyHead)
    3939        {
    40             _pharmacyHeadRepository.Remove(pharmacyHead, Name);
     40            _pharmacyHeadRepository.Remove(pharmacyHead);
    4141        }
    4242    }
Note: See TracChangeset for help on using the changeset viewer.