EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2848 from NoelDeMartin/MOBILE-3320 

MOBILE-3320 calendar: Fix timezone in ion-datetime
main
Dani Palou 2021-06-23 09:05:03 +02:00 committed by GitHub
parent d0c4d986ea e0a6c421ff
commit f17f13a476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/addons/calendar/pages/edit-event/edit-event.html
View File

@ -29,7 +29,7 @@
<p class="item-heading" [core-mark-required]="true">{{ 'core.date' | translate }}</p> <p class="item-heading" [core-mark-required]="true">{{ 'core.date' | translate }}</p>
</ion-label> </ion-label>
<ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat" <ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat"
[max]="maxDate" [min]="minDate"> [max]="maxDate" [min]="minDate" display-timezone="utc">
</ion-datetime> </ion-datetime>
<core-input-errors [control]="form.controls.timestart" [errorMessages]="errors"></core-input-errors> <core-input-errors [control]="form.controls.timestart" [errorMessages]="errors"></core-input-errors>
</ion-item> </ion-item>
@ -166,7 +166,8 @@
<ion-item> <ion-item>
<ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate" <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
[placeholder]="'addon.calendar.durationuntil' | translate" slot="end" [placeholder]="'addon.calendar.durationuntil' | translate" slot="end"
[displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1"> [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1"
display-timezone="utc">
</ion-datetime> </ion-datetime>
</ion-item> </ion-item>
<ion-item lines="none"> <ion-item lines="none">

2
src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
View File

@ -1,7 +1,7 @@
<span *ngIf="inputMode && form" [formGroup]="form"> <span *ngIf="inputMode && form" [formGroup]="form">
<span *ngIf="editMode" [core-mark-required]="field.required" class="core-mark-required"></span> <span *ngIf="editMode" [core-mark-required]="field.required" class="core-mark-required"></span>
<ion-datetime [formControlName]="'f_'+field.id" [placeholder]="'core.date' | translate" [max]="maxDate" [min]="minDate" <ion-datetime [formControlName]="'f_'+field.id" [placeholder]="'core.date' | translate" [max]="maxDate" [min]="minDate"
[disabled]="searchMode && !searchFields!['f_'+field.id+'_z']" [displayFormat]="format"> [disabled]="searchMode && !searchFields!['f_'+field.id+'_z']" [displayFormat]="format" display-timezone="utc">
</ion-datetime> </ion-datetime>
<core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors> <core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>