Skip to content

Commit bd7a8d0

Browse files
committed
Small fixes
1. Fixed datepicker, now it's displaying and saving dates correctly. 2. Removed placeholder from number input.
1 parent a64f73d commit bd7a8d0

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@
6262
<element-text [(fieldValue)]="dataItem.fieldValues[0]"></element-text>
6363
</div>
6464
<ng-container *ngSwitchCase="'Date'">
65-
<element-date [(ngModel)]="dataItem.fieldValues[0].value" [datepicker]="{format: 'mm-dd-yyyy' }"
66-
[timepicker]="false"></element-date>
65+
<element-date [(ngModel)]="dataItem.fieldValues[0].value"
66+
[datepicker]="{format: 'yyyy-mm-dd' }"
67+
[timepicker]="false">
68+
</element-date>
6769
</ng-container>
6870
<div *ngSwitchCase="'SingleSelect'">
6971
<element-singleselect [(fieldValue)]="dataItem.fieldValues[0]"></element-singleselect>
@@ -140,7 +142,9 @@
140142
</div>
141143
<ng-container *ngSwitchCase="'Date'">
142144
<element-date [(ngModel)]="dataItem.fieldValues[0].value"
143-
[datepicker]="{format: 'mm-dd-yyyy' }" [timepicker]="false"></element-date>
145+
[datepicker]="{format: 'yyyy-mm-dd' }"
146+
[timepicker]="false">
147+
</element-date>
144148
</ng-container>
145149
<div *ngSwitchCase="'SingleSelect'">
146150
<element-singleselect [(fieldValue)]="dataItem.fieldValues[0]"></element-singleselect>

eform-client/src/app/modules/cases/components/case-elements/element-date/element-date.component.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ export interface ITimepickerEvent {
2323
};
2424
}
2525

26-
declare var $: any;
27-
declare var jQuery: any;
28-
declare var moment: any;
26+
declare let $: any;
27+
declare let jQuery: any;
28+
declare let moment: any;
2929

3030

3131
@Component({
@@ -74,7 +74,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
7474
@Output() dateChange: EventEmitter<Date> = new EventEmitter<Date>();
7575
@Input('timepicker') timepickerOptions: any = {};
7676
@Input('datepicker') datepickerOptions: any = {};
77-
@Input('hasClearButton') hasClearButton: boolean = false;
77+
@Input('hasClearButton') hasClearButton = false;
7878
@Input() readonly: boolean;
7979
@Input() required: boolean;
8080
@Input() tabindex: string;
@@ -94,10 +94,12 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
9494
@HostListener('dateChange', ['$event'])
9595
onChange = (_: any) => {
9696
}
97+
9798
@HostListener('blur')
9899
onTouched = () => {
99100
}
100101

102+
101103
@HostBinding('attr.tabindex')
102104
get tabindexAttr(): string | undefined {
103105
return this.tabindex === undefined ? '-1' : undefined;
@@ -149,7 +151,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
149151
}
150152

151153
writeValue(value: any): void {
152-
var m = moment.utc(value + 'T00:00:00+00:00', 'mm-DD-yyyy').toDate();
154+
const m = moment.utc(value + 'T00:00:00+00:00', 'MM-DD-YYYY').toDate();
153155
this.date = m;
154156
if (isDate(this.date)) {
155157
setTimeout(() => {
@@ -200,20 +202,18 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
200202
if (!this.datepicker && this.datepickerOptions !== false) {
201203
let options = jQuery.extend({enableOnReadonly: !this.readonly}, this.datepickerOptions);
202204

203-
options.format = 'dd-mm-yyyy';
205+
options.format = 'yyyy-mm-dd'; // 'dd-mm-yyyy';
204206

205207
this.datepicker = (<any>$('#' + this.idDatePicker)).datepicker(options);
206208
this.datepicker
207209
.on('changeDate', (e: any) => {
208210
let newDate: Date = e.date;
209-
210211
if (isDate(this.date) && isDate(newDate)) {
211212
// get hours/minutes
212213
newDate.setHours(this.date.getHours());
213214
newDate.setMinutes(this.date.getMinutes());
214215
newDate.setSeconds(this.date.getSeconds());
215216
}
216-
217217
this.date = newDate;
218218
this.dateChange.emit(newDate);
219219
});
@@ -222,7 +222,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
222222
}
223223

224224
if (!this.timepicker && this.timepickerOptions !== false) {
225-
let options = jQuery.extend({defaultTime: false}, this.timepickerOptions);
225+
const options = jQuery.extend({defaultTime: false}, this.timepickerOptions);
226226
this.timepicker = (<any>$('#' + this.idTimePicker)).timepicker(options);
227227
this.timepicker
228228
.on('changeTime.timepicker', (e: ITimepickerEvent) => {
@@ -290,6 +290,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
290290
}
291291

292292
let id = 0;
293+
293294
function uniqueId(prefix: string): string {
294295
return prefix + ++id;
295296
}

eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
class="form-control"
33
type="number"
44
name="value"
5-
placeholder="1"
65
[value]="fieldValueObj.value"/>

0 commit comments

Comments
 (0)