Merge pull request #323 from mild-blue/322_fix_2x_vaccinate

Fix 2x vaccinate
mild-blue · Jun 16, 2021 · a3c130b · a3c130b
2 parents 01d6406 + 876dd0b
commit a3c130b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 5 deletions.
diff --git a/frontend/src/app/components/dialogs/confirm-patient-data/confirm-patient-data.component.html b/frontend/src/app/components/dialogs/confirm-patient-data/confirm-patient-data.component.html
@@ -14,5 +14,5 @@ <h3>Potrvdit správnost zadaných údajů?</h3>
 </div>
 <mat-dialog-actions class="buttons">
   <button mat-button mat-dialog-close>Ne</button>
-  <button mat-raised-button color="success" mat-dialog-close (click)="confirm()">Ano</button>
+  <button mat-raised-button color="success" mat-dialog-close (click)="confirm()" [disabled]="confirmDisabled">Ano</button>
 </mat-dialog-actions>
diff --git a/frontend/src/app/components/dialogs/confirm-patient-data/confirm-patient-data.component.ts b/frontend/src/app/components/dialogs/confirm-patient-data/confirm-patient-data.component.ts
@@ -14,11 +14,13 @@ export class ConfirmPatientDataComponent implements AbstractConfirmInterface {
   onConfirm: EventEmitter<string> = new EventEmitter<string>();
 
   public note: string = '';
+  public confirmDisabled: boolean = false;
 
   constructor(private _ngZone: NgZone) {
   }
 
   confirm(): void {
+    this.confirmDisabled = true;
     this.onConfirm.emit(this.note);
   }
 

diff --git a/frontend/src/app/components/dialogs/confirm-vaccination/confirm-vaccination.component.html b/frontend/src/app/components/dialogs/confirm-vaccination/confirm-vaccination.component.html
@@ -19,7 +19,7 @@ <h3>Poznámka</h3>
 
 <mat-dialog-actions>
   <button mat-button mat-dialog-close>Zrušit</button>
-  <button mat-raised-button color="success" mat-dialog-close (click)="confirm()">
+  <button mat-raised-button color="success" mat-dialog-close (click)="confirm()" [disabled]="confirmDisabled">
     Potvrdit očkování do {{ bodyPart | bodyPartInflected }}
     <mat-icon>check</mat-icon>
   </button>

diff --git a/frontend/src/app/components/dialogs/confirm-vaccination/confirm-vaccination.component.ts b/frontend/src/app/components/dialogs/confirm-vaccination/confirm-vaccination.component.ts
@@ -19,11 +19,13 @@ export class ConfirmVaccinationComponent implements AbstractConfirmInterface {
   public bodyParts: string[] = Object.values(BodyPart);
 
   public note: string = '';
+  public confirmDisabled: boolean = false;
 
   constructor(private _ngZone: NgZone) {
   }
 
   confirm(): void {
+    this.confirmDisabled = true;
     this.onConfirm.emit({ bodyPart: this.bodyPart, note: this.note });
   }
 

diff --git a/frontend/src/app/pages/admin/edit/admin-edit.component.html b/frontend/src/app/pages/admin/edit/admin-edit.component.html
@@ -19,7 +19,7 @@ <h1>Editace údajů pacienta</h1>
     <div class="buttons">
       <button [routerLink]="['/admin/patient', patient.id]" mat-flat-button>Zrušit</button>
       <button (click)="handleSave()"
-              [disabled]="!patientValid || !patientChanged"
+              [disabled]="!patientValid || !patientChanged || loading"
               color="success"
               mat-raised-button>
         Uložit změny

diff --git a/frontend/src/app/pages/admin/edit/admin-edit.component.ts b/frontend/src/app/pages/admin/edit/admin-edit.component.ts
@@ -44,11 +44,14 @@ export class AdminEditComponent extends AdminPatientAbstractComponent implements
       return;
     }
 
+    this.loading = true;
     try {
       await this._patientService.updatePatient(this.patient);
       this._alertService.successDialog('Data pacienta byla úspěšně uložena.', this._routeBack.bind(this));
     } catch (e) {
       this._alertService.error(e.message);
+    } finally {
+      this.loading = false;
     }
   }
 

diff --git a/frontend/src/app/pages/admin/patient/admin-patient.component.html b/frontend/src/app/pages/admin/patient/admin-patient.component.html
@@ -15,12 +15,14 @@ <h1>Nalezený pacient</h1>
   </app-warning>
 
   <div *ngIf="patient" class="buttons">
-    <button *ngIf="!patient.verified" mat-raised-button (click)="verify()" color="success">
+    <button *ngIf="!patient.verified" mat-raised-button
+            (click)="verify()" color="success" [disabled]="loading">
       Potvrdit správnost údajů
       <mat-icon>check</mat-icon>
     </button>
 
-    <button *ngIf="patient.verified && !patient.vaccinatedOn" mat-raised-button (click)="vaccinate()" color="accent">
+    <button *ngIf="patient.verified && !patient.vaccinatedOn" mat-raised-button
+            (click)="vaccinate()" color="accent" [disabled]="loading">
       Potvrdit proběhlé očkování
       <mat-icon>health_and_safety</mat-icon>
     </button>

diff --git a/frontend/src/app/pages/admin/patient/admin-patient.component.ts b/frontend/src/app/pages/admin/patient/admin-patient.component.ts
@@ -42,12 +42,15 @@ export class AdminPatientComponent extends AdminPatientAbstractComponent impleme
       return;
     }
 
+    this.loading = true;
     try {
       await this._patientService.verifyPatient(this.patient, note);
       this._alertService.successDialog('Údaje pacienta byly ověřeny.');
       this.patient.verified = true;
     } catch (e) {
       this._alertService.error(e.message);
+    } finally {
+      this.loading = false;
     }
   }
 
@@ -56,11 +59,14 @@ export class AdminPatientComponent extends AdminPatientAbstractComponent impleme
       return;
     }
 
+    this.loading = true;
     try {
       await this._patientService.confirmVaccination(this.patient.id, confirmation.bodyPart, confirmation.note);
       this._alertService.successDialog('Očkování bylo zaznamenáno.', this.initPatient.bind(this));
     } catch (e) {
       this._alertService.error(e.message);
+    } finally {
+      this.loading = false;
     }
   }
 }