Index: Farmatiko/ClientApp/angular.json =================================================================== --- Farmatiko/ClientApp/angular.json (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/angular.json (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -27,5 +27,6 @@ "src/custom-theme.scss", "node_modules/bootstrap/dist/css/bootstrap.min.css", - "src/styles.css" + "src/styles.css", + "./node_modules/leaflet/dist/leaflet.css" ], "scripts": [] Index: Farmatiko/ClientApp/package-lock.json =================================================================== --- Farmatiko/ClientApp/package-lock.json (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/package-lock.json (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -866,4 +866,9 @@ } } + }, + "@asymmetrik/ngx-leaflet": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@asymmetrik/ngx-leaflet/-/ngx-leaflet-8.1.0.tgz", + "integrity": "sha512-lq7LduBP/vXcaSEmKnx7mzCR8WsoYqh9pB6BNnq53yeCwsqRbG3GdKye1/i8VvoRzjDsmQBPQsIFZ9uclXrtgg==" }, "@babel/code-frame": { @@ -7300,4 +7305,9 @@ } }, + "leaflet": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", + "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==" + }, "less": { "version": "3.9.0", Index: Farmatiko/ClientApp/package.json =================================================================== --- Farmatiko/ClientApp/package.json (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/package.json (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -24,4 +24,5 @@ "@angular/platform-server": "10.0.4", "@angular/router": "10.0.4", + "@asymmetrik/ngx-leaflet": "^8.1.0", "@nguniversal/module-map-ngfactory-loader": "8.1.1", "angular-rename": "^1.0.7", @@ -31,4 +32,5 @@ "core-js": "^3.3.3", "jquery": "3.4.1", + "leaflet": "^1.7.1", "ngx-countup": "^7.3.1", "oidc-client": "^1.9.1", Index: Farmatiko/ClientApp/src/app/app.module.ts =================================================================== --- Farmatiko/ClientApp/src/app/app.module.ts (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/app.module.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -6,4 +6,5 @@ import { MaterialModule } from './shared/material.module'; import { ReactiveFormsModule } from '@angular/forms'; +import { LeafletModule } from '@asymmetrik/ngx-leaflet'; import { CoreModule } from './shared/core.module'; @@ -65,4 +66,5 @@ MaterialModule, ReactiveFormsModule, + LeafletModule, CoreModule ], Index: Farmatiko/ClientApp/src/app/counter/counter.component.css =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/counter/counter.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -2,5 +2,4 @@ display: flex; flex-direction: column; - max-height: 500px; min-width: 300px; } @@ -27,2 +26,25 @@ padding: 1em 0; } +.tableRow:hover { + background-color: #D4F2CD; + transform: scale(1.0005); +} + +h2 button { + float: right; + padding: 0 5em; +} + +#map { + height: 100%; +} + +.map-frame { + border: 2px solid black; + height: 100%; +} + +.map-wrapper { + margin: 0 3em 3em 3em; + min-height: 400px; +} Index: Farmatiko/ClientApp/src/app/counter/counter.component.html =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -6,5 +6,18 @@
-

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

+

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

+
+
+
+
+
+ @@ -16,18 +29,12 @@ Име Општина - Адреса Тип - Е-пошта - Телефон - - {{ facility.name }} + + {{ facility.name }} {{ facility.municipality }} - {{ facility.address }} {{ facility.type }} - {{ facility.email }} - {{ facility.phone }} @@ -48,14 +55,10 @@ Име Гранка - Установа - Назив - - {{ worker.name }} + + {{ 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 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -5,4 +5,6 @@ import { FacilityDialogComponent } from '../dialogs/facility-dialog/facility-dialog.component'; import { WorkerDialogComponent } from '../dialogs/worker-dialog/worker-dialog.component'; +import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet'; +import { HttpClient } from '@angular/common/http'; @Component({ @@ -16,6 +18,17 @@ public filteredFacilities: IHealthFacilities[] = []; public filteredWorkers: IHealthcareWorkers[] = []; - - constructor(private dataService: DataService, private dialog: MatDialog) { + public lat; + public lng; + clicked = false; + showMap: boolean = false; + options = { + layers: [ + tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }) + ], + zoom: 8, + center: latLng(41.61807, 21.74348) + } + + constructor(private dataService: DataService, private dialog: MatDialog, private http: HttpClient) { } @@ -27,5 +40,8 @@ }, (err: any) => console.log(err), - () => console.log('Facility data retrieved!')); + () => { + this.appendFacilityMarkers(this.facilities) + console.log('Facility data retrieved!'); + }); this.dataService.getWorkers() @@ -35,4 +51,50 @@ (err: any) => console.log(err), () => console.log('Facility data retrieved!')); + + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition((position) => { + if (position) { + this.lat = position.coords.latitude; + this.lng = position.coords.longitude; + let layer = marker([ this.lat, this.lng ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/home-icon.png' + }) + }).bindPopup("Вашата локација"); + this.options.layers.push(layer); + } + }); + } + } + + appendFacilityMarkers(facils: IHealthFacilities[]) { + this.options.layers = []; + this.options.layers.push(tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors'})); + if(this.lat && this.lng) { + this.options.layers.push(marker([ this.lat, this.lng ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/home-icon.png' + }) + }).bindPopup("Вашата локација")); + } + facils.forEach((facil) => { + this.http.get('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+facil.municipality+'&street='+facil.address+'&format=json').subscribe(obj => { + console.log(obj); + if(obj.length) { + let layer = marker([ obj[0]?.lat, obj[0]?.lon ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/hospital-icon.png' + }) + }).bindPopup(facil.name); + this.options.layers.push(layer); + } + }, error => console.error(error)); + }); } @@ -45,8 +107,20 @@ }, (err: any) => console.log(err), - () => console.log('Facility data retrieved!')); + () => { + this.appendFacilityMarkers(this.filteredFacilities); + if(this.showMap) { + this.showMap = false; + setTimeout(() => this.showMap = true, 300); + } + console.log('Facility data retrieved!'); + }); } else { this.filteredFacilities = this.facilities; + this.appendFacilityMarkers(this.facilities); + if(this.showMap) { + this.showMap = false; + setTimeout(() => this.showMap = true, 300); + } } } @@ -80,3 +154,13 @@ }); } + + toggleMap() { + this.showMap = !this.showMap; + } + + refreshMap() { + this.showMap = false; + setTimeout(() => this.showMap = true, 300); + } + } Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -44,8 +44,8 @@ - {{pharmacies.name}} - {{pharmacies.location}} - {{pharmacies.address}} - {{pharmacies.workAllTime}} + {{pharmacies.name}} + {{pharmacies.location}} + {{pharmacies.address}} + {{pharmacies.workAllTime}} Edit @@ -72,10 +72,10 @@ - - {{ pharmacy.name }} - {{ pharmacy.location }} - {{ pharmacy.address }} - {{ pharmacy.workAllTime }} - Claim + + {{ pharmacy.name }} + {{ pharmacy.location }} + {{ pharmacy.address }} + {{ pharmacy.workAllTime }} + Claim Already claimed @@ -114,17 +114,17 @@ - {{ medicine.name }} + {{ medicine.name }} - {{ medicine.strength }} + {{ medicine.strength }} - {{ medicine.form }} + {{ medicine.form }} - {{ medicine.wayOfIssuing }} + {{ medicine.wayOfIssuing }} - {{ medicine.manufacturer }} + {{ medicine.manufacturer }} - {{ medicine.price }} + {{ medicine.price }} - {{ medicine.packaging }} + {{ medicine.packaging }} Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -40,8 +40,9 @@ this.dataService.getPharmacies() .subscribe((pharmacy: IPharmacy[]) => { - this.pharmacies = pharmacy; - this.head.Pharmacy.forEach((pharma) => { - this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma); - }); + this.pharmacies = this.filteredPharmacies = pharmacy; + // Iskluceno filtriranje na farmacies (Star metod) + // this.head.Pharmacy.forEach((pharma) => { + // this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma); + // }); }, (err: any) => console.log(err), @@ -147,5 +148,10 @@ if(listMedicines){ listMedicines.forEach((medicine) => { - this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine); + if(this.head.PharmacyMedicines) { + this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine); + } + else { + this.head.PharmacyMedicines = []; + } this.head.PharmacyMedicines.push(medicine); this.filteredMedicines = this.head.PharmacyMedicines; @@ -175,7 +181,7 @@ .subscribe((pharmacy: IPharmacy[]) => { this.filteredPharmacies = pharmacy; - this.head.Pharmacy.forEach((pharma) => { - this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma); - }); + // this.head.Pharmacy.forEach((pharma) => { + // this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma); + // }); }, (err: any) => console.log(err), 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 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -3,5 +3,5 @@
- +
ID is required
Index: Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.css =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -0,0 +1,3 @@ +button { + float: right; +} Index: Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -1,11 +1,33 @@ -

Повеќе инфо

+

Повеќе информации

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Име{{facility?.name}}
Општина{{facility?.municipality}}
Тип на установа{{facility?.type}}
Адреса{{facility?.address}}
Е-пошта{{facility?.email}}
Телефон{{facility?.phone}}
+ +

-

ИД: {{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 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -2,4 +2,6 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { IHealthFacilities } from '../../shared/interfaces'; +import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet'; +import { HttpClient } from '@angular/common/http'; @Component({ @@ -10,11 +12,43 @@ export class FacilityDialogComponent implements OnInit { facility: IHealthFacilities; + mapShown: boolean = true; + options = { + layers: [ + tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }) + ], + zoom: 7, + center: latLng(41.61807, 21.74348) + } - constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data, private http: HttpClient) { this.facility = data; + if(this.facility) { + this.addMarkers(); + } } ngOnInit(): void { } + + addMarkers() { + this.http.get('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.facility?.municipality+'&street='+this.facility?.address+'&format=json').subscribe(obj => { + console.log(obj); + if(obj.length) { + let layer = marker([ obj[0]?.lat, obj[0]?.lon ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/hospital-icon.png' + }) + }).bindPopup("Аптека: "+this.facility?.name); + this.options.layers.push(layer); + this.options.center = latLng(obj[0]?.lat, obj[0]?.lon); + this.options.zoom = 13; + } + }, error => console.error(error)); + this.mapShown = false; + setTimeout(() => this.mapShown = true, 300); + } + close() { Index: Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.css =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -0,0 +1,3 @@ +button { + float: right; +} Index: Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -1,12 +1,44 @@ -

Повеќе инфо

-
-

ИД: {{medicine.id}}

-

Име: {{medicine.name}}

-

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

-

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

-

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

-

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

-

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

-

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

-
-

Затвори

+

Повеќе информации

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Име{{medicine?.name}}
Форма{{medicine?.form}}
Пакување{{medicine?.packaging}}
Цена{{medicine?.price}}
Јачина{{medicine?.strength}}
Начин на издавање{{medicine?.wayOfIssuing}}
Производител{{medicine?.manufacturer}}
+
+
Достапен во аптеките на:
+ + + + + + +
{{head}}
+
+

Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.css =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -0,0 +1,7 @@ +button { + float: right; +} + +div { + white-space: nowrap; +} Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -1,9 +1,29 @@ -

Повеќе инфо

+

Повеќе информации

+ + + + + + + + + + + + + + + + + + + + + + + +
Име{{pharmacy?.name}}
Општина{{pharmacy?.location}}
Адреса{{pharmacy?.address}}
Работи 24/7
Да
Не
Компанија{{pharmacy?.headName}}
+ +

-

ИД: {{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 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -1,5 +1,7 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, AfterViewInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { IPharmacy } from '../../shared/interfaces'; +import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet'; +import { HttpClient } from '@angular/common/http'; @Component({ @@ -10,10 +12,41 @@ export class PharmacyDialogComponent implements OnInit { pharmacy: IPharmacy; + mapShown: boolean = true; + options = { + layers: [ + tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }) + ], + zoom: 7, + center: latLng(41.61807, 21.74348) + } - constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { + constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data, private http: HttpClient) { this.pharmacy = data; + if(this.pharmacy) { + this.addMarkers(); + } } ngOnInit(): void { + } + + addMarkers() { + this.http.get('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.pharmacy?.location+'&street='+this.pharmacy?.address+'&format=json').subscribe(obj => { + console.log(obj); + if(obj.length) { + let layer = marker([ obj[0]?.lat, obj[0]?.lon ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/pharmacy-icon.png' + }) + }).bindPopup("Аптека: "+this.pharmacy?.name); + this.options.layers.push(layer); + this.options.center = latLng(obj[0]?.lat, obj[0]?.lon); + this.options.zoom = 13; + } + }, error => console.error(error)); + this.mapShown = false; + setTimeout(() => this.mapShown = true, 300); } @@ -22,3 +55,4 @@ } + } Index: Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.css =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -0,0 +1,3 @@ +button { + float: right; +} Index: Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -1,12 +1,78 @@ -

Повеќе инфо

+

Повеќе информации


-

ИД: {{worker.id}}

-

Име: {{worker.name}}

-

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

-

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

-
-

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

-

{{worker.facility.municipality}}

-

{{worker.facility.type}}

-
-

Затвори

+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Име{{worker?.name}}
Гранка{{worker?.branch}}
Титула{{worker?.title}}
Институција{{worker?.facility?.name}}
Општина{{worker?.facility?.municipality}}
Тип{{worker?.facility?.type}}
Адреса{{worker.facility?.address}}
Е-пошта{{worker.facility?.email}}
Телефон{{worker.facility?.phone}}
ИнституцијаНема податок
ОпштинаНема податок
ТипНема податок
АдресаНема податок
Е-поштаНема податок
ТелефонНема податок
+ + +

Index: Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -10,4 +10,5 @@ export class WorkerDialogComponent implements OnInit { worker: IHealthcareWorkers; + isExpanded: boolean = false; constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) { @@ -22,3 +23,7 @@ } + toggleExpansion() { + this.isExpanded = !this.isExpanded; + } + } Index: Farmatiko/ClientApp/src/app/home/home.component.css =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/home/home.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -2,5 +2,4 @@ display: flex; flex-direction: column; - max-height: 500px; min-width: 300px; } @@ -27,2 +26,25 @@ padding: 1em 0; } +.tableRow:hover { + background-color: #D4F2CD; + transform: scale(1.0005); +} + +h2 button { + float: right; + padding: 0 5em; +} + +#map { + height: 100%; +} + +.map-frame { + border: 2px solid black; + height: 100%; +} + +.map-wrapper { + margin: 0 3em 3em 3em; + min-height: 400px; +} Index: Farmatiko/ClientApp/src/app/home/home.component.html =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/home/home.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -14,21 +14,13 @@ Име - Јачина Форма - Начин на издавање - Производител Цена - Пакување - - {{ medicine.name }} - {{ medicine.strength }} + + {{ medicine.name }} {{ medicine.form }} - {{ medicine.wayOfIssuing }} - {{ medicine.manufacturer }} {{ medicine.price }} - {{ medicine.packaging }} @@ -39,5 +31,18 @@
-

Аптеки

+

Аптеки + + +

+
+
+
+
+
+ @@ -49,17 +54,17 @@ Име Локација - Адреса Работи 27/7? - - {{ pharmacy.name }} + + {{ 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 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/home/home.component.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -5,4 +5,6 @@ import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component'; import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component'; +import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet'; +import { HttpClient } from '@angular/common/http'; @Component({ @@ -16,6 +18,17 @@ public filteredMedicines: IMedicine[] = []; public filteredPharmacies: IPharmacy[] = []; + public lat; + public lng; + clicked = false; + showMap: boolean = false; + options = { + layers: [ + tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }) + ], + zoom: 8, + center: latLng(41.61807, 21.74348) + } - constructor(private dataService: DataService, private dialog: MatDialog) { + constructor(private dataService: DataService, private dialog: MatDialog, private http: HttpClient) { } @@ -34,6 +47,55 @@ }, (err: any) => console.log(err), - () => console.log('Pharmacy data retrieved')); + () => { + this.appendPharmacyMarkers(this.pharmacies); + console.log('Pharmacy data retrieved'); + }); + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition((position) => { + if (position) { + this.lat = position.coords.latitude; + this.lng = position.coords.longitude; + let layer = marker([ this.lat, this.lng ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/home-icon.png' + }) + }).bindPopup("Вашата локација"); + this.options.layers.push(layer); + } + }); + } } + + appendPharmacyMarkers(pharmas: IPharmacy[]) { + this.options.layers = []; + this.options.layers.push(tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors'})); + if(this.lat && this.lng) { + this.options.layers.push(marker([ this.lat, this.lng ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/home-icon.png' + }) + }).bindPopup("Вашата локација")); + } + pharmas.forEach((pharmacy) => { + this.http.get('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+pharmacy.location+'&street='+pharmacy.address+'&format=json').subscribe(obj => { + console.log(obj); + if(obj.length) { + let layer = marker([ obj[0]?.lat, obj[0]?.lon ], { + icon: icon({ + iconSize: [ 25, 41 ], + iconAnchor: [ 13, 41 ], + iconUrl: 'assets/pharmacy-icon.png' + }) + }).bindPopup("Аптека: "+pharmacy.name); + this.options.layers.push(layer); + } + }, error => console.error(error)); + }); + } + applyFilterMedicines(filterValue: string) { @@ -60,8 +122,20 @@ }, (err: any) => console.log(err), - () => console.log('Pharmacy data retrieved')); + () => { + this.appendPharmacyMarkers(this.filteredPharmacies); + if(this.showMap) { + this.showMap = false; + setTimeout(() => this.showMap = true, 300); + } + console.log('Pharmacy data retrieved') + }); } else { this.filteredPharmacies = this.pharmacies; + this.appendPharmacyMarkers(this.pharmacies); + if(this.showMap) { + this.showMap = false; + setTimeout(() => this.showMap = true, 300); + } } } @@ -80,3 +154,13 @@ }); } + + toggleMap() { + this.showMap = !this.showMap; + } + + refreshMap() { + this.showMap = false; + setTimeout(() => this.showMap = true, 300); + } + } Index: Farmatiko/ClientApp/src/app/login/login.component.css =================================================================== --- Farmatiko/ClientApp/src/app/login/login.component.css (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/login/login.component.css (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -44,2 +44,7 @@ justify-content: flex-end; } + +.aligner { + float: right; + padding-left: 2.5em; +} Index: Farmatiko/ClientApp/src/app/login/login.component.html =================================================================== --- Farmatiko/ClientApp/src/app/login/login.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/login/login.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -1,5 +1,10 @@
-

Најава

 +

Најава +
+ +
Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html =================================================================== --- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -33,4 +33,7 @@ +
  • + +
    • Index: Farmatiko/ClientApp/src/app/shared/interfaces.ts =================================================================== --- Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -26,4 +26,5 @@ price: number; packaging: string; + headNames?: string[]; } @@ -46,4 +47,5 @@ address: string; workAllTime?: boolean; + headName?: string; } Index: Farmatiko/ClientApp/src/index.html =================================================================== --- Farmatiko/ClientApp/src/index.html (revision 7520f88f288c96ee75b9df03983bd7827c550e0d) +++ Farmatiko/ClientApp/src/index.html (revision 28d7d35de40f66845efd3c7fbdc48a572a31882a) @@ -10,4 +10,10 @@ + +