change date picker

This commit is contained in:
Peter Maquiran
2023-02-06 13:52:08 +01:00
parent 2470e0abfc
commit 0bf43b629c
41 changed files with 65 additions and 120 deletions
@@ -28,17 +28,9 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
[(ngModel)]="folder.DateBegin"
class="d-block d-md-none"
placeholder="Data início*"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
max="2025">
</ion-datetime>
<mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Data inicio*"
[formControl]="dateControlStart"
@@ -59,28 +51,18 @@
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
[(ngModel)]="folder.DateEnd"
placeholder="Data de fim*"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{minDate}}"
max="2025">
</ion-datetime>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom">
<mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Data de fim*"
[formControl]="dateControlEnd"
[min]="endMinDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
@@ -75,8 +75,8 @@ export class NewActionPage implements OnInit {
this.dateControlStart = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
// this.folder.DateBegin = new Date().toISOString()
// this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
// this.dateControlStart.value = new Date().toISOString()
// this.dateControlEnd.value = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
@@ -85,33 +85,18 @@ export class NewActionPage implements OnInit {
// this.setDefaultTime()
}
setDefaultTime() {
this.folder.DateBegin = new Date().toISOString()
this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
segmentChanged(ev: any) {
}
get dateValid() {
var validado: boolean;
if (window.innerWidth <= 800) {
if ((this.folder.DateBegin < this.folder.DateEnd)) {
validado = true;
} else {
validado = false;
}
return validado == true ? ['ok']: [];
} else {
return ['ok']
}
return new Date(this.dateStart).getTime() < new Date(this.dateEnd).getTime() ? 'ok': null
}
runValidation() {
this.validateFrom = true;
if(new Date(this.folder.DateBegin).getTime() > new Date(this.folder.DateEnd).getTime()){
if(new Date(this.dateControlStart.value).getTime() > new Date(this.dateControlEnd.value).getTime()){
this.toastService._badRequest("A data de início não pode ser superior a data de fim");
}
}
@@ -144,8 +129,8 @@ export class NewActionPage implements OnInit {
ProcessId: null,
Description: this.folder.Description,
Detail: this.folder.Detail,
DateBegin: this.folder.DateBegin,
DateEnd: this.folder.DateEnd,
DateBegin: this.dateControlStart.value,
DateEnd: this.dateControlEnd.value,
ActionType: this.segment,
}
@@ -54,7 +54,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
@@ -124,7 +124,7 @@ export class PublicationsPage implements OnInit {
doRefresh(event) {
this.getActions();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 250);
}
@@ -63,7 +63,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
@@ -98,7 +98,7 @@ export class ViewPublicationsPage implements OnInit {
//this.testForkJoin()
this.getPublicationDetail();
this.getPublicationsIds();
event.target.complete();
event?.target?.complete();
//}, 3000);
}