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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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]
Note: See TracChangeset for help on using the changeset viewer.