Merge pull request #175 from jembi/dev

Release v1.7.0
jembi · Oct 30, 2020 · 1f5607e · 1f5607e
2 parents f474380 + 2bcde0c
commit 1f5607e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 5 deletions.
diff --git a/ui/app/common/uicontrols/programmanagement/controllers/manageProgramController.js b/ui/app/common/uicontrols/programmanagement/controllers/manageProgramController.js
@@ -127,6 +127,12 @@ angular.module('bahmni.common.uicontrols.programmanagment')
                 return !_.isEmpty($scope.endedPrograms);
             };
 
+            $scope.programOutcomeChanged = function (_value) {
+                if (_value) {
+                    _value.PROGRAM_MANAGEMENT_OTHER_PROGRAM_OUTCOME = "";
+                }
+            };
+
             $scope.enrollPatient = function () {
                 if (!isProgramSelected()) {
                     messagingService.showMessage("error", "PROGRAM_MANAGEMENT_SELECT_PROGRAM_MESSAGE_KEY");

diff --git 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
@@ -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
@@ -60,10 +60,16 @@
                 </div>
                 <div class="field-value">
                     <select ng-model="patientProgram.outcomeData"
+                            ng-change="programOutcomeChanged(patientProgram.patientProgramAttributes)"
                             ng-options="outcomeSelected.names[0].display for outcomeSelected in ::patientProgram.program.outcomesConcept.setMembers">
                         <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
@@ -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
@@ -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",

diff --git a/ui/app/version.txt b/ui/app/version.txt
@@ -1 +1 @@
-v1.6.0
+v1.7.0
diff --git a/ui/test/unit/clinical/models/drugOrderViewModel.spec.js b/ui/test/unit/clinical/models/drugOrderViewModel.spec.js
@@ -388,7 +388,7 @@ describe("drugOrderViewModel", function () {
 
             treatment.durationUnit = "Mois";
             treatment.calculateDurationInDays();
-            expect(treatment.durationInDays >= 182 && treatment.durationInDays < 185).toBeTruthy();
+            expect(treatment.durationInDays >= 181 && treatment.durationInDays < 185).toBeTruthy();
 
             treatment.durationUnit = "Day(s)"
             treatment.calculateDurationInDays();