Changeset ee137aa for Farmatiko/ClientApp/src/app/korona

Timestamp:

08/07/20 10:59:56 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

63d885e

Parents:

c73269d

Message:

Added DataService and dialogs, all bindings needed implemented

Location:

Farmatiko/ClientApp/src/app/korona

Files:

• korona.component.html (modified) (7 diffs)
• korona.component.ts (modified) (2 diffs)

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

@@ -12 +12 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-code fa-2x" *ngIf="korona">{{korona[0].totalMK}}</i>
+        <i class="fa fa-code fa-2x" *ngIf="korona">{{korona.totalMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи во земјата</p>
@@ -19 +19 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-coffee fa-2x" *ngIf="korona">{{korona[0].activeMK}}</i>
+        <i class="fa fa-coffee fa-2x" *ngIf="korona">{{korona.activeMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи во земјата</p>
@@ -26 +26 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-lightbulb-o fa-2x" *ngIf="korona">{{korona[0].deathsMK}}</i>
+        <i class="fa fa-lightbulb-o fa-2x" *ngIf="korona">{{korona.deathsMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи во земјата</p>
@@ -33 +33 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].newMK}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.newMK}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Нови случаи во земјата</p>
@@ -42 +42 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].totalGlobal}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.totalGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи глобално</p>
@@ -49 +49 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].activeGlobal}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.activeGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи глобално</p>
@@ -56 +56 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].deathsGlobal}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.deathsGlobal}}</i>
         <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи глобално</p>

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

@@ -1 @@
-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 +9 @@
 })
 export class KoronaComponent implements OnInit {
-  public korona: Pandemic[];
+  public korona: IPandemic;
 
-  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
-    http.get<Pandemic[]>(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'));
   }