Changeset 8e74e2f for Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html

Timestamp:

11/16/20 03:55:10 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

db484c9

Parents:

8b13eb2

Message:

Fix bugs, add some more.

File:

• Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (modified) (5 diffs)

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

@@ -13 +13 @@
           <ul class="navbar-nav flex-grow">
             <li>Logged as <p *ngIf="head">{{head.Name}}</p> </li>
-            <li (click)="logout()" class="btn btn-link"><a>Logout</a></li>
           </ul>
         </div>
@@ -20 +19 @@
         <mat-menu #menu="matMenu">
           <button mat-menu-item [routerLink]="['/']"><mat-icon>directions</mat-icon>Почетна</button>
+          <button mat-menu-item (click)="logout()"><mat-icon>exit_to_app</mat-icon>Одјави се</button>
         </mat-menu>
       </div>
@@ -25 +25 @@
 </header>
 
-<mat-tab-group mat-stretch-tabs>
+<mat-tab-group dynamicHeight mat-stretch-tabs>
   <mat-tab class="tab" label="Мои аптеки"> 
   <div class="wrapper">
@@ -88 +88 @@
     <div class="header">
     <h2>Достапни лекови</h2>
-    <mat-form-field>
+    <div class="btns">
+      <button mat-raised-button color="primary" (click)="saveDeletedMedicines()" [disabled]="editedMedicine==false">Зачувај ги промените</button>
+      <button mat-raised-button color="accent" aria-label="Add medicine" (click)="addMedicine()">Додај нов лек</button>
+      <button mat-raised-button color="accent" aria-label="Add medicine" (click)="addMedicinesFromList()">Додај постоечки лекови</button>
+    </div><br/>
+    <mat-slide-toggle (click)="switchEditMedicineMode()">Edit mode</mat-slide-toggle>
+    
+    <mat-form-field *ngIf="!medicinesEditMode">
       <input matInput (keyup)="applyFilterMedicines($event.target.value)" placeholder="Пронајди лек">
     </mat-form-field>
-      </div>
+    </div>
       <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="head">
         <thead>
@@ -102 +109 @@
             <th>Цена</th>
             <th>Пакување</th>
+            <th>Контроли</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let medicine of head.PharmacyMedicines">
-            <td><a (click)="openMedicineDialog(medicine)">{{ medicine.name }}</a></td>
-            <td>{{ medicine.strength }}</td>
-            <td>{{ medicine.form }}</td>
-            <td>{{ medicine.wayOfIssuing }}</td>
-            <td>{{ medicine.manufacturer }}</td>
-            <td>{{ medicine.price }}</td>
-            <td>{{ medicine.packaging }}</td>
-            <td><a (click)="deleteMedicine(medicine)">Delete</a></td>
+          <tr *ngFor="let medicine of filteredMedicines">
+            <td *ngIf="!medicinesEditMode"><a (click)="openMedicineDialog(medicine)">{{ medicine.name }}</a></td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.name" name="medname"></mat-form-field></td>
+            <td *ngIf="!medicinesEditMode">{{ medicine.strength }}</td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.strength" name="medstr"></mat-form-field></td>
+            <td *ngIf="!medicinesEditMode">{{ medicine.form }}</td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.form" name="medform"></mat-form-field></td>
+            <td *ngIf="!medicinesEditMode">{{ medicine.wayOfIssuing }}</td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.wayOfIssuing" name="medwayOfIssuing"></mat-form-field></td>
+            <td *ngIf="!medicinesEditMode">{{ medicine.manufacturer }}</td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.manufacturer" name="medmanufacturer"></mat-form-field></td>
+            <td *ngIf="!medicinesEditMode">{{ medicine.price }}</td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.price" name="medprice"></mat-form-field></td>
+            <td *ngIf="!medicinesEditMode">{{ medicine.packaging }}</td>
+            <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.packaging" name="medpackaging"></mat-form-field></td>
+            <td>
+              <button mat-mini-fab color="warn" aria-label="Delete medicine" (click)="deleteMedicine(medicine)">
+                <mat-icon>delete</mat-icon>
+              </button>
+            </td>
           </tr>
       </tbody>