fix: [DHIS2-14104] make sure deselected checkboxes evaluate `d2:hasVa…

…lue` to `false` (#1692)
dhis2 · May 2, 2023 · 0954cf2 · 0954cf2
1 parent 2fbe885
commit 0954cf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/components/dataentry/compare-form.html b/components/dataentry/compare-form.html
@@ -200,6 +200,7 @@
                                         <input type="checkbox"     
                                                class="form-control-checkbox"
                                                ng-model="otherEvent[prStDe.dataElement.id]"                                                               
+                                               ng-false-value="null"
                                                ng-required={{prStDe.compulsory}}                                        
                                                ng-disabled="true" 
                                                name="foo"/>
@@ -244,6 +245,7 @@
                                     <input type="checkbox"     
                                            class="form-control-checkbox"
                                            ng-model="currentEvent[prStDe.dataElement.id]"                                                               
+                                           ng-false-value="null"
                                            ng-required={{prStDe.compulsory}}                                        
                                            ng-disabled="true" 
                                            name="foo"/>
@@ -372,6 +374,7 @@
                                                         <input type="checkbox"     
                                                                class="form-control-checkbox"
                                                                ng-model="otherEvent[prStDes[de.id].dataElement.id]"                                                               
+                                                               ng-false-value="null"
                                                                ng-required={{prStDesInStage[currentStage.id][de.id].compulsory}}
                                                                ng-disabled="true" 
                                                                name="foo"/>

diff --git a/components/dataentry/inner-form.html b/components/dataentry/inner-form.html
@@ -290,6 +290,7 @@
                 <input type="checkbox"
                        class="form-control-checkbox"
                        ng-model="currentEvent[prStDe.dataElement.id]"
+                       ng-false-value="null"
                        ng-required="prStDe.compulsory || mandatoryFields[currentEvent.event][prStDe.dataElement.id]"
                        ng-disabled="!dataElementEditable(prStDe)"
                        ng-change="saveDatavalue(prStDe, innerForm.foo)"

diff --git a/components/dataentry/table-entry-form.html b/components/dataentry/table-entry-form.html
@@ -304,6 +304,7 @@ <h3>{{'enrollment'| translate}}</h3>
                                            class="form-control"
                                            ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                            ng-model="selectedOrgUnit.closedStatus || eventRow[prStDe.dataElement.id]"
+                                           ng-false-value="null"
                                            ng-required={{prStDe.compulsory}}
                                            ng-attr-title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
                                            ng-dblclick="$event.stopPropagation();"
@@ -368,6 +369,7 @@ <h3>{{'enrollment'| translate}}</h3>
                                     <input type="checkbox"
                                            class="form-control"
                                            ng-model="eventRow[prStDe.dataElement.id]"
+                                           ng-false-value="null"
                                            ng-required={{prStDe.compulsory}}
                                            ng-attr-title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
                                            ng-disabled="true"