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 jcacheConfiguration; public CacheConfiguration(JHipsterProperties jHipsterProperties) { - JHipsterProperties.Cache.Ehcache ehcache = jHipsterProperties.getCache().getEhcache(); + //JHipsterProperties.Cache.Ehcache ehcache = jHipsterProperties.getCache().getEhcache(); jcacheConfiguration = Eh107Configuration.fromEhcacheCacheConfiguration( CacheConfigurationBuilder - .newCacheConfigurationBuilder(Object.class, Object.class, ResourcePoolsBuilder.heap(ehcache.getMaxEntries())) - .withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofSeconds(ehcache.getTimeToLiveSeconds()))) + .newCacheConfigurationBuilder(Object.class, Object.class, ResourcePoolsBuilder.heap(100L)) + .withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofSeconds(1))) .build() ); } @@ -82,6 +82,7 @@ public class CacheConfiguration { private void createCache(javax.cache.CacheManager cm, String cacheName) { javax.cache.Cache cache = cm.getCache(cacheName); + if (cache != null) { cache.clear(); } else { diff --git a/src/main/java/org/datasurvey/repository/UserRepository.java b/src/main/java/org/datasurvey/repository/UserRepository.java index 6a33ce2..3f929fb 100644 --- a/src/main/java/org/datasurvey/repository/UserRepository.java +++ b/src/main/java/org/datasurvey/repository/UserRepository.java @@ -31,7 +31,7 @@ public interface UserRepository extends JpaRepository { Optional findOneByLogin(String login); @EntityGraph(attributePaths = "authorities") - //@Cacheable(cacheNames = USERS_BY_LOGIN_CACHE) + @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE) Optional findOneWithAuthoritiesByLogin(String login); @EntityGraph(attributePaths = "authorities") diff --git a/src/main/java/org/datasurvey/service/MailService.java b/src/main/java/org/datasurvey/service/MailService.java index cf8f62b..a14a8e8 100644 --- a/src/main/java/org/datasurvey/service/MailService.java +++ b/src/main/java/org/datasurvey/service/MailService.java @@ -30,6 +30,8 @@ public class MailService { private static final String USER = "user"; + private static final String CONTRASENNA = "contrasenna"; + private static final String BASE_URL = "baseUrl"; private final JHipsterProperties jHipsterProperties; @@ -93,6 +95,22 @@ public class MailService { sendEmail(user.getEmail(), subject, content, false, true); } + @Async + public void sendEmailFromTemplateEncuesta(User user, String templateName, String titleKey, String contrasenna) { + if (user.getEmail() == null) { + log.debug("Email doesn't exist for user '{}'", user.getLogin()); + return; + } + Locale locale = Locale.forLanguageTag(user.getLangKey()); + Context context = new Context(locale); + context.setVariable(CONTRASENNA, contrasenna); + context.setVariable(USER, user); + context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl()); + String content = templateEngine.process(templateName, context); + String subject = messageSource.getMessage(titleKey, null, locale); + sendEmail(user.getEmail(), subject, content, false, true); + } + @Async public void sendActivationEmail(User user) { log.debug("Sending activation email to '{}'", user.getEmail()); @@ -128,4 +146,16 @@ public class MailService { log.debug("Sending reactivated account mail to '{}'", user.getUser().getEmail()); sendEmailFromTemplate(user.getUser(), "mail/reactivatedAccountEmail", "email.reactivation.title"); } + + @Async + public void sendPublishedPrivateMail(UsuarioExtra user, String contrasenna) { + log.debug("Sending reactivated account mail to '{}'", user.getUser().getEmail()); + sendEmailFromTemplateEncuesta(user.getUser(), "mail/encuestaPrivadaEmail", "email.private.title", contrasenna); + } + + @Async + public void sendPublishedPublicMail(UsuarioExtra user) { + log.debug("Sending reactivated account mail to '{}'", user.getUser().getEmail()); + sendEmailFromTemplate(user.getUser(), "mail/encuestaPublicaEmail", "email.public.title"); + } } diff --git a/src/main/java/org/datasurvey/service/UserService.java b/src/main/java/org/datasurvey/service/UserService.java index 394274c..76f47ec 100644 --- a/src/main/java/org/datasurvey/service/UserService.java +++ b/src/main/java/org/datasurvey/service/UserService.java @@ -394,12 +394,16 @@ public class UserService { @Transactional(readOnly = true) public Optional getUserWithAuthoritiesByLogin(String login) { return userRepository.findOneWithAuthoritiesByLogin(login); + //cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear(); } @Transactional(readOnly = true) public Optional getUserWithAuthorities() { return SecurityUtils.getCurrentUserLogin().flatMap(userRepository::findOneWithAuthoritiesByLogin); //findOneWithAuthoritiesByLogin + //cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear(); + + //return user; } /** diff --git a/src/main/java/org/datasurvey/web/rest/EncuestaResource.java b/src/main/java/org/datasurvey/web/rest/EncuestaResource.java index 2d79429..e3e4b11 100644 --- a/src/main/java/org/datasurvey/web/rest/EncuestaResource.java +++ b/src/main/java/org/datasurvey/web/rest/EncuestaResource.java @@ -14,8 +14,12 @@ import org.datasurvey.domain.EPreguntaAbierta; import org.datasurvey.domain.EPreguntaCerrada; import org.datasurvey.domain.EPreguntaCerradaOpcion; import org.datasurvey.domain.Encuesta; +import org.datasurvey.domain.enumeration.AccesoEncuesta; import org.datasurvey.repository.EncuestaRepository; import org.datasurvey.service.*; +import org.datasurvey.service.EncuestaQueryService; +import org.datasurvey.service.EncuestaService; +import org.datasurvey.service.MailService; import org.datasurvey.service.criteria.EncuestaCriteria; import org.datasurvey.web.rest.errors.BadRequestAlertException; import org.slf4j.Logger; @@ -46,6 +50,8 @@ public class EncuestaResource { private final EncuestaQueryService encuestaQueryService; + private final MailService mailService; + private final EPreguntaCerradaService ePreguntaCerradaService; private final EPreguntaAbiertaService ePreguntaAbiertaService; @@ -56,6 +62,7 @@ public class EncuestaResource { EncuestaService encuestaService, EncuestaRepository encuestaRepository, EncuestaQueryService encuestaQueryService, + MailService mailService, EPreguntaCerradaService ePreguntaCerradaService, EPreguntaAbiertaService ePreguntaAbiertaService, EPreguntaCerradaOpcionService ePreguntaCerradaOpcionService @@ -63,6 +70,7 @@ public class EncuestaResource { this.encuestaService = encuestaService; this.encuestaRepository = encuestaRepository; this.encuestaQueryService = encuestaQueryService; + this.mailService = mailService; this.ePreguntaCerradaService = ePreguntaCerradaService; this.ePreguntaAbiertaService = ePreguntaAbiertaService; this.ePreguntaCerradaOpcionService = ePreguntaCerradaOpcionService; @@ -116,6 +124,12 @@ public class EncuestaResource { } Encuesta result = encuestaService.save(encuesta); + + if (result.getAcceso().equals(AccesoEncuesta.PRIVATE)) { + mailService.sendPublishedPrivateMail(result.getUsuarioExtra(), result.getContrasenna()); + } else { + mailService.sendPublishedPublicMail(result.getUsuarioExtra()); + } return ResponseEntity .ok() .headers(HeaderUtil.createEntityUpdateAlert(applicationName, true, ENTITY_NAME, encuesta.getId().toString())) diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 7ff70ce..6239473 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -39,3 +39,16 @@ email.suspended.title=Your account has been suspended email.suspended.greeting=Dear {0} email.suspended.text1=Su cuenta en DatSurvey se encuentra temporalmente suspendida. Si cree que es un error por favor haga clic en el siguiente enlace para enviar una solicitud para reactivar su cuenta: email.suspended.text2=Saludos, + +#PublicEncuesta +email.public.title=Su encuesta ha sido publicada +email.public.greeting=¡Felicidades {0}! +email.public.text1=Su encuesta ha sido publicada de manera publica +email.public.text2=Saludos, + +#PrivateEncuesta +email.private.title=Su encuesta ha sido publicada de manera privada +email.private.greeting=¡Felicidades {0}! +email.private.text1=Su encuesta ha sdo publicada de manera privada. Su contraseña de acceso es: {0} +email.private.text2=Saludos, + diff --git a/src/main/resources/i18n/messages_es.properties b/src/main/resources/i18n/messages_es.properties index 4406c99..7c205b5 100644 --- a/src/main/resources/i18n/messages_es.properties +++ b/src/main/resources/i18n/messages_es.properties @@ -40,3 +40,15 @@ email.suspended.title=Su cuenta ha sido suspendida email.suspended.greeting=Estimado {0} email.suspended.text1=Lamentamos informarle que su cuenta en DatSurvey se encuentra temporalmente suspendida. Si cree que es un error por favor responda a este correo email.suspended.text2=Saludos, + +#PublicEncuesta +email.public.title=Su encuesta ha sido publicada +email.public.greeting=¡Felicidades {0}! +email.public.text1=Su encuesta ha sido publicada de manera publica +email.public.text2=Saludos, + +#PrivateEncuesta +email.private.title=Su encuesta ha sido publicada de manera privada +email.private.greeting=¡Felicidades {0}! +email.private.text1=Su encuesta ha sdo publicada de manera privada. Su contraseña de acceso es: {0} +email.private.text2=Saludos, diff --git a/src/main/resources/templates/mail/encuestaPrivadaEmail.html b/src/main/resources/templates/mail/encuestaPrivadaEmail.html new file mode 100644 index 0000000..b017e8b --- /dev/null +++ b/src/main/resources/templates/mail/encuestaPrivadaEmail.html @@ -0,0 +1,319 @@ + + + + + + + + + + + JHipster activation + + + + + + + +
+
+ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  +
+ +
+ + diff --git a/src/main/resources/templates/mail/encuestaPublicaEmail.html b/src/main/resources/templates/mail/encuestaPublicaEmail.html new file mode 100644 index 0000000..f4a1dda --- /dev/null +++ b/src/main/resources/templates/mail/encuestaPublicaEmail.html @@ -0,0 +1,319 @@ + + + + + + + + + + + JHipster activation + + + + + + + +
+
+ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  +
+ +
+ + 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/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html index 2ee3101..7fb1898 100644 --- a/src/main/webapp/app/entities/categoria/list/categoria.component.html +++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html @@ -19,12 +19,17 @@ --> -
- + -
-
No categorias found
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 5ac2f58..a21389e 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,8 +1,8 @@ -
+
-

Confirm delete operation

+
@@ -14,11 +14,11 @@
- -
diff --git a/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.ts b/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.ts index 9c56c0e..713e0bb 100644 --- a/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.ts @@ -1,9 +1,8 @@ import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { EstadoEncuesta } from 'app/entities/enumerations/estado-encuesta.model'; - import { IEncuesta } from '../encuesta.model'; import { EncuestaService } from '../service/encuesta.service'; +import { EstadoEncuesta } from 'app/entities/enumerations/estado-encuesta.model'; @Component({ templateUrl: './encuesta-delete-dialog.component.html', @@ -17,9 +16,9 @@ export class EncuestaDeleteDialogComponent { this.activeModal.dismiss(); } - confirmDelete(encuesta: IEncuesta): void { - encuesta.estado = EstadoEncuesta.DELETED; - this.encuestaService.update(encuesta).subscribe(() => { + confirmDelete(encuest: IEncuesta): void { + encuest.estado = EstadoEncuesta.DELETED; + this.encuestaService.deleteEncuesta(encuest).subscribe(() => { this.activeModal.close('deleted'); }); } diff --git a/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html b/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html new file mode 100644 index 0000000..40356a0 --- /dev/null +++ b/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html @@ -0,0 +1,25 @@ + +
+

Confirm delete operation

+ + +
+ +
+ + +

+ Are you sure you want to delete this option? +

+
+ +
+ + + +
+
diff --git a/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.ts b/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.ts new file mode 100644 index 0000000..82d1896 --- /dev/null +++ b/src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + templateUrl: './encuesta-delete-option-dialog.component.html', +}) +export class EncuestaDeleteOptionDialogComponent { + constructor(protected activeModal: NgbActiveModal) {} + + cancel(): void { + this.activeModal.dismiss(); + } + + confirmDelete(): void { + this.activeModal.close('confirm'); + } +} diff --git a/src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.html b/src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.html new file mode 100644 index 0000000..fd2c58c --- /dev/null +++ b/src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.html @@ -0,0 +1,25 @@ +
+
+

Confirm delete operation

+ + +
+ +
+ + +

+ Are you sure you want to delete this question? +

+
+ +
+ + + +
+
diff --git a/src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.ts b/src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.ts new file mode 100644 index 0000000..56c7347 --- /dev/null +++ b/src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + templateUrl: './encuesta-delete-question-dialog.component.html', +}) +export class EncuestaDeleteQuestionDialogComponent { + constructor(protected activeModal: NgbActiveModal) {} + + cancel(): void { + this.activeModal.dismiss(); + } + + confirmDelete(): void { + this.activeModal.close('confirm'); + } +} diff --git a/src/main/webapp/app/entities/encuesta/encuesta-publish-dialog/encuesta-publish-dialog.component.ts b/src/main/webapp/app/entities/encuesta/encuesta-publish-dialog/encuesta-publish-dialog.component.ts index ff2d3b5..dae745d 100644 --- a/src/main/webapp/app/entities/encuesta/encuesta-publish-dialog/encuesta-publish-dialog.component.ts +++ b/src/main/webapp/app/entities/encuesta/encuesta-publish-dialog/encuesta-publish-dialog.component.ts @@ -3,6 +3,8 @@ import { IEncuesta } from '../encuesta.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { EncuestaService } from '../service/encuesta.service'; import { EstadoEncuesta } from '../../enumerations/estado-encuesta.model'; +import { AccesoEncuesta } from '../../enumerations/acceso-encuesta.model'; +import { passwordResetFinishRoute } from '../../../account/password-reset/finish/password-reset-finish.route'; @Component({ selector: 'jhi-encuesta-publish-dialog', @@ -24,10 +26,25 @@ export class EncuestaPublishDialogComponent implements OnInit { encuesta.estado = EstadoEncuesta.ACTIVE; } + if (encuesta.acceso === AccesoEncuesta.PRIVATE) { + encuesta.contrasenna = this.generatePassword(); + } + this.encuestaService.update(encuesta).subscribe(() => { this.activeModal.close('published'); }); } + generatePassword(): string { + debugger; + const alpha = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + + let password = ''; + for (let i = 0; i < 5; i++) { + password += alpha.charAt(Math.floor(Math.random() * alpha.length)); + } + return password; + } + ngOnInit(): void {} } diff --git a/src/main/webapp/app/entities/encuesta/encuesta.module.ts b/src/main/webapp/app/entities/encuesta/encuesta.module.ts index 7b1d91e..86a1c11 100644 --- a/src/main/webapp/app/entities/encuesta/encuesta.module.ts +++ b/src/main/webapp/app/entities/encuesta/encuesta.module.ts @@ -7,6 +7,8 @@ import { EncuestaDeleteDialogComponent } from './delete/encuesta-delete-dialog.c import { EncuestaRoutingModule } from './route/encuesta-routing.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { EncuestaPublishDialogComponent } from './encuesta-publish-dialog/encuesta-publish-dialog.component'; +import { EncuestaDeleteQuestionDialogComponent } from './encuesta-delete-question-dialog/encuesta-delete-question-dialog.component'; +import { EncuestaDeleteOptionDialogComponent } from './encuesta-delete-option-dialog/encuesta-delete-option-dialog.component'; @NgModule({ imports: [SharedModule, EncuestaRoutingModule, FontAwesomeModule], @@ -16,6 +18,8 @@ import { EncuestaPublishDialogComponent } from './encuesta-publish-dialog/encues EncuestaUpdateComponent, EncuestaDeleteDialogComponent, EncuestaPublishDialogComponent, + EncuestaDeleteQuestionDialogComponent, + EncuestaDeleteOptionDialogComponent, ], entryComponents: [EncuestaDeleteDialogComponent], }) diff --git a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html index b67a2e3..07a8a57 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -3,7 +3,7 @@
Encuestas -

Cree encuestas y publiquelas mundialmente.

+

Cree encuestas y publiquelas mundialmente

@@ -27,7 +27,7 @@
- +
  • - +
    • -
    @@ -174,21 +211,55 @@
    No se encontraron preguntas @@ -59,12 +59,16 @@
    Pregunta de respuesta {{ 'dataSurveyApp.PreguntaCerradaTipo.SINGLE' | translate | lowercase }}Pregunta de respuesta {{ 'dataSurveyApp.PreguntaCerradaTipo.SINGLE' | translate | lowercase }} + {{ ePregunta.opcional ? '(opcional)' : '' }} Pregunta de respuesta {{ 'dataSurveyApp.PreguntaCerradaTipo.MULTIPLE' | translate | lowercase }}Pregunta de respuesta {{ 'dataSurveyApp.PreguntaCerradaTipo.MULTIPLE' | translate | lowercase }} + {{ ePregunta.opcional ? '(opcional)' : '' }} + Pregunta de respuesta abierta {{ ePregunta.opcional ? '(opcional)' : '' }} - Pregunta de respuesta abierta
    @@ -172,7 +176,7 @@
    - +
    diff --git a/src/main/webapp/app/entities/encuesta/update/encuesta-update.component.spec.ts b/src/main/webapp/app/entities/encuesta/update/encuesta-update.component.tmpSpec.ts similarity index 100% rename from src/main/webapp/app/entities/encuesta/update/encuesta-update.component.spec.ts rename to src/main/webapp/app/entities/encuesta/update/encuesta-update.component.tmpSpec.ts diff --git a/src/main/webapp/app/entities/encuesta/update/encuesta-update.component.ts b/src/main/webapp/app/entities/encuesta/update/encuesta-update.component.ts index 11c479f..f7787b4 100644 --- a/src/main/webapp/app/entities/encuesta/update/encuesta-update.component.ts +++ b/src/main/webapp/app/entities/encuesta/update/encuesta-update.component.ts @@ -1,3 +1,4 @@ +import { IEPreguntaAbierta } from './../../e-pregunta-abierta/e-pregunta-abierta.model'; import { EPreguntaCerrada } from './../../e-pregunta-cerrada/e-pregunta-cerrada.model'; import { EPreguntaCerradaOpcion, IEPreguntaCerradaOpcion } from './../../e-pregunta-cerrada-opcion/e-pregunta-cerrada-opcion.model'; import { EPreguntaAbiertaService } from './../../e-pregunta-abierta/service/e-pregunta-abierta.service'; @@ -26,6 +27,8 @@ import { EPreguntaCerradaDeleteDialogComponent } from 'app/entities/e-pregunta-c import { faTimes, faPlus } from '@fortawesome/free-solid-svg-icons'; import { PreguntaCerradaTipo } from 'app/entities/enumerations/pregunta-cerrada-tipo.model'; +import { EncuestaDeleteQuestionDialogComponent } from '../encuesta-delete-question-dialog/encuesta-delete-question-dialog.component'; +import { EncuestaDeleteOptionDialogComponent } from '../encuesta-delete-option-dialog/encuesta-delete-option-dialog.component'; @Component({ selector: 'jhi-encuesta-update', @@ -68,6 +71,9 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { editFormQuestion = this.fb.group({ id: [], nombre: [null, [Validators.required, Validators.minLength(1), Validators.maxLength(500)]], + tipo: [PreguntaCerradaTipo.SINGLE], + opcional: [false], + tipopregunta: ['CLOSED'], }); ePreguntas?: any[]; @@ -99,6 +105,7 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { (res: any) => { this.isLoading = false; this.ePreguntas = res.body ?? []; + console.log(this.ePreguntas); }, () => { this.isLoading = false; @@ -188,49 +195,59 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { } deleteQuestion(event: any) { - const id = event.target.dataset.id; - if (event.target.dataset.type) { - // Delete closed question - const questionElement = (event.target as HTMLElement).parentElement?.parentElement; - const optionIdsToDelete: number[] = []; + const modalRef = this.modalService.open(EncuestaDeleteQuestionDialogComponent, { size: 'lg', backdrop: 'static' }); + modalRef.closed.subscribe(reason => { + if (reason === 'confirm') { + const id = event.target.dataset.id; + if (event.target.dataset.type) { + // Delete closed question + const questionElement = (event.target as HTMLElement).parentElement?.parentElement; + const optionIdsToDelete: number[] = []; - // Get options IDs - questionElement?.childNodes.forEach((e, i) => { - if (e.nodeName !== 'DIV') return; - if (i === 0) return; - if ((e as HTMLElement).dataset.id === undefined) return; - if (!(e as HTMLElement).classList.contains('can-delete')) return; - let optionId = (e as HTMLElement).dataset.id; - optionIdsToDelete.push(+optionId!); - }); + // Get options IDs + questionElement?.childNodes.forEach((e, i) => { + if (e.nodeName !== 'DIV') return; + if (i === 0) return; + if ((e as HTMLElement).dataset.id === undefined) return; + if (!(e as HTMLElement).classList.contains('can-delete')) return; + let optionId = (e as HTMLElement).dataset.id; + optionIdsToDelete.push(+optionId!); + }); - if (optionIdsToDelete.length === 0) { - this.ePreguntaCerradaService.delete(id).subscribe(e => { - this.loadAll(); - }); - } else { - // Delete question options - this.ePreguntaCerradaOpcionService.deleteMany(optionIdsToDelete).subscribe(e => { - // Delete question - this.ePreguntaCerradaService.delete(id).subscribe(e => { + if (optionIdsToDelete.length === 0) { + this.ePreguntaCerradaService.delete(id).subscribe(e => { + this.loadAll(); + }); + } else { + // Delete question options + this.ePreguntaCerradaOpcionService.deleteMany(optionIdsToDelete).subscribe(e => { + // Delete question + this.ePreguntaCerradaService.delete(id).subscribe(e => { + this.loadAll(); + }); + }); + } + } else { + // Delete open question + this.ePreguntaAbiertaService.delete(id).subscribe(e => { this.loadAll(); }); - }); + } } - } else { - // Delete open question - this.ePreguntaAbiertaService.delete(id).subscribe(e => { - this.loadAll(); - }); - } + }); } deleteOption(event: any): void { - const id = event.target.dataset.optionid; - this.ePreguntaCerradaOpcionService.delete(id).subscribe(e => { - this.ePreguntas = []; - this.ePreguntasOpciones = []; - this.loadAll(); + const modalRef = this.modalService.open(EncuestaDeleteOptionDialogComponent, { size: 'lg', backdrop: 'static' }); + modalRef.closed.subscribe(reason => { + if (reason === 'confirm') { + const id = event.target.dataset.optionid; + this.ePreguntaCerradaOpcionService.delete(id).subscribe(e => { + this.ePreguntas = []; + this.ePreguntasOpciones = []; + this.loadAll(); + }); + } }); } @@ -296,13 +313,24 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { console.log(surveyId); } - protected createFromFormQuestion(): IEPreguntaCerrada { + protected createFromFormClosedQuestion(): IEPreguntaCerrada { return { // ...new EPreguntaCerrada(), id: undefined, nombre: this.editFormQuestion.get(['nombre'])!.value, - tipo: PreguntaCerradaTipo.SINGLE, - opcional: false, + tipo: this.editFormQuestion.get(['tipo'])!.value, + opcional: this.editFormQuestion.get(['opcional'])!.value, + orden: 10, + encuesta: this.encuesta, + }; + } + + protected createFromFormOpenQuestion(): IEPreguntaAbierta { + return { + // ...new EPreguntaAbierta(), + id: undefined, + nombre: this.editFormQuestion.get(['nombre'])!.value, + opcional: this.editFormQuestion.get(['opcional'])!.value, orden: 10, encuesta: this.encuesta, }; @@ -314,15 +342,33 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { saveQuestion(): void { this.isSavingQuestion = true; - const ePreguntaCerrada = this.createFromFormQuestion(); - if (ePreguntaCerrada.id !== undefined) { - this.subscribeToSaveResponseQuestion(this.ePreguntaCerradaService.update(ePreguntaCerrada)); - } else { - this.subscribeToSaveResponseQuestion(this.ePreguntaCerradaService.create(ePreguntaCerrada)); + const tipoPregunta = this.editFormQuestion.get(['tipopregunta'])!.value; + + if (tipoPregunta === 'CLOSED') { + const ePreguntaCerrada = this.createFromFormClosedQuestion(); + if (ePreguntaCerrada.id !== undefined) { + this.subscribeToSaveResponseQuestionClosed(this.ePreguntaCerradaService.update(ePreguntaCerrada)); + } else { + this.subscribeToSaveResponseQuestionClosed(this.ePreguntaCerradaService.create(ePreguntaCerrada)); + } + } else if (tipoPregunta === 'OPEN') { + const ePreguntaAbierta = this.createFromFormOpenQuestion(); + if (ePreguntaAbierta.id !== undefined) { + this.subscribeToSaveResponseQuestionOpen(this.ePreguntaAbiertaService.update(ePreguntaAbierta)); + } else { + this.subscribeToSaveResponseQuestionOpen(this.ePreguntaAbiertaService.create(ePreguntaAbierta)); + } } } - protected subscribeToSaveResponseQuestion(result: Observable>): void { + protected subscribeToSaveResponseQuestionClosed(result: Observable>): void { + result.pipe(finalize(() => this.onSaveFinalizeQuestion())).subscribe( + () => this.onSaveSuccessQuestion(), + () => this.onSaveErrorQuestion() + ); + } + + protected subscribeToSaveResponseQuestionOpen(result: Observable>): void { result.pipe(finalize(() => this.onSaveFinalizeQuestion())).subscribe( () => this.onSaveSuccessQuestion(), () => this.onSaveErrorQuestion() @@ -330,7 +376,8 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { } protected onSaveSuccessQuestion(): void { - this.editFormQuestion.reset(); + this.editFormQuestion.reset({ tipo: PreguntaCerradaTipo.SINGLE, tipopregunta: 'CLOSED', opcional: false }); + this.editForm.reset(); this.ePreguntas = []; this.ePreguntasOpciones = []; this.loadAll(); @@ -361,13 +408,13 @@ export class EncuestaUpdateComponent implements OnInit, AfterViewChecked { // } // } - // trackCategoriaById(index: number, item: ICategoria): number { - // return item.id!; - // } + trackCategoriaById(index: number, item: ICategoria): number { + return item.id!; + } - // trackUsuarioExtraById(index: number, item: IUsuarioExtra): number { - // return item.id!; - // } + trackUsuarioExtraById(index: number, item: IUsuarioExtra): number { + return item.id!; + } // protected subscribeToSaveResponse(result: Observable>): void { // result.pipe(finalize(() => this.onSaveFinalize())).subscribe( diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html index db78a34..abbc9e8 100644 --- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html +++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html @@ -12,12 +12,33 @@ - +
    No usuarioExtras found
    - +
    +
    +
    +
    + +
    +
    +
    + +
    +
    +
    @@ -32,7 +53,13 @@ - +
    • diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts index 3588bf3..dd5e8f0 100644 --- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts +++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts @@ -17,8 +17,14 @@ export class UsuarioExtraComponent implements OnInit { usuarioExtras?: IUsuarioExtra[]; publicUsers?: IUser[]; isLoading = false; + successChange = false; + public searchNombreUsuario: string; + public searchEstadoUsuario: string; - constructor(protected usuarioExtraService: UsuarioExtraService, protected modalService: NgbModal) {} + constructor(protected usuarioExtraService: UsuarioExtraService, protected modalService: NgbModal) { + this.searchNombreUsuario = ''; + this.searchEstadoUsuario = ''; + } loadPublicUser(): void { this.usuarioExtraService @@ -60,6 +66,8 @@ export class UsuarioExtraComponent implements OnInit { } ngOnInit(): void { + this.searchNombreUsuario = ''; + this.searchEstadoUsuario = ''; this.loadAll(); } @@ -73,6 +81,7 @@ export class UsuarioExtraComponent implements OnInit { // unsubscribe not needed because closed completes on modal close modalRef.closed.subscribe(reason => { if (reason === 'deleted') { + this.successChange = true; this.loadAll(); } }); diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 80b9fdf..7d32ef6 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -1,78 +1,275 @@
      -
      - -
      +
      +
      +
      + -
      -

      Welcome, Java Hipster! (Data Survey)

      +
      + + + + -

      This is your homepage

      - -
      -
      - You are logged in as user "{{ account.login }}". -
      - -
      - If you want to - sign in, you can try the default accounts:
      - Administrator (login="admin" and password="admin")
      - User (login="user" and - password="user").       -
      - -
      - You don't have an account yet?  - Register a new account + +
      + +
      +
      +
      +
      +
      +
      +

      ¡Le damos la bienvenida a DataSurvey!

      +
      + Somos su mejor aliado para la recolección de información, a través de nuestra plataforma +
      +
      +
      + + + +
      +
      +
      + +
      +
      +
      +
      +
      + + + + +
      +
      +
      +
      +
      +
      +
      +

      Diseño amigable

      +
      +

      Contamos con una interfaz fácil de utilizar

      +
      +
      +
      +

      Fácil uso

      +
      +

      Contamos con una plataforma muy sencilla de usar

      +
      +
      +
      +

      Diverso contenido

      +
      +

      Podrá encontrar y crear encuestas de diferentes categorías

      +
      +
      +
      +
      + + + + +
      +
      +
      +
      +

      Encuestas

      +
      +
      +
      +
      +
      {{ encuesta.nombre }}
      +
      + {{ encuesta.categoria?.nombre | lowercase }} +
      +
      + {{ encuesta.descripcion | titlecase }} +
      +
      +
      +
      + Fecha Publicada    {{ + encuesta.fechaPublicacion | formatShortDatetime | titlecase + }} +
      +
      + Fecha de Finalización     {{ encuesta.fechaFinalizar | formatShortDatetime | titlecase }} +
      +
      +

      Calificacion

      + + +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      +
      +
      +

      Preguntas frecuentes

      +
      -

      If you have any question on JHipster:

      + +
      + +
      + + - + +
      +
      DataSurvey utiliza PayPal como método de pago para la compra de plantillas
      +
      +
      + -

      - If you like JHipster, don't forget to give us a star on - GitHub! -

      + +
      + + + + +
      +
      + Uno de los objetivos de DataSurvey es que se puedan compartir las encuestas con todos los usuarios, sin necesidad de tener una + cuenta en la plataforma +
      +
      +
      + + + +
      + + + + +
      +
      + La plataforma tiene dos tipos de encuestas: públicas y privadas. Las públicas pueden ser compartidas con todo tipo de usuario, + sin ninguna excepción, mientras que las encuestas privadas, necesitan de una clave para poder ser accesadas +
      +
      +
      + +
      + +
      diff --git a/src/main/webapp/app/home/home.component.scss b/src/main/webapp/app/home/home.component.scss index c731f12..d56f7c7 100644 --- a/src/main/webapp/app/home/home.component.scss +++ b/src/main/webapp/app/home/home.component.scss @@ -10,6 +10,201 @@ Main page styles background-size: contain; } +.bg-img-cover { + background-position: center; + background-size: cover; + background-repeat: no-repeat; +} + +.overlay { + position: relative; +} +.overlay:before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #000; + opacity: 0.5; +} + +.overlay-10:before { + opacity: 0.1; +} + +.overlay-20:before { + opacity: 0.2; +} + +.overlay-30:before { + opacity: 0.3; +} + +.overlay-40:before { + opacity: 0.4; +} + +.overlay-50:before { + opacity: 0.5; +} + +.overlay-60:before { + opacity: 0.6; +} + +.overlay-70:before { + opacity: 0.7; +} + +.overlay-80:before { + opacity: 0.8; +} + +.overlay-90:before { + opacity: 0.9; +} + +.fixed-top, +.page-header-ui.navbar-fixed .navbar { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; +} + +.text-white-75, +.page-header-ui-dark .page-header-ui-text a { + color: rgba(255, 255, 255, 0.75) !important; +} +.page-header-ui { + position: relative; + padding-top: 8rem; + padding-bottom: 8rem; +} +.page-header-ui .page-header-ui-content .page-header-ui-title { + font-size: 2.5rem; +} +.page-header-ui .page-header-ui-content .page-header-ui-text { + font-size: 1.15rem; +} +.page-header-ui .page-header-ui-content .page-header-ui-text.small { + font-size: 0.9rem; +} + +.page-header-ui-dark { + color: #fff; + background-color: #212832; +} + +.svg-border-rounded svg { + position: absolute; + bottom: 0; + left: 0; + height: 1rem; + width: 100%; +} +@media (min-width: 576px) { + .svg-border-rounded svg { + height: 1.5rem; + } +} +@media (min-width: 768px) { + .svg-border-rounded svg { + height: 2rem; + } +} +@media (min-width: 992px) { + .svg-border-rounded svg { + height: 2.5rem; + } +} +@media (min-width: 1200px) { + .svg-border-rounded svg { + height: 3rem; + } +} + +/** + Cards +**/ +.lift { + box-shadow: 0 0.15rem 1.75rem 0 rgba(33, 40, 50, 0.15); + transition: transform 0.15s ease-in-out, box-shadow 0.15s ease-in-out; +} +.lift:hover { + transform: translateY(-0.3333333333rem); + box-shadow: 0 0.5rem 2rem 0 rgba(33, 40, 50, 0.25); +} +.lift:active { + transform: none; + box-shadow: 0 0.15rem 1.75rem 0 rgba(33, 40, 50, 0.15); +} + +.lift-sm { + box-shadow: 0 0.125rem 0.25rem 0 rgba(33, 40, 50, 0.2); +} +.lift-sm:hover { + transform: translateY(-0.1666666667rem); + box-shadow: 0 0.25rem 1rem 0 rgba(33, 40, 50, 0.25); +} +.lift-sm:active { + transform: none; + box-shadow: 0 0.125rem 0.25rem 0 rgba(33, 40, 50, 0.2); +} + +/*.card.lift { + text-decoration: none; + color: inherit; +} + +.card-flag { + position: absolute; + font-size: 0.7rem; + padding: 0.3rem 0.5rem; + line-height: 1; +} + +.card-flag-dark { + background-color: rgba(33, 40, 50, 0.7); + color: #fff; +} + +.card-flag-light { + background-color: rgba(255, 255, 255, 0.7); + color: #69707a; +} + +.card-flag-lg { + font-size: 0.9rem; + padding: 0.5rem 0.65rem; +} + +.card-flag-top-right { + border-top-left-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; + top: 0.5rem; + right: 0; +} + +.card-flag-top-left { + border-top-right-radius: 0.25rem; + border-bottom-right-radius: 0.25rem; + top: 0.5rem; + left: 0; +}*/ + +.border-cyan { + border-color: #00cfd5 !important; +} + +.py-10 { + padding-top: 6rem !important; + padding-bottom: 6rem !important; +} + /* wait autoprefixer update to allow simple generation of high pixel density media query */ @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (-moz-min-device-pixel-ratio: 2), @@ -21,3 +216,199 @@ Main page styles background-size: contain; } } + +.icon-stack { + display: inline-flex; + justify-content: center; + align-items: center; + border-radius: 100%; + height: 2.5rem; + width: 2.5rem; + font-size: 1rem; + background-color: #f2f6fc; + flex-shrink: 0; +} +.icon-stack svg { + height: 1rem; + width: 1rem; +} + +.icon-stack-sm { + height: 2rem; + width: 2rem; +} + +.icon-stack-lg { + height: 4rem; + width: 4rem; + font-size: 1.5rem; +} +.icon-stack-lg svg { + height: 1.5rem; + width: 1.5rem; +} + +.icon-stack-xl { + height: 5rem; + width: 5rem; + font-size: 1.75rem; +} +.icon-stack-xl svg { + height: 1.75rem; + width: 1.75rem; +} + +.container-encuestas { + background-image: url('../../content/img_datasurvey/background encuestas landing.png'); + max-height: 1536px; + overflow-y: auto; +} +.bg-gradient-primary-to-secondary { + background-color: #1c44b2 !important; + background-image: linear-gradient(135deg, #1c44b2 0%, #00b88d 100%) !important; +} + +/*.card .entity-icon--star { + color: #ffcc47; + margin-right: 0.2rem; +} + +.card .card-title { + font-size: 2em; +} + +.card .tag { + font-size: 0.8rem; + color: #f8f8f8; + margin-top: 0.5rem; + padding: 0.2rem 1.5rem; + background-color: #2962ff94; + border-radius: 15px; +} + +.card .subtitle { + color: rgba(0, 0, 0, 0.54); + font-size: 0.9rem; +} + +.card .btn-card { + padding: 11px 10px !important; +}*/ + +.accordion-button { + position: relative; + display: flex; + align-items: center; + width: 100%; + padding: 1rem 1.25rem; + font-size: 1rem; + color: #69707a; + text-align: left; + background-color: #fff; + border: 0; + border-radius: 0; + overflow-anchor: none; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, + border-radius 0.15s ease; +} +@media (prefers-reduced-motion: reduce) { + .accordion-button { + transition: none; + } +} +.accordion-button:not(.collapsed) { + color: #0057da; + background-color: #e6effe; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.125); +} +.accordion-button:not(.collapsed)::after { + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230057da'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); + transform: rotate(-180deg); +} +.accordion-button::after { + flex-shrink: 0; + width: 1.25rem; + height: 1.25rem; + margin-left: auto; + content: ''; + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%2369707a'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); + background-repeat: no-repeat; + background-size: 1.25rem; + transition: transform 0.2s ease-in-out; +} +@media (prefers-reduced-motion: reduce) { + .accordion-button::after { + transition: none; + } +} +.accordion-button:hover { + z-index: 2; +} +.accordion-button:focus { + z-index: 3; + border-color: transparent; + outline: 0; + box-shadow: 0 0 0 0.25rem #00b88d3a; +} + +.accordion-header { + margin-bottom: 0; +} + +.accordion-item { + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.125); +} +.accordion-item:first-of-type { + border-top-left-radius: 0.35rem; + border-top-right-radius: 0.35rem; +} +.accordion-item:first-of-type .accordion-button { + border-top-left-radius: calc(0.35rem - 1px); + border-top-right-radius: calc(0.35rem - 1px); +} +.accordion-item:not(:first-of-type) { + border-top: 0; +} +.accordion-item:last-of-type { + border-bottom-right-radius: 0.35rem; + border-bottom-left-radius: 0.35rem; +} +.accordion-item:last-of-type .accordion-button.collapsed { + border-bottom-right-radius: calc(0.35rem - 1px); + border-bottom-left-radius: calc(0.35rem - 1px); +} +.accordion-item:last-of-type .accordion-collapse { + border-bottom-right-radius: 0.35rem; + border-bottom-left-radius: 0.35rem; +} + +.accordion-body { + padding: 1rem 1.25rem; +} + +.accordion-flush .accordion-collapse { + border-width: 0; +} +.accordion-flush .accordion-item { + border-right: 0; + border-left: 0; + border-radius: 0; +} +.accordion-flush .accordion-item:first-child { + border-top: 0; +} +.accordion-flush .accordion-item:last-child { + border-bottom: 0; +} +.accordion-flush .accordion-item .accordion-button { + border-radius: 0; +} + +.card-header { + padding: 0; +} + +.card-header .collapsed { + background-color: #e6effe; +} diff --git a/src/main/webapp/app/home/home.component.spec.ts b/src/main/webapp/app/home/home.component.tmpSpec.ts similarity index 100% rename from src/main/webapp/app/home/home.component.spec.ts rename to src/main/webapp/app/home/home.component.tmpSpec.ts diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 9010227..84a01a9 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -1,11 +1,26 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; +import { HttpResponse } from '@angular/common/http'; import { Router } from '@angular/router'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { IEncuesta } from 'app/entities/encuesta/encuesta.model'; +import { EncuestaService } from 'app/entities/encuesta/service/encuesta.service'; +import { FormBuilder } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; + +import { ICategoria } from 'app/entities/categoria/categoria.model'; +import { CategoriaService } from 'app/entities/categoria/service/categoria.service'; +import { IUsuarioExtra, UsuarioExtra } from 'app/entities/usuario-extra/usuario-extra.model'; +import { UsuarioExtraService } from 'app/entities/usuario-extra/service/usuario-extra.service'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/auth/account.model'; +import { faPollH, faCalendarAlt, faStar } from '@fortawesome/free-solid-svg-icons'; + +import * as $ from 'jquery'; + @Component({ selector: 'jhi-home', templateUrl: './home.component.html', @@ -13,16 +28,48 @@ import { Account } from 'app/core/auth/account.model'; }) export class HomeComponent implements OnInit, OnDestroy { account: Account | null = null; - private readonly destroy$ = new Subject(); - constructor(private accountService: AccountService, private router: Router) {} + usuarioExtra: UsuarioExtra | null = null; + encuestas?: IEncuesta[]; + encuestasMostradas: IEncuesta[] = new Array(3); + isLoading = false; + + faStar = faStar; + faCalendarAlt = faCalendarAlt; + faPollH = faPollH; + + notAccount: boolean = true; + + public searchEncuestaPublica: string; + + constructor( + protected encuestaService: EncuestaService, + protected modalService: NgbModal, + protected categoriaService: CategoriaService, + protected usuarioExtraService: UsuarioExtraService, + protected activatedRoute: ActivatedRoute, + protected fb: FormBuilder, + protected accountService: AccountService, + protected router: Router + ) { + this.searchEncuestaPublica = ''; + } ngOnInit(): void { + this.searchEncuestaPublica = ''; this.accountService .getAuthenticationState() .pipe(takeUntil(this.destroy$)) - .subscribe(account => (this.account = account)); + .subscribe(account => { + if (account !== null) { + this.account = account; + this.notAccount = false; + } else { + this.notAccount = true; + } + }); + this.loadAll(); } login(): void { @@ -33,4 +80,44 @@ export class HomeComponent implements OnInit, OnDestroy { this.destroy$.next(); this.destroy$.complete(); } + + ngAfterViewInit(): void {} + + trackId(index: number, item: IEncuesta): number { + return item.id!; + } + + loadAll(): void { + this.isLoading = true; + + this.encuestaService.query().subscribe( + (res: HttpResponse) => { + this.isLoading = false; + const tmpEncuestas = res.body ?? []; + this.encuestas = tmpEncuestas.filter(e => e.estado === 'ACTIVE' && e.acceso === 'PUBLIC'); + this.encuestasMostradas = this.encuestas.reverse().slice(0, 3); + }, + () => { + this.isLoading = false; + } + ); + } + + openSurvey(event: any): void { + const surveyId = event.target.getAttribute('data-id'); + this.router.navigate(['/encuesta', surveyId, 'edit']); + } + + selectSurvey(event: any): void { + document.querySelectorAll('.ds-list--entity').forEach(e => { + e.classList.remove('active'); + }); + if (event.target.classList.contains('ds-list--entity')) { + event.target.classList.add('active'); + } + } + + counter(i: number) { + return new Array(i); + } } diff --git a/src/main/webapp/app/home/home.module.ts b/src/main/webapp/app/home/home.module.ts index 758f5c4..18179b9 100644 --- a/src/main/webapp/app/home/home.module.ts +++ b/src/main/webapp/app/home/home.module.ts @@ -4,9 +4,10 @@ import { RouterModule } from '@angular/router'; import { SharedModule } from 'app/shared/shared.module'; import { HOME_ROUTE } from './home.route'; import { HomeComponent } from './home.component'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @NgModule({ - imports: [SharedModule, RouterModule.forChild([HOME_ROUTE])], + imports: [SharedModule, RouterModule.forChild([HOME_ROUTE]), FontAwesomeModule], declarations: [HomeComponent], }) export class HomeModule {} diff --git a/src/main/webapp/app/layouts/footer/footer.component.html b/src/main/webapp/app/layouts/footer/footer.component.html index 30aca31..f5fbd22 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.html +++ b/src/main/webapp/app/layouts/footer/footer.component.html @@ -1,3 +1,8 @@ -
      -

      This is your footer

      +
      +
      +

      + Copyright © Derechos reservados - Desarrollado por + Quantum +

      +
      diff --git a/src/main/webapp/app/layouts/footer/footer.component.scss b/src/main/webapp/app/layouts/footer/footer.component.scss new file mode 100644 index 0000000..369226a --- /dev/null +++ b/src/main/webapp/app/layouts/footer/footer.component.scss @@ -0,0 +1,7 @@ +.footer { + background: #192e4d; + color: white; + padding: 12px 0; + font-size: 0.8em; + text-align: center; +} diff --git a/src/main/webapp/app/layouts/footer/footer.component.ts b/src/main/webapp/app/layouts/footer/footer.component.ts index 7c640ec..6ed7057 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.ts +++ b/src/main/webapp/app/layouts/footer/footer.component.ts @@ -3,5 +3,6 @@ import { Component } from '@angular/core'; @Component({ selector: 'jhi-footer', templateUrl: './footer.component.html', + styleUrls: ['./footer.component.scss'], }) export class FooterComponent {} diff --git a/src/main/webapp/app/layouts/main/main.component.html b/src/main/webapp/app/layouts/main/main.component.html index cd18230..c9c044f 100644 --- a/src/main/webapp/app/layouts/main/main.component.html +++ b/src/main/webapp/app/layouts/main/main.component.html @@ -19,3 +19,4 @@
      + diff --git a/src/main/webapp/app/login/login.component.html b/src/main/webapp/app/login/login.component.html index c47e7d8..4918e58 100644 --- a/src/main/webapp/app/login/login.component.html +++ b/src/main/webapp/app/login/login.component.html @@ -74,13 +74,18 @@

      Ingrese su correo electrónico y contraseña

      -
      +
      Failed to sign in! Please check your credentials and try again.
      diff --git a/src/main/webapp/app/login/login.component.ts b/src/main/webapp/app/login/login.component.ts index 1dade60..2c79da7 100644 --- a/src/main/webapp/app/login/login.component.ts +++ b/src/main/webapp/app/login/login.component.ts @@ -81,6 +81,9 @@ export class LoginComponent implements OnInit, AfterViewInit { } authenticacionGoogle(): void { + this.error = false; + this.userSuspended = false; + this.loginService.login({ username: this.user.email, password: this.user.id, rememberMe: false }).subscribe( () => { this.authenticationError = false; @@ -123,6 +126,9 @@ export class LoginComponent implements OnInit, AfterViewInit { } activateGoogle(): void { + this.error = false; + this.userSuspended = false; + this.registerService .save({ login: this.user.email, @@ -145,6 +151,8 @@ export class LoginComponent implements OnInit, AfterViewInit { } login(): void { + this.error = false; + this.userSuspended = false; debugger; this.loginService .login({ @@ -169,8 +177,14 @@ export class LoginComponent implements OnInit, AfterViewInit { } // } }, - - response => this.processError(response) + response => { + debugger; + if (response.status == 401 && response.error.detail == 'Bad credentials') { + this.error = true; + } else { + this.processError(response); + } + } ); } } diff --git a/src/main/webapp/content/css/loading-2.css b/src/main/webapp/content/css/loading-2.css new file mode 100644 index 0000000..01f9598 --- /dev/null +++ b/src/main/webapp/content/css/loading-2.css @@ -0,0 +1,57 @@ +.app-loading .container { + margin: auto auto; + height: 100vh; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} +.app-loading .tittle { + margin-bottom: 40px; + color: #44b9ff; + letter-spacing: 4px; + text-transform: uppercase; +} +.app-loading .square-container { + list-style-type: none; + display: flex; + position: relative; +} +.app-loading .square { + margin: 4px; + width: 30px; + height: 30px; + border-radius: 7px; + animation: rotating 2s ease infinite; +} +.app-loading .square1 { + background: #192e4d; + animation-delay: 0.2s; +} +.app-loading .square2 { + background: #018adf; + animation-delay: 0.4s; +} +.app-loading .square3 { + background: #20a9fe; + animation-delay: 0.6s; +} +.app-loading .square4 { + background: #00e0ac; + animation-delay: 0.8s; +} +.app-loading .square5 { + background: #70ffde; + animation-delay: 1s; +} +@keyframes rotating { + 0% { + transform: rotate(0) scale(1); + } + 50% { + transform: rotate(90deg) scale(0.6); + } + 100% { + transform: rotate(90deg) scale(1); + } +} diff --git a/src/main/webapp/content/css/loading-boxes.css b/src/main/webapp/content/css/loading-boxes.css new file mode 100644 index 0000000..4c4bd36 --- /dev/null +++ b/src/main/webapp/content/css/loading-boxes.css @@ -0,0 +1,199 @@ +.loader { + height: 100%; + width: 100%; +} +.loader .l_main { + position: absolute; + top: 20%; + left: 50%; + width: 172px; + height: 128px; + margin: 0; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); +} +@media (max-width: 550px) { + .loader { + -webkit-transform: scale(0.75); + transform: scale(0.75); + } +} +@media (max-width: 440px) { + .loader { + -webkit-transform: scale(0.5); + transform: scale(0.5); + } +} +.l_square { + position: relative; +} +.l_square:nth-child(1) { + margin-left: 0px; +} +.l_square:nth-child(2) { + margin-left: 44px; +} +.l_square:nth-child(3) { + margin-left: 88px; +} +.l_square:nth-child(4) { + margin-left: 132px; +} +.l_square span { + position: absolute; + top: 0px; + left: 20px; + height: 36px; + width: 36px; + border-radius: 2px; + background-color: #1c44b2; +} +.l_square span:nth-child(1) { + top: 0px; +} +.l_square span:nth-child(2) { + top: 44px; +} +.l_square span:nth-child(3) { + top: 88px; +} +.l_square:nth-child(1) span { + -webkit-animation: animsquare1 2s infinite ease-in; + animation: animsquare1 2s infinite ease-in; +} +.l_square:nth-child(2) span { + -webkit-animation: animsquare2 2s infinite ease-in; + animation: animsquare2 2s infinite ease-in; +} +.l_square:nth-child(3) span { + -webkit-animation: animsquare3 2s infinite ease-in; + animation: animsquare3 2s infinite ease-in; +} +.l_square:nth-child(4) span { + -webkit-animation: animsquare4 2s infinite ease-in; + animation: animsquare4 2s infinite ease-in; +} +.l_square span:nth-child(1) { + -webkit-animation-delay: 0s; + animation-delay: 0s; +} +.l_square span:nth-child(2) { + -webkit-animation-delay: 0.15s; + animation-delay: 0.15s; +} +.l_square span:nth-child(3) { + -webkit-animation-delay: 0.3s; + animation-delay: 0.3s; +} +@-webkit-keyframes animsquare1 { + 0%, + 5%, + 95%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 30%, + 70% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@keyframes animsquare1 { + 0%, + 5%, + 95%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 30%, + 70% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@-webkit-keyframes animsquare2 { + 0%, + 10%, + 90%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 35%, + 65% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@keyframes animsquare2 { + 0%, + 10%, + 90%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 35%, + 65% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@-webkit-keyframes animsquare3 { + 0%, + 15%, + 85%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 40%, + 60% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@keyframes animsquare3 { + 0%, + 15%, + 85%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 40%, + 60% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@-webkit-keyframes animsquare4 { + 0%, + 20%, + 80%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 45%, + 55% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} +@keyframes animsquare4 { + 0%, + 20%, + 80%, + 100% { + -webkit-transform: translate(0px, 0px) rotate(0deg); + transform: translate(0px, 0px) rotate(0deg); + } + 45%, + 55% { + -webkit-transform: translate(-40px, 0px) rotate(-90deg); + transform: translate(-40px, 0px) rotate(-90deg); + } +} diff --git a/src/main/webapp/content/css/loading.css b/src/main/webapp/content/css/loading.css index b2c6626..b2f5d31 100644 --- a/src/main/webapp/content/css/loading.css +++ b/src/main/webapp/content/css/loading.css @@ -102,7 +102,7 @@ font-weight: normal; } -.app-loading .lds-pacman { +/*.app-loading .lds-pacman { position: relative; margin: auto; width: 200px !important; @@ -149,4 +149,4 @@ .app-loading .lds-pacman > div:nth-child(1) div:nth-child(3) { -webkit-animation-delay: 0s; animation-delay: 0s; -} +}*/ diff --git a/src/main/webapp/content/img_datasurvey/background encuestas landing.png b/src/main/webapp/content/img_datasurvey/background encuestas landing.png new file mode 100644 index 0000000..e4e1f3d Binary files /dev/null and b/src/main/webapp/content/img_datasurvey/background encuestas landing.png differ diff --git a/src/main/webapp/content/img_datasurvey/banner1.webp b/src/main/webapp/content/img_datasurvey/banner1.webp new file mode 100644 index 0000000..bc6de52 Binary files /dev/null and b/src/main/webapp/content/img_datasurvey/banner1.webp differ diff --git a/src/main/webapp/content/img_datasurvey/banner2.png b/src/main/webapp/content/img_datasurvey/banner2.png new file mode 100644 index 0000000..1e64ef1 Binary files /dev/null and b/src/main/webapp/content/img_datasurvey/banner2.png differ diff --git a/src/main/webapp/content/img_datasurvey/banner2.webp b/src/main/webapp/content/img_datasurvey/banner2.webp new file mode 100644 index 0000000..e4be6b4 Binary files /dev/null and b/src/main/webapp/content/img_datasurvey/banner2.webp differ diff --git a/src/main/webapp/content/scss/paper-dashboard.scss b/src/main/webapp/content/scss/paper-dashboard.scss index d9b2110..711d10e 100644 --- a/src/main/webapp/content/scss/paper-dashboard.scss +++ b/src/main/webapp/content/scss/paper-dashboard.scss @@ -99,4 +99,6 @@ @import 'paper-dashboard/datasurvey-table'; @import 'paper-dashboard/datasurvey-contextmenu'; @import 'paper-dashboard/datasurvey-survey-update'; +@import 'paper-dashboard/datasurvey-home'; +@import 'paper-dashboard/datasurvey-filter'; @import 'paper-dashboard/datasurvey-survey'; diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-filter.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-filter.scss new file mode 100644 index 0000000..65d0420 --- /dev/null +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-filter.scss @@ -0,0 +1,3 @@ +.ds-filter:not(:first-of-type) { + margin-left: 2rem; +} diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-home.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-home.scss new file mode 100644 index 0000000..73ef822 --- /dev/null +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-home.scss @@ -0,0 +1,112 @@ +/** + Cards +**/ +.lift { + box-shadow: 0 0.15rem 1.75rem 0 rgba(33, 40, 50, 0.15); + transition: transform 0.15s ease-in-out, box-shadow 0.15s ease-in-out; +} +.lift:hover { + transform: translateY(-0.3333333333rem); + box-shadow: 0 0.5rem 2rem 0 rgba(33, 40, 50, 0.25); +} +.lift:active { + transform: none; + box-shadow: 0 0.15rem 1.75rem 0 rgba(33, 40, 50, 0.15); +} + +.lift-sm { + box-shadow: 0 0.125rem 0.25rem 0 rgba(33, 40, 50, 0.2); +} +.lift-sm:hover { + transform: translateY(-0.1666666667rem); + box-shadow: 0 0.25rem 1rem 0 rgba(33, 40, 50, 0.25); +} +.lift-sm:active { + transform: none; + box-shadow: 0 0.125rem 0.25rem 0 rgba(33, 40, 50, 0.2); +} + +.card-encuesta { + border-radius: 12px; + background-color: #ffffff; + margin-bottom: 20px; + position: relative; + border: 0 none; +} + +.card-encuesta.lift { + text-decoration: none; + color: inherit; +} + +.card-flag { + position: absolute; + font-size: 0.7rem; + padding: 0.3rem 0.5rem; + line-height: 1; +} + +.card-flag-dark { + background-color: rgba(33, 40, 50, 0.7); + color: #fff; +} + +.card-flag-light { + background-color: rgba(255, 255, 255, 0.7); + color: #69707a; +} + +.card-flag-lg { + font-size: 0.9rem; + padding: 0.5rem 0.65rem; +} + +.card-flag-top-right { + border-top-left-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; + top: 0.5rem; + right: 0; +} + +.card-flag-top-left { + border-top-right-radius: 0.25rem; + border-bottom-right-radius: 0.25rem; + top: 0.5rem; + left: 0; +} + +.card-encuesta .entity-icon--star { + color: #ffcc47; + margin-right: 0.2rem; +} + +.card-encuesta .card-title { + font-size: 2em; +} + +.card-encuesta .tag { + font-size: 0.8rem; + color: #f8f8f8; + margin-top: 0.5rem; + padding: 0.2rem 1.5rem; + background-color: #2962ff94; + border-radius: 15px; +} + +.card-encuesta .subtitle { + color: rgba(0, 0, 0, 0.54); + font-size: 0.9rem; +} + +.card-encuesta .btn-card { + padding: 11px 10px !important; +} + +.border-cyan { + border-color: #00cfd5 !important; +} + +.py-10 { + padding-top: 6rem !important; + padding-bottom: 6rem !important; +} diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss index 439dcfe..4d212aa 100644 --- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss @@ -31,6 +31,13 @@ padding: 0.5rem; margin: 1rem; word-wrap: break-word; + transition: all 0.1s ease-in-out; + + &:hover { + // top: -3px; + // box-shadow: rgba(80, 80, 80, 0.15) 0px 5px 15px; + background-color: #f5f9fd; + } * { pointer-events: none; diff --git a/src/main/webapp/i18n/es/ePreguntaCerrada.json b/src/main/webapp/i18n/es/ePreguntaCerrada.json index 943a041..7aa5b9a 100644 --- a/src/main/webapp/i18n/es/ePreguntaCerrada.json +++ b/src/main/webapp/i18n/es/ePreguntaCerrada.json @@ -23,7 +23,8 @@ "opcional": "Opcional", "orden": "Orden", "ePreguntaCerradaOpcion": "E Pregunta Cerrada Opcion", - "encuesta": "Encuesta" + "encuesta": "Encuesta", + "tiporespuesta": "Tipo de respuesta" } } } diff --git a/src/main/webapp/i18n/es/encuesta.json b/src/main/webapp/i18n/es/encuesta.json index 15c119d..cd755ab 100644 --- a/src/main/webapp/i18n/es/encuesta.json +++ b/src/main/webapp/i18n/es/encuesta.json @@ -12,7 +12,9 @@ "updated": "Una encuesta ha sido actualizado con el identificador {{ param }}", "deleted": "Una encuesta ha sido eliminada con el identificador {{ param }}", "delete": { - "question": "¿Seguro que quiere eliminar la encuesta {{ id }}?" + "question": "¿Seguro que quiere eliminar la encuesta?", + "deletequestion": "¿Seguro que quiere eliminar esta pregunta?", + "deleteoption": "¿Seguro que quiere eliminar esta opción?" }, "detail": { "title": "Encuesta" diff --git a/src/main/webapp/i18n/es/global.json b/src/main/webapp/i18n/es/global.json index adf0939..42d43b3 100644 --- a/src/main/webapp/i18n/es/global.json +++ b/src/main/webapp/i18n/es/global.json @@ -137,7 +137,7 @@ "value": "Valor" }, "delete": { - "title": "Confirmar operación de borrado", + "title": "Confirmar de operación", "status": "Confirmar cambio de estado" }, "validation": { diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 1d945f6..3ba47db 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -12,6 +12,8 @@ + + @@ -23,16 +25,23 @@
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      +
      -
      -
      -
      -
      +
      + +
      +

      Cargando

      +
      +
       
      +
       
      +
       
      +
       
      +