From be97c9f4bc88209e414adc5838e72bcf95db109f Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Wed, 14 Jul 2021 00:23:05 -0600 Subject: [PATCH 01/52] Update visualization of user surveys --- .../encuesta/list/encuesta.component.html | 106 ++++++++++++++---- .../encuesta/list/encuesta.component.ts | 35 +++++- .../app/layouts/sidebar/sidebar.component.ts | 2 + .../webapp/content/scss/paper-dashboard.scss | 2 + .../paper-dashboard/_datasurvey-form.scss | 2 +- .../paper-dashboard/_datasurvey-global.scss | 4 + .../paper-dashboard/_datasurvey-list.scss | 25 +++++ .../paper-dashboard/_datasurvey-table.scss | 0 .../scss/paper-dashboard/_responsive.scss | 8 ++ 9 files changed, 160 insertions(+), 24 deletions(-) create mode 100644 src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss create mode 100644 src/main/webapp/content/scss/paper-dashboard/_datasurvey-table.scss 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 388fc7d..941e95d 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -1,22 +1,29 @@

- Encuestas +
+
+ Encuestas +

Cree encuestas y publiquelas mundialmente.

+
-
- +
+ - + +

@@ -28,6 +35,70 @@ No encuestas found
+ +
+
+ {{ encuesta.nombre }} + + +
+
+
@@ -109,11 +180,6 @@ - - -
{ + // console.log(ele); + + // ele.addEventListener('dblclick', e => { + // console.log(e.target); + + // }); + // }); + } } diff --git a/src/main/webapp/app/layouts/sidebar/sidebar.component.ts b/src/main/webapp/app/layouts/sidebar/sidebar.component.ts index 75fc8f2..93e4ddb 100644 --- a/src/main/webapp/app/layouts/sidebar/sidebar.component.ts +++ b/src/main/webapp/app/layouts/sidebar/sidebar.component.ts @@ -61,6 +61,8 @@ export class SidebarComponent { if (account !== null) { this.usuarioExtraService.find(account.id).subscribe(usuarioExtra => { this.usuarioExtra = usuarioExtra.body; + this.usuarioExtra!.nombre = + usuarioExtra.body!.nombre!.trim().split(' ')[0] + ' ' + usuarioExtra.body!.nombre!.trim().split(' ')[1]; }); } }); diff --git a/src/main/webapp/content/scss/paper-dashboard.scss b/src/main/webapp/content/scss/paper-dashboard.scss index 406620a..80db6c0 100644 --- a/src/main/webapp/content/scss/paper-dashboard.scss +++ b/src/main/webapp/content/scss/paper-dashboard.scss @@ -95,3 +95,5 @@ @import 'paper-dashboard/datasurvey-form'; @import 'paper-dashboard/datasurvey-global'; @import 'paper-dashboard/datasurvey-modal'; +@import 'paper-dashboard/datasurvey-list'; +@import 'paper-dashboard/datasurvey-table'; diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss index bbfb5d4..5ffb44f 100644 --- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss @@ -51,7 +51,7 @@ $form-background: #f1f5f9; outline: 0; background: url(./../../img_datasurvey/down-arrow.svg) no-repeat right; - background-size: 3.5%; + background-size: 1rem; -webkit-appearance: none; background-position-x: 94%; diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss index 4fdf48e..da1c023 100644 --- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss @@ -15,3 +15,7 @@ color: #757d94; font-size: 0.9rem; } + +p { + margin: 0 !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 new file mode 100644 index 0000000..11469a4 --- /dev/null +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss @@ -0,0 +1,25 @@ +.ds-list { + display: grid; + grid-template-columns: repeat(4, 1fr); + grid-auto-rows: minmax(12.5rem, auto); + border: 2px dashed #e6e6e6; + border-radius: $border-radius-x-large; + padding: 1rem; + width: 100%; + user-select: none; + box-sizing: border-box; + + .ds-list--entity { + border: 2px solid #e6e6e6; + border-radius: $border-radius-small; + padding: 0.5rem; + margin: 1rem; + transition: all 0.1s ease-in-out; + word-wrap: break-word; + + &:hover { + background-color: #e8f0fe; + cursor: pointer; + } + } +} diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-table.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-table.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/main/webapp/content/scss/paper-dashboard/_responsive.scss b/src/main/webapp/content/scss/paper-dashboard/_responsive.scss index fda7b54..00cb068 100644 --- a/src/main/webapp/content/scss/paper-dashboard/_responsive.scss +++ b/src/main/webapp/content/scss/paper-dashboard/_responsive.scss @@ -434,6 +434,10 @@ } @media screen and (max-width: 767px) { + .ds-list { + grid-template-columns: repeat(3, 1fr) !important; + } + .nav-tabs-navigation.vertical-navs { padding: 0 28px; } @@ -506,6 +510,10 @@ } @media screen and (max-width: 576px) { + .ds-list { + grid-template-columns: repeat(2, 1fr) !important; + } + .navbar[class*='navbar-toggleable-'] .container { margin-left: 0; margin-right: 0; From 559210768cf65714c47935702f18f04470d478a5 Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Wed, 14 Jul 2021 01:36:26 -0600 Subject: [PATCH 02/52] Update survey entity interaction inside list --- .../app/entities/encuesta/encuesta.module.ts | 3 +- .../encuesta/list/encuesta.component.html | 11 ++++- .../encuesta/list/encuesta.component.ts | 44 +++++++++++-------- .../paper-dashboard/_datasurvey-list.scss | 15 +++---- .../scss/paper-dashboard/_responsive.scss | 18 +++++--- 5 files changed, 57 insertions(+), 34 deletions(-) diff --git a/src/main/webapp/app/entities/encuesta/encuesta.module.ts b/src/main/webapp/app/entities/encuesta/encuesta.module.ts index c78f7dc..6cd231e 100644 --- a/src/main/webapp/app/entities/encuesta/encuesta.module.ts +++ b/src/main/webapp/app/entities/encuesta/encuesta.module.ts @@ -5,9 +5,10 @@ import { EncuestaDetailComponent } from './detail/encuesta-detail.component'; import { EncuestaUpdateComponent } from './update/encuesta-update.component'; import { EncuestaDeleteDialogComponent } from './delete/encuesta-delete-dialog.component'; import { EncuestaRoutingModule } from './route/encuesta-routing.module'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @NgModule({ - imports: [SharedModule, EncuestaRoutingModule], + imports: [SharedModule, EncuestaRoutingModule, FontAwesomeModule], declarations: [EncuestaComponent, EncuestaDetailComponent, EncuestaUpdateComponent, EncuestaDeleteDialogComponent], 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 941e95d..461b88a 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -36,14 +36,23 @@
-
+
{{ encuesta.nombre }} +
+ {{ encuesta.descripcion }} +
+ {{ encuesta.fechaCreacion | formatMediumDatetime }} +
+ {{ encuesta.calificacion }} +
+ - {{ encuesta.nombre }} +   {{ encuesta.nombre }} +   {{ encuesta.nombre }} {{ encuesta.descripcion }}   {{ encuesta.nombre }} -   {{ encuesta.nombre }} - {{ encuesta.descripcion }} +   {{ + encuesta.fechaCreacion | formatShortDatetime + }} + {{ encuesta.descripcion }} + {{ encuesta.categoria?.nombre | lowercase }}
+
-
+ diff --git a/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts b/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts index 2c8d0bd..e1e40ae 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts @@ -23,7 +23,7 @@ import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/auth/account.model'; import { Router } from '@angular/router'; -import { faShareAlt, faLock, faUnlock } from '@fortawesome/free-solid-svg-icons'; +import { faShareAlt, faLock, faUnlock, faCalendarAlt } from '@fortawesome/free-solid-svg-icons'; import * as $ from 'jquery'; @@ -36,6 +36,7 @@ export class EncuestaComponent implements OnInit, AfterViewInit { faShareAlt = faShareAlt; faLock = faLock; faUnlock = faUnlock; + faCalendarAlt = faCalendarAlt; account: Account | null = null; usuarioExtra: UsuarioExtra | null = null; @@ -312,5 +313,6 @@ export class EncuestaComponent implements OnInit, AfterViewInit { // Delete // Copy // Rename + // Share } } diff --git a/src/main/webapp/app/shared/date/format-short-datetime.pipe.ts b/src/main/webapp/app/shared/date/format-short-datetime.pipe.ts new file mode 100644 index 0000000..f68a8eb --- /dev/null +++ b/src/main/webapp/app/shared/date/format-short-datetime.pipe.ts @@ -0,0 +1,12 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +import * as dayjs from 'dayjs'; + +@Pipe({ + name: 'formatShortDatetime', +}) +export class FormatShortDatetimePipe implements PipeTransform { + transform(day: dayjs.Dayjs | null | undefined): string { + return day ? day.format('dddd, MMMM D, YYYY') : ''; + } +} diff --git a/src/main/webapp/app/shared/shared.module.ts b/src/main/webapp/app/shared/shared.module.ts index a433735..a306705 100644 --- a/src/main/webapp/app/shared/shared.module.ts +++ b/src/main/webapp/app/shared/shared.module.ts @@ -9,6 +9,7 @@ import { HasAnyAuthorityDirective } from './auth/has-any-authority.directive'; import { DurationPipe } from './date/duration.pipe'; import { FormatMediumDatetimePipe } from './date/format-medium-datetime.pipe'; import { FormatMediumDatePipe } from './date/format-medium-date.pipe'; +import { FormatShortDatetimePipe } from './date/format-short-datetime.pipe'; import { SortByDirective } from './sort/sort-by.directive'; import { SortDirective } from './sort/sort.directive'; import { ItemCountComponent } from './pagination/item-count.component'; @@ -25,6 +26,7 @@ import { FilterPipe } from './pipes/filter'; DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe, + FormatShortDatetimePipe, SortByDirective, SortDirective, ItemCountComponent, @@ -40,6 +42,7 @@ import { FilterPipe } from './pipes/filter'; DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe, + FormatShortDatetimePipe, SortByDirective, SortDirective, ItemCountComponent, 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 8ea3ce0..ba1b97c 100644 --- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss @@ -48,6 +48,15 @@ color: rgba(0, 0, 0, 0.54); } + .tag { + font-size: 0.8rem; + color: rgb(248, 248, 248); + margin-top: 0.5rem; + padding: 0.2rem 1.5rem; + background-color: #2962ff94; + border-radius: 15px; + } + .entity-header { display: flex; justify-content: space-between; From 530340ada6496bad9e159f7b582b3346044acd9e Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 16 Jul 2021 18:23:03 -0600 Subject: [PATCH 11/52] agregar servicios de encuesta para eventualmente 'eliminar' la categoria de las encuestas que la contengan --- .../categoria/delete/categoria-delete-dialog.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 4bffc15..a9192e4 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 @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { EncuestaService } from 'app/entities/encuesta/service/encuesta.service'; import { EstadoCategoria } from 'app/entities/enumerations/estado-categoria.model'; import { ICategoria } from '../categoria.model'; @@ -11,7 +12,11 @@ import { CategoriaService } from '../service/categoria.service'; export class CategoriaDeleteDialogComponent { categoria?: ICategoria; - constructor(protected categoriaService: CategoriaService, protected activeModal: NgbActiveModal) {} + constructor( + protected categoriaService: CategoriaService, + protected activeModal: NgbActiveModal, + protected encuestaService: EncuestaService + ) {} cancel(): void { this.activeModal.dismiss(); From 81966f4310beb07f6c9eee90bc0c675f6ad716bb Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 16 Jul 2021 20:14:08 -0600 Subject: [PATCH 12/52] organize imports --- .../java/org/datasurvey/repository/CategoriaRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/datasurvey/repository/CategoriaRepository.java b/src/main/java/org/datasurvey/repository/CategoriaRepository.java index 66368c1..6a4897c 100644 --- a/src/main/java/org/datasurvey/repository/CategoriaRepository.java +++ b/src/main/java/org/datasurvey/repository/CategoriaRepository.java @@ -1,7 +1,8 @@ package org.datasurvey.repository; import org.datasurvey.domain.Categoria; -import org.springframework.data.jpa.repository.*; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; /** From 4dfc8c7217ef3da91650a68107a08ead1b98c57a Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 16 Jul 2021 20:18:33 -0600 Subject: [PATCH 13/52] obtener encuestas para filtrado --- .../delete/categoria-delete-dialog.component.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 a9192e4..1f2460b 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 @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { IEncuesta } from 'app/entities/encuesta/encuesta.model'; import { EncuestaService } from 'app/entities/encuesta/service/encuesta.service'; import { EstadoCategoria } from 'app/entities/enumerations/estado-categoria.model'; @@ -11,6 +12,8 @@ import { CategoriaService } from '../service/categoria.service'; }) export class CategoriaDeleteDialogComponent { categoria?: ICategoria; + encuestas?: IEncuesta[]; + encuestasFiltradas?: IEncuesta[]; constructor( protected categoriaService: CategoriaService, @@ -28,4 +31,14 @@ export class CategoriaDeleteDialogComponent { this.activeModal.close('deleted'); }); } + protected getEncuestas(categoria: ICategoria): void { + this.encuestaService.query().subscribe(res => { + this.encuestas = res.body ?? []; + }); + if (this.encuestas) { + this.encuestasFiltradas = this.encuestas.filter(encuesta => { + encuesta.categoria!.id === categoria.id; + }); + } + } } From cfb979899f70adffcf2953203433b4aa622096f4 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 16 Jul 2021 20:20:15 -0600 Subject: [PATCH 14/52] asegurar existencia de categoria nula --- .../delete/categoria-delete-dialog.component.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 1f2460b..465803d 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 @@ -4,7 +4,7 @@ import { IEncuesta } from 'app/entities/encuesta/encuesta.model'; import { EncuestaService } from 'app/entities/encuesta/service/encuesta.service'; import { EstadoCategoria } from 'app/entities/enumerations/estado-categoria.model'; -import { ICategoria } from '../categoria.model'; +import { Categoria, ICategoria } from '../categoria.model'; import { CategoriaService } from '../service/categoria.service'; @Component({ @@ -31,6 +31,16 @@ export class CategoriaDeleteDialogComponent { this.activeModal.close('deleted'); }); } + ensureNulaExists(): void { + const categoriaNula = new Categoria(0, 'Otra', EstadoCategoria.ACTIVE); + const categoria = this.categoriaService.find(0); + if (categoria) { + this.categoriaService.update(categoriaNula); + } else { + this.categoriaService.create(categoriaNula); + } + } + protected getEncuestas(categoria: ICategoria): void { this.encuestaService.query().subscribe(res => { this.encuestas = res.body ?? []; From ff4a6d2194d9e4a4584d4e2bc3bc2717da12d708 Mon Sep 17 00:00:00 2001 From: Paola Date: Fri, 16 Jul 2021 20:38:06 -0600 Subject: [PATCH 15/52] fix validaciones password --- .../account/settings/settings.component.html | 30 +++++++++++---- .../account/settings/settings.component.ts | 37 +++++++++++++------ src/main/webapp/i18n/es/global.json | 4 +- 3 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/main/webapp/app/account/settings/settings.component.html b/src/main/webapp/app/account/settings/settings.component.html index 61968bb..4b22118 100644 --- a/src/main/webapp/app/account/settings/settings.component.html +++ b/src/main/webapp/app/account/settings/settings.component.html @@ -305,26 +305,42 @@
-