FEAT #22798 TIME 0:40 set current date/time

src/frontend/app/administration/history/history-list.component.html

@@ -101,7 +101,7 @@
                         [max]="filters.date.end !== null ? filters.date.end : undefined"
                         [doneText]="'lang.validate' | translate"
                         [cancelText]="'lang.cancel' | translate"
-                        (ionChange)="getDatas(); toggleAccordion()"
+                        (ionChange)="getDatas(); toggleAccordion($event, 'start')"
                         (ionCancel)="toggleAccordion()">
                     </ion-datetime>
                   </ion-accordion>
@@ -127,7 +127,7 @@
                         (ionChange)="getDatas()"
                         [doneText]="'lang.validate' | translate"
                         [cancelText]="'lang.cancel' | translate"
-                        (ionChange)="getDatas(); toggleAccordion()"
+                        (ionChange)="getDatas(); toggleAccordion($event, 'end')"
                         (ionCancel)="toggleAccordion()">
                     </ion-datetime>
                   </ion-accordion>

src/frontend/app/administration/history/history-list.component.ts

@@ -224,7 +224,10 @@ export class HistoryListComponent {
         this.getDatas();
     }
 
-    toggleAccordion() {
+    toggleAccordion(event: any = Event, target: any) {
+        if (event?.type === 'ionChange' && this.filters.date[target] === undefined) {
+            this.filters.date[target] = new Date().toISOString().toString();
+        }
         this.accordionGroup.value = undefined;
     }
 }

src/frontend/app/administration/notification/notification.component.html

@@ -51,7 +51,7 @@
                         [required]="true"></app-grid-buttons>
                 </div>
                 <ion-list *ngIf="currentFrequencyMode === 'daily'" style="width: 35%; margin-top: 10px;">
-                    <ion-accordion-group #startAccordionGroup expand="compact">
+                    <ion-accordion-group #startTimeAccordionGroup expand="compact">
                       <ion-accordion value="start">
                         <ion-item slot="header">
                             <ion-label color="secondary">{{'lang.execDate' | translate}} *</ion-label>
@@ -72,8 +72,8 @@
                             locale="fr-FR"
                             [doneText]="'lang.validate' | translate"
                             [cancelText]="'lang.cancel' | translate"
-                            (ionChange)="checkEndTime($event.detail.value); toggleAccordion('start')"
-                            (ionCancel)="toggleAccordion('start')">
+                            (ionChange)="checkEndTime($event.detail.value); toggleAccordion($event, 'startTime')"
+                            (ionCancel)="toggleAccordion('startTime')">
                         </ion-datetime>
                       </ion-accordion>
                     </ion-accordion-group>
@@ -85,7 +85,7 @@
                         name="repeatFrequency"
                         [(ngModel)]="repeatFrequency"
                         [disabled]="functions.empty(notification.startTime) || getDate(notification.startTime) === '23:59'"
-                        (ionChange)="toggleRepeatFrequency($event)">
+                        (ionChange)="$event.stopPropagation(); toggleRepeatFrequency($event)">
                     </ion-toggle>
                 </ion-item>
                 <ion-item *ngIf="repeatFrequency">
@@ -106,7 +106,7 @@
                     </mat-menu>
                 </ion-item>
                 <ion-list *ngIf="repeatFrequency" style="width: 35%; margin-top: 10px;">
-                    <ion-accordion-group #endAccordionGroup expand="compact">
+                    <ion-accordion-group #endTimeAccordionGroup expand="compact">
                       <ion-accordion value="end">
                         <ion-item slot="header">
                             <ion-label color="secondary">{{'lang.endFrequencyDate' | translate}} *</ion-label>
@@ -129,8 +129,8 @@
                             [showDefaultButtons]="true"
                             [doneText]="'lang.validate' | translate"
                             [cancelText]="'lang.cancel' | translate"
-                            (ionChange)="toggleAccordion('end')"
-                            (ionCancel)="toggleAccordion('end')">
+                            (ionChange)="$event.stopPropagation(); toggleAccordion($event, 'endTime')"
+                            (ionCancel)="toggleAccordion('endTime')">
                          </ion-datetime>
                       </ion-accordion>
                     </ion-accordion-group>

src/frontend/app/administration/notification/notification.component.ts

@@ -18,8 +18,8 @@ import { IonAccordionGroup } from '@ionic/angular';
 
 export class NotificationComponent implements OnInit {
 
-    @ViewChild('startAccordionGroup', { static: false }) startAccordionGroup: IonAccordionGroup;
-    @ViewChild('endAccordionGroup', { static: false }) endAccordionGroup: IonAccordionGroup;
+    @ViewChild('startTimeAccordionGroup', { static: false }) startTimeAccordionGroup: IonAccordionGroup;
+    @ViewChild('endTimeAccordionGroup', { static: false }) endTimeAccordionGroup: IonAccordionGroup;
 
     loading: boolean = true;
     creationMode: boolean = true;
@@ -332,7 +332,10 @@ export class NotificationComponent implements OnInit {
         }
     }
 
-    toggleAccordion(target: string) {
+    toggleAccordion(event: Event = null, target: string) {
+        if (event?.type === 'ionChange' && this.notification[target] === undefined) {
+            this.notification[target] = new Date().toISOString().toString();
+        }
         this[`${target}AccordionGroup`].value = undefined;
     }
 }