From 595be522b0dd3bdb66b4b54d684119a403944e4b Mon Sep 17 00:00:00 2001
From: Tresor Mvumbi <tresor.mvumbi@jembi.org>
Date: Thu, 3 Sep 2020 16:13:23 +0200
Subject: [PATCH] COM-921 Add field "other program outcome" to defaulter
 program The new field is displayed only when the outcome 'others' is selected

---
 .../programmanagement/views/programAttributes.html           | 4 ++--
 .../programmanagement/views/programEnrollment.html           | 2 +-
 .../uicontrols/programmanagement/views/programRow.html       | 5 +++++
 ui/app/i18n/clinical/locale_en.json                          | 1 +
 ui/app/i18n/clinical/locale_fr.json                          | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/app/common/uicontrols/programmanagement/views/programAttributes.html b/ui/app/common/uicontrols/programmanagement/views/programAttributes.html
index f57b63841..faf71fe09 100644
--- a/ui/app/common/uicontrols/programmanagement/views/programAttributes.html
+++ b/ui/app/common/uicontrols/programmanagement/views/programAttributes.html
@@ -1,4 +1,4 @@
-<div class="form-field" ng-repeat="attributeType in programAttributeTypes" ng-show="!patientProgram.editing" ng-if="isIncluded(attributeType) && !attributeType.name.includes('PROGRAM_MANAGEMENT_7')">
+<div class="form-field" ng-repeat="attributeType in programAttributeTypes" ng-show="!patientProgram.editing" ng-if="isIncluded(attributeType) && !attributeType.name.includes('PROGRAM_MANAGEMENT_7') && !attributeType.name.includes('PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME')">
     <div class="field-attribute">
         <label>{{attributeType.description | translate}} : </label>
     </div>
@@ -26,7 +26,7 @@
 </div>
 
 <div ng-show="patientProgram.editing" class="programEditing">
-    <article class="form-field" ng-repeat="attributeType in programAttributeTypes" ng-if="isIncluded(attributeType) && !attributeType.name.includes('PROGRAM_MANAGEMENT_7')">
+    <article class="form-field" ng-repeat="attributeType in programAttributeTypes" ng-if="isIncluded(attributeType) && !attributeType.name.includes('PROGRAM_MANAGEMENT_7') && !attributeType.name.includes('PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME')">
         <attribute-types target-model="patientProgram.patientProgramAttributes" attribute="attributeType"></attribute-types>
     </article>
     <div ng-if="patientProgram.program.name === 'HIV_DEFAULTERS_PROGRAM_KEY'"><br><b>{{'PROGRAM_MANAGEMENT_REASON_FOR_DEFAULTING' | translate}} :</b></div>
diff --git a/ui/app/common/uicontrols/programmanagement/views/programEnrollment.html b/ui/app/common/uicontrols/programmanagement/views/programEnrollment.html
index da6a038b3..0d75d9164 100644
--- a/ui/app/common/uicontrols/programmanagement/views/programEnrollment.html
+++ b/ui/app/common/uicontrols/programmanagement/views/programEnrollment.html
@@ -48,7 +48,7 @@
                     </div>
                 </article>
 
-                <article class="fl" ng-repeat="attribute in programAttributeTypes" ng-if="isIncluded(attribute) && programSelected.name && !attribute.name.includes('PROGRAM_MANAGEMENT_7')">
+                <article class="fl" ng-repeat="attribute in programAttributeTypes" ng-if="isIncluded(attribute) && programSelected.name && !attribute.name.includes('PROGRAM_MANAGEMENT_7') && !attribute.name.includes('PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME')">
                     <attribute-types target-model="patientProgramAttributes" attribute="attribute"
                                      is-form="true"></attribute-types>
                 </article>
diff --git a/ui/app/common/uicontrols/programmanagement/views/programRow.html b/ui/app/common/uicontrols/programmanagement/views/programRow.html
index a64d2501b..6e30c6bd8 100644
--- a/ui/app/common/uicontrols/programmanagement/views/programRow.html
+++ b/ui/app/common/uicontrols/programmanagement/views/programRow.html
@@ -64,6 +64,11 @@
                         <option value="">{{::'PROGRAM_MANAGEMENT_LABEL_CHOOSE_OUTCOME' | translate}}</option>
                     </select>
                 </div>
+                <div class="field-value" ng-show="patientProgram.outcomeData.display==='Others'">
+                    <article class="form-field" ng-repeat="attributeType in programAttributeTypes" ng-if="isIncluded(attributeType) && attributeType.name.includes('PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME')">
+                        <attribute-types target-model="patientProgram.patientProgramAttributes" attribute="attributeType"></attribute-types>
+                    </article>
+                </div>
             </div>
         </div>
     </form>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 592f93b22..9d68ec286 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -60,6 +60,7 @@
     "PROGRAM_MANAGEMENT_712_FEELS_HEALTHY" : "Feels healthy",
     "PROGRAM_MANAGEMENT_713_INSECURITY" : "Insecurity",
     "PROGRAM_MANAGEMENT_714_OTHER_DEFAULTING_REASON" : "Other reason for defaulting",
+    "PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME" : "Other Program Outcome",
     "PROGRAM_MANAGEMENT_2_LAST_FAILED_APPOINTMENT_DATE": "Date of last failed appointment",
     "PROGRAM_MANAGEMENT_DEFAULTING_OUTCOME": "Program Outcome",
     "PROGRAM_MANAGEMENT_3_PRETRACKING_OUTCOME": "Pretracking outcome",
diff --git a/ui/app/i18n/clinical/locale_fr.json b/ui/app/i18n/clinical/locale_fr.json
index ea64322f8..845f7db33 100644
--- a/ui/app/i18n/clinical/locale_fr.json
+++ b/ui/app/i18n/clinical/locale_fr.json
@@ -68,6 +68,7 @@
   "PROGRAM_MANAGEMENT_712_FEELS_HEALTHY" : "Se sens en santé",
   "PROGRAM_MANAGEMENT_713_INSECURITY" : "Insecurité",
   "PROGRAM_MANAGEMENT_714_OTHER_DEFAULTING_REASON" : "Autre raison de l'absence",
+  "PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME" : "Autre résultat du programme",
   "PROGRAM_MANAGEMENT_2_LAST_FAILED_APPOINTMENT_DATE": "Date de rendez-vous manqué",
   "PROGRAM_MANAGEMENT_DEFAULTING_OUTCOME": "Résultat du programme",
   "PROGRAM_MANAGEMENT_3_PRETRACKING_OUTCOME": "Situation du patient avant traçage",