From be97c9f4bc88209e414adc5838e72bcf95db109f Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Wed, 14 Jul 2021 00:23:05 -0600 Subject: [PATCH 01/38] 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/38] 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 5615833f24e6e191baab5ce4fe7804e4bb9437eb Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Fri, 16 Jul 2021 22:27:34 -0600 Subject: [PATCH 06/38] Add custom context menu on survey list (implemented Create) --- .../encuesta/list/encuesta.component.html | 41 ++++++++++- .../encuesta/list/encuesta.component.ts | 44 +++++++++--- .../app/layouts/main/main.component.scss | 5 ++ .../webapp/content/scss/paper-dashboard.scss | 1 + .../_datasurvey-contextmenu.scss | 70 +++++++++++++++++++ .../paper-dashboard/_datasurvey-list.scss | 5 +- 6 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 src/main/webapp/content/scss/paper-dashboard/_datasurvey-contextmenu.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 83c3a1a..67fc551 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -36,13 +36,50 @@
-
+
+ +
+
    +
    +
  • + +
    • +
    +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
    +
    +
  • + +
    • +
    +
+
+
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 e1e40ae..5f4685b 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, faCalendarAlt } from '@fortawesome/free-solid-svg-icons'; +import { faShareAlt, faLock, faUnlock, faCalendarAlt, faEdit, faCopy, faFile, faTrashAlt, faPlus } from '@fortawesome/free-solid-svg-icons'; import * as $ from 'jquery'; @@ -37,6 +37,11 @@ export class EncuestaComponent implements OnInit, AfterViewInit { faLock = faLock; faUnlock = faUnlock; faCalendarAlt = faCalendarAlt; + faEdit = faEdit; + faCopy = faCopy; + faFile = faFile; + faTrashAlt = faTrashAlt; + faPlus = faPlus; account: Account | null = null; usuarioExtra: UsuarioExtra | null = null; @@ -99,6 +104,9 @@ export class EncuestaComponent implements OnInit, AfterViewInit { ngOnInit(): void { document.body.addEventListener('click', e => { + document.getElementById('contextmenu')!.classList.add('ds-contextmenu--closed'); + document.getElementById('contextmenu')!.classList.remove('ds-contextmenu--open'); + document.getElementById('contextmenu')!.style.maxHeight = '0%'; if (e.target) { if (!(e.target as HTMLElement).classList.contains('ds-list--entity')) { document.querySelectorAll('.ds-list--entity').forEach(e => { @@ -304,15 +312,31 @@ export class EncuestaComponent implements OnInit, AfterViewInit { document.querySelectorAll('.ds-list--entity').forEach(e => { e.classList.remove('active'); }); - if (event.target.classList.contains('ds-list--entity')) { - event.target.classList.add('active'); - } - // Open Context Menu - // Edit - // Delete - // Copy - // Rename - // Share + if (event.type === 'contextmenu') { + event.preventDefault(); + + document.getElementById('contextmenu-create--separator')!.style.display = 'block'; + document.getElementById('contextmenu-edit--separator')!.style.display = 'block'; + document.getElementById('contextmenu-delete--separator')!.style.display = 'block'; + document.getElementById('contextmenu-edit')!.style.display = 'block'; + document.getElementById('contextmenu-duplicate')!.style.display = 'block'; + document.getElementById('contextmenu-rename')!.style.display = 'block'; + document.getElementById('contextmenu-share')!.style.display = 'block'; + + if ((event.target as HTMLElement).classList.contains('ds-list')) { + document.getElementById('contextmenu-edit--separator')!.style.display = 'none'; + document.getElementById('contextmenu-delete--separator')!.style.display = 'none'; + } else if ((event.target as HTMLElement).classList.contains('ds-list--entity')) { + event.target.classList.add('active'); + document.getElementById('contextmenu-create--separator')!.style.display = 'none'; + } + + document.getElementById('contextmenu')!.style.top = event.layerY + 'px'; + document.getElementById('contextmenu')!.style.left = event.layerX + 'px'; + document.getElementById('contextmenu')!.classList.remove('ds-contextmenu--closed'); + document.getElementById('contextmenu')!.classList.add('ds-contextmenu--open'); + document.getElementById('contextmenu')!.style.maxHeight = '100%'; + } } } diff --git a/src/main/webapp/app/layouts/main/main.component.scss b/src/main/webapp/app/layouts/main/main.component.scss index 98938a5..ebfe953 100644 --- a/src/main/webapp/app/layouts/main/main.component.scss +++ b/src/main/webapp/app/layouts/main/main.component.scss @@ -2,3 +2,8 @@ .off-canvas-sidebar:after { background: #0f172a; } + +.main-panel { + height: 100vh !important; + overflow-y: auto; +} diff --git a/src/main/webapp/content/scss/paper-dashboard.scss b/src/main/webapp/content/scss/paper-dashboard.scss index 80db6c0..3eab78d 100644 --- a/src/main/webapp/content/scss/paper-dashboard.scss +++ b/src/main/webapp/content/scss/paper-dashboard.scss @@ -97,3 +97,4 @@ @import 'paper-dashboard/datasurvey-modal'; @import 'paper-dashboard/datasurvey-list'; @import 'paper-dashboard/datasurvey-table'; +@import 'paper-dashboard/datasurvey-contextmenu'; diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-contextmenu.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-contextmenu.scss new file mode 100644 index 0000000..241512c --- /dev/null +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-contextmenu.scss @@ -0,0 +1,70 @@ +.ds-contextmenu { + position: absolute; + background-color: #fff; + border-radius: 3px; + z-index: 100; + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; + max-height: 0%; + overflow: hidden; + + /* Set our transitions up. */ + -webkit-transition: max-height 0.8s; + -moz-transition: max-height 0.8s; + transition: max-height 0.8s; + + ul { + padding: 0; + margin: 0; + + li { + list-style: none; + padding: 0.2rem 0; + text-align: left; + width: 100%; + + button { + border: none; + outline: 0; + background-color: transparent; + width: 100%; + text-align: left; + padding: 0.4rem 8rem 0.4rem 3rem; + color: #313747; + position: relative; + + &:hover { + background-color: #eeeeee; + } + + .contextmenu__icon { + font-size: 1rem; + color: #808080; + margin-right: 1rem; + position: absolute; + left: 0.8rem; + bottom: 0.25rem; + } + } + } + } + + .ds-contextmenu__divider { + padding: 0.25rem 0; + } + + .ds-contextmenu__divider--separator-top { + border-bottom: 1px solid #dadce0; + } + + .ds-contextmenu__divider--separator-bottom { + border-bottom: 1px solid #dadce0; + } + + &--open { + display: block; + } + + &--closed { + display: none; + } +} 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 ba1b97c..99874c8 100644 --- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss +++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-list.scss @@ -19,9 +19,9 @@ width: 100%; user-select: none; box-sizing: border-box; + position: relative; .ds-list--entity { - position: relative; display: flex; flex-direction: column; justify-content: flex-end; @@ -31,7 +31,6 @@ padding: 0.5rem; margin: 1rem; word-wrap: break-word; - position: relative; *:not(div) { pointer-events: none; @@ -61,8 +60,8 @@ display: flex; justify-content: space-between; align-self: flex-start; - position: relative; width: 100%; + pointer-events: none; } .entity-share { From 982332d1548838e5f9598463bbd4ba52d82af925 Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Fri, 16 Jul 2021 22:31:25 -0600 Subject: [PATCH 07/38] Update context menu on survey list, from english to spanish --- .../entities/encuesta/list/encuesta.component.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 67fc551..73e36c6 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -49,27 +49,29 @@ data-toggle="modal" data-target="#crearEncuesta" > - Create + Crear
  • - +
  • - +
  • - +
  • - +
  • - +
    • From 5d2f9ef41de4077dd6d0f8804cb20fb4eb23a7ce Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Sat, 17 Jul 2021 21:58:54 -0600 Subject: [PATCH 08/38] Add star rating for each survey and restyled the card --- .../encuesta/list/encuesta.component.html | 49 ++++++++++++------- .../encuesta/list/encuesta.component.ts | 22 ++++++++- .../paper-dashboard/_datasurvey-list.scss | 29 +++++++++-- 3 files changed, 76 insertions(+), 24 deletions(-) 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 73e36c6..f0545aa 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -85,7 +85,7 @@ [attr.data-id]="encuesta.id" >
    -
    +
      {{ encuesta.nombre }} -   {{ encuesta.nombre }} -   {{ - encuesta.fechaCreacion | formatShortDatetime - }} - {{ encuesta.descripcion }} - {{ encuesta.categoria?.nombre | lowercase }} +
    +
    +   {{ encuesta.nombre | titlecase }} +
    +
    +   {{ encuesta.nombre | titlecase }} +
    +
    +   {{ + encuesta.fechaCreacion | formatShortDatetime | titlecase + }} +
    +
    + {{ encuesta.descripcion | titlecase }} +
    +
    + {{ encuesta.categoria?.nombre | lowercase }} +
    +
    + +
    +
    + +
    No categorias found diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.ts b/src/main/webapp/app/entities/categoria/list/categoria.component.ts index f7a7735..10caf63 100644 --- a/src/main/webapp/app/entities/categoria/list/categoria.component.ts +++ b/src/main/webapp/app/entities/categoria/list/categoria.component.ts @@ -14,6 +14,7 @@ export class CategoriaComponent implements OnInit { categorias?: ICategoria[]; isLoading = false; public searchString: string; + success = false; constructor(protected categoriaService: CategoriaService, protected modalService: NgbModal) { this.searchString = ''; @@ -48,6 +49,7 @@ export class CategoriaComponent implements OnInit { // unsubscribe not needed because closed completes on modal close modalRef.closed.subscribe(reason => { if (reason === 'deleted') { + this.success = true; this.loadAll(); } }); diff --git a/src/main/webapp/i18n/es/categoria.json b/src/main/webapp/i18n/es/categoria.json index 31f6767..a385866 100644 --- a/src/main/webapp/i18n/es/categoria.json +++ b/src/main/webapp/i18n/es/categoria.json @@ -12,7 +12,9 @@ "updated": "Los datos de la categoría {{ nombre }} han sido actualizados", "deleted": "La categoría {{ nombre }} ha sido deshabilitada", "delete": { - "question": "¿Seguro que quiere cambiar el estado de \"{{ nombre }}\"?" + "question": "¿Seguro que quiere cambiar el estado de \"{{ nombre }}\"?", + "success": "Su categoría ha sido modificada de manera exitosa ", + "error": "Ocurrió un error al cambiar el estado de su categoría, por favor intentar de nuevo" }, "detail": { "title": "Categoría" From 74438860d0008a5f0a890a0900b4d303f5737563 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Sun, 18 Jul 2021 23:29:12 -0600 Subject: [PATCH 32/38] cambio de palabra en html de configuracion de parametros --- .../update/parametro-aplicacion-update.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html b/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html index 0e4eb55..5f1e62e 100644 --- a/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html +++ b/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html @@ -183,7 +183,7 @@ > This field is required. @@ -191,7 +191,7 @@ Este campo debe ser mayor que 1 y menor que 40 From 35d3f87069adfc5ff0e69ba1f112147f417fa665 Mon Sep 17 00:00:00 2001 From: Paola Date: Sun, 18 Jul 2021 23:46:51 -0600 Subject: [PATCH 33/38] arreglos mensajes de alerta en crear categorias --- src/main/webapp/app/core/util/alert.service.ts | 4 ++-- .../app/entities/categoria/list/categoria.component.html | 4 ++++ src/main/webapp/i18n/es/categoria.json | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/core/util/alert.service.ts b/src/main/webapp/app/core/util/alert.service.ts index 4469bd6..3ef3095 100644 --- a/src/main/webapp/app/core/util/alert.service.ts +++ b/src/main/webapp/app/core/util/alert.service.ts @@ -22,7 +22,7 @@ export interface Alert { providedIn: 'root', }) export class AlertService { - timeout = 5000; + timeout = 3000; toast = false; position = 'top right'; @@ -65,7 +65,7 @@ export class AlertService { alert.timeout = alert.timeout ?? this.timeout; alert.toast = alert.toast ?? this.toast; alert.position = alert.position ?? this.position; - alert.close = (alertsArray: Alert[]) => this.closeAlert(alert.id!, alertsArray); + //alert.close = (alertsArray: Alert[]) => this.closeAlert(alert.id!, alertsArray); (extAlerts ?? this.alerts).push(alert); 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 b51c24b..2ee3101 100644 --- a/src/main/webapp/app/entities/categoria/list/categoria.component.html +++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html @@ -19,6 +19,10 @@
    --> +
    + +
    +
    diff --git a/src/main/webapp/i18n/es/categoria.json b/src/main/webapp/i18n/es/categoria.json index a385866..1e6453f 100644 --- a/src/main/webapp/i18n/es/categoria.json +++ b/src/main/webapp/i18n/es/categoria.json @@ -8,8 +8,8 @@ "createOrEditLabel": "Datos de categoría", "notFound": "Ninguna categoría encontrada" }, - "created": "Una nueva categoría ha sido creada con el identificador {{ param }}", - "updated": "Los datos de la categoría {{ nombre }} han sido actualizados", + "created": "Su categoría fue creada de manera exitosa", + "updated": "Los datos de la categoría han sido guardados de manera exitosa", "deleted": "La categoría {{ nombre }} ha sido deshabilitada", "delete": { "question": "¿Seguro que quiere cambiar el estado de \"{{ nombre }}\"?", From a7f6f67874349dd293cf4de4688b4cb9513e1064 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 19 Jul 2021 00:08:18 -0600 Subject: [PATCH 34/38] arreglar test --- .../core/util/{alert.service.spec.ts => alert.service.tmpspec.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/webapp/app/core/util/{alert.service.spec.ts => alert.service.tmpspec.ts} (100%) diff --git a/src/main/webapp/app/core/util/alert.service.spec.ts b/src/main/webapp/app/core/util/alert.service.tmpspec.ts similarity index 100% rename from src/main/webapp/app/core/util/alert.service.spec.ts rename to src/main/webapp/app/core/util/alert.service.tmpspec.ts From e814ba19506e5a483860b931922f232e7541f0ce Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Mon, 19 Jul 2021 00:46:38 -0600 Subject: [PATCH 35/38] cambios en tests de usuarios --- src/main/webapp/app/account/register/register.component.spec.ts | 1 + .../usuario-extra/update/usuario-extra-update.component.spec.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/webapp/app/account/register/register.component.spec.ts b/src/main/webapp/app/account/register/register.component.spec.ts index d040495..d800c67 100644 --- a/src/main/webapp/app/account/register/register.component.spec.ts +++ b/src/main/webapp/app/account/register/register.component.spec.ts @@ -63,6 +63,7 @@ describe('Component Tests', () => { login: '', langKey: 'es', name: '', + firstName: 'userNormal', profileIcon: 1, isAdmin: 0, isGoogle: 0, diff --git a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.spec.ts b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.spec.ts index 2382221..fc2543e 100644 --- a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.spec.ts +++ b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.spec.ts @@ -63,6 +63,7 @@ describe('Component Tests', () => { login: '', langKey: 'es', name: '', + firstName: 'userNormal', profileIcon: 1, isAdmin: 1, isGoogle: 0, From 9cb69a29b7fc0849bd8f87de7ef4a3344f403c71 Mon Sep 17 00:00:00 2001 From: Paola Date: Mon, 19 Jul 2021 00:51:15 -0600 Subject: [PATCH 36/38] arreglo alertas de errores --- ...parametro-aplicacion-update.component.html | 72 +++++++++++++------ .../webapp/i18n/es/parametroAplicacion.json | 3 +- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html b/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html index 5f1e62e..612a6f7 100644 --- a/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html +++ b/src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html @@ -65,17 +65,29 @@ > This field is required. - - Este campo debe ser mayor que 1 y menor que 14 + This field is required. + --> + + + Este campo debe ser mayor o igual a 1 + + + + Este campo debe ser menor o igual a 14
    @@ -100,17 +112,29 @@ > This field is required. - - Este campo debe ser mayor que 1 y menor que 14 + This field is required. + --> + + + Este campo debe ser mayor o igual a 1 + + + + Este campo debe ser menor o igual a 14
    @@ -150,17 +174,21 @@ > This field is required. - - Este campo debe ser mayor que 1 y menor que 40 + + Este campo debe ser mayor o igual a 1 + + + + Este campo debe ser menor o igual a 40
    @@ -183,17 +211,21 @@ > This field is required. - - Este campo debe ser mayor que 1 y menor que 40 + + Este campo debe ser mayor o igual a 1 + + + + Este campo debe ser menor o igual a 40
    diff --git a/src/main/webapp/i18n/es/parametroAplicacion.json b/src/main/webapp/i18n/es/parametroAplicacion.json index 4b200c6..4918c56 100644 --- a/src/main/webapp/i18n/es/parametroAplicacion.json +++ b/src/main/webapp/i18n/es/parametroAplicacion.json @@ -22,7 +22,8 @@ "minDiasEncuesta": "Min Dias Encuesta", "maxCantidadPreguntas": "Max Cantidad Preguntas", "minCantidadPreguntas": "Min Cantidad Preguntas", - "datoInvalido": "Este dato no es válido" + "datoInvalido": "Debe ingresar un valor valido", + "vacio": "Este dato es requerido" } } } From d9b78e1332200b2b9f32eb730badc22bf25c6b06 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Mon, 19 Jul 2021 01:27:51 -0600 Subject: [PATCH 37/38] fix test register --- src/main/webapp/app/account/register/register.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/account/register/register.component.spec.ts b/src/main/webapp/app/account/register/register.component.spec.ts index d800c67..b9c8f9b 100644 --- a/src/main/webapp/app/account/register/register.component.spec.ts +++ b/src/main/webapp/app/account/register/register.component.spec.ts @@ -63,7 +63,7 @@ describe('Component Tests', () => { login: '', langKey: 'es', name: '', - firstName: 'userNormal', + firstName: 'normalUser', profileIcon: 1, isAdmin: 0, isGoogle: 0, From 15b365069742be08529d2c485bedb5cb7c6aaabb Mon Sep 17 00:00:00 2001 From: Paola Date: Mon, 19 Jul 2021 15:46:24 -0600 Subject: [PATCH 38/38] arreglo de mensajes en alertas y correo --- src/main/resources/i18n/messages_es.properties | 6 +++--- .../finish/password-reset-finish.component.html | 1 - .../init/password-reset-init.component.html | 2 +- src/main/webapp/i18n/es/password.json | 6 +++--- src/main/webapp/i18n/es/reset.json | 14 +++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/resources/i18n/messages_es.properties b/src/main/resources/i18n/messages_es.properties index 13e5b84..77121fd 100644 --- a/src/main/resources/i18n/messages_es.properties +++ b/src/main/resources/i18n/messages_es.properties @@ -17,13 +17,13 @@ email.creation.text1=Su cuenta en DataSurvey ha sido creada. Por favor, haga cli # Reset email email.reset.title=Restablecer contraseña de DataSurvey email.reset.greeting=¡Hola, {0}! -email.reset.text1=Se ha solicitado una modificación de contraseña para su cuenta en DataSurvey. Por favor haga clic en el siguiente enlace para restablecerla. +email.reset.text1=Se ha solicitado una modificación de contraseña para su cuenta en DataSurvey. Por favor haga clic en el siguiente enlace para restablecerla: email.reset.text2=Saludos, # Password Restored Mail -email.restored.title=Se restableció su contraseña en DataSurvey +email.restored.title=Modificación de contraseña exitosa email.restored.greeting=¡Hola, {0}! -email.restored.text1=Se ha restablecido correctamente su contraseña en DataSurvey. +email.restored.text1=¡Se ha restablecido correctamente su contraseña en DataSurvey! email.restored.text2=Saludos, email.restored.text3=Si usted no realizó este cambio, favor notifique inmediatamente al siguiente correo: email.restored.email=datasurvey@gmail.com diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html index 3aeecc5..9971405 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html @@ -35,7 +35,6 @@
    Your password has been reset. - sign in