From ddd8ebcb9735b347e7e63007c5e915ce9184bbbd Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Fri, 16 Jul 2021 01:36:36 -0600 Subject: [PATCH] Update date display for each survey in user survey list --- .../encuesta/list/encuesta.component.html | 19 ++++++++++++------- .../encuesta/list/encuesta.component.ts | 4 +++- .../shared/date/format-short-datetime.pipe.ts | 12 ++++++++++++ src/main/webapp/app/shared/shared.module.ts | 3 +++ .../paper-dashboard/_datasurvey-list.scss | 9 +++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 src/main/webapp/app/shared/date/format-short-datetime.pipe.ts 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 cc67ad2..83c3a1a 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -84,16 +84,21 @@


- {{ encuesta.fechaCreacion | formatMediumDatetime }}   {{ 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;