Changeset 28d7d35 for Farmatiko/ClientApp/src/app/dashboard

Timestamp:

01/31/21 06:27:26 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

de9d697

Parents:

7520f88

Message:

Maps, geolocation api, dialogs & more

Location:

Farmatiko/ClientApp/src/app/dashboard

Files:

• dashboard.component.html (modified) (3 diffs)
• dashboard.component.ts (modified) (3 diffs)

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

@@ -44 +44 @@
       <tbody>
         <tr *ngFor="let pharmacies of head.Pharmacy">
-          <td>{{pharmacies.name}}</td>
-          <td>{{pharmacies.location}}</td>
-          <td>{{pharmacies.address}}</td>
-          <td>{{pharmacies.workAllTime}}</td>
+          <td (click)="openPharmacyDialog(pharmacies)">{{pharmacies.name}}</td>
+          <td (click)="openPharmacyDialog(pharmacies)">{{pharmacies.location}}</td>
+          <td (click)="openPharmacyDialog(pharmacies)">{{pharmacies.address}}</td>
+          <td (click)="openPharmacyDialog(pharmacies)">{{pharmacies.workAllTime}}</td>
           <td><a (click)="openEditPharmacyDialog(pharmacies)">Edit</a></td>
         </tr>
@@ -72 +72 @@
       </thead>
       <tbody>
-        <tr *ngFor="let pharmacy of pharmacies">
-          <td><a (click)="openPharmacyDialog(pharmacy)">{{ pharmacy.name }}</a></td>
-          <td>{{ pharmacy.location }}</td>
-          <td>{{ pharmacy.address }}</td>
-          <td>{{ pharmacy.workAllTime }}</td>
-          <td><a (click)="claimPharmacy(pharmacy)">Claim</a></td>
+        <tr *ngFor="let pharmacy of filteredPharmacies">
+          <td (click)="openPharmacyDialog(pharmacy)">{{ pharmacy.name }}</td>
+          <td (click)="openPharmacyDialog(pharmacy)">{{ pharmacy.location }}</td>
+          <td (click)="openPharmacyDialog(pharmacy)">{{ pharmacy.address }}</td>
+          <td (click)="openPharmacyDialog(pharmacy)">{{ pharmacy.workAllTime }}</td>
+          <td><a (click)="claimPharmacy(pharmacy)" *ngIf="!pharmacy.headName">Claim</a> <span *ngIf="pharmacy.headName">Already claimed</span></td>
         </tr>
     </tbody>
@@ -114 +114 @@
         <tbody>
           <tr *ngFor="let medicine of filteredMedicines">
-            <td *ngIf="!medicinesEditMode"><a (click)="openMedicineDialog(medicine)">{{ medicine.name }}</a></td>
+            <td *ngIf="!medicinesEditMode" (click)="openMedicineDialog(medicine)">{{ medicine.name }}</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" (click)="openMedicineDialog(medicine)">{{ 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" (click)="openMedicineDialog(medicine)">{{ 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" (click)="openMedicineDialog(medicine)">{{ 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" (click)="openMedicineDialog(medicine)">{{ 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" (click)="openMedicineDialog(medicine)">{{ 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" (click)="openMedicineDialog(medicine)">{{ medicine.packaging }}</td>
             <td *ngIf="medicinesEditMode"><mat-form-field appearance="fill"><input matInput [(ngModel)]="medicine.packaging" name="medpackaging"></mat-form-field></td>
             <td>

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

@@ -40 +40 @@
     this.dataService.getPharmacies()
         .subscribe((pharmacy: IPharmacy[]) => {
-          this.pharmacies = pharmacy;
-          this.head.Pharmacy.forEach((pharma) => {
-            this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma);
-          });
+          this.pharmacies = this.filteredPharmacies = pharmacy;
+          // Iskluceno filtriranje na farmacies (Star metod)
+          // this.head.Pharmacy.forEach((pharma) => {
+          //   this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma);
+          // });
         },
         (err: any) => console.log(err),
@@ -147 +148 @@
       if(listMedicines){
         listMedicines.forEach((medicine) => {
-          this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine);
+          if(this.head.PharmacyMedicines) {
+            this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine);
+          }
+          else {
+            this.head.PharmacyMedicines = [];
+          }
           this.head.PharmacyMedicines.push(medicine);
           this.filteredMedicines = this.head.PharmacyMedicines;
@@ -175 +181 @@
           .subscribe((pharmacy: IPharmacy[]) => {
             this.filteredPharmacies = pharmacy;
-            this.head.Pharmacy.forEach((pharma) => {
-              this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma);
-            });
+            // this.head.Pharmacy.forEach((pharma) => {
+            //   this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma);
+            // });
           },
           (err: any) => console.log(err),