From 2c10dfb6d6771294d6a92f63c8e21aebd389fbe3 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 17 Nov 2021 15:06:36 +0100 Subject: [PATCH 1/8] cancel dialog on creation --- angular.json | 18 ++++++-- package.json | 1 + src/app/app.component.ts | 2 +- .../administration/administration.module.ts | 2 + .../steps/step-one/step-one.component.html | 25 ++++++++++- .../form/steps/step-one/step-one.component.ts | 20 ++++++++- .../steps/step-two/step-two.component.html | 1 + .../stepper/stepper.component.html | 42 +++++++++++++++++-- .../stepper/stepper.component.ts | 12 +++++- .../success/success.component.scss | 1 + src/app/shared/shared.module.ts | 5 ++- src/assets/i18n/FR.json | 5 +++ src/environments/environment.ts | 8 ++-- yarn.lock | 5 +++ 14 files changed, 129 insertions(+), 18 deletions(-) diff --git a/angular.json b/angular.json index c86c8402..4848a4f1 100644 --- a/angular.json +++ b/angular.json @@ -22,10 +22,16 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", - "assets": ["src/favicon.ico", "src/assets"], + "assets": [ + "src/favicon.ico", + "src/assets" + ], "styles": [ "node_modules/fork-awesome/css/fork-awesome.min.css", "node_modules/bulma-switch/dist/css/bulma-switch.min.css", + "node_modules/primeicons/primeicons.css", + "node_modules/primeng/resources/themes/saga-blue/theme.css", + "node_modules/primeng/resources/primeng.min.css", "src/styles.scss" ], "scripts": [ @@ -93,8 +99,14 @@ "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"], - "exclude": ["**/node_modules/**"] + "tsConfig": [ + "tsconfig.app.json", + "tsconfig.spec.json", + "e2e/tsconfig.json" + ], + "exclude": [ + "**/node_modules/**" + ] } }, "e2e": { diff --git a/package.json b/package.json index d5c23125..33e64a2c 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "ngx-markdown": "^9.0.0", "ngx-webstorage": "^5.0.0", "node-forge": "^0.10.0", + "primeicons": "^5.0.0", "primeng": "^11.0.0", "quill": "^1.3.7", "rxjs": "^6.5.5", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index dde91e65..834fb389 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -101,7 +101,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { }); // debug cors - this.apiService.getAllAvailablePolls(); + // this.apiService.getAllAvailablePolls(); } ngAfterViewInit(): void { diff --git a/src/app/features/administration/administration.module.ts b/src/app/features/administration/administration.module.ts index 70e204ed..c310d712 100644 --- a/src/app/features/administration/administration.module.ts +++ b/src/app/features/administration/administration.module.ts @@ -28,6 +28,7 @@ import { DayListComponent } from './form/date/list/day/day-list.component'; import { PickerComponent } from './form/date/picker/picker.component'; import { TimeListComponent } from './form/date/list/time/time-list.component'; import { AdminConsultationComponent } from './consultation/consultation.component'; +import { ConfirmDialogModule } from 'primeng/confirmdialog'; @NgModule({ declarations: [ @@ -62,6 +63,7 @@ import { AdminConsultationComponent } from './consultation/consultation.componen FormsModule, TranslateModule.forChild({ extend: true }), DragDropModule, + ConfirmDialogModule, ], }) export class AdministrationModule {} diff --git a/src/app/features/administration/form/steps/step-one/step-one.component.html b/src/app/features/administration/form/steps/step-one/step-one.component.html index f133ba0b..3a227930 100644 --- a/src/app/features/administration/form/steps/step-one/step-one.component.html +++ b/src/app/features/administration/form/steps/step-one/step-one.component.html @@ -58,10 +58,31 @@ + + +

{{ 'creation.dialog' | translate }}

+ + + + + +
-
diff --git a/src/app/features/administration/form/steps/step-one/step-one.component.ts b/src/app/features/administration/form/steps/step-one/step-one.component.ts index 24414959..d39ec912 100644 --- a/src/app/features/administration/form/steps/step-one/step-one.component.ts +++ b/src/app/features/administration/form/steps/step-one/step-one.component.ts @@ -2,6 +2,8 @@ import { Component, Inject, Input, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { PollService } from '../../../../../core/services/poll.service'; import { DOCUMENT } from '@angular/common'; +import { ConfirmationService } from 'primeng/api'; +import { Router } from '@angular/router'; @Component({ selector: 'app-step-one', @@ -9,13 +11,18 @@ import { DOCUMENT } from '@angular/common'; styleUrls: ['./step-one.component.scss'], }) export class StepOneComponent implements OnInit { - constructor(public pollService: PollService, @Inject(DOCUMENT) private document: any) {} - @Input() step_max: any; @Input() form: FormGroup; + constructor( + public pollService: PollService, + @Inject(DOCUMENT) private document: any, + private router: Router, + private confirmationService: ConfirmationService + ) {} + ngOnInit(): void { this.pollService.step_current = 1; const selector = '#title'; @@ -24,4 +31,13 @@ export class StepOneComponent implements OnInit { firstField.focus(); } } + + cancelCreationDialog() { + this.confirmationService.confirm({ + message: 'Quitter la création de sondage?', + accept: () => { + this.router.navigate(['/']); + }, + }); + } } diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.html b/src/app/features/administration/form/steps/step-two/step-two.component.html index 5cfbfba4..d5c44a03 100644 --- a/src/app/features/administration/form/steps/step-two/step-two.component.html +++ b/src/app/features/administration/form/steps/step-two/step-two.component.html @@ -20,6 +20,7 @@
+ + + + diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts index 9f4fc3e7..f37f750c 100644 --- a/src/app/features/administration/stepper/stepper.component.ts +++ b/src/app/features/administration/stepper/stepper.component.ts @@ -1,6 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { PollService } from '../../../core/services/poll.service'; import { environment } from '../../../../environments/environment'; +import { ConfirmationService } from 'primeng/api'; @Component({ selector: 'app-stepper', @@ -13,5 +14,14 @@ export class StepperComponent { @Input() public step_max: number = 5; public show_shortcuts = environment.showStepperShortcuts; - constructor(public pollService: PollService) {} + constructor(public pollService: PollService, private confirmationService: ConfirmationService) {} + + cancelDialog() { + this.confirmationService.confirm({ + message: 'Quitter la création de sondage?', + accept: () => { + this.router.navigate(['/']); + }, + }); + } } diff --git a/src/app/features/administration/success/success.component.scss b/src/app/features/administration/success/success.component.scss index f354ac03..be5620d6 100644 --- a/src/app/features/administration/success/success.component.scss +++ b/src/app/features/administration/success/success.component.scss @@ -11,6 +11,7 @@ a { max-width: 20em; @extend .truncate; } +.admin-ok pre, .truncate { white-space: nowrap; overflow: hidden; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 940a564d..b9e6e287 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -28,6 +28,8 @@ import { ErasableInputComponent } from './components/ui/erasable-input/erasable- import { WipTodoComponent } from './components/ui/wip-todo/wip-todo.component'; import { ErrorsListComponent } from '../features/shared/components/ui/form/errors-list/errors-list.component'; import { ShortcutsHelpComponent } from '../features/shared/components/ui/shortcuts-help/shortcuts-help.component'; +import { ConfirmDialogModule } from 'primeng/confirmdialog'; +import { ConfirmationService } from 'primeng/api'; const COMPONENTS = [ ChoiceDetailsComponent, @@ -63,7 +65,8 @@ const MATERIAL_MODULES = [ @NgModule({ declarations: COMPONENTS, - imports: [...ANGULAR_MODULES, ...MATERIAL_MODULES], + imports: [...ANGULAR_MODULES, ...MATERIAL_MODULES, ConfirmDialogModule], exports: [...ANGULAR_MODULES, ...MATERIAL_MODULES, ...COMPONENTS], + providers: [ConfirmationService], }) export class SharedModule {} diff --git a/src/assets/i18n/FR.json b/src/assets/i18n/FR.json index 95cb5e88..b2e61b61 100644 --- a/src/assets/i18n/FR.json +++ b/src/assets/i18n/FR.json @@ -29,6 +29,7 @@ "creation": { "title": "Créer un sondage", "want": "Choisissez le type de sondage", + "dialog": "Quitter la création de sondage?", "advanced": "Options avancées", "kind": { "classic": "Propositions", @@ -143,6 +144,10 @@ "choiceNotColorblind": "Je ne suis pas", "colorblindText": "daltonien." }, + "dialogs" : { + "no": "non", + "yes": "oui" + }, "selectors": { "lang": "Sélectionner la langue" }, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8b3a6a3c..84964537 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -12,16 +12,14 @@ export const environment = { production: false, display_routes: true, // demo paths to test polls autofill_creation: true, - advanced_options_display: true, - autofill_participation: true, - // autofill: false, + advanced_options_display: false, + autofill_participation: false, showDemoWarning: false, - // autoSendNewPoll: true, autoSendNewPoll: false, showStepperShortcuts: true, interval_days_default: 7, expiresDaysDelay: 60, - maxCountOfAnswers: 150, + maxCountOfAnswers: 300, appTitle: 'Framadate', appVersion: '0.6.0', appLogo: 'assets/img/logo.png', diff --git a/yarn.lock b/yarn.lock index a1ff46b2..d27cddcb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9463,6 +9463,11 @@ pretty-format@^26.0.0, pretty-format@^26.1.0: ansi-styles "^4.0.0" react-is "^16.12.0" +primeicons@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/primeicons/-/primeicons-5.0.0.tgz#73a0b6028a77c58a9eeb331ad13aaf085e8451ee" + integrity sha512-heygWF0X5HFI1otlZE62pp6ye7sZ8om78J9au2BRkg8O7Y8AHTZ9qKMRzchZUHLe8zUAvdi6hZzzm9XxgwIExw== + primeng@^11.0.0: version "11.4.5" resolved "https://registry.yarnpkg.com/primeng/-/primeng-11.4.5.tgz#128137d727d555f68c212a1dcb1f2af3b0f4afd4" From 5b1b173b7bd1f65671ae3773dbd4a7f1daa61353 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 17 Nov 2021 15:16:47 +0100 Subject: [PATCH 2/8] cancel button in stepper --- .../form/steps/step-two/step-two.component.scss | 1 + .../administration/stepper/stepper.component.html | 11 ++++++++++- .../administration/stepper/stepper.component.scss | 10 ++++++++++ .../administration/stepper/stepper.component.ts | 7 ++++++- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.scss b/src/app/features/administration/form/steps/step-two/step-two.component.scss index ff4d18c0..ee0d734b 100644 --- a/src/app/features/administration/form/steps/step-two/step-two.component.scss +++ b/src/app/features/administration/form/steps/step-two/step-two.component.scss @@ -2,6 +2,7 @@ .kind-of-poll { margin-top: 5em; + min-height: 30vh; .fa { margin-right: 1em; } diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index 2090b4e2..76a2b778 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -59,7 +59,16 @@ {{ pollService.form.value.title }} -

Étape {{ step_current }} sur {{ step_max }}

+
+
+

Étape {{ step_current }} sur {{ step_max }}

+
+
+ + + +
+
diff --git a/src/app/features/administration/stepper/stepper.component.scss b/src/app/features/administration/stepper/stepper.component.scss index 0ced13f4..b7ca6e9c 100644 --- a/src/app/features/administration/stepper/stepper.component.scss +++ b/src/app/features/administration/stepper/stepper.component.scss @@ -29,6 +29,16 @@ &.is-active { background: $font_color; } + &:hover { + background: $clicked-color; + } + &.cancel-button { + background: $border-color; + margin-top: -0.5em; + &:hover { + background: $font_color; + } + } } .poll-title { color: $d-neutral; diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts index f37f750c..646f0f9e 100644 --- a/src/app/features/administration/stepper/stepper.component.ts +++ b/src/app/features/administration/stepper/stepper.component.ts @@ -2,6 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { PollService } from '../../../core/services/poll.service'; import { environment } from '../../../../environments/environment'; import { ConfirmationService } from 'primeng/api'; +import { Router } from '@angular/router'; @Component({ selector: 'app-stepper', @@ -14,7 +15,11 @@ export class StepperComponent { @Input() public step_max: number = 5; public show_shortcuts = environment.showStepperShortcuts; - constructor(public pollService: PollService, private confirmationService: ConfirmationService) {} + constructor( + public pollService: PollService, + private confirmationService: ConfirmationService, + private router: Router + ) {} cancelDialog() { this.confirmationService.confirm({ From 794bbec1a7e4da22b68d6c19ec0a7bac962d7b29 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 17 Nov 2021 15:31:09 +0100 Subject: [PATCH 3/8] calendar style and colours --- src/styles/partials/_forms.scss | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 0f25d68f..92fa17fc 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -270,49 +270,49 @@ mat-checkbox { padding: 0.5em; margin: 1em auto; + p-button, button { - border: solid 1px $primary_color; + border: solid 1px $secondary_color !important; + color: $secondary_color !important; } .p-datepicker-buttonbar { margin-top: 0.5em; } - .pi-chevron-left:after { - content: '<'; - } - - .pi-chevron-right:after { - content: '>'; - } - .p-datepicker-month { margin-right: 1em; } .p-datepicker-weeknumber span { - border-right: 1px solid $legend_color; + border-right: 1px solid $secondary_color; } - .p-datepicker-today span { + .p-datepicker-today td span { font-weight: bold; - border: solid 1px $legend_color; + border: solid 3px $secondary_color; + background: $white; } .p-datepicker-calendar td span { - padding: 1em; + padding: 1.5em 0.5em; width: 3.5em; transition: all ease 0.5s; + background: $white; + border: solid 1px $secondary_color; + color: $secondary_color; &:hover { - background: mix($white, $legend_color); + background: mix($white, $secondary_color); color: $white; transition: all ease 0.2s; } } + table td > span { + border-radius: 0.25em; + } .p-highlight { - background: $legend_color; - color: $white; - border-radius: 100%; + background: $secondary_color !important; + color: $white !important; } .p-disabled { background: $d-grey; @@ -326,7 +326,7 @@ mat-checkbox { &:nth-of-type(6), &:nth-of-type(7) { //border-left: 1px solid $border-color; - background: $grey; + background: $grey-lighter; } } } From 5ca08d489fb08022d6163adf027cb953233ccab7 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 17 Nov 2021 15:36:45 +0100 Subject: [PATCH 4/8] space buttons under calendar --- .../form/steps/step-three/step-three.component.html | 5 +++-- .../form/steps/step-three/step-three.component.scss | 3 +++ src/styles/partials/_forms.scss | 1 + src/styles/partials/_responsive.scss | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.html b/src/app/features/administration/form/steps/step-three/step-three.component.html index fa8f3aec..bed05d50 100644 --- a/src/app/features/administration/form/steps/step-three/step-three.component.html +++ b/src/app/features/administration/form/steps/step-three/step-three.component.html @@ -21,7 +21,7 @@ >
@@ -38,8 +38,9 @@ {{ 'dates.add_time' | translate }} +
-
- - {{ dateChoices.length }} - - - {{ 'dates.count_dates' | translate }} - -
+ {{ choice.date_input | date }} + 
+
+				{{ choice.date_object | json }}
+
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.ts b/src/app/features/administration/form/date/list/day/day-list.component.ts index ad569ac6..180a4b59 100644 --- a/src/app/features/administration/form/date/list/day/day-list.component.ts +++ b/src/app/features/administration/form/date/list/day/day-list.component.ts @@ -7,7 +7,8 @@ import { StorageService } from '../../../../../../core/services/storage.service' import { MatDialog } from '@angular/material/dialog'; import { ShortcutsHelpComponent } from '../../../../../shared/components/ui/shortcuts-help/shortcuts-help.component'; import { DateChoice } from '../../../../../../core/models/dateChoice.model'; - +import { PollService } from '../../../../../../core/services/poll.service'; +import { DateUtilitiesService } from '../../../../../../core/services/date.utilities.service'; @Component({ selector: 'app-day-list', templateUrl: './day-list.component.html', @@ -27,6 +28,8 @@ export class DayListComponent { constructor( public dialog: MatDialog, private toastService: ToastService, + private pollService: PollService, + private dateUtilitiesService: DateUtilitiesService, private cd: ChangeDetectorRef, @Inject(DOCUMENT) private document: any, private storageService: StorageService @@ -127,7 +130,7 @@ export class DayListComponent { } addChoice(optionalLabel = ''): void { - this.storageService.dateChoices.push({ + this.pollService.dateChoiceList.push({ literal: '', timeSlices: [], date_object: new Date(), diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.html b/src/app/features/administration/form/steps/step-three/step-three.component.html index bed05d50..6ec08965 100644 --- a/src/app/features/administration/form/steps/step-three/step-three.component.html +++ b/src/app/features/administration/form/steps/step-three/step-three.component.html @@ -2,11 +2,6 @@ - - {{ pollService.calendar.length }} - - - {{ 'dates.count_dates' | translate }} -
-
diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.ts b/src/app/features/administration/form/steps/step-three/step-three.component.ts index 82dacea8..516af21a 100644 --- a/src/app/features/administration/form/steps/step-three/step-three.component.ts +++ b/src/app/features/administration/form/steps/step-three/step-three.component.ts @@ -12,7 +12,7 @@ export class StepThreeComponent implements OnInit { step_max: any; @Input() form: any; - public mode_calendar = true; + public mode_calendar = false; constructor(public pollService: PollService) { this.pollService.step_current = 3; @@ -23,4 +23,10 @@ export class StepThreeComponent implements OnInit { drop(event: CdkDragDrop) { // moveItemInArray(this.pollService.choices, event.previousIndex, event.currentIndex); } + + changeDateInputMode() { + this.mode_calendar ? this.pollService.convertCalendarToText() : this.pollService.convertTextToCalendar(); + + this.mode_calendar = !this.mode_calendar; + } } From 0f4aac7e81224217f6b2abd59ad726ab94977994 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Wed, 17 Nov 2021 16:52:16 +0100 Subject: [PATCH 6/8] convert to date string for inputs --- src/app/core/models/dateChoice.model.ts | 2 +- src/app/core/services/date.utilities.service.ts | 14 +++++++++----- src/app/core/services/poll.service.ts | 13 ++++++++++--- .../form/date-select/date-select.component.html | 6 +----- .../form/date/list/day/day-list.component.html | 7 ------- .../form/date/list/day/day-list.component.ts | 15 +++------------ .../steps/step-three/step-three.component.html | 1 - 7 files changed, 24 insertions(+), 34 deletions(-) diff --git a/src/app/core/models/dateChoice.model.ts b/src/app/core/models/dateChoice.model.ts index 8700cd01..8db7924c 100644 --- a/src/app/core/models/dateChoice.model.ts +++ b/src/app/core/models/dateChoice.model.ts @@ -2,7 +2,7 @@ export interface DateChoice { literal: string; timeSlices: TimeSlices[]; date_object: Date; - date_input: String; + date_input: string; } export interface TimeSlices { diff --git a/src/app/core/services/date.utilities.service.ts b/src/app/core/services/date.utilities.service.ts index 4e5da7e0..35866766 100644 --- a/src/app/core/services/date.utilities.service.ts +++ b/src/app/core/services/date.utilities.service.ts @@ -109,9 +109,9 @@ export class DateUtilitiesService { const ladate4 = this.addDaysToDate(3, today); return [ - this.convertToDateChoiceObject(ladate2), - this.convertToDateChoiceObject(ladate3), - this.convertToDateChoiceObject(ladate4), + this.convertDateToDateChoiceObject(ladate2), + this.convertDateToDateChoiceObject(ladate3), + this.convertDateToDateChoiceObject(ladate4), ]; } @@ -119,12 +119,16 @@ export class DateUtilitiesService { * convert a date to a DateChoice * @param date */ - convertToDateChoiceObject(date: Date): DateChoice { + convertDateToDateChoiceObject(date: Date): DateChoice { + let isUnder10 = date.getDate() < 10; + let day = isUnder10 ? `0${date.getDate()}` : date.getDate(); + // get month is based on 0, so yeah + let input = `${date.getFullYear()}-${date.getMonth() + 1}-${day}`; return { literal: this.formateDateToInputStringNg(date), timeSlices: Object.create(defaultTimeOfDay), date_object: date, - date_input: `${date.getFullYear()}-${date.getMonth()}-${date.getDay()}`, + date_input: input, }; } } diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index 66b92583..7864911f 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -667,7 +667,7 @@ export class PollService implements Resolve { convertCalendarToText() { let converted = []; for (let someDate of this.calendar) { - converted.push(this.DateUtilitiesService.convertToDateChoiceObject(someDate)); + converted.push(this.DateUtilitiesService.convertDateToDateChoiceObject(someDate)); } this.dateChoiceList = converted; @@ -678,11 +678,18 @@ export class PollService implements Resolve { * convert the DateChoices to an arrray of Dates for calendar picker */ convertTextToCalendar() { + console.log('convert text to calendar', this.dateChoiceList); let converted = []; for (let someDateChoice of this.dateChoiceList) { - converted.push(someDateChoice.date_object); + let dateObj = new Date(someDateChoice.date_input); + console.log('dateObj', dateObj); + // check that date is not part of the disabled dates + if (this.disabled_dates.indexOf(dateObj) === -1) { + converted.push(dateObj); + } } + console.log('converted', converted); this.calendar = converted; return; } @@ -741,7 +748,7 @@ export class PollService implements Resolve { for (let elem of this.calendar) { console.log('elem', elem); - let converted_day = this.DateUtilitiesService.convertToDateChoiceObject(elem); + let converted_day = this.DateUtilitiesService.convertDateToDateChoiceObject(elem); newpoll.dateChoices.push(converted_day); } console.log('newpoll.dateChoices', newpoll.dateChoices); diff --git a/src/app/features/administration/form/date-select/date-select.component.html b/src/app/features/administration/form/date-select/date-select.component.html index 320263c8..00b176a2 100644 --- a/src/app/features/administration/form/date-select/date-select.component.html +++ b/src/app/features/administration/form/date-select/date-select.component.html @@ -98,11 +98,7 @@

- +
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.html b/src/app/features/administration/form/date/list/day/day-list.component.html index 8a4b5f1e..ad4a1229 100644 --- a/src/app/features/administration/form/date/list/day/day-list.component.html +++ b/src/app/features/administration/form/date/list/day/day-list.component.html @@ -27,18 +27,11 @@ {{ choice.date_object | date: 'E':'Europe/Paris':'fr_FR' }} - {{ choice.date_input | date }} - 
-
-				{{ choice.date_object | json }}
-