From d11c458c8c0fe7506639e44bb59cd8d8d352e2fb Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 10 Jul 2021 22:34:55 -0600
Subject: [PATCH 1/8] agregar estilos que pidio Pablo

---
 .../delete/categoria-delete-dialog.component.html |  8 ++++----
 .../detail/categoria-detail.component.html        |  4 ++--
 .../categoria/list/categoria.component.html       | 15 ++++++++++-----
 .../update/categoria-update.component.html        | 14 ++++++++++----
 src/main/webapp/app/login/login.component.spec.ts |  1 +
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html
index ed57d17..3fae047 100644
--- a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html
+++ b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html
@@ -1,8 +1,8 @@
-<form *ngIf="categoria" name="deleteForm" (ngSubmit)="confirmDelete(categoria.id!)">
+<form class="ds-form" *ngIf="categoria" name="deleteForm" (ngSubmit)="confirmDelete(categoria.id!)">
   <div class="modal-header">
     <h4 class="modal-title" data-cy="categoriaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h4>
 
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>
+    <button type="button" class="ds-btn close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>
   </div>
 
   <div class="modal-body">
@@ -14,11 +14,11 @@
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
+    <button type="button" class="btn btn-secondary ds-btn ds-btn-secondary" data-dismiss="modal" (click)="cancel()">
       <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-categoria" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
+    <button id="jhi-confirm-delete-categoria" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger ds-btn ds-btn-danger">
       <fa-icon icon="times"></fa-icon>&nbsp;<span jhiTranslate="entity.action.delete">Delete</span>
     </button>
   </div>
diff --git a/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html b/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html
index fe0ee96..9531c6c 100644
--- a/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html
+++ b/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html
@@ -24,11 +24,11 @@
         </dd>
       </dl>
 
-      <button type="submit" (click)="previousState()" class="btn btn-info" data-cy="entityDetailsBackButton">
+      <button type="submit" (click)="previousState()" class="btn btn-ds btn-info" data-cy="entityDetailsBackButton">
         <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.back">Back</span>
       </button>
 
-      <button type="button" [routerLink]="['/categoria', categoria.id, 'edit']" class="btn btn-primary">
+      <button type="button" [routerLink]="['/categoria', categoria.id, 'edit']" class="btn btn-ds btn-ds-primary btn-primary">
         <fa-icon icon="pencil-alt"></fa-icon>&nbsp;<span jhiTranslate="entity.action.edit">Edit</span>
       </button>
     </div>
diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html
index 0a2a444..0f7fc16 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.html
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html
@@ -3,7 +3,7 @@
     <span jhiTranslate="dataSurveyApp.categoria.home.title">Categorias</span>
 
     <div class="d-flex justify-content-end">
-      <button class="btn btn-info mr-2" (click)="loadAll()" [disabled]="isLoading">
+      <button class="btn btn-info mr-2 ds-btn" (click)="loadAll()" [disabled]="isLoading">
         <fa-icon icon="sync" [spin]="isLoading"></fa-icon>
         <span jhiTranslate="dataSurveyApp.categoria.home.refreshListLabel">Refresh List</span>
       </button>
@@ -11,7 +11,7 @@
       <button
         id="jh-create-entity"
         data-cy="entityCreateButton"
-        class="btn btn-primary jh-create-entity create-categoria"
+        class="btn btn-primary jh-create-entity create-categoria ds-btn ds-btn-primary"
         [routerLink]="['/categoria/new']"
       >
         <fa-icon icon="plus"></fa-icon>
@@ -56,7 +56,7 @@
               <button
                 type="submit"
                 [routerLink]="['/categoria', categoria.id, 'view']"
-                class="btn btn-info btn-sm"
+                class="btn btn-info btn-sm ds-btn"
                 data-cy="entityDetailsButton"
               >
                 <fa-icon icon="eye"></fa-icon>
@@ -66,14 +66,19 @@
               <button
                 type="submit"
                 [routerLink]="['/categoria', categoria.id, 'edit']"
-                class="btn btn-primary btn-sm"
+                class="btn btn-primary btn-sm ds-btn ds-btn-primary"
                 data-cy="entityEditButton"
               >
                 <fa-icon icon="pencil-alt"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
               </button>
 
-              <button type="submit" (click)="delete(categoria)" class="btn btn-danger btn-sm" data-cy="entityDeleteButton">
+              <button
+                type="submit"
+                (click)="delete(categoria)"
+                class="btn btn-danger btn-sm ds-btn ds-btn-danger"
+                data-cy="entityDeleteButton"
+              >
                 <fa-icon icon="times"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span>
               </button>
diff --git a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
index 01dea01..778d75c 100644
--- a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
+++ b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
@@ -1,8 +1,8 @@
 <div class="row justify-content-center">
   <div class="col-8">
-    <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
+    <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm" class="ds-form">
       <h2 id="jhi-categoria-heading" data-cy="CategoriaCreateUpdateHeading" jhiTranslate="dataSurveyApp.categoria.home.createOrEditLabel">
-        Create or edit a Categoria
+        Create or edit a Category
       </h2>
 
       <div>
@@ -39,7 +39,13 @@
       </div>
 
       <div>
-        <button type="button" id="cancel-save" data-cy="entityCreateCancelButton" class="btn btn-secondary" (click)="previousState()">
+        <button
+          type="button"
+          id="cancel-save"
+          data-cy="entityCreateCancelButton"
+          class="btn btn-secondary ds-btn ds-btn-secondary"
+          (click)="previousState()"
+        >
           <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
         </button>
 
@@ -48,7 +54,7 @@
           id="save-entity"
           data-cy="entityCreateSaveButton"
           [disabled]="editForm.invalid || isSaving"
-          class="btn btn-primary"
+          class="btn btn-primary ds-btn ds-btn-primary"
         >
           <fa-icon icon="save"></fa-icon>&nbsp;<span jhiTranslate="entity.action.save">Save</span>
         </button>
diff --git a/src/main/webapp/app/login/login.component.spec.ts b/src/main/webapp/app/login/login.component.spec.ts
index 9631606..9f8675a 100644
--- a/src/main/webapp/app/login/login.component.spec.ts
+++ b/src/main/webapp/app/login/login.component.spec.ts
@@ -12,6 +12,7 @@ import { AccountService } from 'app/core/auth/account.service';
 
 import { LoginService } from './login.service';
 import { LoginComponent } from './login.component';
+import { SocialAuthService } from 'angularx-social-login';
 
 describe('Component Tests', () => {
   describe('LoginComponent', () => {

From 88f05bf269bbddd4bd1b0d17706436b3b36df328 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 10 Jul 2021 22:35:30 -0600
Subject: [PATCH 2/8] corregir titulo de pagina de edicion y creacion de
 categoria segun Paola

---
 src/main/webapp/i18n/es/categoria.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/i18n/es/categoria.json b/src/main/webapp/i18n/es/categoria.json
index b5d1305..1007afa 100644
--- a/src/main/webapp/i18n/es/categoria.json
+++ b/src/main/webapp/i18n/es/categoria.json
@@ -5,7 +5,7 @@
         "title": "Categorías",
         "refreshListLabel": "Refrescar lista",
         "createLabel": "Crear nueva Categoría",
-        "createOrEditLabel": "Crear o editar Categoría",
+        "createOrEditLabel": "Datos de Categoría",
         "notFound": "Ninguna Categoría encontrada"
       },
       "created": "Una nueva Categoría ha sido creada con el identificador {{ param }}",

From 6be855b78bfae286a0e40c8e38fa747a0ba688bd Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 10 Jul 2021 22:38:54 -0600
Subject: [PATCH 3/8] =?UTF-8?q?reducir=20tama=C3=B1o=20de=20la=20barra=20d?=
 =?UTF-8?q?e=20busqueda?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/app/entities/categoria/list/categoria.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html
index 0f7fc16..12721e2 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.html
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html
@@ -32,7 +32,7 @@
     <form class="ds-form">
       <div class="input-group">
         <div class="input-group-addon"><i class="glyphicon glyphicon-search"></i></div>
-        <input type="text" class="form-control" name="searchString" placeholder="Type to search..." [(ngModel)]="searchString" />
+        <input type="text" name="searchString" placeholder="Buscar..." [(ngModel)]="searchString" />
       </div>
     </form>
     <table class="table table-striped" aria-describedby="page-heading">

From 78ca0bba184c528a488ab5dbd2d7b6efda14f3ca Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 10 Jul 2021 22:40:48 -0600
Subject: [PATCH 4/8] Eliminar boton de "vista" de categoria

este boton es innecesario dado que las categorias presentan toda su
informacion en la tabla
---
 .../entities/categoria/list/categoria.component.html   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html
index 12721e2..61014bf 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.html
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html
@@ -53,16 +53,6 @@
           <td jhiTranslate="{{ 'dataSurveyApp.EstadoCategoria.' + categoria.estado }}">{{ categoria.estado }}</td>
           <td class="text-right">
             <div class="btn-group">
-              <button
-                type="submit"
-                [routerLink]="['/categoria', categoria.id, 'view']"
-                class="btn btn-info btn-sm ds-btn"
-                data-cy="entityDetailsButton"
-              >
-                <fa-icon icon="eye"></fa-icon>
-                <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
-              </button>
-
               <button
                 type="submit"
                 [routerLink]="['/categoria', categoria.id, 'edit']"

From 10b98b1b8ec546cabaffd26e6a16ca2496106f48 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 10 Jul 2021 22:42:25 -0600
Subject: [PATCH 5/8] eliminar boton de refrescar lista

la lista se refresca automaticamente, este boton solamente ocupa espacio
y "ensucia" la pagina
---
 .../app/entities/categoria/list/categoria.component.html     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html
index 61014bf..a5ce944 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.html
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html
@@ -3,11 +3,6 @@
     <span jhiTranslate="dataSurveyApp.categoria.home.title">Categorias</span>
 
     <div class="d-flex justify-content-end">
-      <button class="btn btn-info mr-2 ds-btn" (click)="loadAll()" [disabled]="isLoading">
-        <fa-icon icon="sync" [spin]="isLoading"></fa-icon>
-        <span jhiTranslate="dataSurveyApp.categoria.home.refreshListLabel">Refresh List</span>
-      </button>
-
       <button
         id="jh-create-entity"
         data-cy="entityCreateButton"

From 1308498603c4da9cbf3a0f3ca01de84b1158202c Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 11 Jul 2021 13:44:20 -0600
Subject: [PATCH 6/8] no registrar categoria si la nueva tiene un nombre
 duplicado

---
 .../update/categoria-update.component.ts      | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts b/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts
index b5d24ae..45f8a09 100644
--- a/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts
+++ b/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts
@@ -14,6 +14,7 @@ import { CategoriaService } from '../service/categoria.service';
 })
 export class CategoriaUpdateComponent implements OnInit {
   isSaving = false;
+  public categorias?: ICategoria[];
 
   editForm = this.fb.group({
     id: [],
@@ -21,12 +22,22 @@ export class CategoriaUpdateComponent implements OnInit {
     estado: [null, [Validators.required]],
   });
 
-  constructor(protected categoriaService: CategoriaService, protected activatedRoute: ActivatedRoute, protected fb: FormBuilder) {}
+  constructor(protected categoriaService: CategoriaService, protected activatedRoute: ActivatedRoute, protected fb: FormBuilder) {
+    this.categorias = [];
+    this.loadAll();
+  }
 
   ngOnInit(): void {
     this.activatedRoute.data.subscribe(({ categoria }) => {
       this.updateForm(categoria);
     });
+    this.loadAll();
+  }
+
+  loadAll(): void {
+    this.categoriaService.query().subscribe(res => {
+      this.categorias = res.body ?? [];
+    });
   }
 
   previousState(): void {
@@ -36,13 +47,25 @@ export class CategoriaUpdateComponent implements OnInit {
   save(): void {
     this.isSaving = true;
     const categoria = this.createFromForm();
-    if (categoria.id !== undefined) {
-      this.subscribeToSaveResponse(this.categoriaService.update(categoria));
+    const condicion = this.categoryExists(categoria);
+    if (!condicion) {
+      if (categoria.id !== undefined) {
+        this.subscribeToSaveResponse(this.categoriaService.update(categoria));
+      } else {
+        this.subscribeToSaveResponse(this.categoriaService.create(categoria));
+      }
     } else {
-      this.subscribeToSaveResponse(this.categoriaService.create(categoria));
+      this.previousState();
     }
   }
 
+  protected categoryExists(categoria: ICategoria): boolean {
+    this.loadAll();
+    var condicion = this.categorias!.some(cat => cat.nombre === categoria.nombre);
+    debugger;
+    return condicion;
+  }
+
   protected subscribeToSaveResponse(result: Observable<HttpResponse<ICategoria>>): void {
     result.pipe(finalize(() => this.onSaveFinalize())).subscribe(
       () => this.onSaveSuccess(),

From 463967c227b5689236d90feadfc511e9644af424 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 11 Jul 2021 17:38:57 -0600
Subject: [PATCH 7/8] =?UTF-8?q?corregir=20tildado=20de=20categor=C3=ADa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/i18n/es/encuesta.json  | 2 +-
 src/main/webapp/i18n/es/global.json    | 2 +-
 src/main/webapp/i18n/es/plantilla.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/i18n/es/encuesta.json b/src/main/webapp/i18n/es/encuesta.json
index 7125183..d2b259a 100644
--- a/src/main/webapp/i18n/es/encuesta.json
+++ b/src/main/webapp/i18n/es/encuesta.json
@@ -31,7 +31,7 @@
       "usuarioEncuesta": "Usuario Encuesta",
       "ePreguntaAbierta": "E Pregunta Abierta",
       "ePreguntaCerrada": "E Pregunta Cerrada",
-      "categoria": "Categoria",
+      "categoria": "Categoría",
       "usuarioExtra": "Usuario Extra"
     }
   }
diff --git a/src/main/webapp/i18n/es/global.json b/src/main/webapp/i18n/es/global.json
index 366239a..11fa5a1 100644
--- a/src/main/webapp/i18n/es/global.json
+++ b/src/main/webapp/i18n/es/global.json
@@ -15,7 +15,7 @@
         "ePreguntaCerrada": "E Pregunta Cerrada",
         "ePreguntaCerradaOpcion": "E Pregunta Cerrada Opcion",
         "usuarioEncuesta": "Usuario Encuesta",
-        "categoria": "Categoria",
+        "categoria": "Categoría",
         "factura": "Factura",
         "plantilla": "Plantilla",
         "pPreguntaAbierta": "P Pregunta Abierta",
diff --git a/src/main/webapp/i18n/es/plantilla.json b/src/main/webapp/i18n/es/plantilla.json
index 40ad319..a6a62cd 100644
--- a/src/main/webapp/i18n/es/plantilla.json
+++ b/src/main/webapp/i18n/es/plantilla.json
@@ -26,7 +26,7 @@
       "precio": "Precio",
       "pPreguntaCerrada": "P Pregunta Cerrada",
       "pPreguntaAbierta": "P Pregunta Abierta",
-      "categoria": "Categoria",
+      "categoria": "Categoría",
       "usuarioExtra": "Usuario Extra"
     }
   }

From db5aab4f1219770ebc53b825f3a990a1537f6281 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 11 Jul 2021 19:51:04 -0600
Subject: [PATCH 8/8] agregar advertencia de que el nombre de la categoria ya
 existe en la base de datos

---
 .../categoria/update/categoria-update.component.html        | 3 +++
 .../entities/categoria/update/categoria-update.component.ts | 6 ++++--
 src/main/webapp/i18n/es/categoria.json                      | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
index 778d75c..289ccb3 100644
--- a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
+++ b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html
@@ -7,6 +7,9 @@
 
       <div>
         <jhi-alert-error></jhi-alert-error>
+        <div class="alert alert-danger" *ngIf="duplicateName" jhiTranslate="dataSurveyApp.categoria.errors.duplicateName">
+          A category with that name already exists.
+        </div>
 
         <div class="form-group" [hidden]="editForm.get('id')!.value == null">
           <label class="form-control-label" jhiTranslate="global.field.id" for="field_id">ID</label>
diff --git a/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts b/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts
index 45f8a09..c7e993a 100644
--- a/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts
+++ b/src/main/webapp/app/entities/categoria/update/categoria-update.component.ts
@@ -21,8 +21,10 @@ export class CategoriaUpdateComponent implements OnInit {
     nombre: [null, [Validators.required]],
     estado: [null, [Validators.required]],
   });
+  public duplicateName: boolean;
 
   constructor(protected categoriaService: CategoriaService, protected activatedRoute: ActivatedRoute, protected fb: FormBuilder) {
+    this.duplicateName = false;
     this.categorias = [];
     this.loadAll();
   }
@@ -55,14 +57,14 @@ export class CategoriaUpdateComponent implements OnInit {
         this.subscribeToSaveResponse(this.categoriaService.create(categoria));
       }
     } else {
-      this.previousState();
+      this.duplicateName = true;
+      this.isSaving = false;
     }
   }
 
   protected categoryExists(categoria: ICategoria): boolean {
     this.loadAll();
     var condicion = this.categorias!.some(cat => cat.nombre === categoria.nombre);
-    debugger;
     return condicion;
   }
 
diff --git a/src/main/webapp/i18n/es/categoria.json b/src/main/webapp/i18n/es/categoria.json
index 1007afa..1a7b898 100644
--- a/src/main/webapp/i18n/es/categoria.json
+++ b/src/main/webapp/i18n/es/categoria.json
@@ -21,7 +21,10 @@
       "nombre": "Nombre",
       "estado": "Estado",
       "encuesta": "Encuesta",
-      "plantilla": "Plantilla"
+      "plantilla": "Plantilla",
+      "errors": {
+        "duplicateName": "Ya existe una categoría con ese nombre."
+      }
     }
   }
 }