Merge pull request #1253 from shraddha761/durationOption

#1219 | DEA fail is no duration option is provided
avniproject · Jun 18, 2024 · c9290c2 · c9290c2
2 parents deacab1 + 04b51cc
commit c9290c2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/formDesigner/components/FormElementDetails.js b/src/formDesigner/components/FormElementDetails.js
@@ -705,6 +705,10 @@ function FormElementDetails({ userInfo, ...props }) {
         {props.formElementData.concept.dataType === "Date" &&
           showPicker("date", cssClasses, props, disableFormElement)}
 
+        {props.formElementData.errorMessage && props.formElementData.errorMessage.durationOptions && (
+          <div style={{ color: "red", fontSize: "13px" }}>Duration options must be selected.</div>
+        )}
+
         {["Date", "Duration"].includes(props.formElementData.concept.dataType) && (
           <Grid container item sm={12}>
             <AvniFormLabel

diff --git a/src/formDesigner/views/FormDetails.js b/src/formDesigner/views/FormDetails.js
@@ -714,6 +714,15 @@ class FormDetails extends Component {
               if (!_.isEmpty(validationError)) {
                 fe.errorMessage.ruleError = validationError;
               }
+            }  else if (
+              (fe.concept.dataType === "Date" || fe.concept.dataType === "Duration") &&
+              (!fe.keyValues.durationOptions || fe.keyValues.durationOptions.length === 0)
+            ) {
+              fe.error = true;
+              fe.expanded = true;
+              fe.errorMessage.durationOptions = true;
+              flag = groupError = true;
+              numberElementError += 1;
             } else if (!declarativeRuleHolder.isEmpty()) {
               fe.rule = declarativeRuleHolder.generateViewFilterRule(this.getEntityNameForRules());
             }