diff --git a/src/main/java/org/datasurvey/config/CacheConfiguration.java b/src/main/java/org/datasurvey/config/CacheConfiguration.java
index 0836c99..0e82862 100644
--- a/src/main/java/org/datasurvey/config/CacheConfiguration.java
+++ b/src/main/java/org/datasurvey/config/CacheConfiguration.java
@@ -24,13 +24,13 @@ public class CacheConfiguration {
private final javax.cache.configuration.Configuration
diff --git a/src/main/resources/templates/mail/encuestaDeletedEmail.html b/src/main/resources/templates/mail/encuestaDeletedEmail.html
new file mode 100644
index 0000000..207f19a
--- /dev/null
+++ b/src/main/resources/templates/mail/encuestaDeletedEmail.html
@@ -0,0 +1,310 @@
+
+
+
+
+
+
+
+
+
+
+ Encuesta Eliminada
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ ¡Encuesta eliminada!
+ ¡Su encuesta ha sido eliminada exitosamente!
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/mail/encuestaPrivadaEmail.html b/src/main/resources/templates/mail/encuestaPrivadaEmail.html
new file mode 100644
index 0000000..4acd28a
--- /dev/null
+++ b/src/main/resources/templates/mail/encuestaPrivadaEmail.html
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+ JHipster activation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ ¡Hola!
+
+ Your JHipster account has been created, please click on the URL below to activate it:
+
+
+
+
+ Regards,
+
+ JHipster.
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/mail/encuestaPublicaEmail.html b/src/main/resources/templates/mail/encuestaPublicaEmail.html
new file mode 100644
index 0000000..67a14a9
--- /dev/null
+++ b/src/main/resources/templates/mail/encuestaPublicaEmail.html
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+ JHipster activation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ ¡Hola!
+
+ Your JHipster account has been created, please click on the URL below to activate it:
+
+
+
+
+ Regards,
+
+ JHipster.
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/mail/passwordResetEmail.html b/src/main/resources/templates/mail/passwordResetEmail.html
index 1742a3f..8c6b549 100644
--- a/src/main/resources/templates/mail/passwordResetEmail.html
+++ b/src/main/resources/templates/mail/passwordResetEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/passwordRestoredEmail.html b/src/main/resources/templates/mail/passwordRestoredEmail.html
index 6dcebd1..5374e25 100644
--- a/src/main/resources/templates/mail/passwordRestoredEmail.html
+++ b/src/main/resources/templates/mail/passwordRestoredEmail.html
@@ -244,7 +244,7 @@
diff --git a/src/main/resources/templates/mail/reactivatedAccountEmail.html b/src/main/resources/templates/mail/reactivatedAccountEmail.html
new file mode 100644
index 0000000..f0b0767
--- /dev/null
+++ b/src/main/resources/templates/mail/reactivatedAccountEmail.html
@@ -0,0 +1,322 @@
+
+
+
+
+
+
+
+
+
+
+ JHipster activation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ ¡Hola!
+
+ Your JHipster account has been created, please click on the URL below to activate it:
+
+
+ Iniciar Sesión
+
+
+
+
+ Regards,
+
+ JHipster.
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/mail/suspendedAccountEmail.html b/src/main/resources/templates/mail/suspendedAccountEmail.html
new file mode 100644
index 0000000..217aedf
--- /dev/null
+++ b/src/main/resources/templates/mail/suspendedAccountEmail.html
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+ JHipster activation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ ¡Hola!
+
+ Your JHipster account has been created, please click on the URL below to activate it:
+
+
+
+
+ Regards,
+
+ JHipster.
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/app/account/settings/settings.component.html b/src/main/webapp/app/account/settings/settings.component.html
index 738b1c0..a840991 100644
--- a/src/main/webapp/app/account/settings/settings.component.html
+++ b/src/main/webapp/app/account/settings/settings.component.html
@@ -1,172 +1,3 @@
-
-
diff --git a/src/main/webapp/app/account/settings/settings.component.ts b/src/main/webapp/app/account/settings/settings.component.ts
index 55335fd..561635e 100644
--- a/src/main/webapp/app/account/settings/settings.component.ts
+++ b/src/main/webapp/app/account/settings/settings.component.ts
@@ -136,10 +136,6 @@ export class SettingsComponent implements OnInit {
save(): void {
this.isSaving = true;
const usuarioExtra = this.createFromForm();
-
- console.log(usuarioExtra.iconoPerfil);
- console.log(usuarioExtra.fechaNacimiento);
-
this.subscribeToSaveResponse(this.usuarioExtraService.update(usuarioExtra));
}
diff --git a/src/main/webapp/app/config/error.constants.ts b/src/main/webapp/app/config/error.constants.ts
index ea24e19..e0721f2 100644
--- a/src/main/webapp/app/config/error.constants.ts
+++ b/src/main/webapp/app/config/error.constants.ts
@@ -3,3 +3,4 @@ export const EMAIL_ALREADY_USED_TYPE = PROBLEM_BASE_URL + '/email-already-used';
export const LOGIN_ALREADY_USED_TYPE = PROBLEM_BASE_URL + '/login-already-used';
export const EMAIL_NOT_EXISTS_TYPE = PROBLEM_BASE_URL + '/email-not-exists';
export const USER_IS_GOOGLE_TYPE = PROBLEM_BASE_URL + '/user-is-google';
+export const USER_IS_SUSPENDED = PROBLEM_BASE_URL + '/user-is-suspended';
diff --git a/src/main/webapp/app/core/auth/account.service.ts b/src/main/webapp/app/core/auth/account.service.ts
index 324c77e..b28fd53 100644
--- a/src/main/webapp/app/core/auth/account.service.ts
+++ b/src/main/webapp/app/core/auth/account.service.ts
@@ -72,6 +72,7 @@ export class AccountService {
shareReplay()
);
}
+
return this.accountCache$;
}
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 ceb258b..d1ad4e4 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
@@ -2,24 +2,25 @@
-
-
+
+
Cambiar estado
Are you sure you want to toggle this category's status?
diff --git a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts
index df89d70..8d665e3 100644
--- a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts
+++ b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts
@@ -10,10 +10,13 @@ import { finalize, map } from 'rxjs/operators';
import { Categoria, ICategoria } from '../categoria.model';
import { CategoriaService } from '../service/categoria.service';
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
@Component({
templateUrl: './categoria-delete-dialog.component.html',
})
export class CategoriaDeleteDialogComponent {
+ faExchangeAlt = faExchangeAlt;
+
categoria?: ICategoria;
encuestas?: IEncuesta[];
encuestasFiltradas?: IEncuesta[];
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 2ee3101..b486a5d 100644
--- a/src/main/webapp/app/entities/categoria/list/categoria.component.html
+++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html
@@ -1,6 +1,9 @@
- Categorias
+
+
Categorias
+
Categorice las encuestas de la aplicación
+
Save
diff --git a/src/main/webapp/app/entities/e-pregunta-cerrada-opcion/service/e-pregunta-cerrada-opcion.service.ts b/src/main/webapp/app/entities/e-pregunta-cerrada-opcion/service/e-pregunta-cerrada-opcion.service.ts
index a3daca3..0f02ff1 100644
--- a/src/main/webapp/app/entities/e-pregunta-cerrada-opcion/service/e-pregunta-cerrada-opcion.service.ts
+++ b/src/main/webapp/app/entities/e-pregunta-cerrada-opcion/service/e-pregunta-cerrada-opcion.service.ts
@@ -16,8 +16,8 @@ export class EPreguntaCerradaOpcionService {
constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {}
- create(ePreguntaCerradaOpcion: IEPreguntaCerradaOpcion): Observable
{
- return this.http.post(this.resourceUrl, ePreguntaCerradaOpcion, { observe: 'response' });
+ create(ePreguntaCerradaOpcion: IEPreguntaCerradaOpcion, preguntaId?: number): Observable {
+ return this.http.post(`${this.resourceUrl}/${preguntaId}`, ePreguntaCerradaOpcion, { observe: 'response' });
}
update(ePreguntaCerradaOpcion: IEPreguntaCerradaOpcion): Observable {
@@ -49,6 +49,10 @@ export class EPreguntaCerradaOpcionService {
return this.http.delete(`${this.resourceUrl}/${id}`, { observe: 'response' });
}
+ deleteMany(ids: number[]): Observable {
+ return this.http.post(`${this.resourceUrl}/deleteMany`, ids, { observe: 'response' });
+ }
+
addEPreguntaCerradaOpcionToCollectionIfMissing(
ePreguntaCerradaOpcionCollection: IEPreguntaCerradaOpcion[],
...ePreguntaCerradaOpcionsToCheck: (IEPreguntaCerradaOpcion | null | undefined)[]
diff --git a/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html b/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html
index dfe7349..8fd4065 100644
--- a/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html
+++ b/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html
@@ -1,24 +1,28 @@
-