@openmrs/ngx-formentry 3.1.1-pre.181 → 3.1.2-pre.186
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/openmrs-ngx-formentry.umd.js +10 -2
- package/bundles/openmrs-ngx-formentry.umd.js.map +1 -1
- package/esm2015/form-entry/validators/max.validator.js +6 -2
- package/esm2015/form-entry/validators/min.validator.js +6 -2
- package/fesm2015/openmrs-ngx-formentry.js +10 -2
- package/fesm2015/openmrs-ngx-formentry.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,11 @@ export class MaxValidator {
|
|
|
4
4
|
if (control.hidden) {
|
|
5
5
|
return null;
|
|
6
6
|
}
|
|
7
|
-
|
|
7
|
+
// Case 1: control.value is a number
|
|
8
|
+
// all the numbers should be passed for validation
|
|
9
|
+
// Case 2: control.value is not a number:
|
|
10
|
+
// if its empty string or null or undefined it will return false else it will pass through for validation
|
|
11
|
+
if (typeof control.value === 'number' || control.value) {
|
|
8
12
|
const v = control.value;
|
|
9
13
|
return v <= max
|
|
10
14
|
? null
|
|
@@ -14,4 +18,4 @@ export class MaxValidator {
|
|
|
14
18
|
};
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF4LnZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25neC1mb3JtZW50cnkvc3JjL2Zvcm0tZW50cnkvdmFsaWRhdG9ycy9tYXgudmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sT0FBTyxZQUFZO0lBQ3ZCLFFBQVEsQ0FBQyxHQUFXO1FBQ2xCLE9BQU8sQ0FBQyxPQUF1QixFQUEwQixFQUFFO1lBQ3pELElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRTtnQkFDbEIsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUVELG9DQUFvQztZQUNwQyxrREFBa0Q7WUFDbEQseUNBQXlDO1lBQ3pDLHlHQUF5RztZQUN6RyxJQUFJLE9BQU8sT0FBTyxDQUFDLEtBQUssS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRTtnQkFDdEQsTUFBTSxDQUFDLEdBQVcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDaEMsT0FBTyxDQUFDLElBQUksR0FBRztvQkFDYixDQUFDLENBQUMsSUFBSTtvQkFDTixDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2FBQ3JEO1lBRUQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBZmVGb3JtQ29udHJvbCB9IGZyb20gJy4uLy4uL2Fic3RyYWN0LWNvbnRyb2xzLWV4dGVuc2lvbi9hZmUtZm9ybS1jb250cm9sJztcblxuZXhwb3J0IGNsYXNzIE1heFZhbGlkYXRvciB7XG4gIHZhbGlkYXRlKG1heDogbnVtYmVyKSB7XG4gICAgcmV0dXJuIChjb250cm9sOiBBZmVGb3JtQ29udHJvbCk6IHsgW2tleTogc3RyaW5nXTogYW55IH0gPT4ge1xuICAgICAgaWYgKGNvbnRyb2wuaGlkZGVuKSB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgICAgfVxuXG4gICAgICAvLyBDYXNlIDE6IGNvbnRyb2wudmFsdWUgaXMgYSBudW1iZXJcbiAgICAgIC8vIGFsbCB0aGUgbnVtYmVycyBzaG91bGQgYmUgcGFzc2VkIGZvciB2YWxpZGF0aW9uXG4gICAgICAvLyBDYXNlIDI6IGNvbnRyb2wudmFsdWUgaXMgbm90IGEgbnVtYmVyOlxuICAgICAgLy8gaWYgaXRzIGVtcHR5IHN0cmluZyBvciBudWxsIG9yIHVuZGVmaW5lZCBpdCB3aWxsIHJldHVybiBmYWxzZSBlbHNlIGl0IHdpbGwgcGFzcyB0aHJvdWdoIGZvciB2YWxpZGF0aW9uXG4gICAgICBpZiAodHlwZW9mIGNvbnRyb2wudmFsdWUgPT09ICdudW1iZXInIHx8IGNvbnRyb2wudmFsdWUpIHtcbiAgICAgICAgY29uc3QgdjogbnVtYmVyID0gY29udHJvbC52YWx1ZTtcbiAgICAgICAgcmV0dXJuIHYgPD0gbWF4XG4gICAgICAgICAgPyBudWxsXG4gICAgICAgICAgOiB7IG1heDogeyByZXF1aXJlZFZhbHVlOiBtYXgsIGFjdHVhbFZhbHVlOiB2IH0gfTtcbiAgICAgIH1cblxuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfTtcbiAgfVxufVxuIl19
|
|
@@ -4,7 +4,11 @@ export class MinValidator {
|
|
|
4
4
|
if (control.hidden) {
|
|
5
5
|
return null;
|
|
6
6
|
}
|
|
7
|
-
|
|
7
|
+
// Case 1: control.value is a number
|
|
8
|
+
// all the numbers should be passed for validation
|
|
9
|
+
// Case 2: control.value is not a number:
|
|
10
|
+
// if its empty string or null or undefined it will return false else it will pass through for validation
|
|
11
|
+
if (typeof control.value === 'number' || control.value) {
|
|
8
12
|
const v = control.value;
|
|
9
13
|
return v >= min
|
|
10
14
|
? null
|
|
@@ -14,4 +18,4 @@ export class MinValidator {
|
|
|
14
18
|
};
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWluLnZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25neC1mb3JtZW50cnkvc3JjL2Zvcm0tZW50cnkvdmFsaWRhdG9ycy9taW4udmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sT0FBTyxZQUFZO0lBQ3ZCLFFBQVEsQ0FBQyxHQUFXO1FBQ2xCLE9BQU8sQ0FBQyxPQUF1QixFQUEwQixFQUFFO1lBQ3pELElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRTtnQkFDbEIsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUVELG9DQUFvQztZQUNwQyxrREFBa0Q7WUFDbEQseUNBQXlDO1lBQ3pDLHlHQUF5RztZQUN6RyxJQUFJLE9BQU8sT0FBTyxDQUFDLEtBQUssS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRTtnQkFDdEQsTUFBTSxDQUFDLEdBQVcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDaEMsT0FBTyxDQUFDLElBQUksR0FBRztvQkFDYixDQUFDLENBQUMsSUFBSTtvQkFDTixDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2FBQ3JEO1lBRUQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBZmVGb3JtQ29udHJvbCB9IGZyb20gJy4uLy4uL2Fic3RyYWN0LWNvbnRyb2xzLWV4dGVuc2lvbi9hZmUtZm9ybS1jb250cm9sJztcblxuZXhwb3J0IGNsYXNzIE1pblZhbGlkYXRvciB7XG4gIHZhbGlkYXRlKG1pbjogbnVtYmVyKSB7XG4gICAgcmV0dXJuIChjb250cm9sOiBBZmVGb3JtQ29udHJvbCk6IHsgW2tleTogc3RyaW5nXTogYW55IH0gPT4ge1xuICAgICAgaWYgKGNvbnRyb2wuaGlkZGVuKSB7XG4gICAgICAgIHJldHVybiBudWxsO1xuICAgICAgfVxuXG4gICAgICAvLyBDYXNlIDE6IGNvbnRyb2wudmFsdWUgaXMgYSBudW1iZXJcbiAgICAgIC8vIGFsbCB0aGUgbnVtYmVycyBzaG91bGQgYmUgcGFzc2VkIGZvciB2YWxpZGF0aW9uXG4gICAgICAvLyBDYXNlIDI6IGNvbnRyb2wudmFsdWUgaXMgbm90IGEgbnVtYmVyOlxuICAgICAgLy8gaWYgaXRzIGVtcHR5IHN0cmluZyBvciBudWxsIG9yIHVuZGVmaW5lZCBpdCB3aWxsIHJldHVybiBmYWxzZSBlbHNlIGl0IHdpbGwgcGFzcyB0aHJvdWdoIGZvciB2YWxpZGF0aW9uXG4gICAgICBpZiAodHlwZW9mIGNvbnRyb2wudmFsdWUgPT09ICdudW1iZXInIHx8IGNvbnRyb2wudmFsdWUpIHtcbiAgICAgICAgY29uc3QgdjogbnVtYmVyID0gY29udHJvbC52YWx1ZTtcbiAgICAgICAgcmV0dXJuIHYgPj0gbWluXG4gICAgICAgICAgPyBudWxsXG4gICAgICAgICAgOiB7IG1pbjogeyByZXF1aXJlZFZhbHVlOiBtaW4sIGFjdHVhbFZhbHVlOiB2IH0gfTtcbiAgICAgIH1cblxuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfTtcbiAgfVxufVxuIl19
|
|
@@ -1251,7 +1251,11 @@ class MinValidator {
|
|
|
1251
1251
|
if (control.hidden) {
|
|
1252
1252
|
return null;
|
|
1253
1253
|
}
|
|
1254
|
-
|
|
1254
|
+
// Case 1: control.value is a number
|
|
1255
|
+
// all the numbers should be passed for validation
|
|
1256
|
+
// Case 2: control.value is not a number:
|
|
1257
|
+
// if its empty string or null or undefined it will return false else it will pass through for validation
|
|
1258
|
+
if (typeof control.value === 'number' || control.value) {
|
|
1255
1259
|
const v = control.value;
|
|
1256
1260
|
return v >= min
|
|
1257
1261
|
? null
|
|
@@ -1268,7 +1272,11 @@ class MaxValidator {
|
|
|
1268
1272
|
if (control.hidden) {
|
|
1269
1273
|
return null;
|
|
1270
1274
|
}
|
|
1271
|
-
|
|
1275
|
+
// Case 1: control.value is a number
|
|
1276
|
+
// all the numbers should be passed for validation
|
|
1277
|
+
// Case 2: control.value is not a number:
|
|
1278
|
+
// if its empty string or null or undefined it will return false else it will pass through for validation
|
|
1279
|
+
if (typeof control.value === 'number' || control.value) {
|
|
1272
1280
|
const v = control.value;
|
|
1273
1281
|
return v <= max
|
|
1274
1282
|
? null
|