Index: Farmatiko/ClientApp/package-lock.json =================================================================== --- Farmatiko/ClientApp/package-lock.json (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/package-lock.json (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -2637,4 +2637,13 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "angular-rename": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/angular-rename/-/angular-rename-1.0.7.tgz", + "integrity": "sha512-exQd1ASkjHENW+b3dfF90Vsik4GQdiaGxhUKx8/EHPcWOeGDDSCHslWxcehYgQb7YfOe47Z4f22PBIIvldesxg==", + "requires": { + "fs": "0.0.1-security", + "path": "^0.12.7" + } + }, "ansi-colors": { "version": "3.2.4", @@ -4101,4 +4110,9 @@ } } + }, + "countup.js": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.0.6.tgz", + "integrity": "sha512-pcOaDNjW8dz3V5hCZTIwQpRDGm6tdxz0BRbcKEgCAr+j6jbJcdDdnumr4DpCSjhih7s1m/cWYZNC5MuFeSflFA==" }, "coverage-istanbul-loader": { @@ -5556,4 +5570,9 @@ } }, + "fs": { + "version": "0.0.1-security", + "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", + "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=" + }, "fs-extra": { "version": "7.0.1", @@ -8042,4 +8061,13 @@ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true + }, + "ngx-countup": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ngx-countup/-/ngx-countup-7.3.1.tgz", + "integrity": "sha512-+nw3Axg/5R/09hjG1uOyOItdIxAxv8V1GNz0oR8MlB27tB5sH9aknCUPJiEfdPAGSCfMfG7nsURlz4WAoIDrhA==", + "requires": { + "countup.js": "^2.0.5", + "tslib": "^1.9.0" + } }, "nice-try": { @@ -8977,4 +9005,28 @@ "dev": true }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", + "requires": { + "process": "^0.11.1", + "util": "^0.10.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "requires": { + "inherits": "2.0.3" + } + } + } + }, "path-browserify": { "version": "0.0.1", @@ -9262,6 +9314,5 @@ "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { Index: Farmatiko/ClientApp/package.json =================================================================== --- Farmatiko/ClientApp/package.json (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/package.json (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -25,4 +25,5 @@ "@angular/router": "10.0.4", "@nguniversal/module-map-ngfactory-loader": "8.1.1", + "angular-rename": "^1.0.7", "aspnet-prerendering": "^3.0.1", "big-integer": "^1.6.48", @@ -30,4 +31,5 @@ "core-js": "^3.3.3", "jquery": "3.4.1", + "ngx-countup": "^7.3.1", "oidc-client": "^1.9.1", "popper.js": "^1.16.0", Index: Farmatiko/ClientApp/src/app/admin/admin.component.html =================================================================== --- Farmatiko/ClientApp/src/app/admin/admin.component.html (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/admin/admin.component.html (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -18,5 +18,5 @@ - +
Index: Farmatiko/ClientApp/src/app/counter/counter.component.css =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.css (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/counter/counter.component.css (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,13 +1,29 @@ .wrapper { - display: flex; - justify-content: space-around; - padding-top: 50px; + display: flex; + flex-direction: column; + max-height: 500px; + min-width: 300px; } - -nav { - float: right; + +.mat-table { + overflow: auto; + max-height: 500px; +} + +.header { + min-height: 64px; + padding: 8px 24px 0; +} + +.mat-form-field { + font-size: 14px; + width: 100%; } table { - margin-top: 25px; + width: 100%; } + +h2 { + padding: 1em 0; +} Index: Farmatiko/ClientApp/src/app/counter/counter.component.html =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,99 +1,95 @@ + -
-
+ + +
+

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

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

Здравствени работници

+ + +
-
-

Здравствени работници

- - - - - - - - - - - - - - - - - - -
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Име {{facilities.name}} Општина {{facilities.municipality}} Адреса {{facilities.address}} Тип {{facilities.type}} Е-пошта {{facilities.email}} Телефон {{facilities.phone}}
+
-
+ + Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,5 +1,9 @@ -import { Component, Inject } from '@angular/core'; +import { Component, OnInit, ViewChild, Inject } 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'; + @Component({ selector: 'app-counter-component', @@ -7,6 +11,11 @@ styleUrls: ['./counter.component.css'] }) -export class CounterComponent { +export class CounterComponent implements OnInit { public facilities: HealthFacilities[]; + displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон']; + dataSource = new MatTableDataSource(); + + @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { @@ -14,14 +23,19 @@ this.facilities = result; console.log(this.facilities); + this.dataSource = new MatTableDataSource(this.facilities); }, error => console.error(error)); } + ngOnInit(): void { + } + + ngAfterViewInit(): void { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + + applyFilter(filterValue: string) { + filterValue = filterValue.trim(); + filterValue = filterValue.toLowerCase(); + this.dataSource.filter = filterValue; + } } -/*interface healthFacilities { - Name: string; - Municipality: string; - Address: string; - Type: string; - Email: string; - Phone: string; -}*/ - Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.css =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.css (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.css (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -4,13 +4,29 @@ .wrapper { display: flex; - justify-content: space-around; - padding-top: 50px; + flex-direction: column; + max-height: 500px; + min-width: 300px; } -.wrapper nav { - float: right; +.mat-table { + overflow: auto; + max-height: 500px; } +.header { + min-height: 64px; + padding: 8px 24px 0; +} + +.mat-form-field { + font-size: 14px; + width: 100%; +} + table { - margin-top: 25px; + width: 100%; } + +h2 { + padding: 1em 0; +} Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -2,5 +2,5 @@
-
-
-
-

Мои аптеки

- - - - - - - - - - - - - - - - - -
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
- + + + +
+
+

Мои аптеки

-
-

Сите аптеки

- - - - - - - - - - - - - - - - - - -
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
- -
-
- -
-

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

- @@ -116,5 +41,5 @@ - + @@ -124,23 +49,94 @@
data1 data2
-
-
+ + +
+
+

Сите аптеки

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

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

+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Име {{facilities.name}} Општина {{facilities.municipality}} Адреса {{facilities.address}} Тип {{facilities.type}} Е-пошта {{facilities.email}} Телефон {{facilities.phone}}
+ +
Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,7 +1,13 @@ -import { Component, OnInit, Input, ViewChild } from '@angular/core'; +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 { HealthFacilities } from '../models/HealthFacilities'; +import { HttpClient } from '@angular/common/http';; +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'; @Component({ @@ -11,7 +17,53 @@ }) export class DashboardComponent implements OnInit { + public facilities: HealthFacilities[]; + displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон']; + dataSource = new MatTableDataSource(); - constructor() { } + @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; + @ViewChild(MatSort) sort: MatSort; - ngOnInit(): void { } + constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string, private dialog: MatDialog, private _snackBar: MatSnackBar, private router: Router) { + http.get(baseUrl + 'HealthFacilities/Get?').subscribe(result => { + this.facilities = result; + console.log(this.facilities); + this.dataSource = new MatTableDataSource(this.facilities); + }, error => console.error(error)); + } + ngOnInit(): void { + } + + ngAfterViewInit(): void { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + + applyFilter(filterValue: string) { + filterValue = filterValue.trim(); + filterValue = filterValue.toLowerCase(); + this.dataSource.filter = filterValue; + } + test(): void { + console.log('Snackbar works!'); + this.openSnackBar("Are you sure?", "Yes").onAction().subscribe(() => { + this.router.navigate(['/']); + }); + } + + openDialog():void { + let dialogRef = this.dialog.open(HomeComponent, { + width: '70%' + }); + dialogRef.afterClosed().subscribe(result => { + if(result) { + this.openSnackBar("Success", "OK"); + } + }); + } + + openSnackBar(message: string, action: string) : MatSnackBarRef { + return this._snackBar.open(message, action, { + duration: 10000, + }); + } } Index: Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -12,4 +12,5 @@ http.get(baseUrl + 'weatherforecast').subscribe(result => { this.forecasts = result; + console.log(this.forecasts); }, error => console.error(error)); } Index: Farmatiko/ClientApp/src/app/home/home.component.css =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.css (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/home/home.component.css (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,13 +1,29 @@ .wrapper { display: flex; - justify-content: space-around; - padding-top: 50px; + flex-direction: column; + max-height: 500px; + min-width: 300px; } -nav { - float: right; +.mat-table { + overflow: auto; + max-height: 500px; +} + +.header { + min-height: 64px; + padding: 8px 24px 0; +} + +.mat-form-field { + font-size: 14px; + width: 100%; } table { - margin-top: 25px; +width: 100%; } + +h2 { + padding: 1em 0; +} Index: Farmatiko/ClientApp/src/app/home/home.component.html =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.html (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/home/home.component.html (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,86 +1,94 @@ -
-
+ + +
+

Лекови

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

Аптеки

- - - - - - - - - - - - - - - - - - -
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
- -
-
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Име {{facilities.name}} Општина {{facilities.municipality}} Адреса {{facilities.address}} Тип {{facilities.type}} Е-пошта {{facilities.email}} Телефон {{facilities.phone}}
+ +
+ + Index: Farmatiko/ClientApp/src/app/home/home.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/home/home.component.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,3 +1,9 @@ -import { Component, OnInit, Input, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild, Inject } 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'; + @Component({ @@ -6,4 +12,31 @@ styleUrls: ['./home.component.css'] }) -export class HomeComponent { +export class HomeComponent implements OnInit { + public facilities: HealthFacilities[]; + displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон']; + dataSource = new MatTableDataSource(); + + @ViewChild(MatPaginator, {static: true}) 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)); + } + ngOnInit(): void { + } + + ngAfterViewInit(): void { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + + applyFilter(filterValue: string) { + filterValue = filterValue.trim(); + filterValue = filterValue.toLowerCase(); + this.dataSource.filter = filterValue; + } } Index: Farmatiko/ClientApp/src/app/korona/korona.component.css =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.css (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/korona/korona.component.css (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -27,2 +27,6 @@ color: #4ad1e5; } + +.pads { + padding: 1em 0; +} Index: Farmatiko/ClientApp/src/app/korona/korona.component.html =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.html (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/korona/korona.component.html (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -12,10 +12,10 @@
-
+
0

-

Placeholder1

+

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

@@ -24,5 +24,5 @@ 0

-

Placeholder2

+

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

@@ -31,5 +31,5 @@ 0

-

Placeholder3

+

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

@@ -38,7 +38,30 @@ 0

-

Placeholder4

+

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

+
+
+
+ 0 +

+

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

+
+
+
+
+ 0 +

+

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

+
+
+
+
+ 0 +

+

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

+
+
+
Index: Farmatiko/ClientApp/src/app/login/login.component.css =================================================================== --- Farmatiko/ClientApp/src/app/login/login.component.css (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/login/login.component.css (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -29,4 +29,6 @@ display: flex; justify-content: center; + text-align: center; + align-items: center; } Index: Farmatiko/ClientApp/src/app/models/HealthFacilities.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/HealthFacilities.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/models/HealthFacilities.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,8 +1,11 @@ export class HealthFacilities { - Name: string; - Municipality: string; - Address: string; - Type: string; - Email: string; - Phone: string; + address: string; + createdOn: string; + deletedOn: string; + email: string; + id: number; + municipality: string; + name: string; + phone: string; + type: string; } Index: Farmatiko/ClientApp/src/app/models/Pandemic.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Pandemic.ts (revision d2e69be8d63167e8e231babb28ed50703975a234) +++ Farmatiko/ClientApp/src/app/models/Pandemic.ts (revision ef1219aba40504a9fc62968af4fd3c7d2f7f2dfb) @@ -1,10 +1,10 @@ export class Pandemic { Name: string; - TotalMK: BigInteger; - ActiveMK: BigInteger; - DeathsMK: BigInteger; - NewMK: BigInteger; - TotalGlobal: BigInteger; - DeathsGlobal: BigInteger; - ActiveGlobal: BigInteger; + TotalMK: number; + ActiveMK: number; + DeathsMK: number; + NewMK: number; + TotalGlobal: number; + DeathsGlobal: number; + ActiveGlobal: number; }