feat: more information about past date

RefuAPP · Nov 21, 2023 · 0c51fef · 0c51fef
1 parent ce40bb1
commit 0c51fef
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 12 deletions.
diff --git a/app/src/app/app.component.html b/app/src/app/app.component.html
@@ -68,8 +68,8 @@
 <ng-container *ngIf="hasConnectionError$ | async as error">
   <ion-alert
     isOpen="{{ error }}"
-    header="You are offline!"
-    message="You are offline or the server is not reachable. Please check your internet connection and try again."
+    header="{{ 'HOME.CLIENT_ERROR.HEADER' | translate }}"
+    message="{{ 'HOME.CLIENT_ERROR.SUBHEADER' | translate }}"
     [buttons]="alertButtons"
   ></ion-alert>
 </ng-container>
diff --git a/app/src/app/app.component.ts b/app/src/app/app.component.ts
@@ -30,7 +30,7 @@ export class AppComponent implements OnInit {
   isMapLoading$: Observable<boolean> = this.store.select(isMapLoading);
   public alertButtons = [
     {
-      text: 'OK',
+      text: this.translateService.instant('HOME.CLIENT_ERROR.OKAY_BUTTON'),
       role: 'confirm',
       handler: () => {
         this.store.dispatch(fixFatalError());

diff --git a/app/src/app/components/reservation-picker/reservation-picker.component.html b/app/src/app/components/reservation-picker/reservation-picker.component.html
@@ -15,8 +15,8 @@
       </ion-col>
       <ion-alert
         trigger="present-info-alert"
-        header="'REFUGE.RESERVATIONS.INFO.HEADER' | translate"
-        message="'REFUGE.RESERVATIONS.INFO.BODY' | translate"
+        header="{{ 'REFUGE.RESERVATIONS.INFO.HEADER' | translate }}"
+        message="{{ 'REFUGE.RESERVATIONS.INFO.BODY' | translate }}"
         [buttons]="alertButtons"
       ></ion-alert>
     </ion-row>

diff --git a/app/src/app/pages/reservations/reservations.store.ts b/app/src/app/pages/reservations/reservations.store.ts
@@ -239,10 +239,11 @@ export class ReservationsComponentStore extends ComponentStore<ReservationsState
           }),
         ),
       )
-      .with(CreateReservationDataError.INVALID_DATE, () =>
+      .with(CreateReservationDataError.INVALID_DATE_ALREADY_RESERVED, () =>
         this.store.dispatch(
           customMinorError({
-            error: 'RESERVATIONS.CREATE_OPERATION.INVALID_DATE',
+            error:
+              'RESERVATIONS.CREATE_OPERATION.INVALID_DATE_ALREADY_RESERVED',
           }),
         ),
       )
@@ -253,6 +254,13 @@ export class ReservationsComponentStore extends ComponentStore<ReservationsState
           }),
         ),
       )
+      .with(CreateReservationDataError.INVALID_DATE_PAST_DATE, () =>
+        this.store.dispatch(
+          customMinorError({
+            error: 'RESERVATIONS.CREATE_OPERATION.INVALID_DATE_PAST',
+          }),
+        ),
+      )
       .otherwise((error) => this.store.dispatch(minorError({ error })));
   }
 

diff --git a/app/src/app/schemas/reservations/create-reservation.ts b/app/src/app/schemas/reservations/create-reservation.ts
@@ -7,7 +7,8 @@ import { getErrorFrom } from '../errors/all-errors';
 
 export enum CreateReservationDataError {
   REFUGE_OR_USER_NOT_FOUND = 'REFUGE_OR_USER_NOT_FOUND',
-  INVALID_DATE = 'INVALID_DATE',
+  INVALID_DATE_ALREADY_RESERVED = 'INVALID_DATE_ALREADY_RESERVED',
+  INVALID_DATE_PAST_DATE = 'INVALID_DATE_IS_PAST',
   NTP_SERVER_IS_DOWN = 'NTP_SERVER_IS_DOWN',
 }
 
@@ -28,7 +29,14 @@ export namespace CreateReservationError {
             'User already has a reservation on this date',
           )
         )
-          return CreateReservationDataError.INVALID_DATE;
+          return CreateReservationDataError.INVALID_DATE_ALREADY_RESERVED;
+        if (
+          error.error.detail !== undefined &&
+          error.error.detail.includes(
+            'You cannot make a reservation for a past date',
+          )
+        )
+          return CreateReservationDataError.INVALID_DATE_PAST_DATE;
         return PermissionsErrors.NOT_ALLOWED_OPERATION_FOR_USER;
       })
       .with(

diff --git a/app/src/assets/i18n/ca.json b/app/src/assets/i18n/ca.json
@@ -118,7 +118,8 @@
     },
     "CREATE_OPERATION": {
       "CORRECT": "Reserva al dia {{day}} creada!",
-      "INVALID_DATE": "La data seleccionada no és vàlida.",
+      "INVALID_DATE_PAST": "No pots seleccionar una data passada",
+      "INVALID_DATE_ALREADY_RESERVED": "No pots seleccionar una data ja reservada",
       "NOT_ALLOWED_CREATION_FOR_USER": "No pots crear una reserva per a un altre usuari",
       "REFUGE_OR_USER_NOT_FOUND": "Refugi o usuari ha estat eliminat, refresca la pàgina"
     },

diff --git a/app/src/assets/i18n/en.json b/app/src/assets/i18n/en.json
@@ -118,7 +118,8 @@
     },
     "CREATE_OPERATION": {
       "CORRECT": "Reservation on day {{day}} created!",
-      "INVALID_DATE": "The selected date is invalid!",
+      "INVALID_DATE_PAST": "Can't select past date!",
+      "INVALID_DATE_ALREADY_RESERVED": "Can't select a date that is already reserved!",
       "NOT_ALLOWED_CREATION_FOR_USER": "You can't create a reservation for another user",
       "REFUGE_OR_USER_NOT_FOUND": "Refuge or user has been deleted, refresh the page"
     },

diff --git a/app/src/assets/i18n/es.json b/app/src/assets/i18n/es.json
@@ -118,7 +118,8 @@
     },
     "CREATE_OPERATION": {
       "CORRECT": "¡Reserva en el día {{day}} creada!",
-      "INVALID_DATE": "La fecha seleccionada no es válida.",
+      "INVALID_DATE_PAST": "No puedes seleccionar una fecha en el pasado",
+      "INVALID_DATE_ALREADY_RESERVED": "No puedes seleccionar una fecha que ya está reservada",
       "NOT_ALLOWED_CREATION_FOR_USER": "No puedes crear una reserva para otro usuario",
       "REFUGE_OR_USER_NOT_FOUND": "Refugio o usuario ha sido eliminado, actualiza la página"
     },