Merge pull request #351 from mild-blue/better-nav

Add search again button to success dialog
mild-blue · Jul 15, 2021 · d8c845d · d8c845d
2 parents 2dd7bfa + f530499
commit d8c845d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/backend/src/test/kotlin/blue/mild/covid/vaxx/routes/VaccinationRouteTest.kt b/backend/src/test/kotlin/blue/mild/covid/vaxx/routes/VaccinationRouteTest.kt
@@ -36,7 +36,6 @@ class VaccinationRouteTest : ServerTestBase() {
 
     @Suppress("LongMethod") // This is test, it is ok here
     @Test
-    @Suppress("LongMethod")
     fun `test vaccination flow`() = withTestApplication {
         // verify that only authorized users can access vaccination data
         handleRequest(HttpMethod.Get, "${Routes.vaccination}?id=${patient1.id}").run {
@@ -165,7 +164,7 @@ class VaccinationRouteTest : ServerTestBase() {
         }.run {
             expectStatus(HttpStatusCode.OK)
             val output = receive<VaccinationDetailDtoOut>()
-            assertEquals(vaccinationId, output.vaccinationId)
+            assertEquals(vaccinationFirstDoseId, output.vaccinationId)
         }
     }
 }
diff --git a/frontend/src/app/components/dialogs/success/success-dialog.component.html b/frontend/src/app/components/dialogs/success/success-dialog.component.html
@@ -5,5 +5,6 @@ <h3>{{ data.message }}</h3>
   </div>
 </div>
 <mat-dialog-actions class="buttons">
+  <button mat-button mat-dialog-close (click)="searchPatient()">Vyhledat dalšího pacienta</button>
   <button mat-button mat-dialog-close>OK</button>
 </mat-dialog-actions>
diff --git a/frontend/src/app/components/dialogs/success/success-dialog.component.ts b/frontend/src/app/components/dialogs/success/success-dialog.component.ts
@@ -1,5 +1,6 @@
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-dialog',
@@ -8,6 +9,11 @@ import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 })
 export class SuccessDialogComponent {
 
-  constructor(@Inject(MAT_DIALOG_DATA) public data: { message: string; }) {
+  constructor(@Inject(MAT_DIALOG_DATA) public data: { message: string; },
+              private _router: Router) {
+  }
+
+  public searchPatient(): void {
+    this._router.navigate(['admin']);
   }
 }