Index: Farmatiko/ClientApp/angular.json =================================================================== --- Farmatiko/ClientApp/angular.json (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/angular.json (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -54,5 +54,6 @@ "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "Farmatiko:build" + "browserTarget": "Farmatiko:build", + "port": 80 }, "configurations": { Index: Farmatiko/ClientApp/src/app/admin/admin.component.css =================================================================== --- Farmatiko/ClientApp/src/app/admin/admin.component.css (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/admin/admin.component.css (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -11,2 +11,7 @@ width: 30vh; } + +h2 { + text-align: center; + padding: 50px; +} Index: Farmatiko/ClientApp/src/app/admin/admin.component.html =================================================================== --- Farmatiko/ClientApp/src/app/admin/admin.component.html (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/admin/admin.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -22,5 +22,5 @@
- +
@@ -31,8 +31,8 @@ - - - - + + + + @@ -44,5 +44,5 @@
-
{{head.Name}} | {{head.Email}}{{head.Pharmacy[0].name}}Approve | Reject
{{request.PharmacyHead.Name}} | {{request.PharmacyHead.Email}}{{request.Pharmacy.name}}Approve | Reject
+
@@ -53,6 +53,6 @@ - - + + @@ -62,16 +62,17 @@ -
+

Loading form...

+
Name - +
Email - +
Password - +
@@ -79,4 +80,2 @@ - -
{{status}}
Index: Farmatiko/ClientApp/src/app/admin/admin.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/admin/admin.component.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/admin/admin.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -1,10 +1,11 @@ -import { Component, OnInit, Inject, Output, EventEmitter } from '@angular/core'; -import { Pharmacy } from '../models/Pharmacy'; -import { HttpClient } from '@angular/common/http'; +import { Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; -import { Router, RouterModule } from '@angular/router'; -import { PharmacyHead } from '../models/PharmacyHead'; -import { FormControl } from '@angular/forms'; +import { Router } from '@angular/router'; +import { IPharmacyHead, IPharmacyHeadRequest, IPharmacy } from '../shared/interfaces'; +import { DataService } from '../shared/data.service'; +import { EditPharmacyHeadDialogComponent } from '../dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component'; +import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component'; +import { PharmacyHeadDialogComponent } from '../nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component'; @@ -15,49 +16,122 @@ }) export class AdminComponent implements OnInit { - public heads: PharmacyHead[]; - public head: PharmacyHead; - public status: string; + public heads: IPharmacyHead[] = []; + public requests: IPharmacyHeadRequest[] = []; + public head: IPharmacyHead; - constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string, private dialog: MatDialog, private _snackBar: MatSnackBar, private router: Router) { - http.get(baseUrl + 'PharmacyHead/Get?').subscribe(result => { - this.heads = result; - console.log(this.heads); - }, error => console.error(error)); + constructor(private dataService: DataService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router) { + } ngOnInit(): void { - this.head = new PharmacyHead(); + this.dataService.getPharmacyHeads() + .subscribe((pHeads: IPharmacyHead[]) => { + this.heads = pHeads; + }, + (err: any) => console.log(err), + () => console.log("PharmacyHead data retrieved")); + + this.dataService.getClaimingRequests() + .subscribe((pRequests: IPharmacyHeadRequest[]) => { + this.requests = pRequests; + }, + (err: any) => console.log(err), + () => console.log("PharmacyHead data retrieved")); } createHead() { - console.log(this.head); - // post request vo prodolzenie - - this.status="Status bar createHead"; - //window.location.reload(); + this.dataService.insertPharmacyHead(this.head) + .subscribe((cHead: IPharmacyHead) => { + if(cHead) { + this.heads.push(cHead); + this.openSnackBar("New head created!","OK"); + } + }, + (err: any) => console.log(err), + () => console.log("PharmacyHead inserted")); + this.head = null; } - Del(head: PharmacyHead) { - console.log(this.head); - // post request vo prodolzenie - - this.status="Status bar Del"; + deletePharmacyHead(dHead: IPharmacyHead) { + this.dataService.deletePharmacyHead(dHead.id) + .subscribe((status: boolean) => { + if(status) { + this.openSnackBar("Head deleted!","OK"); + } + }, + (err: any) => console.log(err), + () => console.log("PharmacyHead deleted")); } - ChangeDialog(head: PharmacyHead) { - console.log(this.head); - + openEditPharmacyHeadDialog(eHead: IPharmacyHead) { + let dialogRef = this.dialog.open(EditPharmacyHeadDialogComponent, { + width: '450px', + data: eHead + }); + dialogRef.afterClosed().subscribe((editedHead: IPharmacyHead) => { + if(editedHead){ + this.heads = this.heads.filter(x => x !== eHead); + this.heads.push(editedHead); + this.dataService.updatePharmacyHead(editedHead) + .subscribe((hd: IPharmacyHead) => { + if(hd) { + this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => { + window.location.reload(); + }); + } + else { + this.openSnackBar("PharmacyHead edit failed", "Try again"); + } + }, + (err: any) => console.log(err), + () => console.log('PharmacyHead data updated')); + } + }); } - Reject() { - console.log('Rejected'); - // post request vo prodolzenie - + openPharmacyDialog(pharmacy: IPharmacy): void { + this.dialog.open(PharmacyDialogComponent, { + width: '450px', + data: pharmacy + }); } - Approve() { - console.log('Approved'); - // post request vo prodolzenie + openPharmacyHeadDialog(hd: IPharmacyHead): void { + this.dialog.open(PharmacyHeadDialogComponent, { + width: '450px', + data: hd + }); + } + rejectRequest(req: IPharmacyHeadRequest) { + this.dataService.deleteClaimingRequest(req.id) + .subscribe((status: boolean) => { + if(status) { + this.openSnackBar("Request rejected!","OK"); + } + else { + this.openSnackBar("Something went wrong","Try again"); + } + }, + (err: any) => console.log(err), + () => console.log("PharmacyHeadRequest deleted")); + } + + approveRequest(req: IPharmacyHeadRequest) { + if(req) { + req.PharmacyHead.Pharmacy.push(req.Pharmacy); + this.dataService.updatePharmacyHead(req.PharmacyHead) + .subscribe(() => { + + }, + (err: any) => console.log(err), + () => console.log("PharmacyHead updated")) + } + } + + openSnackBar(message: string, action: string) : MatSnackBarRef { + return this.snackBar.open(message, action, { + duration: 5000, + }); } Index: Farmatiko/ClientApp/src/app/app.module.ts =================================================================== --- Farmatiko/ClientApp/src/app/app.module.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/app.module.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -6,4 +6,6 @@ import { MaterialModule } from './shared/material.module'; import { ReactiveFormsModule } from '@angular/forms'; + +import { DataService } from './shared/data.service'; import { AppComponent } from './app.component'; @@ -16,4 +18,11 @@ import { DashboardComponent } from './dashboard/dashboard.component'; import { LoginComponent } from './login/login.component'; +import { MedicineDialogComponent } from './dialogs/medicine-dialog/medicine-dialog.component'; +import { PharmacyDialogComponent } from './dialogs/pharmacy-dialog/pharmacy-dialog.component'; +import { FacilityDialogComponent } from './dialogs/facility-dialog/facility-dialog.component'; +import { WorkerDialogComponent } from './dialogs/worker-dialog/worker-dialog.component'; +import { EditPharmacyDialogComponent } from './dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component'; +import { EditPharmacyHeadDialogComponent } from './dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component'; +import { PharmacyHeadDialogComponent } from './nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component'; @NgModule({ @@ -26,5 +35,12 @@ AdminComponent, DashboardComponent, - LoginComponent + LoginComponent, + MedicineDialogComponent, + PharmacyDialogComponent, + FacilityDialogComponent, + WorkerDialogComponent, + EditPharmacyDialogComponent, + EditPharmacyHeadDialogComponent, + PharmacyHeadDialogComponent ], imports: [ @@ -38,4 +54,5 @@ { path: 'admin', component: AdminComponent }, { path: 'dashboard', component: DashboardComponent }, + { path: 'dashboard/:token', component: DashboardComponent }, { path: 'login', component: LoginComponent } ]), @@ -44,5 +61,7 @@ ReactiveFormsModule ], - providers: [], + providers: [ + DataService + ], bootstrap: [AppComponent] }) Index: Farmatiko/ClientApp/src/app/counter/counter.component.html =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -8,57 +8,29 @@

Здравствени установи

- +
-
{{head.Name}} | {{head.Email}}Delete | Change{{head.Name}} | {{head.Email}}Delete | Change
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
id {{facilities.id}} createdOn {{facilities.createdOn}} deletedOn {{facilities.deletedOn}} Име {{facilities.name}} Општина {{facilities.municipality}} Адреса {{facilities.address}} Тип {{facilities.type}} Е-пошта {{facilities.email}} Телефон {{facilities.phone}}
- + + + + + + + + + + + + + + + + + + + + + +
ИмеОпштинаАдресаТипЕ-поштаТелефон
{{ facility.name }}{{ facility.municipality }}{{ facility.address }}{{ facility.type }}{{ facility.email }}{{ facility.phone }}
@@ -71,29 +43,22 @@
- - - - - - - - - - - - - - - - - - - - - - - -
Име {{workers.name}} Гранка {{workers.branch}} Установа {{workers.facility}} Назив {{workers.title}}
- + + + + + + + + + + + + + + + + + +
ИмеГранкаУстановаНазив
{{ worker.name }}{{ worker.branch }}{{ worker.facility }}{{ worker.title }}
Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -1,9 +1,8 @@ -import { Component, OnInit, ViewChild, Inject, Input } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { HealthFacilities } from '../models/HealthFacilities'; -import { MatTableDataSource } from '@angular/material/table'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatSort } from '@angular/material/sort'; -import { HealthcareWorkers } from '../models/HealthcareWorkers'; +import { Component, OnInit } from '@angular/core'; +import { IHealthFacilities, IHealthcareWorkers } from '../shared/interfaces'; +import { DataService } from '../shared/data.service'; +import { MatDialog } from '@angular/material/dialog'; +import { FacilityDialogComponent } from '../dialogs/facility-dialog/facility-dialog.component'; +import { WorkerDialogComponent } from '../dialogs/worker-dialog/worker-dialog.component'; @Component({ @@ -13,44 +12,71 @@ }) export class CounterComponent implements OnInit { - @Input() facilities: HealthFacilities[]; - public workers: HealthcareWorkers[]; - displayedColumns = ['id','createdOn','deletedOn','Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон']; - displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив']; - dataSource = new MatTableDataSource(); - dataSourceWorkers = new MatTableDataSource(); + public facilities: IHealthFacilities[] = []; + public workers: IHealthcareWorkers[] = []; + public filteredFacilities: IHealthFacilities[] = []; + public filteredWorkers: IHealthcareWorkers[] = []; - @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; - - constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { - http.get(baseUrl + 'HealthFacilities/Get?').subscribe(result => { - this.facilities = result; - console.log(this.facilities); - this.dataSource = new MatTableDataSource(this.facilities); - }, error => console.error(error)); - http.get(baseUrl + 'HealthcareWorker/Get?').subscribe(result => { - this.workers = result; - console.log(this.workers); - this.dataSourceWorkers = new MatTableDataSource(this.workers); - }, error => console.error(error)); - } - ngOnInit(): void { + constructor(private dataService: DataService, private dialog: MatDialog) { + } - ngAfterViewInit(): void { - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; + ngOnInit(): void { + this.dataService.getFacilities() + .subscribe((facility: IHealthFacilities[]) => { + this.facilities = this.filteredFacilities = facility; + }, + (err: any) => console.log(err), + () => console.log('Facility data retrieved!')); + + this.dataService.getWorkers() + .subscribe((worker: IHealthcareWorkers[]) => { + this.workers = this.filteredWorkers = worker; + }, + (err: any) => console.log(err), + () => console.log('Facility data retrieved!')); } - applyFilter(filterValue: string) { - filterValue = filterValue.trim(); - filterValue = filterValue.toLowerCase(); - this.dataSource.filter = filterValue; + applyFilterFacilities(filterValue: string) { + console.log("applyFilterFacilities works!") + if(filterValue) { + this.dataService.searchFacilities(filterValue) + .subscribe((facility: IHealthFacilities[]) => { + this.filteredFacilities = facility; + }, + (err: any) => console.log(err), + () => console.log('Facility data retrieved!')); + } + else { + this.filteredFacilities = this.facilities; + } } applyFilterWorkers(filterValue: string) { - filterValue = filterValue.trim(); - filterValue = filterValue.toLowerCase(); - this.dataSourceWorkers.filter = filterValue; + console.log("applyFilterWorkers works!") + if(filterValue) { + this.dataService.searchWorkers(filterValue) + .subscribe((worker: IHealthcareWorkers[]) => { + this.filteredWorkers = worker; + }, + (err: any) => console.log(err), + () => console.log('Worker data retrieved!')); + } + else { + this.filteredWorkers = this.workers; + } + } + + openFacilityDialog(facility: IHealthFacilities): void { + this.dialog.open(FacilityDialogComponent, { + width: '450px', + data: facility + }); + } + + openWorkerDialog(worker: IHealthcareWorkers): void { + this.dialog.open(WorkerDialogComponent, { + width: '450px', + data: worker + }); } } Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -12,5 +12,5 @@
    -
  • Logged as
    • +
  • Logged as ...

    {{head.Name}}

@@ -18,6 +18,5 @@ - - + @@ -30,7 +29,7 @@

Мои аптеки

-

Loading...

+

Loading...

- +
@@ -43,10 +42,10 @@ - + - + @@ -61,35 +60,27 @@ - -
{{pharmacies.name}} {{pharmacies.location}} {{pharmacies.address}} {{pharmacies.workAllTime}}Работи 24/7 | Не работи 24/7Edit
- a - - - - - - - - - - - - - - - - - - - - - -
Име {{pharmacies.name}} Локација {{pharmacies.location}} Адреса {{pharmacies.address}} Actions Claim Pharmacy
- + + + + + + + + + + + + + + + + + + + +
ИмеЛокацијаАдресаРаботи 27/7?
{{ pharmacy.name }}{{ pharmacy.location }}{{ pharmacy.address }}{{ pharmacy.workAllTime }}Claim
- -
{{status}}
@@ -97,51 +88,31 @@

Достапни лекови

- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Име {{mymedicines.name}} Јачина {{mymedicines.strength}} Форма {{mymedicines.form}} Начин на издавање {{mymedicines.wayOfIssuing}} Производител {{mymedicines.manufacturer}} Цена {{mymedicines.price}} Пакување {{mymedicines.packaging}} Actions Exists | Doesnt sell
- + + + + + + + + + + + + + + + + + + + + + + + + +
ИмеЈачинаФормаНачин на издавањеПроизводителЦенаПакување
{{ medicine.name }}{{ medicine.strength }}{{ medicine.form }}{{ medicine.wayOfIssuing }}{{ medicine.manufacturer }}{{ medicine.price }}{{ medicine.packaging }}Delete
Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -1,15 +1,11 @@ -import { Component, OnInit, ViewChild, Inject, Output, EventEmitter } from '@angular/core'; -import { Pharmacy } from '../models/Pharmacy'; -import { MatTableDataSource } from '@angular/material/table'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatSort } from '@angular/material/sort'; -import { HttpClient } from '@angular/common/http'; +import { Component, OnInit} from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; -import { Router, RouterModule } from '@angular/router'; -import { HomeComponent } from '../home/home.component'; -import { Medicine } from '../models/Medicine'; -import { PharmacyHead } from '../models/PharmacyHead'; -import { MedicineList } from '../models/MedicineList'; +import { IPharmacy, IMedicine, IPharmacyHead, IPharmacyHeadRequest } from '../shared/interfaces'; +import { DataService } from '../shared/data.service'; +import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component'; +import { EditPharmacyDialogComponent } from '../dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component'; +import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component'; +import { ActivatedRoute, Router } from '@angular/router'; @Component({ @@ -19,113 +15,139 @@ }) export class DashboardComponent implements OnInit { - public mymedicines: Medicine[]; - public hasmymedicines: boolean[]; - public pharmacies: Pharmacy[]; - public mypharmacies: Pharmacy[]; - public head: PharmacyHead; - public status: string; - displayedColumns = ['Име','Јачина','Форма', 'Начин на издавање', 'Производител', 'Цена', 'Пакување', 'Actions']; - displayedColumnsPharmacies = ['Име','Локација','Адреса', 'Actions']; - dataSource = new MatTableDataSource(); - dataSourcePharmacies = new MatTableDataSource(); + public pharmacies: IPharmacy[] = []; + public head: IPharmacyHead; + public filteredPharmacies: IPharmacy[] = []; + public filteredMedicines: IMedicine[] = []; + public request: IPharmacyHeadRequest; + public token: string; - @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + constructor(private dataService: DataService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router, private route: ActivatedRoute) { - constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string, private dialog: MatDialog, private _snackBar: MatSnackBar, private router: Router) { - http.get(baseUrl + 'PharmacyHead/GetLoggedHead?').subscribe(result => { - this.head = result; - console.log(this.head); - this.mymedicines = this.head.PharmacyMedicines.Medicines; - console.log(this.mymedicines); - this.mypharmacies = this.head.Pharmacy; - console.log(this.mypharmacies); - this.dataSource = new MatTableDataSource(this.mymedicines); - }, error => console.error(error)); - http.get(baseUrl + 'Pharmacy/Get?').subscribe(result => { - this.pharmacies = result; - console.log(this.pharmacies); - this.dataSourcePharmacies = new MatTableDataSource(this.pharmacies); - }, error => console.error(error)); } ngOnInit(): void { + this.token = this.route.snapshot.params['token']; + this.dataService.getPharmacyHead(this.token) + .subscribe((hd: IPharmacyHead) => { + this.head = hd; + }, + (err: any) => console.log(err), + () => console.log('Head data retrieved')); + + this.dataService.getPharmacies() + .subscribe((pharmacy: IPharmacy[]) => { + this.pharmacies = pharmacy; + }, + (err: any) => console.log(err), + () => console.log('Pharmacy data retrieved')); + } + + claimPharmacy(pharmacy: IPharmacy) { + if(pharmacy && !this.head.Pharmacy.find(x => x === pharmacy)) { + this.request = null; + this.request.Pharmacy = pharmacy; + this.request.PharmacyHead = this.head; + this.dataService.claimPharmacy(this.request) + .subscribe((req: IPharmacyHeadRequest) => { + if(req) { + this.openSnackBar("Claiming request sent!", "OK"); + } + else { + this.openSnackBar("Unable to send a request", "Try again"); + } + }, + (err: any) => console.log(err), + () => console.log('Claiming request sent!')); + } } - ngAfterViewInit(): void { - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; - this.dataSourcePharmacies.paginator = this.paginator; - this.dataSourcePharmacies.sort = this.sort; + deleteMedicine(medicine: IMedicine){ + this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x !== medicine); + this.dataService.updatePharmacyHead(this.head) + .subscribe((hd: IPharmacyHead) => { + if(hd) { + this.openSnackBar("Success! Medicine deleted", "OK"); + } + else { + this.openSnackBar("Unable to delete Medicine", "Try again"); + } + }, + (err: any) => console.log(err), + () => console.log('Update sent!')); } - works24hrs(pharmacy: Pharmacy) { - console.log(pharmacy); - // post request vo prodolzenie - - this.status="Status bar works24hrs"; - } - - doesntWork24hrs(pharmacy: Pharmacy) { - console.log(pharmacy); - // post request vo prodolzenie - - this.status="Status bar doesntWork24hrs"; - } - - claimPharmacy(pharmacy: Pharmacy) { - console.log(pharmacy); - // post request vo prodolzenie - - this.status="Status bar claimPharmacy"; - } - - medicineExists(mymedicine: Medicine) { - console.log(mymedicine); - // post request vo prodolzenie - - this.status="Status bar medicineexists"; - } - - medicineDoesntSell(mymedicine: Medicine) { - console.log(mymedicine); - // post request vo prodolzenie - - this.status="Status bar medicineDoesntSell"; - } - - applyFilter(filterValue: string) { - filterValue = filterValue.trim(); - filterValue = filterValue.toLowerCase(); - this.dataSource.filter = filterValue; + applyFilterMedicines(filterValue: string) { + console.log("applyFilterMedicines works!") + if(filterValue) { + this.dataService.searchMedicines(filterValue) + .subscribe((medicine: IMedicine[]) => { + this.filteredMedicines = medicine; + }, + (err: any) => console.log(err), + () => console.log('Medicine data retrieved')); + } + else { + this.filteredMedicines = this.head.PharmacyMedicines; + } } applyFilterPharmacies(filterValue: string) { - filterValue = filterValue.trim(); - filterValue = filterValue.toLowerCase(); - this.dataSourcePharmacies.filter = filterValue; + console.log("applyFilterPharmacies works!") + if(filterValue) { + this.dataService.searchPharmacies(filterValue) + .subscribe((pharmacy: IPharmacy[]) => { + this.filteredPharmacies = pharmacy; + }, + (err: any) => console.log(err), + () => console.log('Pharmacy data retrieved')); + } + else { + this.filteredPharmacies = this.pharmacies; + } } - test(): void { - console.log('Snackbar works!'); - this.openSnackBar("Are you sure?", "Yes").onAction().subscribe(() => { - this.router.navigate(['/']); + openPharmacyDialog(pharmacy: IPharmacy): void { + this.dialog.open(PharmacyDialogComponent, { + width: '450px', + data: pharmacy }); } - openDialog():void { - let dialogRef = this.dialog.open(HomeComponent, { - width: '70%' + openEditPharmacyDialog(pharmacy: IPharmacy): void { + let dialogRef = this.dialog.open(EditPharmacyDialogComponent, { + width: '450px', + data: pharmacy }); - dialogRef.afterClosed().subscribe(result => { - if(result) { - this.openSnackBar("Success", "OK"); - } + dialogRef.afterClosed().subscribe((editedPharmacy: IPharmacy) => { + if(editedPharmacy) { + this.head.Pharmacy = this.head.Pharmacy.filter(x => x !== pharmacy); + this.head.Pharmacy.push(editedPharmacy); + this.dataService.updatePharmacyHead(this.head) + .subscribe((hd: IPharmacyHead) => { + if(hd) { + this.openSnackBar("Success! Pharmacy edited", "OK").onAction().subscribe(() => { + window.location.reload(); + }); + } + else { + this.openSnackBar("Pharmacy edit failed", "Try again"); + } + }, + (err: any) => console.log(err), + () => console.log('PharmacyHead data updated')); + }; + }); + } + + openMedicineDialog(medicine: IMedicine): void { + this.dialog.open(MedicineDialogComponent, { + width: '450px', + data: medicine }); } openSnackBar(message: string, action: string) : MatSnackBarRef { - return this._snackBar.open(message, action, { - duration: 10000, + return this.snackBar.open(message, action, { + duration: 5000, }); } Index: Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,39 @@ + +
+
+ + +
Name is required
+
+
+ + +
Address is required
+
+
+ + +
Location is required
+
+
+ +
+
+ +
+
+ +
+
+
+
+    + +
+
Index: Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,28 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IPharmacy } from '../../shared/interfaces'; + +@Component({ + selector: 'app-edit-pharmacy-dialog', + templateUrl: './edit-pharmacy-dialog.component.html', + styleUrls: ['./edit-pharmacy-dialog.component.css'] +}) +export class EditPharmacyDialogComponent implements OnInit { + pharmacy: IPharmacy; + + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + this.pharmacy = data; + } + + ngOnInit(): void { + } + + save() { + this.dialogRef.close(this.pharmacy); + } + + close() { + this.dialogRef.close(); + } + +} Index: Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,28 @@ + +
+
+ + +
ID is required
+
+
+ + +
Name is required
+
+
+ + +
Email is required
+
+
+ + +
Password is required
+
+
+
+    + +
+
Index: Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,28 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IPharmacyHead } from '../../shared/interfaces'; + +@Component({ + selector: 'app-edit-pharmacy-head-dialog', + templateUrl: './edit-pharmacy-head-dialog.component.html', + styleUrls: ['./edit-pharmacy-head-dialog.component.css'] +}) +export class EditPharmacyHeadDialogComponent implements OnInit { + head: IPharmacyHead; + + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + this.head = data; + } + + ngOnInit(): void { + } + + save() { + this.dialogRef.close(this.head); + } + + close() { + this.dialogRef.close(); + } + +} Index: Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,11 @@ +

Повеќе инфо

+
+

ИД: {{facility.id}}

+

Име: {{facility.name}}

+

Општина: {{facility.municipality}}

+

Тип на установа: {{facility.type}}

+

Адреса: {{facility.address}}

+

Адреса: {{facility.email}}

+

Адреса: {{facility.phone}}

+
+

Затвори

Index: Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,24 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IHealthFacilities } from '../../shared/interfaces'; + +@Component({ + selector: 'app-facility-dialog', + templateUrl: './facility-dialog.component.html', + styleUrls: ['./facility-dialog.component.css'] +}) +export class FacilityDialogComponent implements OnInit { + facility: IHealthFacilities; + + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + this.facility = data; + } + + ngOnInit(): void { + } + + close() { + this.dialogRef.close(); + } + +} Index: Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,12 @@ +

Повеќе инфо

+
+

ИД: {{medicine.id}}

+

Име: {{medicine.name}}

+

Форма: {{medicine.form}}

+

Пакување: {{medicine.packaging}}

+

Цена: {{medicine.price}}

+

Јачина: {{medicine.strength}}

+

Начин на издавање: {{medicine.wayOfIssuing}}

+

Производител: {{medicine.manufacturer}}

+
+

Затвори

Index: Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,24 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IMedicine } from '../../shared/interfaces'; + +@Component({ + selector: 'app-medicine-dialog', + templateUrl: './medicine-dialog.component.html', + styleUrls: ['./medicine-dialog.component.css'] +}) +export class MedicineDialogComponent implements OnInit { + medicine: IMedicine; + + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + this.medicine = data; + } + + ngOnInit(): void { + } + + close() { + this.dialogRef.close(); + } + +} Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,9 @@ +

Повеќе инфо

+
+

ИД: {{pharmacy.id}}

+

Име: {{pharmacy.name}}

+

Општина: {{pharmacy.location}}

+

Адреса: {{pharmacy.address}}

+

Работи 24/7: {{pharmacy.workAllTime}}

+
+

Затвори

Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,24 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IPharmacy } from '../../shared/interfaces'; + +@Component({ + selector: 'app-pharmacy-dialog', + templateUrl: './pharmacy-dialog.component.html', + styleUrls: ['./pharmacy-dialog.component.css'] +}) +export class PharmacyDialogComponent implements OnInit { + pharmacy: IPharmacy; + + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + this.pharmacy = data; + } + + ngOnInit(): void { + } + + close() { + this.dialogRef.close(); + } + +} Index: Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,12 @@ +

Повеќе инфо

+
+

ИД: {{worker.id}}

+

Име: {{worker.name}}

+

Гранка: {{worker.branch}}

+

Титула: {{worker.title}}

+
+

Институција: {{worker.facility.name}}

+

{{worker.facility.municipality}}

+

{{worker.facility.type}}

+
+

Затвори

Index: Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,24 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IHealthcareWorkers } from '../../shared/interfaces'; + +@Component({ + selector: 'app-worker-dialog', + templateUrl: './worker-dialog.component.html', + styleUrls: ['./worker-dialog.component.css'] +}) +export class WorkerDialogComponent implements OnInit { + worker: IHealthcareWorkers; + + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + this.worker = data; + } + + ngOnInit(): void { + } + + close() { + this.dialogRef.close(); + } + +} Index: Farmatiko/ClientApp/src/app/home/home.component.html =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.html (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/home/home.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -7,47 +7,31 @@

Лекови

- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Име {{medicines.name}} Јачина {{medicines.strength}} Форма {{medicines.form}} Начин на издавање {{medicines.wayOfIssuing}} Производител {{medicines.manufacturer}} Цена {{medicines.price}} Пакување {{medicines.packaging}}
- + + + + + + + + + + + + + + + + + + + + + + + +
ИмеЈачинаФормаНачин на издавањеПроизводителЦенаПакување
{{ medicine.name }}{{ medicine.strength }}{{ medicine.form }}{{ medicine.wayOfIssuing }}{{ medicine.manufacturer }}{{ medicine.price }}{{ medicine.packaging }}
@@ -60,29 +44,22 @@ - - - - - - - - - - - - - - - - - - - - - - - -
Име {{pharmacies.name}} Локација {{pharmacies.location}} Адреса {{pharmacies.address}} Работи 27/7? {{pharmacies.workAllTime}}
- + + + + + + + + + + + + + + + + + +
ИмеЛокацијаАдресаРаботи 27/7?
{{ pharmacy.name }}{{ pharmacy.location }}{{ pharmacy.address }}{{ pharmacy.workAllTime }}
Index: Farmatiko/ClientApp/src/app/home/home.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/home/home.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -1,9 +1,8 @@ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { Medicine } from '../models/Medicine'; -import { Pharmacy } from '../models/Pharmacy'; -import { MatTableDataSource } from '@angular/material/table'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatSort } from '@angular/material/sort'; +import { Component, OnInit } from '@angular/core'; +import { IMedicine, IPharmacy } from '../shared/interfaces'; +import { DataService } from '../shared/data.service'; +import { MatDialog } from '@angular/material/dialog'; +import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component'; +import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component'; @Component({ @@ -13,46 +12,71 @@ }) export class HomeComponent implements OnInit { - public medicines: Medicine[]; - public pharmacies: Pharmacy[]; - displayedColumns = ['Име','Јачина','Форма', 'Начин на издавање', 'Производител', 'Цена', 'Пакување']; - displayedColumnsPharmacies = ['Име','Локација','Адреса', 'Работи 27/7?']; - dataSource = new MatTableDataSource(); - dataSourcePharmacies = new MatTableDataSource(); + public medicines: IMedicine[] = []; + public pharmacies: IPharmacy[] = []; + public filteredMedicines: IMedicine[] = []; + public filteredPharmacies: IPharmacy[] = []; - @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; - @ViewChild(MatSort) sort: MatSort; + constructor(private dataService: DataService, private dialog: MatDialog) { - constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { - http.get(baseUrl + 'Medicine/Get?').subscribe(result => { - this.medicines = result; - console.log(this.medicines); - this.dataSource = new MatTableDataSource(this.medicines); - }, error => console.error(error)); - http.get(baseUrl + 'Pharmacy/Get?').subscribe(result => { - this.pharmacies = result; - console.log(this.pharmacies); - this.dataSourcePharmacies = new MatTableDataSource(this.pharmacies); - }, error => console.error(error)); - } - ngOnInit(): void { } - ngAfterViewInit(): void { - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; - this.dataSourcePharmacies.paginator = this.paginator; - this.dataSourcePharmacies.sort = this.sort; + ngOnInit(): void { + this.dataService.getMedicines() + .subscribe((medicine: IMedicine[]) => { + this.medicines = this.filteredMedicines = medicine; + }, + (err: any) => console.log(err), + () => console.log('Medicine data retrieved')); + + this.dataService.getPharmacies() + .subscribe((pharmacy: IPharmacy[]) => { + this.pharmacies = this.filteredPharmacies = pharmacy; + }, + (err: any) => console.log(err), + () => console.log('Pharmacy data retrieved')); } - applyFilter(filterValue: string) { - filterValue = filterValue.trim(); - filterValue = filterValue.toLowerCase(); - this.dataSource.filter = filterValue; + applyFilterMedicines(filterValue: string) { + console.log("applyFilterMedicines works!") + if(filterValue) { + this.dataService.searchMedicines(filterValue) + .subscribe((medicine: IMedicine[]) => { + this.filteredMedicines = medicine; + }, + (err: any) => console.log(err), + () => console.log('Medicine data retrieved')); + } + else { + this.filteredMedicines = this.medicines; + } } applyFilterPharmacies(filterValue: string) { - filterValue = filterValue.trim(); - filterValue = filterValue.toLowerCase(); - this.dataSourcePharmacies.filter = filterValue; + console.log("applyFilterPharmacies works!") + if(filterValue) { + this.dataService.searchPharmacies(filterValue) + .subscribe((pharmacy: IPharmacy[]) => { + this.filteredPharmacies = pharmacy; + }, + (err: any) => console.log(err), + () => console.log('Pharmacy data retrieved')); + } + else { + this.filteredPharmacies = this.pharmacies; + } + } + + openMedicineDialog(medicine: IMedicine): void { + this.dialog.open(MedicineDialogComponent, { + width: '450px', + data: medicine + }); + } + + openPharmacyDialog(pharmacy: IPharmacy): void { + this.dialog.open(PharmacyDialogComponent, { + width: '450px', + data: pharmacy + }); } } Index: Farmatiko/ClientApp/src/app/korona/korona.component.html =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.html (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/korona/korona.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -12,5 +12,5 @@
- {{korona[0].totalMK}} + {{korona.totalMK}}

Вкупно случаи во земјата

@@ -19,5 +19,5 @@
- {{korona[0].activeMK}} + {{korona.activeMK}}

Активни случаи во земјата

@@ -26,5 +26,5 @@
- {{korona[0].deathsMK}} + {{korona.deathsMK}}

Смртни случаи во земјата

@@ -33,5 +33,5 @@
- {{korona[0].newMK}} + {{korona.newMK}}

Нови случаи во земјата

@@ -42,5 +42,5 @@
- {{korona[0].totalGlobal}} + {{korona.totalGlobal}}

Вкупно случаи глобално

@@ -49,5 +49,5 @@
- {{korona[0].activeGlobal}} + {{korona.activeGlobal}}

Активни случаи глобално

@@ -56,5 +56,5 @@
- {{korona[0].deathsGlobal}} + {{korona.deathsGlobal}}

Смртни случаи глобално

Index: Farmatiko/ClientApp/src/app/korona/korona.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -1,6 +1,5 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { Pandemic } from '../models/Pandemic'; -import { MatTableDataSource } from '@angular/material/table'; -import { HttpClient } from '@angular/common/http'; +import { Component, OnInit } from '@angular/core'; +import { DataService } from '../shared/data.service'; +import { IPandemic } from '../shared/interfaces'; @Component({ @@ -10,14 +9,17 @@ }) export class KoronaComponent implements OnInit { - public korona: Pandemic[]; + public korona: IPandemic; - constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { - http.get(baseUrl + 'Pandemic/Get?').subscribe(result => { - this.korona = result; - console.log(this.korona); - }, error => console.error(error)); + constructor(private dataService: DataService) { + } ngOnInit(): void { + this.dataService.getPandemic() + .subscribe((res: IPandemic) => { + this.korona = res; + }, + (err: any) => console.log(err), + () => console.log('Pandemic data retrieved')); } Index: Farmatiko/ClientApp/src/app/login/login.component.html =================================================================== --- Farmatiko/ClientApp/src/app/login/login.component.html (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/login/login.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -6,12 +6,12 @@
- + - + - +
Index: Farmatiko/ClientApp/src/app/login/login.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/login/login.component.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ Farmatiko/ClientApp/src/app/login/login.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, FormControl, Validators, FormArray } from '@angular/forms'; +import { FormGroup, FormControl, Validators } from '@angular/forms'; +import { Router, ActivatedRoute } from '@angular/router'; +import { DataService } from '../shared/data.service'; @Component({ @@ -9,6 +11,9 @@ export class LoginComponent implements OnInit { loginForm: FormGroup; + email: string; + passwd: string; + errorMessage: string; - constructor() { + constructor(private dataService: DataService,private router: Router, private route: ActivatedRoute) { this.loginForm = new FormGroup({ email: new FormControl('', [Validators.required, Validators.email]), @@ -20,3 +25,16 @@ } + loginPharmacyHead() { + this.dataService.loginPharmacyHead(this.email, this.passwd) + .subscribe((id: Number) => { + if(id) { + this.router.navigate(['/dashboard/' + id]); + } + else { + this.errorMessage = 'There was a problem signing in!'; + console.log(this.errorMessage); + } + }, + (err: any) => console.log(err)); + } } Index: rmatiko/ClientApp/src/app/models/HealthFacilities.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/HealthFacilities.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,11 +1,0 @@ -export class HealthFacilities { - address: string; - createdOn: string; - deletedOn: string; - email: string; - id: number; - municipality: string; - name: string; - phone: string; - type: string; -} Index: rmatiko/ClientApp/src/app/models/HealthcareWorkers.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,8 +1,0 @@ -import { HealthFacilities } from "./HealthFacilities"; - -export class HealthcareWorkers { - name: string; - branch: Date; - facility: HealthFacilities; - title: string; -} Index: rmatiko/ClientApp/src/app/models/Medicine.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Medicine.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,9 +1,0 @@ -export class Medicine { - name: string; - strength: string; - form: string; - wayOfIssuing: string; - manufacturer: string; - price: number; - packaging: string; -} Index: rmatiko/ClientApp/src/app/models/MedicineList.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/MedicineList.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,6 +1,0 @@ -import { Medicine } from "./Medicine"; - -export class MedicineList { - Medicines: Medicine[]; - HasMedicine: boolean[]; -} Index: rmatiko/ClientApp/src/app/models/Pandemic.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Pandemic.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,13 +1,0 @@ -export class Pandemic { - id: number; - createdOn: string; - deletedOn: string; - name: string; - totalMK: number; - activeMK: number; - deathsMK: number; - newMK: number; - totalGlobal: number; - deathsGlobal: number; - activeGlobal: number; -} Index: rmatiko/ClientApp/src/app/models/Pharmacy.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Pharmacy.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,6 +1,0 @@ -export class Pharmacy { - name: string; - location: string; - address: string; - workAllTime: boolean; -} Index: rmatiko/ClientApp/src/app/models/PharmacyHead.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/PharmacyHead.ts (revision c73269da31e030fe9495c2027a505e09c4d5a292) +++ (revision ) @@ -1,10 +1,0 @@ -import { MedicineList } from "./MedicineList"; -import { Pharmacy } from "./Pharmacy"; - -export class PharmacyHead { - PharmacyMedicines: MedicineList; - Pharmacy: Pharmacy[]; - Email: string; - Passwd: string; - Name: string; -} Index: Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,1 @@ +

pharmacy-head-dialog works!

Index: Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-pharmacy-head-dialog', + templateUrl: './pharmacy-head-dialog.component.html', + styleUrls: ['./pharmacy-head-dialog.component.css'] +}) +export class PharmacyHeadDialogComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} Index: Farmatiko/ClientApp/src/app/shared/data.service.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/data.service.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/shared/data.service.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,208 @@ +import { Injectable, } from '@angular/core'; +import { HttpClient, HttpErrorResponse } from '@angular/common/http'; + +import { Observable } from 'rxjs'; +import { map, catchError } from 'rxjs/operators'; + +import { IHealthFacilities, IHealthcareWorkers, IMedicine, IPandemic, IPharmacy, IPharmacyHead, IPharmacyHeadRequest } from './interfaces'; + +@Injectable() +export class DataService { + baseFacilitiesUrl: string = '/api/facilities'; + baseWorkersUrl: string = '/api/workers'; + baseMedicineUrl: string = '/api/medicine'; + basePandemicUrl: string = '/api/pandemic'; + basePharmacyUrl: string = '/api/pharmacy'; + basePharmacyHead: string = '/api/pharmacyhead'; + + constructor(private http: HttpClient) { + + } + + //Facility GET + getFacilities() : Observable { + return this.http.get(this.baseFacilitiesUrl) + .pipe( + map((facilities: IHealthFacilities[]) => { + return facilities; + }), + catchError(this.handleError) + ); + } + searchFacilities(searchquery: string) : Observable { + return this.http.get(this.baseFacilitiesUrl + '/search/' + searchquery) + .pipe( + map((facilities: IHealthFacilities[]) => { + return facilities; + }), + catchError(this.handleError) + ); + } + getFacility(id: string) : Observable { + return this.http.get(this.baseFacilitiesUrl + '/' + id) + .pipe(catchError(this.handleError)); + } + + + //Worker GET + getWorkers() : Observable { + return this.http.get(this.baseWorkersUrl) + .pipe( + map((workers: IHealthcareWorkers[]) => { + return workers; + }), + catchError(this.handleError) + ); + } + searchWorkers(searchquery: string) : Observable { + return this.http.get(this.baseWorkersUrl + '/search/' + searchquery) + .pipe( + map((workers: IHealthcareWorkers[]) => { + return workers; + }), + catchError(this.handleError) + ); + } + getWorker(id: string) : Observable { + return this.http.get(this.baseWorkersUrl + '/' + id) + .pipe(catchError(this.handleError)); + } + + + //Medicine GET + getMedicines() : Observable { + return this.http.get(this.baseMedicineUrl) + .pipe( + map((medicines: IMedicine[]) => { + return medicines; + }), + catchError(this.handleError) + ); + } + searchMedicines(searchquery: string) : Observable { + return this.http.get(this.baseMedicineUrl + '/search/' + searchquery) + .pipe( + map((medicines: IMedicine[]) => { + return medicines; + }), + catchError(this.handleError) + ); + } + getMedicine(id: string) : Observable { + return this.http.get(this.baseMedicineUrl + '/' + id) + .pipe(catchError(this.handleError)); + } + + + getPandemic() : Observable { + return this.http.get(this.basePandemicUrl) + .pipe(catchError(this.handleError)); + } + + + //Pharmacy GET + getPharmacies() : Observable { + return this.http.get(this.basePharmacyUrl) + .pipe( + map((pharmacies: IPharmacy[]) => { + return pharmacies; + }), + catchError(this.handleError) + ); + } + searchPharmacies(searchquery: string) : Observable { + return this.http.get(this.basePharmacyUrl + '/search/' + searchquery) + .pipe( + map((pharmacies: IPharmacy[]) => { + return pharmacies; + }), + catchError(this.handleError) + ); + } + getPharmacy(id: string) : Observable { + return this.http.get(this.basePharmacyUrl + '/' + id) + .pipe(catchError(this.handleError)); + } + + //PharmacyHead GET + getPharmacyHeads() : Observable { + return this.http.get(this.basePharmacyHead) + .pipe( + map((pharmacyheads: IPharmacyHead[]) => { + return pharmacyheads; + }), + catchError(this.handleError) + ); + } + getClaimingRequests() : Observable { + return this.http.get(this.basePharmacyHead + '/requests') + .pipe( + map((requests: IPharmacyHeadRequest[]) => { + return requests; + }), + catchError(this.handleError) + ); + } + loginPharmacyHead(email: string, passwd: string) : Observable { + let postData = {email : email ,password :passwd}; + return this.http.post(this.basePharmacyHead + '/login', postData) + .pipe( + map((data) => { + return data; + }), + catchError(this.handleError) + ); + } + getPharmacyHead(id: string) : Observable { + return this.http.get(this.basePharmacyHead + '/' + id) + .pipe(catchError(this.handleError)); + } + //PharmacyHead POST + insertPharmacyHead(head: IPharmacyHead) : Observable { + return this.http.post(this.basePharmacyHead, head) + .pipe( + map((data) => { + return data; + }), + catchError(this.handleError) + ); + } + claimPharmacy(req: IPharmacyHeadRequest) : Observable { + return this.http.post(this.basePharmacyHead + '/requests', req) + .pipe( + map((data) => { + return data; + }), + catchError(this.handleError) + ); + } + //PharmacyHead PUT + updatePharmacyHead(head: IPharmacyHead) : Observable { + return this.http.put(this.basePharmacyHead + '/' + head.id, head) + .pipe( + map((data) => { + return data; + }), + catchError(this.handleError) + ); + } + //PharmacyHead DELETE + deletePharmacyHead(id: string) : Observable { + return this.http.delete(this.basePharmacyHead + '/' + id) + .pipe(catchError(this.handleError)); + } + deleteClaimingRequest(id: string) : Observable { + return this.http.delete(this.basePharmacyHead + '/requests/' + id) + .pipe(catchError(this.handleError)); + } + + private handleError(error: HttpErrorResponse) { + console.error('server error:', error); + if (error.error instanceof Error) { + let errMessage = error.error.message; + return Observable.throw(errMessage); + } + return Observable.throw(error || 'ASP.NET Core server error'); + } + +} Index: Farmatiko/ClientApp/src/app/shared/interfaces.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) +++ Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision ee137aa0f7283d2d56e78e6d02e354b59cbb6e44) @@ -0,0 +1,62 @@ +export interface IHealthcareWorkers { + id?: string; + name: string; + branch: Date; + facility: IHealthFacilities; + title: string; +} + +export interface IHealthFacilities { + id?: string; + address: string; + email?: string; + municipality: string; + name: string; + phone?: string; + type?: string; +} + +export interface IMedicine { + id?: string; + name: string; + strength: string; + form: string; + wayOfIssuing: string; + manufacturer: string; + price: number; + packaging: string; +} + +export interface IPandemic { + name?: string; + totalMK?: number; + activeMK?: number; + deathsMK?: number; + newMK?: number; + totalGlobal?: number; + deathsGlobal?: number; + activeGlobal?: number; +} + +export interface IPharmacy { + id?: string; + name: string; + location: string; + address: string; + workAllTime?: boolean; +} + +export interface IPharmacyHead { + id?: string; + PharmacyMedicines?: IMedicine[]; + Pharmacy?: IPharmacy[]; + Email: string; + Passwd: string; + Name: string; +} + +export interface IPharmacyHeadRequest { + id?: string; + PharmacyHead?: IPharmacyHead; + Pharmacy?: IPharmacy; +}