Index: Farmatiko/ClientApp/src/app/counter/counter.component.html =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -17,12 +17,21 @@ - + {{ facility.Name }} - {{ facility.Municipality }} - {{ facility.Address }} - {{ facility.Type }} - {{ facility.Email }} - {{ facility.Phone }} - + + facility.Municipality + + + + + + + + Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -11,7 +11,17 @@ constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { - http.get(baseUrl + 'HealthFacilities').subscribe(result => { + http.get(baseUrl + 'HealthFacilities/Get?').subscribe(result => { this.facilities = result; + console.log(this.facilities); }, error => console.error(error)); - } + } } +/*interface healthFacilities { + Name: string; + Municipality: string; + Address: string; + Type: string; + Email: string; + Phone: string; +}*/ + Index: Farmatiko/Controllers/HealthFacilitiesController.cs =================================================================== --- Farmatiko/Controllers/HealthFacilitiesController.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/Controllers/HealthFacilitiesController.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -0,0 +1,39 @@ +using FarmatikoData; +using FarmatikoData.Models; +using Microsoft.AspNetCore.Mvc; +using System.Collections.Generic; + +namespace Farmatiko.Controllers +{ + [ApiController] + [Route("[controller]/[action]")] + public class HealthFacilitiesController : Controller + { + private IHealthFacilityService _healthFacilitiesService; + public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService) + { + _healthFacilitiesService = healthFacilitiesService; + } + [HttpGet] + public IEnumerable Get() + { + return _healthFacilitiesService.GetAll(); + } + [HttpGet] + public IEnumerable GetByName(string Name) + { + return _healthFacilitiesService.GetByName(Name); + } + + [HttpGet] + public IEnumerable GetByType(string Type) + { + return _healthFacilitiesService.GetByType(Type); + } + [HttpPut] + public void Add(HealthFacilities healthFacility) + { + _healthFacilitiesService.Add(healthFacility); + } + } +} Index: Farmatiko/Controllers/HealthcareWorkerController.cs =================================================================== --- Farmatiko/Controllers/HealthcareWorkerController.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/Controllers/HealthcareWorkerController.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -0,0 +1,42 @@ +using Microsoft.AspNetCore.Mvc; +using FarmatikoData.FarmatikoServiceInterfaces; +using System.Collections.Generic; +using FarmatikoData.Models; + +namespace Farmatiko.Controllers +{ + public class HealthcareWorkerController : Controller + { + private IHealthcareWorkerService _healthcareWorkerService; + public HealthcareWorkerController(IHealthcareWorkerService healthcareWorkerService) + { + _healthcareWorkerService = healthcareWorkerService; + } + + [HttpGet] + public IEnumerable GetAll() + { + return _healthcareWorkerService.GetAll(); + } + [HttpGet] + public HealthcareWorkers GetByName(string Name) + { + return _healthcareWorkerService.GetByName(Name); + } + [HttpGet] + public IEnumerable GetAllByBranch(string Branch) + { + return _healthcareWorkerService.GetAllByBranch(Branch); + } + [HttpGet] + public IEnumerable GetAllByFacility(HealthFacilities Facility) + { + return _healthcareWorkerService.GetAllByFacility(Facility); + } + [HttpGet] + public void Add(HealthcareWorkers HealthcareWorker) + { + _healthcareWorkerService.Add(HealthcareWorker); + } + } +} Index: Farmatiko/Farmatiko.csproj =================================================================== --- Farmatiko/Farmatiko.csproj (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ Farmatiko/Farmatiko.csproj (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -36,4 +36,5 @@ + Index: Farmatiko/Startup.cs =================================================================== --- Farmatiko/Startup.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ Farmatiko/Startup.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -8,4 +8,7 @@ using FarmatikoData; using Microsoft.EntityFrameworkCore; +using FarmatikoServices; +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.FarmatikoRepo; namespace Farmatiko @@ -32,4 +35,6 @@ services.AddEntityFrameworkNpgsql().AddDbContext(opt => opt.UseNpgsql(connectionString)); + services.AddTransient(); + services.AddTransient(); } Index: FarmatikoData/Base/BaseEntity.cs =================================================================== --- FarmatikoData/Base/BaseEntity.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ FarmatikoData/Base/BaseEntity.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -9,4 +9,5 @@ public int Id { get; set; } public DateTime CreatedOn { get; set; } + public DateTime DeletedOn { get; set; } } Index: FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -26,28 +26,19 @@ public IEnumerable GetAll() { - return _context.HealthFacilities; + return _context.HealthFacilities.OrderBy(x => x.Name).ToList(); } - public HealthFacilities GetByFullName(string FullName) + public IEnumerable GetAllByName(string Name) { - return (HealthFacilities)_context.HealthFacilities - .Where(Facility => Facility.Name == FullName) - .FirstOrDefault(Facility => Facility.Name == FullName); + Name = Name.ToLower(); + + return _context.HealthFacilities.Where(x => x.Name.ToLower().Contains(Name)).OrderBy(x => x.Name.ToLower().IndexOf(Name)).ToList(); } - public HealthFacilities GetByType(string FacilityType) + IEnumerable IHealthFacilityRepository.GetByType(string Type) { - return (HealthFacilities)_context.HealthFacilities - .Where(FacilityType => FacilityType.Type.Equals(FacilityType)) - .FirstOrDefault(FacilityType => FacilityType.Name.Equals(FacilityType)); + return (IEnumerable)_context.HealthFacilities + .Where(type => type.Type.Equals(Type)); } - - public void Remove(string healthFacility) - { - HealthFacilities Facility = (HealthFacilities)_context.HealthFacilities.Where(healthFacility => healthFacility.Name.Equals(healthFacility)); - _context.Remove(Facility); - _context.SaveChangesAsync(); - } - } } Index: FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -9,8 +9,7 @@ { IEnumerable GetAll(); - HealthFacilities GetByFullName(string FullName); - HealthFacilities GetByType(string FacilityType); + IEnumerable GetByType(string Type); void Add(HealthFacilities healthFacility); - void Remove(string healthFacility); + IEnumerable GetAllByName(string Name); } } Index: FarmatikoData/Migrations/20200722131856_Initial migration.cs =================================================================== --- FarmatikoData/Migrations/20200722131856_Initial migration.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ FarmatikoData/Migrations/20200722131856_Initial migration.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -15,6 +15,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), Name = table.Column(nullable: false), Municipality = table.Column(nullable: false), @@ -35,6 +35,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), Name = table.Column(nullable: true), TotalMK = table.Column(nullable: false), @@ -57,6 +57,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), Name = table.Column(nullable: false), Branch = table.Column(nullable: false), @@ -81,6 +81,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), Name = table.Column(nullable: true), Strength = table.Column(nullable: true), @@ -103,6 +103,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), PharmacyMedicinesId = table.Column(nullable: true), PharmacyId = table.Column(nullable: true), @@ -122,6 +122,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), MedicinesId = table.Column(nullable: true), HasMedicine = table.Column(nullable: false), @@ -151,6 +151,6 @@ Id = table.Column(nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), + CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), + DeletedOn = table.Column(nullable: true), Name = table.Column(nullable: true), Location = table.Column(nullable: true), Index: rmatikoServices/FarmatikoServiceInterfaces/IFarmatikoHealthFacilitiesService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IFarmatikoHealthFacilitiesService.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ (revision ) @@ -1,12 +1,0 @@ -using FarmatikoData.Models; -using System; -using System.Collections.Generic; -using System.Text; - -namespace FarmatikoData -{ - public interface IFarmatikoHealthFacilitiesService - { - - } -} Index: FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -0,0 +1,15 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoData +{ + public interface IHealthFacilityService + { + IEnumerable GetByName(string name); + IEnumerable GetAll(); + IEnumerable GetByType(string Type); + void Add(HealthFacilities healthFacility); + } +} Index: FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -0,0 +1,14 @@ +using FarmatikoData.Models; +using System.Collections.Generic; + +namespace FarmatikoData.FarmatikoServiceInterfaces +{ + public interface IHealthcareWorkerService + { + IEnumerable GetAll(); + HealthcareWorkers GetByName(string Name); + IEnumerable GetAllByBranch(string Branch); + IEnumerable GetAllByFacility(HealthFacilities Facility); + void Add(HealthcareWorkers HealthcareWorker); + } +} Index: rmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkersService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkersService.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ (revision ) @@ -1,15 +1,0 @@ -using FarmatikoData.Models; -using System; -using System.Collections.Generic; -using System.Text; - -namespace FarmatikoData.FarmatikoServiceInterfaces -{ - public interface IHealthcareWorkersService - { - IEnumerable GetAll(); - HealthcareWorkers GetByName(string Name); - IEnumerable GetAllByBranch(string Branch); - IEnumerable GetAllByFacility(HealthFacilities Facility); - } -} Index: FarmatikoServices/FarmatikoServices.csproj =================================================================== --- FarmatikoServices/FarmatikoServices.csproj (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ FarmatikoServices/FarmatikoServices.csproj (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -6,4 +6,8 @@ + + + + Index: rmatikoServices/Services/FarmatikoHealthFacilitiesService.cs =================================================================== --- FarmatikoServices/Services/FarmatikoHealthFacilitiesService.cs (revision 4b342bb138fa07b852582b8afca09386e033298a) +++ (revision ) @@ -1,12 +1,0 @@ -using FarmatikoData; -using FarmatikoData.Models; -using System.Collections.Generic; -using System.Linq; - -namespace FarmatikoServices -{ - public class FarmatikoHealthFacilitiesService : IFarmatikoHealthFacilitiesService - { - - } -} Index: FarmatikoServices/Services/HealthFacilityService.cs =================================================================== --- FarmatikoServices/Services/HealthFacilityService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ FarmatikoServices/Services/HealthFacilityService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -0,0 +1,38 @@ +using FarmatikoData; +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using System.Collections.Generic; +using System.Linq; + +namespace FarmatikoServices +{ + public class HealthFacilityService : IHealthFacilityService + { + private IHealthFacilityRepository _healthFacilityRepository; + + public HealthFacilityService(IHealthFacilityRepository healthFacilityRepository) + { + _healthFacilityRepository = healthFacilityRepository; + } + + public void Add(HealthFacilities healthFacility) + { + _healthFacilityRepository.Add(healthFacility); + } + + public IEnumerable GetAll() + { + return _healthFacilityRepository.GetAll(); + } + + public IEnumerable GetByName(string name) + { + return _healthFacilityRepository.GetAllByName(name); + } + + public IEnumerable GetByType(string Type) + { + return _healthFacilityRepository.GetByType(Type); + } + } +} Index: FarmatikoServices/Services/HealthcareWorkerService.cs =================================================================== --- FarmatikoServices/Services/HealthcareWorkerService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ FarmatikoServices/Services/HealthcareWorkerService.cs (revision d2e69be8d63167e8e231babb28ed50703975a234) @@ -0,0 +1,42 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.FarmatikoServiceInterfaces; +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoServices.Services +{ + public class HealthcareWorkerService : IHealthcareWorkerService + { + private IHealthcareWorkersRepository _workersRepository; + public HealthcareWorkerService(IHealthcareWorkersRepository workersRepository) + { + _workersRepository = workersRepository; + } + public void Add(HealthcareWorkers HealthcareWorker) + { + _workersRepository.Add(HealthcareWorker); + } + + public IEnumerable GetAll() + { + return _workersRepository.GetAll(); + } + + public IEnumerable GetAllByBranch(string Branch) + { + return _workersRepository.GetByBranch(Branch); + } + + public IEnumerable GetAllByFacility(HealthFacilities Facility) + { + return _workersRepository.GetByFacility(Facility); + } + + public HealthcareWorkers GetByName(string Name) + { + return _workersRepository.GetByName(Name); + } + } +}