add margin

This commit is contained in:
Peter Maquiran
2024-07-03 10:15:53 +01:00
parent 6d38870761
commit 0e12b5de5e
14 changed files with 401 additions and 339 deletions
@@ -243,6 +243,7 @@
[(ngModel)]="postEvent.StartDate"
[max]="maxDate"
[disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -273,6 +274,7 @@
[(ngModel)]="postEvent.StartDate"
[max]="maxDate"
[disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -427,6 +427,19 @@ export class EditEventPage implements OnInit {
}
}
onDateChange(e) {
const cloneDateStartDate = new Date(this.postEvent.StartDate);
const cloneDateEndDate = new Date(this.postEvent.EndDate);
if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) {
cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1);
this.postEvent.EndDate = cloneDateStartDate
}
}
@XTracerAsync({name:'mobile/create-event', bugPrint: true, daley: 4000})
async save_v2(tracing?: TracingType) {
this.injectValidation()
@@ -674,7 +687,7 @@ export class EditEventPage implements OnInit {
}
onCheckboxChange(event: any) {
console.log(this.postEvent.CalendarId)
if (this.allDayCheck) {
this.postEvent.IsAllDayEvent = this.allDayCheck;
this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate)
@@ -196,6 +196,7 @@
placeholder="Data Inicio*"
[(ngModel)]="postEvent.StartDate"
[disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -220,6 +221,7 @@
placeholder="Data Inicio*"
[(ngModel)]="postEvent.StartDate"
[disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -340,6 +340,19 @@ export class NewEventPage implements OnInit {
}
}
onDateChange(e) {
const cloneDateStartDate = new Date(this.postEvent.StartDate);
const cloneDateEndDate = new Date(this.postEvent.EndDate);
if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) {
cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1);
this.postEvent.EndDate = cloneDateStartDate
}
}
onSelectedRecurringChanged(ev: any) {
this.calculetedLastOccurrence(ev);
@@ -152,6 +152,7 @@
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"
(ngModelChange)="onDateChange($event)"
>
</ion-datetime>
@@ -160,6 +161,7 @@
placeholder="Choose a date"
[(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
[disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -75,6 +75,7 @@ export class EditEventToApprovePage implements OnInit {
Attachments: [],
serialNumber: "",
taskStartDate: "",
activityInstanceName: "",
workflowInstanceDataFields: {
Body: "",
OccurrenceType: '',
@@ -234,6 +235,19 @@ export class EditEventToApprovePage implements OnInit {
}
onDateChange(e) {
const cloneDateStartDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
const cloneDateEndDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) {
cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1);
this.eventProcess.workflowInstanceDataFields.EndDate = cloneDateStartDate as any
}
}
defineLastOccurrence(valor: number, opcao: boolean) {
var time = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
if (opcao == true) {
@@ -513,12 +527,7 @@ export class EditEventToApprovePage implements OnInit {
async gravasAction() {
await this.save();
if (this.eventProcess['activityInstanceName'] == 'Editar Evento') {
this.reenviar();
} else {
this.toastService._badRequest('Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico. #this.eventProcess["activityInstanceName"] == "Editar Evento"')
}
this.reenviar();
}
@@ -232,7 +232,9 @@
<mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1" placeholder="Choose a date"
[(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled">
[(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1 [showSpinners]="showSpinners" [showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" [hideTime]="true">
@@ -252,7 +254,7 @@
<mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1" placeholder="Choose a date"
[(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled">
[(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled" (ngModelChange)="onDateChange($event)">
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1 [showSpinners]="showSpinners" [showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" [hideTime]="false">
@@ -272,7 +274,7 @@
<mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim" placeholder="Choose a date" [(ngModel)]="_postEvent.EndDate"
[max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate">
[max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate" >
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim [showSpinners]="showSpinners" [showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [hideTime]="true">
@@ -519,6 +519,17 @@ export class EditEventPage implements OnInit {
this.clearContact.emit();
}
onDateChange(e) {
const cloneDateStartDate = new Date(this._postEvent.StartDate);
const cloneDateEndDate = new Date(this._postEvent.EndDate);
if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) {
cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1);
this._postEvent.EndDate = cloneDateStartDate
}
}
saveTemporaryData() {
@@ -113,6 +113,7 @@
placeholder="Choose a date"
[(ngModel)]="startDate"
[disabled]="disabled"
(ngModelChange)="onDateChange($event)"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -285,7 +286,7 @@
</ion-label>
</div>
<div class="d-flex container-div width-100" >
<ion-list class="width-100 ">
<ion-item class="width-100" *ngFor="let document of loadedAttachments; let i = index">
@@ -259,12 +259,23 @@ export class EditEventToApproveComponent implements OnInit {
}
}
close() {
this.modalController.dismiss();
}
onDateChange(e) {
const cloneDateStartDate = new Date(this.startDate);
const cloneDateEndDate = new Date(this.endDate);
if(cloneDateStartDate.getTime() >= cloneDateEndDate.getTime()) {
cloneDateStartDate.setHours(cloneDateStartDate.getHours() + 1);
this.endDate = cloneDateStartDate as any
}
}
@XTracerAsync({name:'desktop/edit-event', bugPrint: true, daley: 4000})
async save(tracing?: TracingType) {
// set dates to eventProcess object