Changeset 5d02859 for Farmatiko/ClientApp/src

Timestamp:

09/30/20 10:37:22 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

1454207

Parents:

63d885e

Message:

Add new repo, service and controller

Location:

Farmatiko/ClientApp/src/app

Files:

• korona/korona.component.html (modified) (8 diffs)
• korona/korona.component.ts (modified) (2 diffs)
• shared/data.service.ts (modified) (6 diffs)

Farmatiko/ClientApp/src/app/korona/korona.component.html

@@ -1 +1 @@
 <app-nav-menu></app-nav-menu>
 
-<div class="container">
+<div class="container" *ngIf="korona">
   <div class="row">
     <br />
     <div class="col text-center">
-      <h2>Коронавирус</h2>
+      <h2>{{korona[0].name}}</h2>
       <p>статистика</p>
     </div>
@@ -11 +11 @@
   <div class="row text-center pads">
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-code fa-2x" *ngIf="korona">{{korona.totalMK}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-code fa-2x">{{korona[0].totalMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи во земјата</p>
@@ -18 +18 @@
     </div>
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-coffee fa-2x" *ngIf="korona">{{korona.activeMK}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-coffee fa-2x">{{korona[0].activeMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи во земјата</p>
@@ -25 +25 @@
     </div>
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-lightbulb-o fa-2x" *ngIf="korona">{{korona.deathsMK}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-lightbulb-o fa-2x">{{korona[0].deathsMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи во земјата</p>
@@ -32 +32 @@
     </div>
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.newMK}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-bug fa-2x">{{korona[0].newMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Нови случаи во земјата</p>
@@ -41 +41 @@
   <div class="row text-center pads">
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.totalGlobal}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-bug fa-2x">{{korona[0].totalGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи глобално</p>
@@ -48 +48 @@
     </div>
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.activeGlobal}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-bug fa-2x">{{korona[0].activeGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи глобално</p>
@@ -55 +55 @@
     </div>
     <div class="col">
-      <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.deathsGlobal}}</i>
+      <div class="counter" *ngIf="korona">
+        <i class="fa fa-bug fa-2x">{{korona[0].deathsGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи глобално</p>

Farmatiko/ClientApp/src/app/korona/korona.component.ts

@@ -9 +9 @@
 })
 export class KoronaComponent implements OnInit {
-  public korona: IPandemic;
+  public korona: IPandemic[];
 
   constructor(private dataService: DataService) {
@@ -17 +17 @@
   ngOnInit(): void {
     this.dataService.getPandemic()
-        .subscribe((res: IPandemic) => {
+        .subscribe((res: IPandemic[]) => {
           this.korona = res;
+          console.log(this.korona);
         },
         (err: any) => console.log(err),

Farmatiko/ClientApp/src/app/shared/data.service.ts

@@ -11 +11 @@
     baseFacilitiesUrl: string = '/api/facilities';
     baseWorkersUrl: string = '/api/workers';
-    baseMedicineUrl: string = '/api/medicine';
+    baseMedicineUrl: string = '/api/medicines';
     basePandemicUrl: string = '/api/pandemic';
     basePharmacyUrl: string = '/api/pharmacy';
     basePharmacyHead: string = '/api/pharmacyhead';
 
-    constructor(private http: HttpClient) { 
+    constructor(private http: HttpClient) {
 
     }
@@ -44 +44 @@
     }
 
-    
+
     //Worker GET
     getWorkers() : Observable<IHealthcareWorkers[]> {
@@ -69 +69 @@
     }
 
-    
+
     //Medicine GET
     getMedicines() : Observable<IMedicine[]> {
@@ -95 +95 @@
 
 
-    getPandemic() : Observable<IPandemic> {
-        return this.http.get<IPandemic>(this.basePandemicUrl)
+    getPandemic() : Observable<IPandemic[]> {
+        return this.http.get<IPandemic[]>(this.basePandemicUrl)
                    .pipe(catchError(this.handleError));
     }
@@ -179 +179 @@
     //PharmacyHead PUT
     updatePharmacyHead(head: IPharmacyHead) : Observable<IPharmacyHead> {
-        return this.http.put<IPharmacyHead>(this.basePharmacyHead + '/' + head.id, head) 
+        return this.http.put<IPharmacyHead>(this.basePharmacyHead + '/' + head.id, head)
                    .pipe(
                         map((data) => {
@@ -198 +198 @@
 
     private handleError(error: HttpErrorResponse) {
-        console.error('server error:', error); 
+        console.error('server error:', error);
         if (error.error instanceof Error) {
           let errMessage = error.error.message;