Changeset d8fafb8 for Farmatiko/ClientApp/src/app

Timestamp:

07/31/20 10:43:09 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

58fa654, c73269d

Parents:

a55ef91

Message:

Prototype N1

Location:

Farmatiko/ClientApp/src/app

Files:

• home/home.component.html (modified) (4 diffs)
• korona/korona.component.html (modified) (7 diffs)
• korona/korona.component.ts (modified) (1 diff)
• models/Pandemic.ts (modified) (1 diff)

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

@@ -2 +2 @@
 
 <mat-tab-group mat-stretch-tabs>
-  <mat-tab class="tab" label="Лекови"> 
+  <mat-tab class="tab" label="Лекови">
   <div class="wrapper">
     <div class="header">
@@ -15 +15 @@
         <td mat-cell *matCellDef="let medicines"> {{medicines.name}} </td>
       </ng-container>
-  
+
       <ng-container matColumnDef="Јачина">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Јачина </th>
         <td mat-cell *matCellDef="let medicines"> {{medicines.strength}} </td>
       </ng-container>
-    
+
       <ng-container matColumnDef="Форма">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Форма </th>
         <td mat-cell *matCellDef="let medicines"> {{medicines.form}} </td>
       </ng-container>
-      
+
       <ng-container matColumnDef="Начин на издавање">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Начин на издавање </th>
         <td mat-cell *matCellDef="let medicines"> {{medicines.wayOfIssuing}} </td>
       </ng-container>
-  
+
       <ng-container matColumnDef="Производител">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Производител </th>
         <td mat-cell *matCellDef="let medicines"> {{medicines.manufacturer}} </td>
       </ng-container>
-    
+
       <ng-container matColumnDef="Цена">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Цена </th>
@@ -52 +52 @@
   </div>
   </mat-tab>
-  <mat-tab class="tab" label="Аптеки"> 
+  <mat-tab class="tab" label="Аптеки">
   <div class="wrapper">
     <div class="header">
@@ -60 +60 @@
     </mat-form-field>
     </div>
-      <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
-        <ng-container matColumnDef="Име">a
+      <table [dataSource]="dataSourcePharmacies" mat-table matSort class="mat-elevation-z8">
+        <ng-container matColumnDef="Име">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
           <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.name}} </td>
         </ng-container>
-    
+
         <ng-container matColumnDef="Локација">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Локација </th>
           <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.location}} </td>
         </ng-container>
-      
+
         <ng-container matColumnDef="Адреса">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
           <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.address}} </td>
         </ng-container>
-        
+
         <ng-container matColumnDef="Работи 27/7?">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Работи 27/7? </th>
           <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.workAllTime}} </td>
         </ng-container>
-  
+
           <tr mat-header-row *matHeaderRowDef="displayedColumnsPharmacies"></tr>
           <tr mat-row *matRowDef="let row; columns: displayedColumnsPharmacies;"></tr>

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.totalMK}}</i>
+        <i class="fa fa-code fa-2x" *ngIf="korona">{{korona[0].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.activeMK}}</i>
+        <i class="fa fa-coffee fa-2x" *ngIf="korona">{{korona[0].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.deathsMK}}</i>
+        <i class="fa fa-lightbulb-o fa-2x" *ngIf="korona">{{korona[0].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.newMK}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].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.totalGlobal}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].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.activeGlobal}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona[0].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.deathsGlobal}}</i>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{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

@@ -10 +10 @@
 })
 export class KoronaComponent implements OnInit {
-  public korona: Pandemic;
+  public korona: Pandemic[];
 
-  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { 
-    http.get<Pandemic>(baseUrl + 'Pandemic/Get?').subscribe(result => {
+  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
+    http.get<Pandemic[]>(baseUrl + 'Pandemic/Get?').subscribe(result => {
       this.korona = result;
       console.log(this.korona);

Farmatiko/ClientApp/src/app/models/Pandemic.ts

@@ -1 +1 @@
 export class Pandemic {
+  id: number;
+  createdOn: string;
+  deletedOn: string;
   name: string;
   totalMK: number;