Implement date validation

Author: tkleinke

core/src/model/configuration/field.ts

@@ -2,14 +2,14 @@ import { isArray, isObject, isString } from 'tsfun';
 import { I18N } from '../../tools/i18n';
 import { validateFloat, validateInt, validateUnsignedFloat, validateUnsignedInt,
     validateUrl } from '../../tools/validation-util';
-import { parseDate } from '../../tools/parse-date';
 import { Dating } from '../input-types/dating';
 import { Dimension } from '../input-types/dimension';
 import { Literature } from '../input-types/literature';
 import { OptionalRange } from '../input-types/optional-range';
 import { Valuelist } from './valuelist';
 import { Composite } from '../input-types/composite';
 import { DateConfiguration } from './date-configuration';
+import { DateSpecification } from '../input-types/date-specification';
 
 
 /**
@@ -84,7 +84,7 @@ export module Field {
         export const COMMON = 'common';
     }
 
-    export function isValidFieldData(fieldData: any, field: BaseField): boolean {
+    export function isValidFieldData(fieldData: any, field: BaseField, permissive: boolean = false): boolean {
 
         if (fieldData === null || fieldData === undefined) return false;
 
@@ -121,9 +121,7 @@ export module Field {
             case InputType.BOOLEAN:
                 return fieldData === true || fieldData === false;
             case InputType.DATE:
-                return isObject(fieldData)
-                    && fieldData.value !== undefined
-                    && !isNaN(parseDate(fieldData.value)?.getTime());
+                return permissive ? isObject(fieldData) : DateSpecification.validate(fieldData, field);
             case InputType.DROPDOWNRANGE:
                 return OptionalRange.buildIsOptionalRange(isString)(fieldData);
             case InputType.DATING:

core/src/model/input-types/date-specification.ts

@@ -1,5 +1,8 @@
+import { isObject } from 'tsfun';
 import { parseDate } from '../../tools/parse-date';
 import { formatDate } from '../../tools/format-date';
+import { Field } from '../configuration/field';
+import { DateConfiguration } from '../configuration/date-configuration';
 
 
 /**
@@ -14,13 +17,33 @@ export interface DateSpecification {
 
 export module DateSpecification {
 
+    export function validate(date: DateSpecification, field: Field): boolean {
+
+        if (!isObject(date) || !validateDateValue(date.value, field)) return false;
+
+        if (field.dateConfiguration?.inputMode === DateConfiguration.InputMode.SINGLE && date.endValue !== undefined) {
+            return false;
+        }
+
+        if (field.dateConfiguration?.inputMode === DateConfiguration.InputMode.RANGE
+               && !validateDateValue(date.endValue, field)) {
+            return false;
+        }
+
+        return true;
+    }
+
+
     export function generateLabel(date: DateSpecification, timezone: string, timeSuffix: string,
                                   locale: string): string {
 
-        let result: string = getValueLabel(date.value, timezone, timeSuffix, locale, !date.endValue);
-        if (date.endValue) result += ' - ' + getValueLabel(date.endValue, timezone, timeSuffix, locale, true);
-
-        return result;
+        try {
+            let result: string = getValueLabel(date.value, timezone, timeSuffix, locale, !date.endValue);
+            if (date.endValue) result += ' - ' + getValueLabel(date.endValue, timezone, timeSuffix, locale, true);
+            return result;
+        } catch (_) {
+            return null;
+        }
     }
 
 
@@ -37,4 +60,20 @@ export module DateSpecification {
 
         return formattedDate;
     }
+
+
+    function validateDateValue(dateValue: string, field: Field) {
+
+        if (!dateValue || isNaN(parseDate(dateValue)?.getTime())) return false;
+
+        if (field.dateConfiguration?.dataType === DateConfiguration.DataType.DATE_TIME && !dateValue.includes(':')) {
+            return false;
+        }
+        
+        if (field.dateConfiguration?.dataType === DateConfiguration.DataType.DATE && dateValue.includes(':')) {
+            return false;
+        }
+
+        return true;
+    }
 }

desktop/src/app/components/docedit/core/edit-form-group.component.ts

@@ -109,7 +109,7 @@ export class EditFormGroup implements OnChanges {
 
         return fieldData === undefined
             ? true
-            : Field.isValidFieldData(fieldData, field);
+            : Field.isValidFieldData(fieldData, field, true);
     }