@piserve-tech/form-submission 1.3.149 → 1.3.151

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.
Files changed (4) hide show
  1. package/esm2022/services/form-validation.service.mjs +77 -18
  2. package/fesm2022/piserve-tech-form-submission.mjs +76 -17
  3. package/fesm2022/piserve-tech-form-submission.mjs.map +1 -1
  4. package/package.json +2 -2
package/esm2022/services/form-validation.service.mjs CHANGED
@@ -3,32 +3,49 @@ import * as i0 from "@angular/core";
3
3
  export class FormValidationService {
4
4
  constructor() { }
5
5
  validateRequiredQuestions(page) {
6
- const validateQuestions = (formElements) => {
6
+ const validateQuestions = (formElements, submissionContext = null) => {
7
7
  for (let element of formElements) {
8
8
  if (element.entityType === 'QUESTION') {
9
- const required = element.element.required;
10
- const answer = element.element.answer;
11
- if (element.element.formElement.elementType === 'FILE_PICKER') {
12
- if (required && (!answer || answer.length === 0)) {
9
+ const question = element.element;
10
+ const required = question.required;
11
+ const questionId = question.id;
12
+ const elementType = question.formElement?.elementType;
13
+ // If inside a subform submission context
14
+ if (submissionContext?.isInMultipleSubform) {
15
+ const { submission, questionMap } = submissionContext;
16
+ const submittedAnswer = submission.answers.find((ans) => ans.questionId === questionId);
17
+ const answer = submittedAnswer?.answer;
18
+ const isEmpty = answer === null ||
19
+ answer === undefined ||
20
+ (typeof answer === 'string' && answer.trim() === '') ||
21
+ (typeof answer === 'object' && Object.keys(answer).length === 0);
22
+ if (required && isEmpty) {
13
23
  return {
14
24
  isValid: false,
15
- message: `Required file question ${element.element.questionNumber} is not answered.`,
25
+ message: `Required question ${question.questionNumber} is not answered in a subform.`,
16
26
  };
17
27
  }
18
28
  }
19
29
  else {
20
- if (required && (!answer || Object.keys(answer).length === 0)) {
30
+ // Normal non-subform validation
31
+ const answer = question.answer;
32
+ const isEmpty = answer === null ||
33
+ answer === undefined ||
34
+ (typeof answer === 'string' && answer.trim() === '') ||
35
+ (typeof answer === 'object' && Object.keys(answer).length === 0);
36
+ if (required && isEmpty) {
21
37
  return {
22
38
  isValid: false,
23
- message: `Required question ${element.element.questionNumber} is not answered.`,
39
+ message: `Required question ${question.questionNumber} is not answered.`,
24
40
  };
25
41
  }
26
42
  }
27
- if (element.element.childLogics) {
28
- for (let logic of element.element.childLogics) {
43
+ // Recursively validate child logics
44
+ if (question.childLogics) {
45
+ for (let logic of question.childLogics) {
29
46
  if (logic.showLogic) {
30
47
  for (let row of logic.rows) {
31
- const result = validateQuestions(row.grid);
48
+ const result = validateQuestions(row.grid, submissionContext);
32
49
  if (!result.isValid)
33
50
  return result;
34
51
  }
@@ -37,8 +54,50 @@ export class FormValidationService {
37
54
  }
38
55
  }
39
56
  else if (element.entityType === 'SUBFORM') {
40
- if (element.element.rows) {
41
- for (let row of element.element.rows) {
57
+ const subform = element.element;
58
+ if (subform.property?.subFormStructure === 'multiple') {
59
+ const submissions = subform.submissions || [];
60
+ // Check if subform has any required questions
61
+ let hasRequiredQuestion = false;
62
+ for (const row of subform.rows) {
63
+ for (const field of row.grid) {
64
+ if (field.entityType === 'QUESTION' && field.element.required) {
65
+ hasRequiredQuestion = true;
66
+ break;
67
+ }
68
+ }
69
+ if (hasRequiredQuestion)
70
+ break;
71
+ }
72
+ if (hasRequiredQuestion && submissions.length === 0) {
73
+ return {
74
+ isValid: false,
75
+ message: `Subform "${subform.title || 'Untitled'}" is missing required submissions.`,
76
+ };
77
+ }
78
+ const questionMap = new Map();
79
+ for (const row of subform.rows) {
80
+ for (const field of row.grid) {
81
+ if (field.entityType === 'QUESTION') {
82
+ questionMap.set(field.element.id, field.element);
83
+ }
84
+ }
85
+ }
86
+ for (const submission of submissions) {
87
+ for (const row of subform.rows) {
88
+ const result = validateQuestions(row.grid, {
89
+ isInMultipleSubform: true,
90
+ submission,
91
+ questionMap
92
+ });
93
+ if (!result.isValid)
94
+ return result;
95
+ }
96
+ }
97
+ }
98
+ else {
99
+ // Single-entry subform
100
+ for (const row of subform.rows || []) {
42
101
  const result = validateQuestions(row.grid);
43
102
  if (!result.isValid)
44
103
  return result;
@@ -48,7 +107,7 @@ export class FormValidationService {
48
107
  else if ((element.entityType === 'QUESTION_GROUP' || element.entityType === 'MULTIFIELD') &&
49
108
  element.element.rows) {
50
109
  for (const row of element.element.rows) {
51
- const result = validateQuestions(row.grid);
110
+ const result = validateQuestions(row.grid, submissionContext);
52
111
  if (!result.isValid)
53
112
  return result;
54
113
  }
@@ -56,11 +115,11 @@ export class FormValidationService {
56
115
  }
57
116
  return { isValid: true, message: 'All required questions are answered.' };
58
117
  };
59
- for (let row of page.rows) {
118
+ // Start validation from top-level rows
119
+ for (const row of page.rows) {
60
120
  const result = validateQuestions(row.grid);
61
- if (!result.isValid) {
121
+ if (!result.isValid)
62
122
  return result;
63
- }
64
123
  }
65
124
  return { isValid: true, message: 'All required questions are answered.' };
66
125
  }
@@ -73,4 +132,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
73
132
  providedIn: 'root'
74
133
  }]
75
134
  }], ctorParameters: function () { return []; } });
76
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS12YWxpZGF0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9mb3JtLXN1Ym1pc3Npb24vc3JjL3NlcnZpY2VzL2Zvcm0tdmFsaWRhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7O0FBSzNDLE1BQU0sT0FBTyxxQkFBcUI7SUFFaEMsZ0JBQWUsQ0FBQztJQUVoQix5QkFBeUIsQ0FBQyxJQUFTO1FBQ2pDLE1BQU0saUJBQWlCLEdBQUcsQ0FDeEIsWUFBbUIsRUFDb0IsRUFBRTtZQUN6QyxLQUFLLElBQUksT0FBTyxJQUFJLFlBQVksRUFBRTtnQkFDaEMsSUFBSSxPQUFPLENBQUMsVUFBVSxLQUFLLFVBQVUsRUFBRTtvQkFDckMsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7b0JBQzFDLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO29CQUN0QyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLFdBQVcsS0FBSyxhQUFhLEVBQUU7d0JBQzdELElBQUksUUFBUSxJQUFJLENBQUMsQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUMsRUFBRTs0QkFDaEQsT0FBTztnQ0FDTCxPQUFPLEVBQUUsS0FBSztnQ0FDZCxPQUFPLEVBQUUsMEJBQTBCLE9BQU8sQ0FBQyxPQUFPLENBQUMsY0FBYyxtQkFBbUI7NkJBQ3JGLENBQUM7eUJBQ0g7cUJBQ0Y7eUJBQU07d0JBQ0wsSUFBSSxRQUFRLElBQUksQ0FBQyxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUMsRUFBRTs0QkFDN0QsT0FBTztnQ0FDTCxPQUFPLEVBQUUsS0FBSztnQ0FDZCxPQUFPLEVBQUUscUJBQXFCLE9BQU8sQ0FBQyxPQUFPLENBQUMsY0FBYyxtQkFBbUI7NkJBQ2hGLENBQUM7eUJBQ0g7cUJBQ0Y7b0JBQ0QsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRTt3QkFDL0IsS0FBSyxJQUFJLEtBQUssSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRTs0QkFDN0MsSUFBSSxLQUFLLENBQUMsU0FBUyxFQUFFO2dDQUNuQixLQUFLLElBQUksR0FBRyxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUU7b0NBQzFCLE1BQU0sTUFBTSxHQUFHLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztvQ0FDM0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPO3dDQUFFLE9BQU8sTUFBTSxDQUFDO2lDQUNwQzs2QkFDRjt5QkFDRjtxQkFDRjtpQkFDRjtxQkFBTSxJQUFJLE9BQU8sQ0FBQyxVQUFVLEtBQUssU0FBUyxFQUFFO29CQUMzQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFO3dCQUN4QixLQUFLLElBQUksR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFOzRCQUNwQyxNQUFNLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7NEJBQzNDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTztnQ0FBRSxPQUFPLE1BQU0sQ0FBQzt5QkFDcEM7cUJBQ0Y7aUJBQ0Y7cUJBQU0sSUFDTCxDQUFDLE9BQU8sQ0FBQyxVQUFVLEtBQUssZ0JBQWdCLElBQUksT0FBTyxDQUFDLFVBQVUsS0FBSyxZQUFZLENBQUM7b0JBQ2hGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUNwQjtvQkFDQSxLQUFLLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFO3dCQUN0QyxNQUFNLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBQzNDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTzs0QkFBRSxPQUFPLE1BQU0sQ0FBQztxQkFDcEM7aUJBQ0Y7YUFDRjtZQUVELE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxDQUFDO1FBQzVFLENBQUMsQ0FBQztRQUVGLEtBQUssSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksRUFBRTtZQUN6QixNQUFNLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDM0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7Z0JBQ25CLE9BQU8sTUFBTSxDQUFDO2FBQ2Y7U0FDRjtRQUVELE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxDQUFDO0lBQzVFLENBQUM7K0dBbEVVLHFCQUFxQjttSEFBckIscUJBQXFCLGNBRnBCLE1BQU07OzRGQUVQLHFCQUFxQjtrQkFIakMsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIEZvcm1WYWxpZGF0aW9uU2VydmljZSB7XG5cbiAgY29uc3RydWN0b3IoKSB7fVxuXG4gIHZhbGlkYXRlUmVxdWlyZWRRdWVzdGlvbnMocGFnZTogYW55KTogeyBpc1ZhbGlkOiBib29sZWFuOyBtZXNzYWdlOiBzdHJpbmcgfSB7XG4gICAgY29uc3QgdmFsaWRhdGVRdWVzdGlvbnMgPSAoXG4gICAgICBmb3JtRWxlbWVudHM6IGFueVtdXG4gICAgKTogeyBpc1ZhbGlkOiBib29sZWFuOyBtZXNzYWdlOiBzdHJpbmcgfSA9PiB7XG4gICAgICBmb3IgKGxldCBlbGVtZW50IG9mIGZvcm1FbGVtZW50cykge1xuICAgICAgICBpZiAoZWxlbWVudC5lbnRpdHlUeXBlID09PSAnUVVFU1RJT04nKSB7XG4gICAgICAgICAgY29uc3QgcmVxdWlyZWQgPSBlbGVtZW50LmVsZW1lbnQucmVxdWlyZWQ7XG4gICAgICAgICAgY29uc3QgYW5zd2VyID0gZWxlbWVudC5lbGVtZW50LmFuc3dlcjtcbiAgICAgICAgICBpZiAoZWxlbWVudC5lbGVtZW50LmZvcm1FbGVtZW50LmVsZW1lbnRUeXBlID09PSAnRklMRV9QSUNLRVInKSB7XG4gICAgICAgICAgICBpZiAocmVxdWlyZWQgJiYgKCFhbnN3ZXIgfHwgYW5zd2VyLmxlbmd0aCA9PT0gMCkpIHtcbiAgICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgICBpc1ZhbGlkOiBmYWxzZSxcbiAgICAgICAgICAgICAgICBtZXNzYWdlOiBgUmVxdWlyZWQgZmlsZSBxdWVzdGlvbiAke2VsZW1lbnQuZWxlbWVudC5xdWVzdGlvbk51bWJlcn0gaXMgbm90IGFuc3dlcmVkLmAsXG4gICAgICAgICAgICAgIH07XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIGlmIChyZXF1aXJlZCAmJiAoIWFuc3dlciB8fCBPYmplY3Qua2V5cyhhbnN3ZXIpLmxlbmd0aCA9PT0gMCkpIHtcbiAgICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgICBpc1ZhbGlkOiBmYWxzZSxcbiAgICAgICAgICAgICAgICBtZXNzYWdlOiBgUmVxdWlyZWQgcXVlc3Rpb24gJHtlbGVtZW50LmVsZW1lbnQucXVlc3Rpb25OdW1iZXJ9IGlzIG5vdCBhbnN3ZXJlZC5gLFxuICAgICAgICAgICAgICB9O1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgICBpZiAoZWxlbWVudC5lbGVtZW50LmNoaWxkTG9naWNzKSB7XG4gICAgICAgICAgICBmb3IgKGxldCBsb2dpYyBvZiBlbGVtZW50LmVsZW1lbnQuY2hpbGRMb2dpY3MpIHtcbiAgICAgICAgICAgICAgaWYgKGxvZ2ljLnNob3dMb2dpYykge1xuICAgICAgICAgICAgICAgIGZvciAobGV0IHJvdyBvZiBsb2dpYy5yb3dzKSB7XG4gICAgICAgICAgICAgICAgICBjb25zdCByZXN1bHQgPSB2YWxpZGF0ZVF1ZXN0aW9ucyhyb3cuZ3JpZCk7XG4gICAgICAgICAgICAgICAgICBpZiAoIXJlc3VsdC5pc1ZhbGlkKSByZXR1cm4gcmVzdWx0O1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgfSBlbHNlIGlmIChlbGVtZW50LmVudGl0eVR5cGUgPT09ICdTVUJGT1JNJykge1xuICAgICAgICAgIGlmIChlbGVtZW50LmVsZW1lbnQucm93cykge1xuICAgICAgICAgICAgZm9yIChsZXQgcm93IG9mIGVsZW1lbnQuZWxlbWVudC5yb3dzKSB7XG4gICAgICAgICAgICAgIGNvbnN0IHJlc3VsdCA9IHZhbGlkYXRlUXVlc3Rpb25zKHJvdy5ncmlkKTtcbiAgICAgICAgICAgICAgaWYgKCFyZXN1bHQuaXNWYWxpZCkgcmV0dXJuIHJlc3VsdDtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9XG4gICAgICAgIH0gZWxzZSBpZiAoXG4gICAgICAgICAgKGVsZW1lbnQuZW50aXR5VHlwZSA9PT0gJ1FVRVNUSU9OX0dST1VQJyB8fCBlbGVtZW50LmVudGl0eVR5cGUgPT09ICdNVUxUSUZJRUxEJykgJiZcbiAgICAgICAgICBlbGVtZW50LmVsZW1lbnQucm93c1xuICAgICAgICApIHtcbiAgICAgICAgICBmb3IgKGNvbnN0IHJvdyBvZiBlbGVtZW50LmVsZW1lbnQucm93cykge1xuICAgICAgICAgICAgY29uc3QgcmVzdWx0ID0gdmFsaWRhdGVRdWVzdGlvbnMocm93LmdyaWQpO1xuICAgICAgICAgICAgaWYgKCFyZXN1bHQuaXNWYWxpZCkgcmV0dXJuIHJlc3VsdDtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH1cblxuICAgICAgcmV0dXJuIHsgaXNWYWxpZDogdHJ1ZSwgbWVzc2FnZTogJ0FsbCByZXF1aXJlZCBxdWVzdGlvbnMgYXJlIGFuc3dlcmVkLicgfTtcbiAgICB9O1xuXG4gICAgZm9yIChsZXQgcm93IG9mIHBhZ2Uucm93cykge1xuICAgICAgY29uc3QgcmVzdWx0ID0gdmFsaWRhdGVRdWVzdGlvbnMocm93LmdyaWQpO1xuICAgICAgaWYgKCFyZXN1bHQuaXNWYWxpZCkge1xuICAgICAgICByZXR1cm4gcmVzdWx0O1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiB7IGlzVmFsaWQ6IHRydWUsIG1lc3NhZ2U6ICdBbGwgcmVxdWlyZWQgcXVlc3Rpb25zIGFyZSBhbnN3ZXJlZC4nIH07XG4gIH1cbn1cbiJdfQ==
135
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-validation.service.js","sourceRoot":"","sources":["../../../../projects/form-submission/src/services/form-validation.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class FormValidationService {\n\n  constructor() {}\n\n  validateRequiredQuestions(page: any): { isValid: boolean; message: string } {\n    const validateQuestions = (\n      formElements: any[],\n      submissionContext: any = null\n    ): { isValid: boolean; message: string } => {\n      for (let element of formElements) {\n        if (element.entityType === 'QUESTION') {\n          const question = element.element;\n          const required = question.required;\n          const questionId = question.id;\n          const elementType = question.formElement?.elementType;\n  \n          // If inside a subform submission context\n          if (submissionContext?.isInMultipleSubform) {\n            const { submission, questionMap } = submissionContext;\n  \n            const submittedAnswer = submission.answers.find(\n              (ans: any) => ans.questionId === questionId\n            );\n  \n            const answer = submittedAnswer?.answer;\n  \n            const isEmpty =\n              answer === null ||\n              answer === undefined ||\n              (typeof answer === 'string' && answer.trim() === '') ||\n              (typeof answer === 'object' && Object.keys(answer).length === 0);\n  \n            if (required && isEmpty) {\n              return {\n                isValid: false,\n                message: `Required question ${question.questionNumber} is not answered in a subform.`,\n              };\n            }\n          } else {\n            // Normal non-subform validation\n            const answer = question.answer;\n            const isEmpty =\n              answer === null ||\n              answer === undefined ||\n              (typeof answer === 'string' && answer.trim() === '') ||\n              (typeof answer === 'object' && Object.keys(answer).length === 0);\n  \n            if (required && isEmpty) {\n              return {\n                isValid: false,\n                message: `Required question ${question.questionNumber} is not answered.`,\n              };\n            }\n          }\n  \n          // Recursively validate child logics\n          if (question.childLogics) {\n            for (let logic of question.childLogics) {\n              if (logic.showLogic) {\n                for (let row of logic.rows) {\n                  const result = validateQuestions(row.grid, submissionContext);\n                  if (!result.isValid) return result;\n                }\n              }\n            }\n          }\n        } else if (element.entityType === 'SUBFORM') {\n          const subform = element.element;\n  \n          if (subform.property?.subFormStructure === 'multiple') {\n            const submissions = subform.submissions || [];\n          \n            // Check if subform has any required questions\n            let hasRequiredQuestion = false;\n            for (const row of subform.rows) {\n              for (const field of row.grid) {\n                if (field.entityType === 'QUESTION' && field.element.required) {\n                  hasRequiredQuestion = true;\n                  break;\n                }\n              }\n              if (hasRequiredQuestion) break;\n            }\n          \n            if (hasRequiredQuestion && submissions.length === 0) {\n              return {\n                isValid: false,\n                message: `Subform \"${subform.title || 'Untitled'}\" is missing required submissions.`,\n              };\n            }\n          \n            const questionMap = new Map();\n            for (const row of subform.rows) {\n              for (const field of row.grid) {\n                if (field.entityType === 'QUESTION') {\n                  questionMap.set(field.element.id, field.element);\n                }\n              }\n            }\n          \n            for (const submission of submissions) {\n              for (const row of subform.rows) {\n                const result = validateQuestions(row.grid, {\n                  isInMultipleSubform: true,\n                  submission,\n                  questionMap\n                });\n                if (!result.isValid) return result;\n              }\n            }\n          }\n           \n          \n          else {\n            // Single-entry subform\n            for (const row of subform.rows || []) {\n              const result = validateQuestions(row.grid);\n              if (!result.isValid) return result;\n            }\n          }\n        } else if (\n          (element.entityType === 'QUESTION_GROUP' || element.entityType === 'MULTIFIELD') &&\n          element.element.rows\n        ) {\n          for (const row of element.element.rows) {\n            const result = validateQuestions(row.grid, submissionContext);\n            if (!result.isValid) return result;\n          }\n        }\n      }\n  \n      return { isValid: true, message: 'All required questions are answered.' };\n    };\n  \n    // Start validation from top-level rows\n    for (const row of page.rows) {\n      const result = validateQuestions(row.grid);\n      if (!result.isValid) return result;\n    }\n  \n    return { isValid: true, message: 'All required questions are answered.' };\n  }\n  \n  \n}\n"]}
package/fesm2022/piserve-tech-form-submission.mjs CHANGED
@@ -430,32 +430,49 @@ function mapOptionToModel(apiOption) {
430
430
  class FormValidationService {
431
431
  constructor() { }
432
432
  validateRequiredQuestions(page) {
433
- const validateQuestions = (formElements) => {
433
+ const validateQuestions = (formElements, submissionContext = null) => {
434
434
  for (let element of formElements) {
435
435
  if (element.entityType === 'QUESTION') {
436
- const required = element.element.required;
437
- const answer = element.element.answer;
438
- if (element.element.formElement.elementType === 'FILE_PICKER') {
439
- if (required && (!answer || answer.length === 0)) {
436
+ const question = element.element;
437
+ const required = question.required;
438
+ const questionId = question.id;
439
+ const elementType = question.formElement?.elementType;
440
+ // If inside a subform submission context
441
+ if (submissionContext?.isInMultipleSubform) {
442
+ const { submission, questionMap } = submissionContext;
443
+ const submittedAnswer = submission.answers.find((ans) => ans.questionId === questionId);
444
+ const answer = submittedAnswer?.answer;
445
+ const isEmpty = answer === null ||
446
+ answer === undefined ||
447
+ (typeof answer === 'string' && answer.trim() === '') ||
448
+ (typeof answer === 'object' && Object.keys(answer).length === 0);
449
+ if (required && isEmpty) {
440
450
  return {
441
451
  isValid: false,
442
- message: `Required file question ${element.element.questionNumber} is not answered.`,
452
+ message: `Required question ${question.questionNumber} is not answered in a subform.`,
443
453
  };
444
454
  }
445
455
  }
446
456
  else {
447
- if (required && (!answer || Object.keys(answer).length === 0)) {
457
+ // Normal non-subform validation
458
+ const answer = question.answer;
459
+ const isEmpty = answer === null ||
460
+ answer === undefined ||
461
+ (typeof answer === 'string' && answer.trim() === '') ||
462
+ (typeof answer === 'object' && Object.keys(answer).length === 0);
463
+ if (required && isEmpty) {
448
464
  return {
449
465
  isValid: false,
450
- message: `Required question ${element.element.questionNumber} is not answered.`,
466
+ message: `Required question ${question.questionNumber} is not answered.`,
451
467
  };
452
468
  }
453
469
  }
454
- if (element.element.childLogics) {
455
- for (let logic of element.element.childLogics) {
470
+ // Recursively validate child logics
471
+ if (question.childLogics) {
472
+ for (let logic of question.childLogics) {
456
473
  if (logic.showLogic) {
457
474
  for (let row of logic.rows) {
458
- const result = validateQuestions(row.grid);
475
+ const result = validateQuestions(row.grid, submissionContext);
459
476
  if (!result.isValid)
460
477
  return result;
461
478
  }
@@ -464,8 +481,50 @@ class FormValidationService {
464
481
  }
465
482
  }
466
483
  else if (element.entityType === 'SUBFORM') {
467
- if (element.element.rows) {
468
- for (let row of element.element.rows) {
484
+ const subform = element.element;
485
+ if (subform.property?.subFormStructure === 'multiple') {
486
+ const submissions = subform.submissions || [];
487
+ // Check if subform has any required questions
488
+ let hasRequiredQuestion = false;
489
+ for (const row of subform.rows) {
490
+ for (const field of row.grid) {
491
+ if (field.entityType === 'QUESTION' && field.element.required) {
492
+ hasRequiredQuestion = true;
493
+ break;
494
+ }
495
+ }
496
+ if (hasRequiredQuestion)
497
+ break;
498
+ }
499
+ if (hasRequiredQuestion && submissions.length === 0) {
500
+ return {
501
+ isValid: false,
502
+ message: `Subform "${subform.title || 'Untitled'}" is missing required submissions.`,
503
+ };
504
+ }
505
+ const questionMap = new Map();
506
+ for (const row of subform.rows) {
507
+ for (const field of row.grid) {
508
+ if (field.entityType === 'QUESTION') {
509
+ questionMap.set(field.element.id, field.element);
510
+ }
511
+ }
512
+ }
513
+ for (const submission of submissions) {
514
+ for (const row of subform.rows) {
515
+ const result = validateQuestions(row.grid, {
516
+ isInMultipleSubform: true,
517
+ submission,
518
+ questionMap
519
+ });
520
+ if (!result.isValid)
521
+ return result;
522
+ }
523
+ }
524
+ }
525
+ else {
526
+ // Single-entry subform
527
+ for (const row of subform.rows || []) {
469
528
  const result = validateQuestions(row.grid);
470
529
  if (!result.isValid)
471
530
  return result;
@@ -475,7 +534,7 @@ class FormValidationService {
475
534
  else if ((element.entityType === 'QUESTION_GROUP' || element.entityType === 'MULTIFIELD') &&
476
535
  element.element.rows) {
477
536
  for (const row of element.element.rows) {
478
- const result = validateQuestions(row.grid);
537
+ const result = validateQuestions(row.grid, submissionContext);
479
538
  if (!result.isValid)
480
539
  return result;
481
540
  }
@@ -483,11 +542,11 @@ class FormValidationService {
483
542
  }
484
543
  return { isValid: true, message: 'All required questions are answered.' };
485
544
  };
486
- for (let row of page.rows) {
545
+ // Start validation from top-level rows
546
+ for (const row of page.rows) {
487
547
  const result = validateQuestions(row.grid);
488
- if (!result.isValid) {
548
+ if (!result.isValid)
489
549
  return result;
490
- }
491
550
  }
492
551
  return { isValid: true, message: 'All required questions are answered.' };
493
552
  }