From 0954cf290b0fa68f2b8bdfe316b17ef20aba3542 Mon Sep 17 00:00:00 2001
From: Tony Valle <79843014+superskip@users.noreply.github.com>
Date: Tue, 2 May 2023 13:19:39 +0200
Subject: [PATCH] fix: [DHIS2-14104] make sure deselected checkboxes evaluate
 `d2:hasValue` to `false` (#1692)

---
 components/dataentry/compare-form.html     | 3 +++
 components/dataentry/inner-form.html       | 1 +
 components/dataentry/table-entry-form.html | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/components/dataentry/compare-form.html b/components/dataentry/compare-form.html
index b65bd0cf6..67dcf44b5 100644
--- 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
index f59470c7c..4915da05b 100644
--- 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
index 53b3caf50..939ef4f96 100644
--- 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"