From 7cf2ac0e3e59e6408580c208ff48996e909316e4 Mon Sep 17 00:00:00 2001
From: Pablo Bonilla <pbonilla29@hotmail.com>
Date: Sun, 1 Aug 2021 20:17:50 -0600
Subject: [PATCH] Fix survey template register validations

---
 .../plantilla/list/plantilla.component.html   | 30 ++++++++++++++++---
 .../plantilla/list/plantilla.component.ts     |  8 ++---
 src/main/webapp/i18n/es/global.json           |  3 +-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/app/entities/plantilla/list/plantilla.component.html b/src/main/webapp/app/entities/plantilla/list/plantilla.component.html
index 400e2c0..565edfe 100644
--- a/src/main/webapp/app/entities/plantilla/list/plantilla.component.html
+++ b/src/main/webapp/app/entities/plantilla/list/plantilla.component.html
@@ -26,9 +26,9 @@
     </div>
   </h2>
 
-  <jhi-alert-error></jhi-alert-error>
+  <!-- <jhi-alert-error></jhi-alert-error>
 
-  <jhi-alert></jhi-alert>
+  <jhi-alert></jhi-alert> -->
 
   <div class="alert alert-warning" id="no-result" *ngIf="plantillas?.length === 0">
     <span jhiTranslate="dataSurveyApp.plantilla.home.notFound">No templates found</span>
@@ -56,7 +56,8 @@
           <td *ngIf="plantilla.fechaPublicacionTienda">{{ plantilla.fechaPublicacionTienda | formatShortDatetime | titlecase }}</td>
           <td *ngIf="!plantilla.fechaPublicacionTienda">No establecida</td>
           <td jhiTranslate="{{ 'dataSurveyApp.EstadoPlantilla.' + plantilla.estado }}">{{ plantilla.estado }}</td>
-          <td>{{ plantilla.precio | currency: 'USD':'symbol-narrow' }}</td>
+          <td *ngIf="plantilla.precio! > 0">${{ plantilla.precio | number: '1.2' }}</td>
+          <td *ngIf="plantilla.precio! === 0">Gratis</td>
           <td>{{ plantilla.categoria?.nombre }}</td>
           <td class="text-right">
             <div class="btn-group">
@@ -168,7 +169,7 @@
 
             <div class="form-group">
               <label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.precio" for="field_precio">Precio</label>
-              <input type="number" class="form-control" name="precio" id="field_precio" data-cy="precio" formControlName="precio" />
+              <input type="number" min="0" class="form-control" name="precio" id="field_precio" data-cy="precio" formControlName="precio" />
               <div
                 *ngIf="
                   templateCreateForm.get('precio')!.invalid &&
@@ -189,6 +190,13 @@
                 >
                   This field should be a number.
                 </small>
+                <small
+                  class="form-text text-danger"
+                  [hidden]="!templateCreateForm.get('precio')?.errors?.min"
+                  jhiTranslate="entity.validation.minoigual"
+                >
+                  This field should be great than or equals to 0.
+                </small>
               </div>
             </div>
 
@@ -207,6 +215,20 @@
                   {{ categoriaOption.nombre }}
                 </option>
               </select>
+              <div
+                *ngIf="
+                  templateCreateForm.get('categoria')!.invalid &&
+                  (templateCreateForm.get('categoria')!.dirty || templateCreateForm.get('categoria')!.touched)
+                "
+              >
+                <small
+                  class="form-text text-danger"
+                  *ngIf="templateCreateForm.get('categoria')?.errors?.required"
+                  jhiTranslate="entity.validation.required"
+                >
+                  This field is required.
+                </small>
+              </div>
             </div>
           </div>
         </div>
diff --git a/src/main/webapp/app/entities/plantilla/list/plantilla.component.ts b/src/main/webapp/app/entities/plantilla/list/plantilla.component.ts
index dc1f19f..9145186 100644
--- a/src/main/webapp/app/entities/plantilla/list/plantilla.component.ts
+++ b/src/main/webapp/app/entities/plantilla/list/plantilla.component.ts
@@ -33,10 +33,10 @@ export class PlantillaComponent implements OnInit {
 
   templateCreateForm = this.fb.group({
     id: [],
-    nombre: [null, [Validators.minLength(1), Validators.maxLength(50)]],
-    descripcion: [],
-    precio: [null, [Validators.required]],
-    categoria: [],
+    nombre: [null, [Validators.required, Validators.minLength(1), Validators.maxLength(50)]],
+    descripcion: [[Validators.required]],
+    precio: [null, [Validators.required, Validators.min(0)]],
+    categoria: [null, [Validators.required]],
   });
 
   constructor(
diff --git a/src/main/webapp/i18n/es/global.json b/src/main/webapp/i18n/es/global.json
index 42d43b3..02866f3 100644
--- a/src/main/webapp/i18n/es/global.json
+++ b/src/main/webapp/i18n/es/global.json
@@ -151,7 +151,8 @@
       "pattern": "Este campo debe seguir el patrón {{pattern}}.",
       "number": "Este campo debe ser un número.",
       "integerNumber": "Este campo debe ser un número entero.",
-      "datetimelocal": "Este campo debe ser una fecha y hora."
+      "datetimelocal": "Este campo debe ser una fecha y hora.",
+      "minoigual": "Este campo debe ser mayor o igual que 0."
     },
     "publish": {
       "title": "Publicar encuesta",