Skip to content
Snippets Groups Projects

Resolve "Réorganisation criterion (null, not null)"

Merged Angapay Divin requested to merge 41-reorganisation-criterion-null-not-null into develop
Files
6
@@ -15,7 +15,7 @@ export class BetweenDateComponent extends AbstractSearchTypeComponent {
dateRange: new FormControl('', [Validators.required]),
label: new FormControl()
});
}
setCriterion(criterion: Criterion) {
@@ -27,7 +27,7 @@ export class BetweenDateComponent extends AbstractSearchTypeComponent {
new Date(betweenCriterion.min),
new Date(betweenCriterion.max)
]);
}
}
@@ -55,9 +55,18 @@ export class BetweenDateComponent extends AbstractSearchTypeComponent {
*
* @return string
*/
getDateString(date: Date): string {
const month = ('0' + (date.getMonth() + 1)).slice(-2);
const day = ('0' + (date.getDate())).slice(-2);
return `${date.getFullYear()}-${month}-${day}`;
}
/**
* manage label change
*/
labelOnChange() {
if (this.form.controls.label.value === 'nl' || this.form.controls.label.value === 'nnl') {
this.nullOrNotNull = this.form.controls.label.value ;
if (this.form.controls.label.value === 'nl' || this.form.controls.label.value === 'nnl') {
this.nullOrNotNull = this.form.controls.label.value;
this.form.controls.dateRange.disable();
} else {
this.nullOrNotNull = '';
@@ -65,10 +74,5 @@ export class BetweenDateComponent extends AbstractSearchTypeComponent {
}
}
getDateString(date: Date): string {
const month = ('0' + (date.getMonth() + 1)).slice(-2);
const day = ('0' + (date.getDate())).slice(-2);
return `${date.getFullYear()}-${month}-${day}`;
}
}
Loading