MOBILE-3947 ui: Display Cancel/Done buttons in datetime
parent
1c93299467
commit
f0bb576920
|
@ -32,7 +32,8 @@
|
||||||
<ion-datetime-button datetime="timestart" />
|
<ion-datetime-button datetime="timestart" />
|
||||||
<ion-modal [keepContentsMounted]="true">
|
<ion-modal [keepContentsMounted]="true">
|
||||||
<ng-template>
|
<ng-template>
|
||||||
<ion-datetime id="timestart" formControlName="timestart" presentation="date-time" [max]="maxDate" [min]="minDate">
|
<ion-datetime id="timestart" formControlName="timestart" presentation="date-time" [max]="maxDate" [min]="minDate"
|
||||||
|
[showDefaultButtons]="true">
|
||||||
<span slot="title">{{'core.date' | translate}}</span>
|
<span slot="title">{{'core.date' | translate}}</span>
|
||||||
</ion-datetime>
|
</ion-datetime>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
@ -155,7 +156,7 @@
|
||||||
<ion-modal [keepContentsMounted]="true">
|
<ion-modal [keepContentsMounted]="true">
|
||||||
<ng-template>
|
<ng-template>
|
||||||
<ion-datetime id="timedurationuntil" formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
|
<ion-datetime id="timedurationuntil" formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
|
||||||
presentation="date-time">
|
presentation="date-time" [showDefaultButtons]="true">
|
||||||
<span slot="title">{{'addon.calendar.durationuntil' | translate}}</span>
|
<span slot="title">{{'addon.calendar.durationuntil' | translate}}</span>
|
||||||
</ion-datetime>
|
</ion-datetime>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<ion-modal [keepContentsMounted]="true">
|
<ion-modal [keepContentsMounted]="true">
|
||||||
<ng-template>
|
<ng-template>
|
||||||
<ion-datetime id="datetime" [formControlName]="'f_'+field.id" [max]="maxDate" [min]="minDate"
|
<ion-datetime id="datetime" [formControlName]="'f_'+field.id" [max]="maxDate" [min]="minDate"
|
||||||
[disabled]="searchMode && !searchFields['f_'+field.id+'_z']" presentation="date" />
|
[disabled]="searchMode && !searchFields['f_'+field.id+'_z']" presentation="date" [showDefaultButtons]="true" />
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</ion-modal>
|
</ion-modal>
|
||||||
<core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error" />
|
<core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error" />
|
||||||
|
|
|
@ -22,7 +22,8 @@
|
||||||
<ion-datetime-button datetime="datetime" />
|
<ion-datetime-button datetime="datetime" />
|
||||||
<ion-modal [keepContentsMounted]="true">
|
<ion-modal [keepContentsMounted]="true">
|
||||||
<ng-template>
|
<ng-template>
|
||||||
<ion-datetime id="datetime" [formControlName]="modelName" [presentation]="ionDateTimePresentation" [max]="max" [min]="min">
|
<ion-datetime id="datetime" [formControlName]="modelName" [presentation]="ionDateTimePresentation" [max]="max" [min]="min"
|
||||||
|
[showDefaultButtons]="true">
|
||||||
<span slot="title">
|
<span slot="title">
|
||||||
<core-format-text [text]="field.name" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"
|
<core-format-text [text]="field.name" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"
|
||||||
[courseId]="courseId" [wsNotFiltered]="true" />
|
[courseId]="courseId" [wsNotFiltered]="true" />
|
||||||
|
|
Loading…
Reference in New Issue