From 714c5d7a0abf6b1be7fc30a0857edc23f36b712c Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Thu, 11 Jul 2019 16:25:02 +0200
Subject: [PATCH 001/131] Update patient registration translation

---
 ui/app/i18n/registration/locale_pt_BR.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/i18n/registration/locale_pt_BR.json b/ui/app/i18n/registration/locale_pt_BR.json
index 6e8f835e63..517df6d7d7 100644
--- a/ui/app/i18n/registration/locale_pt_BR.json
+++ b/ui/app/i18n/registration/locale_pt_BR.json
@@ -158,7 +158,7 @@
     "REGISTRATION_NUMBERS_OLY": "Introduza números positivos apenas",
     "REGISTRATION_CHARACTER_OLY": "Introduza caracteres apenas",
     "REGISTRATION_CHARACTER_AND_NUMBERS_OLY": "Introduza números e/ou caracteres apenas",
-    "REGISTRATION_OCCUPATION_CHOICE": "Começa a digitar uma ocupação/profissão",
+    "REGISTRATION_OCCUPATION_CHOICE": "Introduza uma ocupação/profissão",
     "REGISTRATION_CHOOSE_AN_OPTION": "Selecione uma opção",
     "PATTERN_REGISTRATION_NUMBERS_ONLY": "Números positivos apenas",
     "PATTERN_REGISTRATION_CHARACTERS_ONLY": "Introduza caracteres apenas",
@@ -176,7 +176,7 @@
     "Observations":"Observações",
     "REGISTRATION_REQUIRED_INVALID_FIELD": "Preencha os campos correctamente.",
     "REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE" : "Ex: 12345",
-    "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "YYYY",
+    "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "AAAA",
     "REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE" : "Ex: 12345678",
     "US_REG_DATE_MESSAGE" : "Digite uma data válida."
 }
\ No newline at end of file

From 03e24ee1a92556c75cb35f808424834425b02059 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Wed, 17 Jul 2019 11:14:27 +0200
Subject: [PATCH 002/131] Remove all tooltips from registration form

---
 .../views/attributeInformation.html           |  1 -
 ui/app/registration/views/age.html            |  4 +---
 ui/app/registration/views/newpatient.html     |  8 +++----
 ui/app/registration/views/patientcommon.html  | 24 +++++++++----------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/ui/app/common/attributeTypes/views/attributeInformation.html b/ui/app/common/attributeTypes/views/attributeInformation.html
index 98cb5c8777..acae71d8b6 100644
--- a/ui/app/common/attributeTypes/views/attributeInformation.html
+++ b/ui/app/common/attributeTypes/views/attributeInformation.html
@@ -51,7 +51,6 @@
                ng-keyup="suggest(targetModel[attribute.name])"
                ng-blur="validateField(false)"
                ng-mouseleave="validateField(true)"
-               title="{{::'REGISTRATION_OCCUPATION_CHOICE' | translate}}"
                ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}">
         <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterOcuppation.length > 0" ng-hide="hideList"
             style="position:absolute; top:31px;  width:192px">
diff --git a/ui/app/registration/views/age.html b/ui/app/registration/views/age.html
index ac00157c8d..f826700195 100644
--- a/ui/app/registration/views/age.html
+++ b/ui/app/registration/views/age.html
@@ -7,7 +7,7 @@
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_YEARS' | translate}}</span>
             <input  type="number" id="ageYears" name="ageYear" max="120" ng-model="patient.age.years" min="0"
-                    ng-required="::!dobMandatory" title="{{ ::'REGISTRATION_LABEL_NUMERIC_YEARS' | translate}}"
+                    ng-required="::!dobMandatory"
                     ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()" ng-blur="handleUpdate('age')"
                     ng-disabled="isAgeDisabled" ng-class="{ 'illegalValue': submitted && this.myForms.myForm.ageYear.$invalid || this.myForms.myForm.ageYear.$invalid && !this.myForms.myForm.ageYear.$pristine}"
             >
@@ -15,7 +15,6 @@
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_MONTHS' | translate}}</span>
             <input type="number" id="ageMonths" name="ageMonths" max="12" ng-model="patient.age.months" min="0"
-                   title="{{ ::'REGISTRATION_LABEL_NUMERIC_MONTHS' | translate}}"
                    ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()"
                    ng-disabled="isAgeDisabled" required
             >
@@ -23,7 +22,6 @@
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_DAYS' | translate}}</span>
             <input type="number" id="ageDays" name="ageDays" max="31" ng-model="patient.age.days" min="0"
-                   title="{{ ::'REGISTRATION_LABEL_NUMERIC_DAYS' | translate}}"
                    ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()"
                    ng-disabled="isAgeDisabled" required
             >
diff --git a/ui/app/registration/views/newpatient.html b/ui/app/registration/views/newpatient.html
index 2d70766460..834f198760 100644
--- a/ui/app/registration/views/newpatient.html
+++ b/ui/app/registration/views/newpatient.html
@@ -62,7 +62,7 @@
                             <span class="add-on">{{ ::'REGISTRATION_HEALTH_FACILITY_CODE' | translate}}</span>
                             <input type="text" name="healthFacilityCode" id="healthFacilityCode" ng-model="NID.healthFacilityCode"
                                    pattern-validate onfocus="this.value=''" focus-me="true" placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE' | translate}}"
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" title="{{ ::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                                   focus-on="patient.primaryIdentifier.hasOldIdentifier"
                                    ng-blur="buildFinalNID()" minlength="8" ng-pattern="regexDigits" maxlength="8" size=8 required
                                    ng-class="{'illegalValue' : submitted && this.myForms.myForm.healthFacilityCode.$invalid || this.myForms.myForm.healthFacilityCode.$invalid && !this.myForms.myForm.healthFacilityCode.$pristine || this.myForms.myForm.healthFacilityCode.$error.pattern}" >
                             <p class="help-block" ng-show="this.myForms.myForm.healthFacilityCode.$error.minlength && !this.myForms.myForm.healthFacilityCode.$error.pattern">{{::'MINLENGTH_HEALTH_FACILITY_CODE' | translate}}</p>
@@ -83,13 +83,13 @@
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_SERVICE_CODE' | translate}}</span>
                             <input type="text" name="serviceCode" id="serviceCode" ng-model="NID.serviceCode" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" disabled size="2" title="{{ ::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" disabled size="2"
                                    ng-init="NID.serviceCode='01'">
                         </div>
 
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_NID_YEAR' | translate}}</span>
-                            <input type="number" id="nidYear" name="nidYear" ng-model="NID.year" pattern-validate title="{{::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                            <input type="number" id="nidYear" name="nidYear" ng-model="NID.year" pattern-validate
                                    focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()" min="1900" size="4"
                                    max="{{currentYear}}" minlength="1" maxlength="4" required placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_YEAR' | translate}}"
                                    ng-class="{'illegalValue' : submitted && this.myForms.myForm.nidYear.$invalid || this.myForms.myForm.nidYear.$invalid && !this.myForms.myForm.nidYear.$pristine}">
@@ -98,7 +98,7 @@
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_SEQUENTIAL_CODE' | translate}}</span>
                             <input type="text" name="sequentialCode" id="sequentialCode" ng-model="NID.sequentialCode" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()" title="{{ ::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()"
                                    minlength="5" ng-pattern="regexDigits" maxlength="5" size="8" required placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE' | translate}}"
                                    ng-class="{'illegalValue' : submitted && this.myForms.myForm.sequentialCode.$invalid || !this.myForms.myForm.sequentialCode.$pristine && this.myForms.myForm.sequentialCode.$invalid || this.myForms.myForm.sequentialCode.$error.pattern || this.myForms.myForm.sequentialCode.$error.minlength}">
                             <p class="help-block" ng-show="this.myForms.myForm.sequentialCode.$error.minlength && !this.myForms.myForm.sequentialCode.$error.pattern">{{::'MINLENGTH_REGISTRATION_SEQUENTIAL_CODE' | translate}}</p>
diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index 122a56ab15..da64a1ee9a 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -29,12 +29,10 @@
                         <input data-ng-switch-when="true" type="text" name="givenName" id="givenName" field-validation="::fieldValidation"
                                ng-model="$parent.patient.givenName" non-blank pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
-                               placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}">
+                               placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}">
 
                         <input data-ng-switch-default type="text" name="givenName" field-validation="::fieldValidation" id="givenName" ng-model="patient.givenName" non-blank
-                               pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}">
+                               pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}">
                     </span>
 
                     <span data-ng-switch="::isAutoComplete('givenName')"
@@ -43,11 +41,11 @@
                                ng-model="$parent.patient.givenName" non-blank pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}" field-validation="::fieldValidation"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" focus-me="true" ng-pattern="regexCharacters">
+                               focus-me="true" ng-pattern="regexCharacters">
 
                         <input data-ng-switch-default type="text" name="givenName" id="givenName" ng-model="patient.givenName" non-blank
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" focus-me="true" ng-pattern="regexCharacters"
+                               focus-me="true" ng-pattern="regexCharacters"
                                ng-change="checkDuplicatePatients()" required field-validation="::fieldValidation"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.givenName.$invalid || this.myForms.myForm.givenName.$error.pattern || (this.myForms.myForm.givenName.$error.required && !this.myForms.myForm.givenName.$pristine)}">
                         <p class="help-block" ng-show="this.myForms.myForm.givenName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
@@ -58,11 +56,11 @@
                                ng-model="$parent.patient.middleName" pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}" field-validation="::fieldValidation"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" ng-pattern="regexCharacters">
+                               ng-pattern="regexCharacters">
 
                         <input data-ng-switch-default type="text" name="middleName" id="middleName" ng-model="patient.middleName"
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}" field-validation="::fieldValidation"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" ng-pattern="regexCharacters">
+                               ng-pattern="regexCharacters">
                         <p class="help-block" ng-show="this.myForms.myForm.middleName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
                     </span>
 
@@ -71,13 +69,13 @@
                                ng-model="$parent.patient.familyName" pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" field-validation="::fieldValidation"
+                               field-validation="::fieldValidation"
                                ng-required="::isLastNameMandatory" ng-change="checkDuplicatePatients()" ng-pattern="regexCharacters"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}">
 
                         <input data-ng-switch-default type="text" name="familyName" id="familyName" ng-model="patient.familyName"
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" field-validation="::fieldValidation"
+                               field-validation="::fieldValidation"
                                ng-required="::isLastNameMandatory" ng-pattern="regexCharacters"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}">
                         <p class="help-block" ng-show="this.myForms.myForm.familyName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
@@ -89,7 +87,7 @@
                             <article class="form-field" ng-repeat="attribute in ::attributeRow"
                                      ng-if="attribute.name == 'NICK_NAME'" ng-class="::{'right-form-field' : $index%2 != 0}">
                                 <attribute-types target-model="patient" attribute="::attribute"
-                                                 field-validation="::fieldValidation" is-auto-complete="isAutoComplete" title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}"
+                                                 field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
                                                  get-auto-complete-list="getAutoCompleteList" get-data-results="getDataResults"
                                                  is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
                             </article>
@@ -167,14 +165,14 @@
             <article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'MOTHER_NAME'"
                      ng-class="::{'right-form-field' : $index%2 != 0}">
                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList" title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}"
+                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
                                  ng-pattern="regexCharacters" get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
             </article>
 
             <article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'FATHER_NAME'"
                      ng-class="::{'right-form-field' : $index%2 != 0}">
                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList" title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}"
+                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
                                  get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
             </article>
 

From ae4f4ff5a20a22b9270f7f654bebe01965cf0c24 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Tue, 23 Jul 2019 10:17:47 +0200
Subject: [PATCH 003/131] Changes to prophylaxis section

Update the conditions on Tuberculoses section.
---
 .../concept-set/directives/buttonSelect.js    |  4 ++
 .../common/concept-set/directives/concept.js  | 42 +++++++++++++++++--
 .../observationDataTypes/html5DataType.html   |  5 ++-
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/ui/app/common/concept-set/directives/buttonSelect.js b/ui/app/common/concept-set/directives/buttonSelect.js
index f343dbf2a4..3eb8fa522f 100644
--- a/ui/app/common/concept-set/directives/buttonSelect.js
+++ b/ui/app/common/concept-set/directives/buttonSelect.js
@@ -23,6 +23,10 @@ angular.module('bahmni.common.conceptSet')
                     $scope.observation.disabled = true;
                 }
 
+                if ($scope.observation.concept.name == 'SP_Treatment State') {
+                    $scope.observation.disabled = true;
+                }
+
                 $scope.select = function (answer) {
                     $scope.observation.toggleSelection(answer);
                     if ($scope.$parent.observation && typeof $scope.$parent.observation.onValueChanged == 'function') {
diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 23e404e0c3..7b4c868a95 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -1,10 +1,11 @@
 'use strict';
 
 angular.module('bahmni.common.conceptSet')
-    .directive('concept', ['RecursionHelper', 'spinner', '$filter', 'messagingService', '$http', '$timeout', 'bmiCalculationService',
-        function (RecursionHelper, spinner, $filter, messagingService, $http, $timeout, bmiCalculationService) {
-            var height, weight, brachialPerimeter, bmi, data, key, isValidHeight;
+    .directive('concept', ['RecursionHelper', 'spinner', '$filter', 'messagingService', '$http', '$timeout', 'bmiCalculationService', '$rootScope',
+        function (RecursionHelper, spinner, $filter, messagingService, $http, $timeout, bmiCalculationService, $rootScope) {
+            var height, weight, brachialPerimeter, bmi, data, key, isValidHeight, treatmentStartDate, treatmentEndDate, answer, prophylaxisKey;
             var link = function (scope) {
+                var dateUtil = Bahmni.Common.Util.DateUtil;
                 var patientUuid = scope.patient.uuid;
                 var dataSource = " ";
                 var eligibleForBP = false;
@@ -17,8 +18,36 @@ angular.module('bahmni.common.conceptSet')
                 var ageToMonths = (patientAgeYears * 12) + patientAgeMonths;
                 var hideAbnormalbuttonConfig = scope.observation && scope.observation.conceptUIConfig && scope.observation.conceptUIConfig['hideAbnormalButton'];
                 var currentUrl = window.location.href;
+                scope.today = dateUtil.getDateWithoutTime(dateUtil.now());
+                scope.currentDate = $filter("date")(dateUtil.now(), 'yyyy-MM-dd');
                 weight = scope.patient.weight;
                 height = scope.patient.height;
+
+                scope.onDateChange = function () {
+                    if (scope.observation.concept.name === "SP_Treatment Start Date") {
+                        treatmentStartDate = scope.observation.value;
+                    }
+                    if (scope.observation.concept.name === "SP_Treatment End Date") {
+                        treatmentEndDate = scope.observation.value;
+                    }
+                    if (scope.observation.concept.name === "SP_Treatment End Date") {
+                        treatmentEndDate = scope.observation.value;
+                    }
+
+                    if (treatmentStartDate === scope.today) {
+                        answer = prophylaxisKey[0];
+                        $rootScope.observationData.toggleSelection(answer);
+                    }
+                    if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate) && (treatmentEndDate != undefined || treatmentEndDate != null)) {
+                        answer = prophylaxisKey[1];
+                        $rootScope.observationData.toggleSelection(answer);
+                    }
+                    if (scope.today >= treatmentEndDate && (treatmentStartDate != undefined || treatmentStartDate != null)) {
+                        answer = prophylaxisKey[2];
+                        $rootScope.observationData.toggleSelection(answer);
+                    }
+                };
+
                 if (scope.observation !== null && scope.observation !== undefined && currentUrl.includes("registration")) {
                     scope.observation.value = "";
                 }
@@ -33,6 +62,13 @@ angular.module('bahmni.common.conceptSet')
                     if (scope.observation.concept.name === "BMI") {
                         scope.observation.disabled = true;
                     }
+
+                    if (scope.conceptSetName === 'Group V-Screening / Prophylaxis') {
+                        if (scope.observation.concept.name === 'SP_Treatment State') {
+                            $rootScope.observationData = scope.observation;
+                            prophylaxisKey = scope.observation.possibleAnswers;
+                        }
+                    }
                 }
 
                 scope.$watch('rootObservation', function (newValue, oldValue) {
diff --git a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
index eb93ff999a..38a4a914a6 100644
--- a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
+++ b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
@@ -30,11 +30,12 @@
        type="number"
        focus-me="::observation.isFocused" tabindex="1"/>
 
-<input id="{{::observation.uniqueId}}" obs-constraints obs="::observation"
+<input id="{{::observation.uniqueId}}" obs-constraints obs="::observation" max = "{{::today}}"
        ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear" ng-disabled="observation.disabled"
-       ng-model="observation.value" ng-change="handleUpdate()"
+       ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
        ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
        focus-me="::observation.isFocused" tabindex="1"/>
+
 <stepper id="{{::observation.uniqueId}}"
          ng-model="observation.value" ng-blur="handleUpdate()" obs="observation"
          ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet, conceptSetRequired)}"

From 0f3ca679f812cf00768b710d4a259148874e3443 Mon Sep 17 00:00:00 2001
From: Nathan Floor <nathan.floor@jembi.org>
Date: Tue, 23 Jul 2019 14:01:56 +0200
Subject: [PATCH 004/131] Pre develop (#261)

* Update patient registration translation

* Remove all tooltips from registration form

* Amos | MPOC 217 unit labels and duration preselected
---
 .../views/treatmentSections/addTreatment.html |  1 +
 .../views/attributeInformation.html           |  1 -
 ui/app/i18n/clinical/locale_en.json           |  2 +-
 ui/app/i18n/clinical/locale_pt_BR.json        |  2 +-
 ui/app/i18n/registration/locale_pt_BR.json    |  4 ++--
 ui/app/registration/views/age.html            |  4 +---
 ui/app/registration/views/newpatient.html     |  8 +++----
 ui/app/registration/views/patientcommon.html  | 24 +++++++++----------
 8 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index eb38ab0831..2a9134d0ee 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -189,6 +189,7 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                                 <select  ng-if="!treatmentConfig.isHiddenField('durationUnits')" id="duration-unit"
                                          class=" duration-unit" ng-model="treatment.durationUnit"
                                          ng-options="item.name as item.name for item in treatmentConfig.getDurationUnits()"
+                                         ng-disabled="treatmentConfig.getDurationUnits().length == 1"
                                          required></select>
                             </div>
                         </article>
diff --git a/ui/app/common/attributeTypes/views/attributeInformation.html b/ui/app/common/attributeTypes/views/attributeInformation.html
index 98cb5c8777..acae71d8b6 100644
--- a/ui/app/common/attributeTypes/views/attributeInformation.html
+++ b/ui/app/common/attributeTypes/views/attributeInformation.html
@@ -51,7 +51,6 @@
                ng-keyup="suggest(targetModel[attribute.name])"
                ng-blur="validateField(false)"
                ng-mouseleave="validateField(true)"
-               title="{{::'REGISTRATION_OCCUPATION_CHOICE' | translate}}"
                ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}">
         <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterOcuppation.length > 0" ng-hide="hideList"
             style="position:absolute; top:31px;  width:192px">
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 01ff31ce55..b9bf22efc1 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -134,7 +134,7 @@
     "MEDICATION_ADD_DRUG_FORM_TITLE": "Order Drug",
     "MEDICATION_ADD_ORDERSET_FORM_TITLE": "Order an Order Set",
     "MEDICATION_LABEL_DOSE" :"Dose",
-    "MEDICATION_LABEL_UNITS" :"Units",
+    "MEDICATION_LABEL_UNITS" :"Units/Pharmaceutical Form",
     "MEDICATION_LABEL_FREQUENCY" :"Frequency",
     "MEDICATION_LABEL_ROUTE" :"Route",
     "MEDICATION_LABEL_DURATION" :"Duration",
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index 63fab2f8e9..ce22331c79 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -201,7 +201,7 @@
   "MEDICATION_LABEL_ROUTE": "Via",
   "MEDICATION_LABEL_START_DATE": "Data início da medicação",
   "MEDICATION_LABEL_TOTAL_QUANTITY": "Quantidade total",
-  "MEDICATION_LABEL_UNITS": "Unidades",
+  "MEDICATION_LABEL_UNITS": "Unidades/Forma Farmacêutica",
   "MEDICATION_NEW_PRESCRIPTION": "Nova prescrição",
   "MEDICATION_NEW_TREATMENTS": "Novo tratamento",
   "MEDICATION_NO_PRESCRIPTION_SAVED_PLACEHOLDER": "A prescrição ainda não foi gravada",
diff --git a/ui/app/i18n/registration/locale_pt_BR.json b/ui/app/i18n/registration/locale_pt_BR.json
index 6e8f835e63..517df6d7d7 100644
--- a/ui/app/i18n/registration/locale_pt_BR.json
+++ b/ui/app/i18n/registration/locale_pt_BR.json
@@ -158,7 +158,7 @@
     "REGISTRATION_NUMBERS_OLY": "Introduza números positivos apenas",
     "REGISTRATION_CHARACTER_OLY": "Introduza caracteres apenas",
     "REGISTRATION_CHARACTER_AND_NUMBERS_OLY": "Introduza números e/ou caracteres apenas",
-    "REGISTRATION_OCCUPATION_CHOICE": "Começa a digitar uma ocupação/profissão",
+    "REGISTRATION_OCCUPATION_CHOICE": "Introduza uma ocupação/profissão",
     "REGISTRATION_CHOOSE_AN_OPTION": "Selecione uma opção",
     "PATTERN_REGISTRATION_NUMBERS_ONLY": "Números positivos apenas",
     "PATTERN_REGISTRATION_CHARACTERS_ONLY": "Introduza caracteres apenas",
@@ -176,7 +176,7 @@
     "Observations":"Observações",
     "REGISTRATION_REQUIRED_INVALID_FIELD": "Preencha os campos correctamente.",
     "REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE" : "Ex: 12345",
-    "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "YYYY",
+    "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "AAAA",
     "REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE" : "Ex: 12345678",
     "US_REG_DATE_MESSAGE" : "Digite uma data válida."
 }
\ No newline at end of file
diff --git a/ui/app/registration/views/age.html b/ui/app/registration/views/age.html
index ac00157c8d..f826700195 100644
--- a/ui/app/registration/views/age.html
+++ b/ui/app/registration/views/age.html
@@ -7,7 +7,7 @@
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_YEARS' | translate}}</span>
             <input  type="number" id="ageYears" name="ageYear" max="120" ng-model="patient.age.years" min="0"
-                    ng-required="::!dobMandatory" title="{{ ::'REGISTRATION_LABEL_NUMERIC_YEARS' | translate}}"
+                    ng-required="::!dobMandatory"
                     ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()" ng-blur="handleUpdate('age')"
                     ng-disabled="isAgeDisabled" ng-class="{ 'illegalValue': submitted && this.myForms.myForm.ageYear.$invalid || this.myForms.myForm.ageYear.$invalid && !this.myForms.myForm.ageYear.$pristine}"
             >
@@ -15,7 +15,6 @@
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_MONTHS' | translate}}</span>
             <input type="number" id="ageMonths" name="ageMonths" max="12" ng-model="patient.age.months" min="0"
-                   title="{{ ::'REGISTRATION_LABEL_NUMERIC_MONTHS' | translate}}"
                    ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()"
                    ng-disabled="isAgeDisabled" required
             >
@@ -23,7 +22,6 @@
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_DAYS' | translate}}</span>
             <input type="number" id="ageDays" name="ageDays" max="31" ng-model="patient.age.days" min="0"
-                   title="{{ ::'REGISTRATION_LABEL_NUMERIC_DAYS' | translate}}"
                    ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()"
                    ng-disabled="isAgeDisabled" required
             >
diff --git a/ui/app/registration/views/newpatient.html b/ui/app/registration/views/newpatient.html
index 2d70766460..834f198760 100644
--- a/ui/app/registration/views/newpatient.html
+++ b/ui/app/registration/views/newpatient.html
@@ -62,7 +62,7 @@
                             <span class="add-on">{{ ::'REGISTRATION_HEALTH_FACILITY_CODE' | translate}}</span>
                             <input type="text" name="healthFacilityCode" id="healthFacilityCode" ng-model="NID.healthFacilityCode"
                                    pattern-validate onfocus="this.value=''" focus-me="true" placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE' | translate}}"
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" title="{{ ::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                                   focus-on="patient.primaryIdentifier.hasOldIdentifier"
                                    ng-blur="buildFinalNID()" minlength="8" ng-pattern="regexDigits" maxlength="8" size=8 required
                                    ng-class="{'illegalValue' : submitted && this.myForms.myForm.healthFacilityCode.$invalid || this.myForms.myForm.healthFacilityCode.$invalid && !this.myForms.myForm.healthFacilityCode.$pristine || this.myForms.myForm.healthFacilityCode.$error.pattern}" >
                             <p class="help-block" ng-show="this.myForms.myForm.healthFacilityCode.$error.minlength && !this.myForms.myForm.healthFacilityCode.$error.pattern">{{::'MINLENGTH_HEALTH_FACILITY_CODE' | translate}}</p>
@@ -83,13 +83,13 @@
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_SERVICE_CODE' | translate}}</span>
                             <input type="text" name="serviceCode" id="serviceCode" ng-model="NID.serviceCode" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" disabled size="2" title="{{ ::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" disabled size="2"
                                    ng-init="NID.serviceCode='01'">
                         </div>
 
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_NID_YEAR' | translate}}</span>
-                            <input type="number" id="nidYear" name="nidYear" ng-model="NID.year" pattern-validate title="{{::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                            <input type="number" id="nidYear" name="nidYear" ng-model="NID.year" pattern-validate
                                    focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()" min="1900" size="4"
                                    max="{{currentYear}}" minlength="1" maxlength="4" required placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_YEAR' | translate}}"
                                    ng-class="{'illegalValue' : submitted && this.myForms.myForm.nidYear.$invalid || this.myForms.myForm.nidYear.$invalid && !this.myForms.myForm.nidYear.$pristine}">
@@ -98,7 +98,7 @@
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_SEQUENTIAL_CODE' | translate}}</span>
                             <input type="text" name="sequentialCode" id="sequentialCode" ng-model="NID.sequentialCode" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()" title="{{ ::'REGISTRATION_NUMBERS_OLY' | translate}}"
+                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()"
                                    minlength="5" ng-pattern="regexDigits" maxlength="5" size="8" required placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE' | translate}}"
                                    ng-class="{'illegalValue' : submitted && this.myForms.myForm.sequentialCode.$invalid || !this.myForms.myForm.sequentialCode.$pristine && this.myForms.myForm.sequentialCode.$invalid || this.myForms.myForm.sequentialCode.$error.pattern || this.myForms.myForm.sequentialCode.$error.minlength}">
                             <p class="help-block" ng-show="this.myForms.myForm.sequentialCode.$error.minlength && !this.myForms.myForm.sequentialCode.$error.pattern">{{::'MINLENGTH_REGISTRATION_SEQUENTIAL_CODE' | translate}}</p>
diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index 122a56ab15..da64a1ee9a 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -29,12 +29,10 @@
                         <input data-ng-switch-when="true" type="text" name="givenName" id="givenName" field-validation="::fieldValidation"
                                ng-model="$parent.patient.givenName" non-blank pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
-                               placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}">
+                               placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}">
 
                         <input data-ng-switch-default type="text" name="givenName" field-validation="::fieldValidation" id="givenName" ng-model="patient.givenName" non-blank
-                               pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}">
+                               pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}">
                     </span>
 
                     <span data-ng-switch="::isAutoComplete('givenName')"
@@ -43,11 +41,11 @@
                                ng-model="$parent.patient.givenName" non-blank pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}" field-validation="::fieldValidation"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" focus-me="true" ng-pattern="regexCharacters">
+                               focus-me="true" ng-pattern="regexCharacters">
 
                         <input data-ng-switch-default type="text" name="givenName" id="givenName" ng-model="patient.givenName" non-blank
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" focus-me="true" ng-pattern="regexCharacters"
+                               focus-me="true" ng-pattern="regexCharacters"
                                ng-change="checkDuplicatePatients()" required field-validation="::fieldValidation"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.givenName.$invalid || this.myForms.myForm.givenName.$error.pattern || (this.myForms.myForm.givenName.$error.required && !this.myForms.myForm.givenName.$pristine)}">
                         <p class="help-block" ng-show="this.myForms.myForm.givenName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
@@ -58,11 +56,11 @@
                                ng-model="$parent.patient.middleName" pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}" field-validation="::fieldValidation"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" ng-pattern="regexCharacters">
+                               ng-pattern="regexCharacters">
 
                         <input data-ng-switch-default type="text" name="middleName" id="middleName" ng-model="patient.middleName"
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}" field-validation="::fieldValidation"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" ng-pattern="regexCharacters">
+                               ng-pattern="regexCharacters">
                         <p class="help-block" ng-show="this.myForms.myForm.middleName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
                     </span>
 
@@ -71,13 +69,13 @@
                                ng-model="$parent.patient.familyName" pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" field-validation="::fieldValidation"
+                               field-validation="::fieldValidation"
                                ng-required="::isLastNameMandatory" ng-change="checkDuplicatePatients()" ng-pattern="regexCharacters"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}">
 
                         <input data-ng-switch-default type="text" name="familyName" id="familyName" ng-model="patient.familyName"
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}"
-                               title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}" field-validation="::fieldValidation"
+                               field-validation="::fieldValidation"
                                ng-required="::isLastNameMandatory" ng-pattern="regexCharacters"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}">
                         <p class="help-block" ng-show="this.myForms.myForm.familyName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
@@ -89,7 +87,7 @@
                             <article class="form-field" ng-repeat="attribute in ::attributeRow"
                                      ng-if="attribute.name == 'NICK_NAME'" ng-class="::{'right-form-field' : $index%2 != 0}">
                                 <attribute-types target-model="patient" attribute="::attribute"
-                                                 field-validation="::fieldValidation" is-auto-complete="isAutoComplete" title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}"
+                                                 field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
                                                  get-auto-complete-list="getAutoCompleteList" get-data-results="getDataResults"
                                                  is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
                             </article>
@@ -167,14 +165,14 @@
             <article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'MOTHER_NAME'"
                      ng-class="::{'right-form-field' : $index%2 != 0}">
                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList" title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}"
+                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
                                  ng-pattern="regexCharacters" get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
             </article>
 
             <article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'FATHER_NAME'"
                      ng-class="::{'right-form-field' : $index%2 != 0}">
                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList" title="{{::'REGISTRATION_CHARACTER_OLY' | translate}}"
+                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
                                  get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
             </article>
 

From d0d2aa4ab4940cbcb1f2669522f3efb631d2158f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Tue, 23 Jul 2019 14:05:53 +0200
Subject: [PATCH 005/131] Moves Field "Idade em" to next(in line) to the field
 "Idade"

---
 .../common/concept-set/views/observation.html | 27 ++++++++++++++++---
 .../views/conceptDropdown.html                |  2 +-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ui/app/common/concept-set/views/observation.html b/ui/app/common/concept-set/views/observation.html
index 1ce97f9e14..bd8469ae93 100644
--- a/ui/app/common/concept-set/views/observation.html
+++ b/ui/app/common/concept-set/views/observation.html
@@ -178,7 +178,7 @@
                     <span class="details" ng-bind-html="::observation.concept.description"></span>
                 </div>
 
-                <label class="control-label" ng-hide="observation.getControlType()== 'image'"  ng-if="::showTitle" for="{{::observation.uniqueId}}">
+                <label class="control-label" ng-hide="observation.getControlType()== 'image'"  ng-if="::showTitle && observation.concept.name != 'CONFIDENT_AGE_TYPE'" for="{{::observation.uniqueId}}">
                     <span ng-bind="::observation.label"></span>
                     <span ng-show="::getBooleanResult(observation.units)" ng-bind-html="::'(' + observation.units + ')'"></span>
                     <span ng-if="::observation.conceptUIConfig.required===true" class="asterick">*</span>
@@ -187,12 +187,19 @@
                     </i>
                 </label>
 
+
+
+
                 <div class="field-value" ng-switch="::observation.getControlType()"  ng-class="{'field-value-buttonSelectType' :observation.getControlType()== 'buttonselect' || observation.getControlType()== 'grid'}">
                     <div class="concept-description" ng-if="::getBooleanResult(observation.previous)">
                         <span class="details" ng-bind-html="getStringValue(observation.previous)"></span>
                     </div>
 
-                    <div ng-switch-when="html5InputDataType">
+                    <div ng-switch-when="html5InputDataType" ng-if="observation.concept.name !== 'CONFIDENT_AGE'">
+                        <div ng-include src="'../common/concept-set/views/observationDataTypes/html5DataType.html'"></div>
+                    </div>
+
+                    <div ng-switch-when="html5InputDataType" ng-if="observation.concept.name == 'CONFIDENT_AGE'">
                         <div ng-include src="'../common/concept-set/views/observationDataTypes/html5DataType.html'"></div>
                     </div>
 
@@ -266,7 +273,7 @@
                         </textarea>
                     </div>
 
-                    <div ng-switch-when="dropdown" class="field-value info fa fa-info-sign">
+                    <div ng-switch-when="dropdown" class="field-value info fa fa-info-sign" ng-if="observation.concept.name !== 'CONFIDENT_AGE_TYPE'">
                         <concept-dropdown
                                 on-change="update"
                                 ng-disabled="observation.disabled"
@@ -277,6 +284,18 @@
                                 is-valid="observation.isValid(atLeastOneValueIsSet,conceptSetRequired)">
                         </concept-dropdown>
                     </div>
+
+                    <div ng-switch-when="dropdown" class="field-value info fa fa-info-sign" ng-if="observation.concept.name === 'CONFIDENT_AGE_TYPE'" style="position: relative">
+                        <concept-dropdown style="float: left; margin-top:-62px; margin-left:460px"
+                                on-change="update"
+                                ng-disabled="observation.disabled"
+                                model="observation.value"
+                                answers-concept-name="::observation.conceptUIConfig.answersConceptName"
+                                default-concept="::observation.concept"
+                                on-invalid-class="'illegalValue'"
+                                is-valid="observation.isValid(atLeastOneValueIsSet,conceptSetRequired)">
+                        </concept-dropdown>
+                    </div>
                     <div data-ng-controller="multiSelectObservationSearchController" ng-switch-when="autocompleteMultiSelect" class="autocompleteMultiSelect">
                         <tags-input ng-model="values" display-property="label"
                                     ng-blur="removeFreeTextItem()"
@@ -382,7 +401,6 @@
             </div>
         </fieldset>
 
-
         <fieldset ng-if="(!observation.isObservationNode && !observation.isFormElement() && observation.getControlType()!='tabular')" class="hasLegend"
                   ng-class="{'collapsible-set': isCollapsibleSet(), 'collapsed': collapse}" scroll-to-obs-element="{{ observation.scrollToElement }}">
             <legend ng-if="::(showTitle && !observation.isComputed())" class="mylegend" ng-click="toggleSection()">
@@ -421,5 +439,6 @@
                 </div>
             </div>
         </fieldset>
+
     </div>
 </div>
diff --git a/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html b/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html
index 88ecb3796a..2892a06ac6 100644
--- a/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html
+++ b/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html
@@ -5,5 +5,5 @@
         '{' + onInvalidClass + ' : ' + '!isValid' + '}'
         }}"
         ng-model="selectedAnswer">
-    <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+    <option value="" ng-if="defaultConcept.name !== 'CONFIDENT_AGE_TYPE'">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
 </select>
\ No newline at end of file

From 2bcec9e4290c90b6127b2b7eeba7d93df9bf0903 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Tue, 23 Jul 2019 17:30:34 +0200
Subject: [PATCH 006/131] Fix the auto-selected button

---
 .../common/obs/directives/editObservation.js  | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/ui/app/common/obs/directives/editObservation.js b/ui/app/common/obs/directives/editObservation.js
index 5ed477d0c7..86e594ee67 100644
--- a/ui/app/common/obs/directives/editObservation.js
+++ b/ui/app/common/obs/directives/editObservation.js
@@ -2,9 +2,9 @@
 
 angular.module('bahmni.common.obs')
     .directive('editObservation', ['$q', 'spinner', '$state', '$rootScope', 'ngDialog', 'messagingService',
-        'encounterService', 'configurations', 'contextChangeHandler', 'auditLogService', 'patientService',
+        'encounterService', 'configurations', 'contextChangeHandler', 'auditLogService', 'patientService', '$http',
         function ($q, spinner, $state, $rootScope, ngDialog, messagingService, encounterService, configurations,
-                  contextChangeHandler, auditLogService, patientService) {
+                  contextChangeHandler, auditLogService, patientService, $http) {
             var controller = function ($scope) {
                 var ObservationUtil = Bahmni.Common.Obs.ObservationUtil;
                 var findEditableObs = function (observations) {
@@ -22,8 +22,8 @@ angular.module('bahmni.common.obs')
                     var consultationMapper = new Bahmni.ConsultationMapper(configurations.dosageFrequencyConfig(), configurations.dosageInstructionConfig(),
                         configurations.consultationNoteConcept(), configurations.whoStageConcept(), configurations.labOrderNotesConcept());
 
-                    return encounterService.findByEncounterUuid($scope.observation.encounterUuid).then(function (reponse) {
-                        var encounterTransaction = reponse.data;
+                    return $q.all([encounterService.findByEncounterUuid($scope.observation.encounterUuid)]).then(function (reponse) {
+                        var encounterTransaction = reponse[0].data;
                         $scope.encounter = consultationMapper.map(encounterTransaction);
                         $scope.editableObservations = [];
                         if (shouldEditSpecificObservation()) {
@@ -41,13 +41,38 @@ angular.module('bahmni.common.obs')
                         // Need the UUID up front so the execution of the process can continue
                         // fetch the gender (or whatever other patient data is needed) later
                         $scope.patient = {uuid: $scope.encounter.patientUuid};
-                        patientService.getPatient($scope.encounter.patientUuid).then(function (response) {
-                            $scope.patient.gender = response.data.person.gender;
+                        $q.all([patientService.getPatient($scope.encounter.patientUuid), getHeight($scope.patient.uuid), getWeight($scope.patient.uuid)]).then(function (response) {
+                            $scope.patient.gender = response[0].data.person.gender;
+                            $scope.patient.age = response[0].data.person.age;
+                            $scope.patient.height = response[1].data[0].value;
+                            $scope.patient.weight = response[2].data[0].value;
                             return;
                         });
                     });
                 };
 
+                var getHeight = function (patientUuid) {
+                    return $http.get(Bahmni.Common.Constants.observationsUrl, {
+                        params: {
+                            concept: "HEIGHT",
+                            numberOfVisits: 1,
+                            patientUuid: patientUuid
+                        },
+                        withCredentials: true
+                    });
+                };
+
+                var getWeight = function (patientUuid) {
+                    return $http.get(Bahmni.Common.Constants.observationsUrl, {
+                        params: {
+                            concept: "WEIGHT",
+                            numberOfVisits: 1,
+                            patientUuid: patientUuid
+                        },
+                        withCredentials: true
+                    });
+                };
+
                 spinner.forPromise(init());
 
                 var isFormValid = function () {

From 2a01e0199e3ad421abd22f77c6b45a10d0ff1d08 Mon Sep 17 00:00:00 2001
From: Paul Ekirapa <ekirapapaul@gmail.com>
Date: Wed, 24 Jul 2019 08:30:41 +0300
Subject: [PATCH 007/131] MPOC-479 translate page title names (#259)

---
 ui/app/admin/index.html                                  | 6 +++---
 ui/app/appointments/index.html                           | 6 +++---
 .../common/controllers/patientListHeaderController.js    | 9 +++++++--
 ui/app/clinical/index.html                               | 6 +++---
 ui/app/home/index.html                                   | 6 +++---
 ui/app/i18n/admin/locale_en.json                         | 3 ++-
 ui/app/i18n/admin/locale_pt_BR.json                      | 5 +++--
 ui/app/i18n/appointments/locale_en.json                  | 3 ++-
 ui/app/i18n/appointments/locale_pt_BR.json               | 3 ++-
 ui/app/i18n/clinical/locale_en.json                      | 4 +++-
 ui/app/i18n/clinical/locale_pt_BR.json                   | 4 +++-
 ui/app/i18n/home/locale_en.json                          | 3 ++-
 ui/app/i18n/home/locale_pt_BR.json                       | 5 +++--
 13 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/ui/app/admin/index.html b/ui/app/admin/index.html
index 75703091c2..364011fa2f 100644
--- a/ui/app/admin/index.html
+++ b/ui/app/admin/index.html
@@ -1,8 +1,8 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" ng-app="admin">
     <head>
         <meta charset="utf-8">
-        <title>Bahmni Admin</title>
+        <title>{{'ADMIN_APP_TITLE'|translate}}</title>
 
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0, minimal-ui" />
         <link rel="shortcut icon" type="image/x-icon" href="../favicon.ico">
@@ -13,7 +13,7 @@
         <link rel="stylesheet" href="../styles/home.css"/>
         <!-- endbuild -->
     </head>
-    <body ng-app="admin" class="admin-app">
+    <body class="admin-app">
         <div ng-include src="'../common/ui-helper/header.html'"></div>
         <div ng-include src="'../common/ui-helper/messages.html'"></div>
         <div class="opd-wrapper">
diff --git a/ui/app/appointments/index.html b/ui/app/appointments/index.html
index bd97157605..2333f02740 100644
--- a/ui/app/appointments/index.html
+++ b/ui/app/appointments/index.html
@@ -1,8 +1,8 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" ng-app="bahmni.appointments">
     <head>
         <meta charset="utf-8">
-        <title>Appointment Scheduling</title>
+        <title>{{'APPOINTMENTS_APP_TITLE'|translate}}</title>
         <link rel="stylesheet" href="../lib/jquery/jquery-ui-1.10.4.custom.min.css">
         <link rel="shortcut icon" type="image/x-icon" href="../favicon.ico">
         <link rel="stylesheet" href="../components/ngDialog/css/ngDialog.min.css"/>
@@ -19,7 +19,7 @@
         <!-- endbuild -->
     </head>
     <body>
-        <div ng-app="bahmni.appointments" class="bahmni-appointments">
+        <div class="bahmni-appointments">
             <div ui-view="additional-header"></div>
             <div ng-include src="'../common/ui-helper/messages.html'"></div>
             <div ui-view="mainContent"></div>
diff --git a/ui/app/clinical/common/controllers/patientListHeaderController.js b/ui/app/clinical/common/controllers/patientListHeaderController.js
index c757a9c0fb..d1221d6455 100644
--- a/ui/app/clinical/common/controllers/patientListHeaderController.js
+++ b/ui/app/clinical/common/controllers/patientListHeaderController.js
@@ -1,9 +1,14 @@
 'use strict';
 
 angular.module('bahmni.clinical')
-    .controller('PatientListHeaderController', ['$scope', '$rootScope', '$bahmniCookieStore', 'providerService', 'spinner', 'locationService', '$window', 'ngDialog', 'retrospectiveEntryService', '$translate',
-        function ($scope, $rootScope, $bahmniCookieStore, providerService, spinner, locationService, $window, ngDialog, retrospectiveEntryService, $translate) {
+    .controller('PatientListHeaderController', ['$scope', '$rootScope', '$stateParams', '$bahmniCookieStore', 'providerService', 'spinner', 'locationService', '$window', 'ngDialog', 'retrospectiveEntryService', '$translate',
+        function ($scope, $rootScope, $stateParams, $bahmniCookieStore, providerService, spinner, locationService, $window, ngDialog, retrospectiveEntryService, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
+            if ($stateParams.configName === 'programs') {
+                $rootScope.title = $translate.instant('SERVICES_APP_TITLE');
+            } else {
+                $rootScope.title = $translate.instant('CLINICAL_APP_TITLE');
+            }
             $scope.maxStartDate = DateUtil.getDateWithoutTime(DateUtil.today());
             var selectedProvider = {};
             $scope.retrospectivePrivilege = Bahmni.Common.Constants.retrospectivePrivilege;
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 58efcf6163..098edb1f63 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" ng-app="consultation" >
     <head>
-        <title>OPD</title>
+        <title ng-bind-html="title || 'Clínico'"></title>
 
         <meta charset="utf-8">
         <meta name="HandheldFriendly" content="true">
@@ -22,7 +22,7 @@
         <!-- endbuild -->
 
     </head>
-    <body ng-app="consultation" >
+    <body>
         <div ng-controller="ClinicalController" ng-class="{'retro-mode':retrospectiveClass()}" id="ClinicalController">
             <div ng-include src="'../common/ui-helper/messages.html'"></div>
             <div class="opd-wrapper">
diff --git a/ui/app/home/index.html b/ui/app/home/index.html
index c8acf63cd5..e93df60e87 100644
--- a/ui/app/home/index.html
+++ b/ui/app/home/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" ng-app="bahmni.home">
     <head>
-        <title>Bahmni Home</title>
+        <title>{{'HOME_APP_TITLE' | translate}}</title>
 
         <meta charset="utf-8">
         <meta name="HandheldFriendly" content="true">
@@ -19,7 +19,7 @@
     </head>
     <body>
         <div class="reg-wrapper">
-            <div ng-app="bahmni.home">
+            <div >
                 <div ng-include src="'../common/ui-helper/messages.html'"></div>
                 <div ui-view id="view-content"></div>
             </div>
diff --git a/ui/app/i18n/admin/locale_en.json b/ui/app/i18n/admin/locale_en.json
index 82e3f0ade6..94aef6cc49 100644
--- a/ui/app/i18n/admin/locale_en.json
+++ b/ui/app/i18n/admin/locale_en.json
@@ -17,5 +17,6 @@
   "FILTER_BUTTON_LABEL": "Filter",
   "AUDIT_LOG_TABLE_HEADER_LABEL": "Audit Log Events",
   "NO_NAVIGATION_LINKS_AVAILABLE_MESSAGE": "No navigation links available.",
-  "SELECT_VALUE_FROM_AUTOCOMPLETE_DEFAULT_MESSAGE": "Please select a value from auto complete"
+  "SELECT_VALUE_FROM_AUTOCOMPLETE_DEFAULT_MESSAGE": "Please select a value from auto complete",
+  "ADMIN_APP_TITLE":"Admin"
 }
diff --git a/ui/app/i18n/admin/locale_pt_BR.json b/ui/app/i18n/admin/locale_pt_BR.json
index a1eb895430..ad747c34e1 100644
--- a/ui/app/i18n/admin/locale_pt_BR.json
+++ b/ui/app/i18n/admin/locale_pt_BR.json
@@ -8,5 +8,6 @@
     "MESSAGE_DIALOG_OPTION_COPY": "Erro de Cópia",
     "MESSAGE_DIALOG_OPTION_OKAY": "OK",
     "HEADER_LABEL_LOGOUT_KEY": "Sair",
-    "CHANGE_PASSWORD": "Alterar Senha"
-}
\ No newline at end of file
+    "CHANGE_PASSWORD": "Alterar Senha",
+    "ADMIN_APP_TITLE":"Administração"
+}
diff --git a/ui/app/i18n/appointments/locale_en.json b/ui/app/i18n/appointments/locale_en.json
index 05af3bb367..cca82325cc 100644
--- a/ui/app/i18n/appointments/locale_en.json
+++ b/ui/app/i18n/appointments/locale_en.json
@@ -177,5 +177,6 @@
   "APPOINTMENT_SUMMARY_END_ALERT": "End Date should be later than Start Date.",
   "APPOINTMENT_CREATE_SAVE_ADD_NEW": "Save and add New Visit",
   "APPOINTMENT_DATE_WARNING": "Appointment date cannot be before today",
-  "APPOINTMENT_INVALID_DATE": "Ivanlid appointment date"
+  "APPOINTMENT_INVALID_DATE": "Ivanlid appointment date",
+  "APPOINTMENTS_APP_TITLE": "Appointment Scheduling"
 }
diff --git a/ui/app/i18n/appointments/locale_pt_BR.json b/ui/app/i18n/appointments/locale_pt_BR.json
index 37559276f4..e514f38c43 100644
--- a/ui/app/i18n/appointments/locale_pt_BR.json
+++ b/ui/app/i18n/appointments/locale_pt_BR.json
@@ -177,5 +177,6 @@
   "APPOINTMENT_SUMMARY_END_ALERT": "A Data de Fim deve ser maior que a de Inicio.",
   "APPOINTMENT_CREATE_SAVE_ADD_NEW": "Salvar e adicionar nova visita",
   "APPOINTMENT_DATE_WARNING": "A data da consulta não pode ser inferior à data de hoje",
-  "APPOINTMENT_INVALID_DATE": "Data de consulta inválida"
+  "APPOINTMENT_INVALID_DATE": "Data de consulta inválida",
+  "APPOINTMENTS_APP_TITLE": "Marcações"
 }
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index b9bf22efc1..d00e06310d 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -406,5 +406,7 @@
     "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_STOP": "is conflicting with drug order you are trying to add. You can stop the active drug order and create a new one.",
     "MEDICATION_REVISE":"Revise",
     "CLINICAL_NO_NUTRITIONAL_STATUS": "No Nutritional Status Available",
-    "VALUE_RANGE_MESSAGE":"The value is out of range"
+    "VALUE_RANGE_MESSAGE":"The value is out of range",
+    "CLINICAL_APP_TITLE":"OPD",
+    "SERVICES_APP_TITLE": "Services"
 }
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index ce22331c79..f6028a1087 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -429,6 +429,8 @@
   "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_STOP": "está em conflito com o medicamento que pretende adicionar. Pode terminar a prescrição activa ou criar uma nova",
   "CLINICAL_NO_NUTRITIONAL_STATUS": "Nenhum estado nutricional disponivel",
   "VALUE_RANGE_MESSAGE": "Os valores introduzidos estão fora do intervalo",
-  "MEDICATION_REVISE":"Rever"
+  "MEDICATION_REVISE":"Rever",
+  "CLINICAL_APP_TITLE":"Clínico",
+  "SERVICES_APP_TITLE": "Serviços"
 
 }
diff --git a/ui/app/i18n/home/locale_en.json b/ui/app/i18n/home/locale_en.json
index 9b0a61c6c0..842d4c3bc5 100644
--- a/ui/app/i18n/home/locale_en.json
+++ b/ui/app/i18n/home/locale_en.json
@@ -58,5 +58,6 @@
     "NO_NAVIGATION_LINKS_AVAILABLE_MESSAGE": "No navigation links available.",
     "ACCEPT":"Accept",
     "SELECT_VALUE_FROM_AUTOCOMPLETE_DEFAULT_MESSAGE": "Please select a value from auto complete",
-    "POC_VERSION" : "2.0.0"
+    "POC_VERSION" : "2.0.0",
+    "HOME_APP_TITLE": "Home"
 }
diff --git a/ui/app/i18n/home/locale_pt_BR.json b/ui/app/i18n/home/locale_pt_BR.json
index 0c1fa86060..0bcf3f7a22 100644
--- a/ui/app/i18n/home/locale_pt_BR.json
+++ b/ui/app/i18n/home/locale_pt_BR.json
@@ -58,5 +58,6 @@
 	"UNABLE_TO_GET_PROVIDER_DATA": "Não foi possível obter dados do Médico",
 	"WARNING_SERVER_TIME_ZONE_MISMATCH": "O fuso horário do servidor ({{serverTime}}) é diferente do fuso horário / hora do seu navegador ({{localeTimeZone}}). Isso pode fazer com que alguns dados ou relatórios pareçam incorretos. Por favor entre em contato com o administrador para mais detalhes.",
 	"YOU_HAVE_NOT_BEEN_SETUP_PROVIDER": "Não está configurado como Provedor, por favor entre em contacto com o Administrador.",
-	"POC_VERSION" : "2.0.0"
-}
\ No newline at end of file
+	"POC_VERSION" : "2.0.0",
+    "HOME_APP_TITLE": "Página Inicial"
+}

From 48d90f7a52849d44aea2a9f22ae38ae0edec435b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Wed, 24 Jul 2019 11:40:49 +0200
Subject: [PATCH 008/131] Keep default dropdown message

---
 .../uicontrols/concept-dropdown/views/conceptDropdown.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html b/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html
index 2892a06ac6..88ecb3796a 100644
--- a/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html
+++ b/ui/app/common/uicontrols/concept-dropdown/views/conceptDropdown.html
@@ -5,5 +5,5 @@
         '{' + onInvalidClass + ' : ' + '!isValid' + '}'
         }}"
         ng-model="selectedAnswer">
-    <option value="" ng-if="defaultConcept.name !== 'CONFIDENT_AGE_TYPE'">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+    <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
 </select>
\ No newline at end of file

From ea5f52c27a6d0ba81ea1d4d921ad7fbb6f791fae Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Wed, 24 Jul 2019 12:23:25 +0200
Subject: [PATCH 009/131] On Change event updated

---
 .../common/concept-set/directives/concept.js   | 18 +++++++++---------
 .../models/conceptSetObservation.js            |  7 +++++++
 ui/app/i18n/clinical/locale_en.json            |  3 ++-
 ui/app/i18n/clinical/locale_pt_BR.json         |  3 ++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 7b4c868a95..c7df5e5ef5 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -30,21 +30,21 @@ angular.module('bahmni.common.conceptSet')
                     if (scope.observation.concept.name === "SP_Treatment End Date") {
                         treatmentEndDate = scope.observation.value;
                     }
-                    if (scope.observation.concept.name === "SP_Treatment End Date") {
-                        treatmentEndDate = scope.observation.value;
-                    }
 
-                    if (treatmentStartDate === scope.today) {
+                    if (treatmentStartDate === scope.today && treatmentStartDate !== '') {
                         answer = prophylaxisKey[0];
-                        $rootScope.observationData.toggleSelection(answer);
+                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
                     }
-                    if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate) && (treatmentEndDate != undefined || treatmentEndDate != null)) {
+                    if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate)) {
                         answer = prophylaxisKey[1];
-                        $rootScope.observationData.toggleSelection(answer);
+                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
                     }
-                    if (scope.today >= treatmentEndDate && (treatmentStartDate != undefined || treatmentStartDate != null)) {
+                    if ((treatmentEndDate <= scope.today) && (treatmentEndDate >= treatmentStartDate) && (treatmentEndDate != '')) {
                         answer = prophylaxisKey[2];
-                        $rootScope.observationData.toggleSelection(answer);
+                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
+                    }
+                    if (treatmentStartDate > treatmentEndDate)  {
+                        messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                     }
                 };
 
diff --git a/ui/app/common/concept-set/models/conceptSetObservation.js b/ui/app/common/concept-set/models/conceptSetObservation.js
index d95d3ca5dc..f65589379e 100644
--- a/ui/app/common/concept-set/models/conceptSetObservation.js
+++ b/ui/app/common/concept-set/models/conceptSetObservation.js
@@ -361,6 +361,7 @@ Bahmni.ConceptSet.Observation.prototype = {
     },
 
     toggleSelection: function (answer) {
+        console.log(answer);
         if (this.value && this.value.uuid === answer.uuid) {
             this.value = null;
         } else {
@@ -368,6 +369,12 @@ Bahmni.ConceptSet.Observation.prototype = {
         }
     },
 
+    toggleSelectionTreatmentState: function (answer) {
+        if (answer) {
+            this.value = answer;
+        }
+    },
+
     isValidDate: function () {
         if (this.isComputed()) {
             return true;
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 52735ed0c8..4da1139f5c 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -404,5 +404,6 @@
     "MEDICATION_ERROR_ONE_OR_MORE": "One or more drugs you are trying to order are already active. Please change the start date of the conflicting drug or remove them from the new prescription.",
     "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_REVISE": "is conflicting with drug order you are trying to add. You can revise or refill instead.",
     "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_STOP": "is conflicting with drug order you are trying to add. You can stop the active drug order and create a new one.",
-    "MEDICATION_REVISE":"Revise"
+    "MEDICATION_REVISE":"Revise",
+    "INVALID_TREATMENT_END_DATE": "TREATMENT END DATE cannot be less than START DATE"
 }
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index fb3f81198a..97c235c92d 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -426,6 +426,7 @@
   "MEDICATION_ERROR_ONE_OR_MORE": "O (s) medicamento (s) que pretende prescrever já estão activos. Por favor, altere a data de início do medicamento em conflito ou retire da nova prescrição",
   "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_REVISE": "está em conflito com o medicamento que pretende adicionar. Pode rever ou reabastecer.",
   "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_STOP": "está em conflito com o medicamento que pretende adicionar. Pode terminar a prescrição activa ou criar uma nova",
-  "MEDICATION_REVISE":"Rever"
+  "MEDICATION_REVISE":"Rever",
+  "INVALID_TREATMENT_END_DATE": "DATA DO FIM DO TRATAMENTO não pode ser menor que DATA DO INÍCIO"
 
 }

From 110a5e454184729a5b627f7a182ab95a394f59ef Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Wed, 24 Jul 2019 18:09:55 +0530
Subject: [PATCH 010/131] Amol | Removed code of existing visit types (#258)

* Amol | Removed code of existing visit types

* Amol | Removed Console from code
---
 ui/app/i18n/registration/locale_en.json       |  1 +
 ui/app/i18n/registration/locale_pt_BR.json    |  1 +
 .../registration/directives/patientAction.js  | 21 ++-----------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/ui/app/i18n/registration/locale_en.json b/ui/app/i18n/registration/locale_en.json
index b201e4749e..68987bff43 100644
--- a/ui/app/i18n/registration/locale_en.json
+++ b/ui/app/i18n/registration/locale_en.json
@@ -159,6 +159,7 @@
   "FIRST_CLINICAL_CONSULTATION_A":"First Clinical Consultation",
   "FOLLOWUP_CLINICAL_CONSULTATION":"Clinical Consultation",
   "FOLLOWUP_CLINICAL_CONSULTATION_A":"Clinical - Follow Up Consultation",
+  "Patient_Start_Visit" :"Start Visit",
   "REGISTRATION_PERSONAL_INFORMATION":"Personal Details",
   "REGISTRATION_PROFESSIONAL_INFORMATION":"Professional Information",
   "FATHER_NAME": "Father Name",
diff --git a/ui/app/i18n/registration/locale_pt_BR.json b/ui/app/i18n/registration/locale_pt_BR.json
index 517df6d7d7..6a3ea451fa 100644
--- a/ui/app/i18n/registration/locale_pt_BR.json
+++ b/ui/app/i18n/registration/locale_pt_BR.json
@@ -132,6 +132,7 @@
     "FIRST_CLINICAL_CONSULTATION_A":"Primeira Consulta Clínica",
     "FOLLOWUP_CLINICAL_CONSULTATION":"Consulta Clinica",
     "FOLLOWUP_CLINICAL_CONSULTATION_A":"Clinica - Consulta de Seguimento",
+    "Patient_Start_Visit" :"Iniciar Consulta",
     "REGISTRATION_PERSONAL_INFORMATION":"Detalhes pessoais",
     "REGISTRATION_PROFESSIONAL_INFORMATION":"Informação profissional",
     "FATHER_NAME": "Nome do Pai",
diff --git a/ui/app/registration/directives/patientAction.js b/ui/app/registration/directives/patientAction.js
index 178ab0c09d..f07229a012 100644
--- a/ui/app/registration/directives/patientAction.js
+++ b/ui/app/registration/directives/patientAction.js
@@ -108,26 +108,9 @@ angular.module('bahmni.registration')
                 getVisitHistory();
 
                 if (uuid == undefined) {
-                    $scope.startVisits = [$scope.allVisits[2], $scope.allVisits[3]];
+                    $scope.startVisits = [$scope.allVisits[0]];
                 } else {
-                    var visitTableList = [];
-                    $scope.visitTable.forEach(function (item, index) {
-                        visitTableList.push($scope.visitTable[index].type);
-                    });
-
-                    if (visitTableList == undefined) {
-                        $scope.startVisits = [$scope.allVisits[2], $scope.allVisits[3]];
-                    } else if (visitTableList == "") {
-                        $scope.startVisits = [$scope.allVisits[2], $scope.allVisits[3]];
-                    } else if (visitTableList.includes("FIRST_APSS_CONSULTATION", "FIRST_CLINICAL_CONSULTATION") === true) {
-                        $scope.startVisits = [$scope.allVisits[0], $scope.allVisits[1]];
-                    } else if (visitTableList.includes("FIRST_APSS_CONSULTATION") === true) {
-                        $scope.startVisits = [$scope.allVisits[0], $scope.allVisits[2]];
-                    } else if (visitTableList.includes("FIRST_CLINICAL_CONSULTATION") === true) {
-                        $scope.startVisits = [$scope.allVisits[1], $scope.allVisits[3]];
-                    } else {
-                        $scope.startVisits = [$scope.allVisits[2], $scope.allVisits[3]];
-                    }
+                    $scope.startVisits = [$scope.allVisits[0]];
                 }
 
                 $scope.visitControl = new Bahmni.Common.VisitControl(

From 8a812540efa8ce3bfcf795360ae4992defa4d9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Wed, 24 Jul 2019 16:43:45 +0200
Subject: [PATCH 011/131] Adds improvemnts on age dropdown

---
 ui/app/common/concept-set/views/observation.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/app/common/concept-set/views/observation.html b/ui/app/common/concept-set/views/observation.html
index 094b1f64aa..a946e77766 100644
--- a/ui/app/common/concept-set/views/observation.html
+++ b/ui/app/common/concept-set/views/observation.html
@@ -198,11 +198,12 @@
                     <div ng-if="observation.concept.name =='Prophylaxis_Nutritional_Status'" style="position: absolute; top: 14%">
                         <strong class="grid-row-element">{{nutritionalStateDisplay | translate}}</strong>
                     </div>
+
                     <div ng-switch-when="html5InputDataType" ng-if="observation.concept.name !== 'CONFIDENT_AGE'">
                         <div ng-include src="'../common/concept-set/views/observationDataTypes/html5DataType.html'"></div>
                     </div>
 
-                    <div ng-switch-when="html5InputDataType" ng-if="observation.concept.name == 'CONFIDENT_AGE'">
+                    <div ng-switch-when="html5InputDataType" ng-if="observation.concept.name === 'CONFIDENT_AGE'" style="margin-bottom: -50px">
                         <div ng-include src="'../common/concept-set/views/observationDataTypes/html5DataType.html'"></div>
                     </div>
 
@@ -288,8 +289,8 @@
                         </concept-dropdown>
                     </div>
 
-                    <div ng-switch-when="dropdown" class="field-value info fa fa-info-sign" ng-if="observation.concept.name === 'CONFIDENT_AGE_TYPE'" style="position: relative">
-                        <concept-dropdown style="float: left; margin-top:-62px; margin-left:460px"
+                    <div ng-switch-when="dropdown" class="field-value info fa fa-info-sign" ng-if="observation.concept.name === 'CONFIDENT_AGE_TYPE'">
+                        <concept-dropdown style="float: left; margin-top:-50px; margin-left:460px"
                                 on-change="update"
                                 ng-disabled="observation.disabled"
                                 model="observation.value"

From e2d1b8b2476d7f816a86387991aabd1cfeae46c6 Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Wed, 24 Jul 2019 20:35:32 +0530
Subject: [PATCH 012/131] Amol | Created PR for adding code of MPOC-478 branch
 to devlop branch (#267)

---
 .../controllers/manage/appointmentsCreateController.js        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/appointments/controllers/manage/appointmentsCreateController.js b/ui/app/appointments/controllers/manage/appointmentsCreateController.js
index 1512af6396..e0f29d47f2 100644
--- a/ui/app/appointments/controllers/manage/appointmentsCreateController.js
+++ b/ui/app/appointments/controllers/manage/appointmentsCreateController.js
@@ -53,7 +53,9 @@ angular.module('bahmni.appointments')
                 $scope.appointment = Bahmni.Appointments.AppointmentViewModel.create(appointmentContext.appointment || { appointmentKind: 'Scheduled' }, appointmentCreateConfig);
                 $scope.selectedService = appointmentCreateConfig.selectedService;
                 $scope.isPastAppointment = $scope.isEditMode() ? Bahmni.Common.Util.DateUtil.isBeforeDate($scope.appointment.date, moment().startOf('day')) : false;
-                $scope.appointment.patient = $state.params.patient;
+                if ($state.params.patient) {
+                    $scope.appointment.patient = $state.params.patient;
+                }
                 $scope.appointment.date = $stateParams.selectedAppointmentDate || null;
                 $scope.selectedAppointmentBlock = $stateParams.selectedAppointmentBlock;
                 if ($scope.selectedAppointmentBlock) {

From b106b1128a7e42ebf75ad14a0bbe816815048279 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Thu, 25 Jul 2019 10:12:58 +0200
Subject: [PATCH 013/131] Allow future dates in tubercoluses section

---
 ui/app/common/concept-set/directives/concept.js           | 4 ++++
 ui/app/common/concept-set/models/conceptSetObservation.js | 3 +++
 .../views/observationDataTypes/html5DataType.html         | 8 +++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index c7df5e5ef5..1f58c12a9f 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -31,6 +31,10 @@ angular.module('bahmni.common.conceptSet')
                         treatmentEndDate = scope.observation.value;
                     }
 
+                    if (treatmentStartDate === '' || treatmentEndDate === '') {
+                        answer = null;
+                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
+                    }
                     if (treatmentStartDate === scope.today && treatmentStartDate !== '') {
                         answer = prophylaxisKey[0];
                         $rootScope.observationData.toggleSelectionTreatmentState(answer);
diff --git a/ui/app/common/concept-set/models/conceptSetObservation.js b/ui/app/common/concept-set/models/conceptSetObservation.js
index f65589379e..1b6e415e92 100644
--- a/ui/app/common/concept-set/models/conceptSetObservation.js
+++ b/ui/app/common/concept-set/models/conceptSetObservation.js
@@ -370,8 +370,11 @@ Bahmni.ConceptSet.Observation.prototype = {
     },
 
     toggleSelectionTreatmentState: function (answer) {
+        console.log(answer);
         if (answer) {
             this.value = answer;
+        } else {
+            this.value = null;
         }
     },
 
diff --git a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
index 38a4a914a6..6d0aefa850 100644
--- a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
+++ b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
@@ -31,7 +31,13 @@
        focus-me="::observation.isFocused" tabindex="1"/>
 
 <input id="{{::observation.uniqueId}}" obs-constraints obs="::observation" max = "{{::today}}"
-       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear" ng-disabled="observation.disabled"
+       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId !== 'observation_40'" ng-disabled="observation.disabled"
+       ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
+       ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
+       focus-me="::observation.isFocused" tabindex="1"/>
+
+<input id="{{::observation.uniqueId}}" obs-constraints obs="::observation"
+       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId === 'observation_40'" ng-disabled="observation.disabled"
        ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
        ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
        focus-me="::observation.isFocused" tabindex="1"/>

From 74a58ff63e78635c74b147892554216c1e5d51e1 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Thu, 25 Jul 2019 12:31:58 +0300
Subject: [PATCH 014/131] MPOC-481 Add user locale to encounter data

---
 ui/app/common/domain/services/encounterService.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/app/common/domain/services/encounterService.js b/ui/app/common/domain/services/encounterService.js
index 9489b50ed3..2b8ae52aa4 100644
--- a/ui/app/common/domain/services/encounterService.js
+++ b/ui/app/common/domain/services/encounterService.js
@@ -1,14 +1,14 @@
 'use strict';
 
 angular.module('bahmni.common.domain')
-    .service('encounterService', ['$http', '$q', '$rootScope', 'configurations', '$bahmniCookieStore',
-        function ($http, $q, $rootScope, configurations, $bahmniCookieStore) {
+    .service('encounterService', ['$http', '$q', '$rootScope', '$window', 'configurations', '$bahmniCookieStore',
+        function ($http, $q, $rootScope, $window, configurations, $bahmniCookieStore) {
             this.buildEncounter = function (encounter) {
                 encounter.observations = encounter.observations || [];
                 encounter.observations.forEach(function (obs) {
                     stripExtraConceptInfo(obs);
                 });
-
+                encounter.locale = $window.localStorage["NG_TRANSLATE_LANG_KEY"] || "en";
                 encounter.providers = encounter.providers || [];
 
                 var providerData = $bahmniCookieStore.get(Bahmni.Common.Constants.grantProviderAccessDataCookieName);
@@ -112,7 +112,6 @@ angular.module('bahmni.common.domain')
 
             this.create = function (encounter) {
                 encounter = this.buildEncounter(encounter);
-
                 return $http.post(Bahmni.Common.Constants.bahmniEncounterUrl, encounter, {
                     withCredentials: true
                 });

From 9c19db63920f117c4bdd9b0fe89b309129acd182 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Thu, 25 Jul 2019 11:49:00 +0200
Subject: [PATCH 015/131] Removed extra whitespaces

---
 ui/app/common/concept-set/directives/concept.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 779a82a6cf..71659ed8e1 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -49,7 +49,7 @@ angular.module('bahmni.common.conceptSet')
                         answer = prophylaxisKey[2];
                         $rootScope.observationData.toggleSelectionTreatmentState(answer);
                     }
-                    if (treatmentStartDate > treatmentEndDate)  {
+                    if (treatmentStartDate > treatmentEndDate) {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                     }
                 };

From dc104ff84d1fd00efa1278b1c7a9e29c3222f71b Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Thu, 25 Jul 2019 12:06:37 +0200
Subject: [PATCH 016/131] Fix the translate message bug

---
 ui/app/common/concept-set/directives/concept.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 71659ed8e1..291e0b489c 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -1,8 +1,8 @@
 'use strict';
 
 angular.module('bahmni.common.conceptSet')
-    .directive('concept', ['RecursionHelper', 'spinner', '$filter', 'messagingService', '$http', '$timeout', 'bmiCalculationService', '$rootScope',
-        function (RecursionHelper, spinner, $filter, messagingService, $http, $timeout, bmiCalculationService, $rootScope) {
+    .directive('concept', ['RecursionHelper', 'spinner', '$filter', 'messagingService', '$http', '$timeout', 'bmiCalculationService', '$rootScope', '$translate',
+        function (RecursionHelper, spinner, $filter, messagingService, $http, $timeout, bmiCalculationService, $rootScope, $translate) {
             var height, weight, brachialPerimeter, bmi, data, key, isValidHeight, treatmentStartDate, treatmentEndDate, answer, prophylaxisKey;
 
             var link = function (scope) {

From d65e73f7ede907798e5db5d342acd620c7257bd8 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Fri, 26 Jul 2019 16:13:04 +0300
Subject: [PATCH 017/131] MPOC-459 migrate from pt_BR to pt

---
 ui/app/i18n/admin/{locale_pt_BR.json => locale_pt.json}        | 0
 ui/app/i18n/adt/{locale_pt_BR.json => locale_pt.json}          | 0
 ui/app/i18n/appointments/{locale_pt_BR.json => locale_pt.json} | 0
 ui/app/i18n/clinical/{locale_pt_BR.json => locale_pt.json}     | 0
 ui/app/i18n/home/{locale_pt_BR.json => locale_pt.json}         | 0
 ui/app/i18n/orders/{locale_pt_BR.json => locale_pt.json}       | 0
 ui/app/i18n/registration/{locale_pt_BR.json => locale_pt.json} | 0
 ui/app/i18n/reports/{locale_pt_BR.json => locale_pt.json}      | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename ui/app/i18n/admin/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/adt/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/appointments/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/clinical/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/home/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/orders/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/registration/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/reports/{locale_pt_BR.json => locale_pt.json} (100%)

diff --git a/ui/app/i18n/admin/locale_pt_BR.json b/ui/app/i18n/admin/locale_pt.json
similarity index 100%
rename from ui/app/i18n/admin/locale_pt_BR.json
rename to ui/app/i18n/admin/locale_pt.json
diff --git a/ui/app/i18n/adt/locale_pt_BR.json b/ui/app/i18n/adt/locale_pt.json
similarity index 100%
rename from ui/app/i18n/adt/locale_pt_BR.json
rename to ui/app/i18n/adt/locale_pt.json
diff --git a/ui/app/i18n/appointments/locale_pt_BR.json b/ui/app/i18n/appointments/locale_pt.json
similarity index 100%
rename from ui/app/i18n/appointments/locale_pt_BR.json
rename to ui/app/i18n/appointments/locale_pt.json
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt.json
similarity index 100%
rename from ui/app/i18n/clinical/locale_pt_BR.json
rename to ui/app/i18n/clinical/locale_pt.json
diff --git a/ui/app/i18n/home/locale_pt_BR.json b/ui/app/i18n/home/locale_pt.json
similarity index 100%
rename from ui/app/i18n/home/locale_pt_BR.json
rename to ui/app/i18n/home/locale_pt.json
diff --git a/ui/app/i18n/orders/locale_pt_BR.json b/ui/app/i18n/orders/locale_pt.json
similarity index 100%
rename from ui/app/i18n/orders/locale_pt_BR.json
rename to ui/app/i18n/orders/locale_pt.json
diff --git a/ui/app/i18n/registration/locale_pt_BR.json b/ui/app/i18n/registration/locale_pt.json
similarity index 100%
rename from ui/app/i18n/registration/locale_pt_BR.json
rename to ui/app/i18n/registration/locale_pt.json
diff --git a/ui/app/i18n/reports/locale_pt_BR.json b/ui/app/i18n/reports/locale_pt.json
similarity index 100%
rename from ui/app/i18n/reports/locale_pt_BR.json
rename to ui/app/i18n/reports/locale_pt.json

From 5bf84d8d7a1691a016d6620cedb0421ba2298bf9 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Mon, 29 Jul 2019 17:41:11 +0300
Subject: [PATCH 018/131] MPOC-459 fix medications duration units translation

---
 .../clinical/common/models/drugOrderViewModel.js |  5 +++--
 .../controllers/addTreatmentController.js        | 11 +++++++++--
 .../consultation/services/treatmentConfig.js     | 16 +++++++++++++---
 ui/app/clinical/index.html                       |  1 +
 ui/app/i18n/clinical/locale_en.json              |  3 ++-
 ui/app/i18n/clinical/locale_pt.json              |  3 ++-
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ui/app/clinical/common/models/drugOrderViewModel.js b/ui/app/clinical/common/models/drugOrderViewModel.js
index 744af3baab..1fb5ca1d2f 100644
--- a/ui/app/clinical/common/models/drugOrderViewModel.js
+++ b/ui/app/clinical/common/models/drugOrderViewModel.js
@@ -324,7 +324,8 @@ Bahmni.Clinical.DrugOrderViewModel = function (config, proto, encounterDate) {
         }
     };
 
-    this.calculateDurationUnit = function () {
+    this.calculateDurationUnit = function (durationUnits) {
+        durationUnits = durationUnits || "Day(s)";
         if (self.frequencyType === Bahmni.Clinical.Constants.dosingTypes.uniform && self.uniformDosingType.frequency != null) {
             var defaultDurationUnitMap = inputOptionsConfig.frequencyDefaultDurationUnitsMap || [];
 
@@ -333,7 +334,7 @@ Bahmni.Clinical.DrugOrderViewModel = function (config, proto, encounterDate) {
                 var maxFrequency = eval(range.maxFrequency); // eslint-disable-line no-eval
                 if ((!minFrequency || minFrequency < getFrequencyPerDay()) &&
                     (!maxFrequency || getFrequencyPerDay() <= maxFrequency)) {
-                    self.durationUnit = range.defaultDurationUnit;
+                    self.durationUnit = durationUnits.length > 0 && durationUnits[0].name ? durationUnits[0].name : range.defaultDurationUnit;
                 }
             });
         }
diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index a0317d84e6..d2b467df91 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,13 +3,19 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'spinner', '$translate',
+        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, spinner, $translate) {
+                  orderSetService, $q, locationService, localeService, spinner, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
+            var defaultLocale = "en";
+            localeService.defaultLocale().then(function (response) {
+                defaultLocale = response.data;
+                $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
+                return response.data;
+            });
 
             $scope.showOrderSetDetails = true;
             $scope.addTreatment = true;
@@ -115,6 +121,7 @@ angular.module('bahmni.clinical')
             };
 
             $scope.treatment = newTreatment();
+            $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
             treatmentConfig.durationUnits.forEach(function (durationUnit) {
                 if (_.isEqual(durationUnit, $scope.treatment.durationUnit)) {
                     $scope.treatment.durationUnit = durationUnit;
diff --git a/ui/app/clinical/consultation/services/treatmentConfig.js b/ui/app/clinical/consultation/services/treatmentConfig.js
index 71b469fd62..62cb4cd3a6 100644
--- a/ui/app/clinical/consultation/services/treatmentConfig.js
+++ b/ui/app/clinical/consultation/services/treatmentConfig.js
@@ -1,13 +1,22 @@
 'use strict';
 
 angular.module('bahmni.clinical').factory('treatmentConfig',
-    ['treatmentService', 'spinner', 'configurationService', 'appService', '$q', '$translate',
-        function (treatmentService, spinner, configurationService, appService, $q, $translate) {
+    ['treatmentService', 'spinner', 'configurationService', 'appService', 'localeService', '$q', '$translate',
+        function (treatmentService, spinner, configurationService, appService, localeService, $q, $translate) {
+            var defaultLocale = "en";
+            var getDefaultLocale = function () {
+                return localeService.defaultLocale().then(function (response) {
+                    defaultLocale = response.data;
+                    return response.data;
+                });
+            };
+
             var getConfigFromServer = function (baseTreatmentConfig) {
                 return treatmentService.getConfig().then(function (result) {
                     var config = angular.extend(baseTreatmentConfig, result.data);
+                    var durationConceptName = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                     config.durationUnits = [
-                        {name: "Day(s)", factor: 1}
+                        {name: durationConceptName, factor: 1}
                     ];
                     config.frequencies = _(config.frequencies)
                         .reverse()
@@ -38,6 +47,7 @@ angular.module('bahmni.clinical').factory('treatmentConfig',
 
             return function (tabConfigName) {
                 var drugOrderOptions;
+                getDefaultLocale();
                 var baseTreatmentConfig = {
                     allowNonCodedDrugs: function () {
                         return drugOrderOptions.allowNonCodedDrugs;
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 098edb1f63..9f776009a4 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -140,6 +140,7 @@
         <script src="../common/domain/services/dispositionService.js"></script>
         <script src="../common/domain/services/visitDocumentService.js"></script>
         <script src="../common/domain/services/bedService.js"></script>
+        <script src="../common/domain/services/localeService.js"></script>
 
         <script src="../common/domain/services/providerService.js"></script>
         <script src="../common/domain/services/providerTypeService.js"></script>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index e9da529aaa..73d53752f4 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -409,5 +409,6 @@
     "CLINICAL_NO_NUTRITIONAL_STATUS": "No Nutritional Status Available",
     "VALUE_RANGE_MESSAGE":"The value is out of range",
     "CLINICAL_APP_TITLE":"OPD",
-    "SERVICES_APP_TITLE": "Services"
+    "SERVICES_APP_TITLE": "Services",
+    "DURATION_UNIT": "Day(s)"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index cfb22da056..1c4a9cd9ad 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -432,5 +432,6 @@
   "CLINICAL_NO_NUTRITIONAL_STATUS": "Nenhum estado nutricional disponivel",
   "VALUE_RANGE_MESSAGE": "Os valores introduzidos estão fora do intervalo",
   "CLINICAL_APP_TITLE":"Clínico",
-  "SERVICES_APP_TITLE": "Serviços"
+  "SERVICES_APP_TITLE": "Serviços",
+  "DURATION_UNIT" : "Dia (s)"
 }

From 03ffc83fb8cf34729e0f86e470c046393af545cf Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Tue, 30 Jul 2019 10:41:42 +0300
Subject: [PATCH 019/131] Revert "MPOC-459 fix medications duration units
 translation"

This reverts commit 5bf84d8d7a1691a016d6620cedb0421ba2298bf9.
---
 .../clinical/common/models/drugOrderViewModel.js |  5 ++---
 .../controllers/addTreatmentController.js        | 11 ++---------
 .../consultation/services/treatmentConfig.js     | 16 +++-------------
 ui/app/clinical/index.html                       |  1 -
 ui/app/i18n/clinical/locale_en.json              |  3 +--
 ui/app/i18n/clinical/locale_pt.json              |  3 +--
 6 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/ui/app/clinical/common/models/drugOrderViewModel.js b/ui/app/clinical/common/models/drugOrderViewModel.js
index 1fb5ca1d2f..744af3baab 100644
--- a/ui/app/clinical/common/models/drugOrderViewModel.js
+++ b/ui/app/clinical/common/models/drugOrderViewModel.js
@@ -324,8 +324,7 @@ Bahmni.Clinical.DrugOrderViewModel = function (config, proto, encounterDate) {
         }
     };
 
-    this.calculateDurationUnit = function (durationUnits) {
-        durationUnits = durationUnits || "Day(s)";
+    this.calculateDurationUnit = function () {
         if (self.frequencyType === Bahmni.Clinical.Constants.dosingTypes.uniform && self.uniformDosingType.frequency != null) {
             var defaultDurationUnitMap = inputOptionsConfig.frequencyDefaultDurationUnitsMap || [];
 
@@ -334,7 +333,7 @@ Bahmni.Clinical.DrugOrderViewModel = function (config, proto, encounterDate) {
                 var maxFrequency = eval(range.maxFrequency); // eslint-disable-line no-eval
                 if ((!minFrequency || minFrequency < getFrequencyPerDay()) &&
                     (!maxFrequency || getFrequencyPerDay() <= maxFrequency)) {
-                    self.durationUnit = durationUnits.length > 0 && durationUnits[0].name ? durationUnits[0].name : range.defaultDurationUnit;
+                    self.durationUnit = range.defaultDurationUnit;
                 }
             });
         }
diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index d2b467df91..a0317d84e6 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,19 +3,13 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate',
+        'orderSetService', '$q', 'locationService', 'spinner', '$translate',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, localeService, spinner, $translate) {
+                  orderSetService, $q, locationService, spinner, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
-            var defaultLocale = "en";
-            localeService.defaultLocale().then(function (response) {
-                defaultLocale = response.data;
-                $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
-                return response.data;
-            });
 
             $scope.showOrderSetDetails = true;
             $scope.addTreatment = true;
@@ -121,7 +115,6 @@ angular.module('bahmni.clinical')
             };
 
             $scope.treatment = newTreatment();
-            $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
             treatmentConfig.durationUnits.forEach(function (durationUnit) {
                 if (_.isEqual(durationUnit, $scope.treatment.durationUnit)) {
                     $scope.treatment.durationUnit = durationUnit;
diff --git a/ui/app/clinical/consultation/services/treatmentConfig.js b/ui/app/clinical/consultation/services/treatmentConfig.js
index 62cb4cd3a6..71b469fd62 100644
--- a/ui/app/clinical/consultation/services/treatmentConfig.js
+++ b/ui/app/clinical/consultation/services/treatmentConfig.js
@@ -1,22 +1,13 @@
 'use strict';
 
 angular.module('bahmni.clinical').factory('treatmentConfig',
-    ['treatmentService', 'spinner', 'configurationService', 'appService', 'localeService', '$q', '$translate',
-        function (treatmentService, spinner, configurationService, appService, localeService, $q, $translate) {
-            var defaultLocale = "en";
-            var getDefaultLocale = function () {
-                return localeService.defaultLocale().then(function (response) {
-                    defaultLocale = response.data;
-                    return response.data;
-                });
-            };
-
+    ['treatmentService', 'spinner', 'configurationService', 'appService', '$q', '$translate',
+        function (treatmentService, spinner, configurationService, appService, $q, $translate) {
             var getConfigFromServer = function (baseTreatmentConfig) {
                 return treatmentService.getConfig().then(function (result) {
                     var config = angular.extend(baseTreatmentConfig, result.data);
-                    var durationConceptName = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                     config.durationUnits = [
-                        {name: durationConceptName, factor: 1}
+                        {name: "Day(s)", factor: 1}
                     ];
                     config.frequencies = _(config.frequencies)
                         .reverse()
@@ -47,7 +38,6 @@ angular.module('bahmni.clinical').factory('treatmentConfig',
 
             return function (tabConfigName) {
                 var drugOrderOptions;
-                getDefaultLocale();
                 var baseTreatmentConfig = {
                     allowNonCodedDrugs: function () {
                         return drugOrderOptions.allowNonCodedDrugs;
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 9f776009a4..098edb1f63 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -140,7 +140,6 @@
         <script src="../common/domain/services/dispositionService.js"></script>
         <script src="../common/domain/services/visitDocumentService.js"></script>
         <script src="../common/domain/services/bedService.js"></script>
-        <script src="../common/domain/services/localeService.js"></script>
 
         <script src="../common/domain/services/providerService.js"></script>
         <script src="../common/domain/services/providerTypeService.js"></script>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 73d53752f4..e9da529aaa 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -409,6 +409,5 @@
     "CLINICAL_NO_NUTRITIONAL_STATUS": "No Nutritional Status Available",
     "VALUE_RANGE_MESSAGE":"The value is out of range",
     "CLINICAL_APP_TITLE":"OPD",
-    "SERVICES_APP_TITLE": "Services",
-    "DURATION_UNIT": "Day(s)"
+    "SERVICES_APP_TITLE": "Services"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 1c4a9cd9ad..cfb22da056 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -432,6 +432,5 @@
   "CLINICAL_NO_NUTRITIONAL_STATUS": "Nenhum estado nutricional disponivel",
   "VALUE_RANGE_MESSAGE": "Os valores introduzidos estão fora do intervalo",
   "CLINICAL_APP_TITLE":"Clínico",
-  "SERVICES_APP_TITLE": "Serviços",
-  "DURATION_UNIT" : "Dia (s)"
+  "SERVICES_APP_TITLE": "Serviços"
 }

From 5f7fdae55a7c1ee94e19c2e35733adce48606945 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Tue, 30 Jul 2019 12:38:06 +0300
Subject: [PATCH 020/131] MPOC-459 Fix duration units saving issue

---
 .../controllers/addTreatmentController.js      | 18 +++++++++++++++---
 .../consultation/services/treatmentConfig.js   | 16 +++++++++++++---
 ui/app/clinical/index.html                     |  1 +
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index a0317d84e6..b45497076f 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,14 +3,26 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'spinner', '$translate',
+        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, spinner, $translate) {
+                  orderSetService, $q, locationService, localeService, spinner, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
 
+            var defaultLocale = "en";
+            localeService.defaultLocale().then(function (response) {
+                defaultLocale = response.data;
+                $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
+                treatmentConfig.durationUnits.forEach(function (durationUnit) {
+                    if (_.isEqual(durationUnit, $scope.treatment.durationUnit)) {
+                        $scope.treatment.durationUnit = durationUnit;
+                    }
+                });
+                return response.data;
+            });
+
             $scope.showOrderSetDetails = true;
             $scope.addTreatment = true;
             $scope.canOrderSetBeAdded = true;
@@ -120,9 +132,9 @@ angular.module('bahmni.clinical')
                     $scope.treatment.durationUnit = durationUnit;
                 }
             });
-
             var watchFunctionForQuantity = function () {
                 var treatment = $scope.treatment;
+                treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                 return {
                     uniformDosingType: treatment.uniformDosingType,
                     variableDosingType: treatment.variableDosingType,
diff --git a/ui/app/clinical/consultation/services/treatmentConfig.js b/ui/app/clinical/consultation/services/treatmentConfig.js
index 71b469fd62..62cb4cd3a6 100644
--- a/ui/app/clinical/consultation/services/treatmentConfig.js
+++ b/ui/app/clinical/consultation/services/treatmentConfig.js
@@ -1,13 +1,22 @@
 'use strict';
 
 angular.module('bahmni.clinical').factory('treatmentConfig',
-    ['treatmentService', 'spinner', 'configurationService', 'appService', '$q', '$translate',
-        function (treatmentService, spinner, configurationService, appService, $q, $translate) {
+    ['treatmentService', 'spinner', 'configurationService', 'appService', 'localeService', '$q', '$translate',
+        function (treatmentService, spinner, configurationService, appService, localeService, $q, $translate) {
+            var defaultLocale = "en";
+            var getDefaultLocale = function () {
+                return localeService.defaultLocale().then(function (response) {
+                    defaultLocale = response.data;
+                    return response.data;
+                });
+            };
+
             var getConfigFromServer = function (baseTreatmentConfig) {
                 return treatmentService.getConfig().then(function (result) {
                     var config = angular.extend(baseTreatmentConfig, result.data);
+                    var durationConceptName = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                     config.durationUnits = [
-                        {name: "Day(s)", factor: 1}
+                        {name: durationConceptName, factor: 1}
                     ];
                     config.frequencies = _(config.frequencies)
                         .reverse()
@@ -38,6 +47,7 @@ angular.module('bahmni.clinical').factory('treatmentConfig',
 
             return function (tabConfigName) {
                 var drugOrderOptions;
+                getDefaultLocale();
                 var baseTreatmentConfig = {
                     allowNonCodedDrugs: function () {
                         return drugOrderOptions.allowNonCodedDrugs;
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 098edb1f63..9f776009a4 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -140,6 +140,7 @@
         <script src="../common/domain/services/dispositionService.js"></script>
         <script src="../common/domain/services/visitDocumentService.js"></script>
         <script src="../common/domain/services/bedService.js"></script>
+        <script src="../common/domain/services/localeService.js"></script>
 
         <script src="../common/domain/services/providerService.js"></script>
         <script src="../common/domain/services/providerTypeService.js"></script>

From d26f02b70f941e79793d5be5c4ddadbb52cc2f15 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Tue, 30 Jul 2019 15:29:14 +0200
Subject: [PATCH 021/131] Changes in Prophylaxis Sections Fixed

---
 .../concept-set/directives/buttonSelect.js    |  4 ++
 .../common/concept-set/directives/concept.js  | 49 +++++++++++++++----
 .../models/conceptSetObservation.js           | 12 +++--
 .../observationDataTypes/html5DataType.html   | 21 +++++++-
 ui/app/i18n/clinical/locale_en.json           |  2 +-
 ui/app/i18n/clinical/locale_pt_BR.json        |  2 +-
 6 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/ui/app/common/concept-set/directives/buttonSelect.js b/ui/app/common/concept-set/directives/buttonSelect.js
index 3eb8fa522f..8eef93e045 100644
--- a/ui/app/common/concept-set/directives/buttonSelect.js
+++ b/ui/app/common/concept-set/directives/buttonSelect.js
@@ -27,6 +27,10 @@ angular.module('bahmni.common.conceptSet')
                     $scope.observation.disabled = true;
                 }
 
+                if ($scope.observation.concept.name == 'State_Prophylaxis') {
+                    $scope.observation.disabled = true;
+                }
+
                 $scope.select = function (answer) {
                     $scope.observation.toggleSelection(answer);
                     if ($scope.$parent.observation && typeof $scope.$parent.observation.onValueChanged == 'function') {
diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 291e0b489c..a389065089 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -3,7 +3,7 @@
 angular.module('bahmni.common.conceptSet')
     .directive('concept', ['RecursionHelper', 'spinner', '$filter', 'messagingService', '$http', '$timeout', 'bmiCalculationService', '$rootScope', '$translate',
         function (RecursionHelper, spinner, $filter, messagingService, $http, $timeout, bmiCalculationService, $rootScope, $translate) {
-            var height, weight, brachialPerimeter, bmi, data, key, isValidHeight, treatmentStartDate, treatmentEndDate, answer, prophylaxisKey;
+            var height, weight, brachialPerimeter, bmi, data, key, isValidHeight, startDateProphylaxis, enDateProphylaxis, treatmentStartDate, treatmentEndDate, answer, tuberculosisData, prophylaxisData;
 
             var link = function (scope) {
                 var dateUtil = Bahmni.Common.Util.DateUtil;
@@ -32,24 +32,48 @@ angular.module('bahmni.common.conceptSet')
                     if (scope.observation.concept.name === "SP_Treatment End Date") {
                         treatmentEndDate = scope.observation.value;
                     }
+                    if (scope.observation.concept.name === "Start Date_Prophylaxis") {
+                        startDateProphylaxis = scope.observation.value;
+                    }
+                    if (scope.observation.concept.name === "End Date") {
+                        enDateProphylaxis = scope.observation.value;
+                    }
 
                     if (treatmentStartDate === '' || treatmentEndDate === '') {
                         answer = null;
-                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
+                        $rootScope.observationData.toggleSelectionTBState(answer);
                     }
                     if (treatmentStartDate === scope.today && treatmentStartDate !== '') {
-                        answer = prophylaxisKey[0];
-                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
+                        answer = tuberculosisData[0];
+                        $rootScope.observationData.toggleSelectionTBState(answer);
                     }
                     if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate)) {
-                        answer = prophylaxisKey[1];
-                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
+                        answer = tuberculosisData[1];
+                        $rootScope.observationData.toggleSelectionTBState(answer);
                     }
                     if ((treatmentEndDate <= scope.today) && (treatmentEndDate >= treatmentStartDate) && (treatmentEndDate != '')) {
-                        answer = prophylaxisKey[2];
-                        $rootScope.observationData.toggleSelectionTreatmentState(answer);
+                        answer = tuberculosisData[2];
+                        $rootScope.observationData.toggleSelectionTBState(answer);
+                    }
+
+                    if (startDateProphylaxis === '' || enDateProphylaxis === '') {
+                        answer = null;
+                        $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
+                    }
+                    if (startDateProphylaxis === scope.today && startDateProphylaxis !== '') {
+                        answer = prophylaxisData[0];
+                        $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
-                    if (treatmentStartDate > treatmentEndDate) {
+                    if ((startDateProphylaxis < scope.today) && (scope.today < enDateProphylaxis)) {
+                        answer = prophylaxisData[1];
+                        $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
+                    }
+                    if ((enDateProphylaxis <= scope.today) && (enDateProphylaxis >= startDateProphylaxis) && (enDateProphylaxis != '')) {
+                        answer = prophylaxisData[2];
+                        $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
+                    }
+
+                    if (treatmentStartDate > treatmentEndDate || startDateProphylaxis > enDateProphylaxis) {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                     }
                 };
@@ -72,7 +96,12 @@ angular.module('bahmni.common.conceptSet')
                     if (scope.conceptSetName === 'Group V-Screening / Prophylaxis') {
                         if (scope.observation.concept.name === 'SP_Treatment State') {
                             $rootScope.observationData = scope.observation;
-                            prophylaxisKey = scope.observation.possibleAnswers;
+                            tuberculosisData = scope.observation.possibleAnswers;
+                        }
+
+                        if (scope.observation.concept.name === 'INH_Details' || scope.observation.concept.name === 'CTZ_Details' || scope.observation.concept.name === 'Fluconazol_Details') {
+                            $rootScope.prophylaxisObservationData = scope.observation.groupMembers[1];
+                            prophylaxisData = $rootScope.prophylaxisObservationData.possibleAnswers;
                         }
                     }
                 }
diff --git a/ui/app/common/concept-set/models/conceptSetObservation.js b/ui/app/common/concept-set/models/conceptSetObservation.js
index 1b6e415e92..4a26ccb220 100644
--- a/ui/app/common/concept-set/models/conceptSetObservation.js
+++ b/ui/app/common/concept-set/models/conceptSetObservation.js
@@ -361,7 +361,6 @@ Bahmni.ConceptSet.Observation.prototype = {
     },
 
     toggleSelection: function (answer) {
-        console.log(answer);
         if (this.value && this.value.uuid === answer.uuid) {
             this.value = null;
         } else {
@@ -369,8 +368,15 @@ Bahmni.ConceptSet.Observation.prototype = {
         }
     },
 
-    toggleSelectionTreatmentState: function (answer) {
-        console.log(answer);
+    toggleSelectionTBState: function (answer) {
+        if (answer) {
+            this.value = answer;
+        } else {
+            this.value = null;
+        }
+    },
+
+    toggleSelectionProphylaxisState: function (answer) {
         if (answer) {
             this.value = answer;
         } else {
diff --git a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
index 6d0aefa850..26e1174467 100644
--- a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
+++ b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
@@ -31,7 +31,8 @@
        focus-me="::observation.isFocused" tabindex="1"/>
 
 <input id="{{::observation.uniqueId}}" obs-constraints obs="::observation" max = "{{::today}}"
-       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId !== 'observation_40'" ng-disabled="observation.disabled"
+       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId !== 'observation_40' && observation.uniqueId !== 'observation_45' && observation.uniqueId !== 'observation_51' && observation.uniqueId !== 'observation_57'"
+       ng-disabled="observation.disabled"
        ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
        ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
        focus-me="::observation.isFocused" tabindex="1"/>
@@ -42,6 +43,24 @@
        ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
        focus-me="::observation.isFocused" tabindex="1"/>
 
+<input id="{{::observation.uniqueId}}" obs-constraints obs="::observation"
+       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId === 'observation_45'" ng-disabled="observation.disabled"
+       ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
+       ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
+       focus-me="::observation.isFocused" tabindex="1"/>
+
+<input id="{{::observation.uniqueId}}" obs-constraints obs="::observation"
+       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId === 'observation_51'" ng-disabled="observation.disabled"
+       ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
+       ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
+       focus-me="::observation.isFocused" tabindex="1"/>
+
+<input id="{{::observation.uniqueId}}" obs-constraints obs="::observation"
+       ng-if="!observation.isNumeric() && !observation._isDateTimeDataType() && !observation.conceptUIConfig.displayMonthAndYear && observation.uniqueId === 'observation_57'" ng-disabled="observation.disabled"
+       ng-model="observation.value" ng-change="handleUpdate();onDateChange()"
+       ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
+       focus-me="::observation.isFocused" tabindex="1"/>
+
 <stepper id="{{::observation.uniqueId}}"
          ng-model="observation.value" ng-blur="handleUpdate()" obs="observation"
          ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet, conceptSetRequired)}"
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index e9da529aaa..4e711c3e8c 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -405,7 +405,7 @@
     "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_REVISE": "is conflicting with drug order you are trying to add. You can revise or refill instead.",
     "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_STOP": "is conflicting with drug order you are trying to add. You can stop the active drug order and create a new one.",
     "MEDICATION_REVISE":"Revise",
-    "INVALID_TREATMENT_END_DATE": "TREATMENT END DATE cannot be less than START DATE",
+    "INVALID_TREATMENT_END_DATE": "END DATE cannot be less than START DATE",
     "CLINICAL_NO_NUTRITIONAL_STATUS": "No Nutritional Status Available",
     "VALUE_RANGE_MESSAGE":"The value is out of range",
     "CLINICAL_APP_TITLE":"OPD",
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index cfb22da056..aeb23eaa07 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -428,7 +428,7 @@
   "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_REVISE": "está em conflito com o medicamento que pretende adicionar. Pode rever ou reabastecer.",
   "MEDICATION_ERROR_CONFLICTING_WITH_DRUG_ORDER_YOU_CAN_STOP": "está em conflito com o medicamento que pretende adicionar. Pode terminar a prescrição activa ou criar uma nova",
   "MEDICATION_REVISE":"Rever",
-  "INVALID_TREATMENT_END_DATE": "DATA DO FIM DO TRATAMENTO não pode ser menor que DATA DO INÍCIO",
+  "INVALID_TREATMENT_END_DATE": "DATA DO FIM não pode ser menor que DATA DE INÍCIO",
   "CLINICAL_NO_NUTRITIONAL_STATUS": "Nenhum estado nutricional disponivel",
   "VALUE_RANGE_MESSAGE": "Os valores introduzidos estão fora do intervalo",
   "CLINICAL_APP_TITLE":"Clínico",

From c8b90231f9e449e84f9b57718c871f20cdfe687d Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Wed, 31 Jul 2019 12:29:56 +0300
Subject: [PATCH 022/131] MPOC-442 refactor special opd visit type

---
 ui/app/i18n/clinical/locale_en.json    | 3 ++-
 ui/app/i18n/clinical/locale_pt_BR.json | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index e9da529aaa..553848dba0 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -383,7 +383,8 @@
     "FOLLOWUP_CLINICAL_CONSULTATION":"Clinical Consultation",
     "FOLLOWUP_CLINICAL_CONSULTATION_A":"Clinical - Follow Up Consultation",
     "BIRTHDATE_ESTIMATED": "Estimated",
-    "SPECIAL_OPD": "Special OPD",
+    "SPECIAL_OPD": "Retrospective Visit",
+    "Special OPD" : "Retrospective Visit",
     "ENCOUNTER_APSS_FIRST": "APSS First",
     "ENCOUNTER_APSS_FOLLOWUP": "APSS Follow Up",
     "ENCOUNTER_CLINICAL_FIRST": "Clinical First",
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index cfb22da056..2400316b4c 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -367,8 +367,8 @@
   "ORDER_TYPE": "Exames",
   "BIRTHDATE_ESTIMATED": "Estimado",
   "CLINICAL_ORDER_URGENT_TITLE": "Urgente",
-  "SPECIAL_OPD": "OPD Especial",
-  "Special OPD": "OPD Especial",
+  "SPECIAL_OPD": "Consulta Retrospectiva",
+  "Special OPD": "Consulta Retrospectiva",
   "NO_VITALS_MESSAGE": "Nenhum dado registado para este paciente",
   "ENCOUNTER_APSS_FIRST": "APSS - Primeira Consulta",
   "ENCOUNTER_APSS_FOLLOWUP": "APSS - Consulta de Seguimento",

From e09d944843d52081644d0db0a4da11807916fe5a Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Wed, 31 Jul 2019 13:56:44 +0300
Subject: [PATCH 023/131] MPOC-442 add start visit type to clinical app locale

---
 ui/app/i18n/clinical/locale_en.json    | 1 +
 ui/app/i18n/clinical/locale_pt_BR.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 553848dba0..d03f41675e 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -385,6 +385,7 @@
     "BIRTHDATE_ESTIMATED": "Estimated",
     "SPECIAL_OPD": "Retrospective Visit",
     "Special OPD" : "Retrospective Visit",
+    "Patient_Start_Visit" :"Start Visit",
     "ENCOUNTER_APSS_FIRST": "APSS First",
     "ENCOUNTER_APSS_FOLLOWUP": "APSS Follow Up",
     "ENCOUNTER_CLINICAL_FIRST": "Clinical First",
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index 2400316b4c..322fb929ad 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -369,6 +369,7 @@
   "CLINICAL_ORDER_URGENT_TITLE": "Urgente",
   "SPECIAL_OPD": "Consulta Retrospectiva",
   "Special OPD": "Consulta Retrospectiva",
+  "Patient_Start_Visit" :"Iniciar Consulta",
   "NO_VITALS_MESSAGE": "Nenhum dado registado para este paciente",
   "ENCOUNTER_APSS_FIRST": "APSS - Primeira Consulta",
   "ENCOUNTER_APSS_FOLLOWUP": "APSS - Consulta de Seguimento",

From 31e565b529328f6800f9cde1ee0f6d52aec6e17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Wed, 31 Jul 2019 14:35:47 +0200
Subject: [PATCH 024/131] Simao Mazive - MPOC-79 Changes on Patient Dashboard
 (#269)

* Changes on Patient Dashboard

I took advantage for update the "focus-me" property in registration module.

* Update allergies title in dashbord

* Remove inactive button
---
 .../controllers/diagnosisController.js        |  3 +--
 .../consultation/views/allergies.html         | 27 -------------------
 .../views/attributeInformation.html           |  2 +-
 .../allergiesList/directives/allergiesList.js |  4 +--
 ui/app/i18n/clinical/locale_pt_BR.json        |  6 ++---
 ui/app/registration/views/patientcommon.html  |  2 +-
 6 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/diagnosisController.js b/ui/app/clinical/consultation/controllers/diagnosisController.js
index a1c97b1288..dc1a4e633a 100644
--- a/ui/app/clinical/consultation/controllers/diagnosisController.js
+++ b/ui/app/clinical/consultation/controllers/diagnosisController.js
@@ -32,8 +32,7 @@ angular.module('bahmni.clinical')
                 'CONDITION_LIST_HISTORY_OF': 'HISTORY_OF'
             };
             $scope.allergiesStatuses = {
-                'ALLERGIES_LIST_ACTIVE': 'ACTIVE',
-                'ALLERGIES_LIST_INACTIVE': 'INACTIVE'
+                'ALLERGIES_LIST_ACTIVE': 'ACTIVE'
             };
             $scope.consultation.followUpConditions = $scope.consultation.followUpConditions || [];
             $scope.consultation.followUpAllergies = $scope.consultation.followUpAllergies || [];
diff --git a/ui/app/clinical/consultation/views/allergies.html b/ui/app/clinical/consultation/views/allergies.html
index 9c1ec379d5..dd7eb5a9c0 100644
--- a/ui/app/clinical/consultation/views/allergies.html
+++ b/ui/app/clinical/consultation/views/allergies.html
@@ -80,33 +80,6 @@ <h2 class="section-title">
                 <ng-include src="'consultation/views/allergiesRow.html'"/>
             </div>
         </div>
-        <div class="table new-diagnosis section-grid">
-            <div class="row table-header" toggle="toggles.expandInactive">
-                <div class="col col1">
-                <span>
-                    <i class="fa fa-caret-down" ng-show="toggles.expandInactive"></i>
-                    <i class="fa fa-caret-right" ng-hide="toggles.expandInactive"></i>
-                    {{'ALLERGIES_LIST_ALLERGIES_INACTIVE'|translate}}
-                </span>
-                </div>
-                <div class="col col2 notes-subscriber">
-                    <span class="subscriber-name"></span>
-                    <span>{{'ALLERGIES_LIST_NOTES'|translate}}</span>
-                </div>
-            </div>
-            <div ng-show="toggles.expandInactive">
-                <div class="row" ng-if="filterAllergies('INACTIVE').length == 0">
-                    <div class="col col1">
-                        <div class="diagnosis-name">
-                            {{'ALLERGIES_LIST_NO_ALLERGIES' | translate}}
-                        </div>
-                    </div>
-                </div>
-                <div ng-repeat="allergy in filterAllergies('INACTIVE')" class="table-body">
-                    <ng-include src="'consultation/views/allergiesRow.html'"/>
-                </div>
-            </div>
-        </div>
     </div>
  
 </div>
diff --git a/ui/app/common/attributeTypes/views/attributeInformation.html b/ui/app/common/attributeTypes/views/attributeInformation.html
index acae71d8b6..5c732386be 100644
--- a/ui/app/common/attributeTypes/views/attributeInformation.html
+++ b/ui/app/common/attributeTypes/views/attributeInformation.html
@@ -100,7 +100,7 @@
 
     <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name === 'TYPE_OF_REGISTRATION'">
         <select id="{{::attribute.name}}" ng-model="targetModel[attribute.name].conceptUuid" ng-disabled="attribute.enabled"
-                ng-options="a.conceptId as a.description | translate for a in ::attribute.answers"
+                ng-options="a.conceptId as a.description | translate for a in ::attribute.answers" focus-me="true"
                 ng-required="{{::attribute.required}}" ng-change="appendConceptNameToModel(attribute);validationDirectiveTypeOfRegistration(attribute);handleUpdate(attribute.name)">
             <option disabled value="">{{::'REGISTRATION_CHOOSE_AN_OPTION' | translate}}</option>
         </select>
diff --git a/ui/app/common/displaycontrols/allergiesList/directives/allergiesList.js b/ui/app/common/displaycontrols/allergiesList/directives/allergiesList.js
index fdcfae5f54..3dc3edadb0 100644
--- a/ui/app/common/displaycontrols/allergiesList/directives/allergiesList.js
+++ b/ui/app/common/displaycontrols/allergiesList/directives/allergiesList.js
@@ -4,7 +4,7 @@ angular.module('bahmni.common.displaycontrol.allergiesList', []);
 angular.module('bahmni.common.displaycontrol.allergiesList')
     .directive('allergiesList', ['allergiesService', 'ngDialog', function (allergiesService, ngDialog) {
         var controller = function ($scope) {
-            $scope.statuses = ['ACTIVE', 'INACTIVE'];
+            $scope.statuses = ['ACTIVE'];
 
             $scope.openSummaryDialog = function () {
                 ngDialog.open({
@@ -13,7 +13,7 @@ angular.module('bahmni.common.displaycontrol.allergiesList')
                     data: {allergies: $scope.allergies},
                     controller: function ($scope) {
                         $scope.hideTitle = true;
-                        $scope.statuses = ['ACTIVE', 'INACTIVE'];
+                        $scope.statuses = ['ACTIVE'];
                         $scope.allergies = $scope.ngDialogData.allergies;
                     }
                 });
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt_BR.json
index cfb22da056..b5f24163fe 100644
--- a/ui/app/i18n/clinical/locale_pt_BR.json
+++ b/ui/app/i18n/clinical/locale_pt_BR.json
@@ -391,13 +391,13 @@
   "ALLERGIES_LIST_ADD": "Adicionar",
   "ALLERGIES_LIST_ALREADY_EXISTS_AS_ACTIVE": " Alergias já existe como activa",
   "ALLERGIES_LIST_ALREADY_EXISTS": " Alergias já existe com o estado '{{status}}' na lista de condições ({{lastActive}})",
-  "ALLERGIES_LIST_CONDITION": " Alergias",
-  "ALLERGIES_LIST_ALLERGIES_ACTIVE": " Alergias Activas",
+  "ALLERGIES_LIST_CONDITION": " Alergias a medicamentos",
+  "ALLERGIES_LIST_ALLERGIES_ACTIVE": " Alergias a medicamentos",
   "ALLERGIES_LIST_ALLERGIES_HISTORY_OF": "Historico de  Alergias",
   "ALLERGIES_LIST_ALLERGIES_INACTIVE": " Alergias Inactivas ",
   "ALLERGIES_LIST_CREATED_BY": "por",
   "ALLERGIES_LIST_DATE": "Data",
-  "ALLERGIES_LIST_DISPLAY_CONTROL_TITLE": " Alergias",
+  "ALLERGIES_LIST_DISPLAY_CONTROL_TITLE": " Alergias a medicamentos",
   "ALLERGIES_LIST_FOLLOW_UP": "Seguimento",
   "ALLERGIES_LIST_HISTORY_OF": "Histórico de",
   "ALLERGIES_LIST_INACTIVE": "Inactivo",
diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index da64a1ee9a..a6967a3e82 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -45,7 +45,7 @@
 
                         <input data-ng-switch-default type="text" name="givenName" id="givenName" ng-model="patient.givenName" non-blank
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
-                               focus-me="true" ng-pattern="regexCharacters"
+                               ng-pattern="regexCharacters"
                                ng-change="checkDuplicatePatients()" required field-validation="::fieldValidation"
                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.givenName.$invalid || this.myForms.myForm.givenName.$error.pattern || (this.myForms.myForm.givenName.$error.required && !this.myForms.myForm.givenName.$pristine)}">
                         <p class="help-block" ng-show="this.myForms.myForm.givenName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>

From b236cbe9f876776c36cf31e0385dc2f8478ef94d Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Thu, 1 Aug 2019 16:02:14 +0200
Subject: [PATCH 025/131] Revert "Merge branch 'MPOC-459' into develop"

This reverts commit 14f25841098ec5fa8e137461e0d8b7f82981f27d, reversing
changes made to 31e565b529328f6800f9cde1ee0f6d52aec6e17c.
---
 .../controllers/addTreatmentController.js      | 18 +++---------------
 .../consultation/services/treatmentConfig.js   | 16 +++-------------
 ui/app/clinical/index.html                     |  1 -
 .../{locale_pt.json => locale_pt_BR.json}      |  0
 .../adt/{locale_pt.json => locale_pt_BR.json}  |  0
 .../{locale_pt.json => locale_pt_BR.json}      |  0
 .../{locale_pt.json => locale_pt_BR.json}      |  0
 .../home/{locale_pt.json => locale_pt_BR.json} |  0
 .../{locale_pt.json => locale_pt_BR.json}      |  0
 .../{locale_pt.json => locale_pt_BR.json}      |  0
 .../{locale_pt.json => locale_pt_BR.json}      |  0
 11 files changed, 6 insertions(+), 29 deletions(-)
 rename ui/app/i18n/admin/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/adt/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/appointments/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/clinical/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/home/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/orders/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/registration/{locale_pt.json => locale_pt_BR.json} (100%)
 rename ui/app/i18n/reports/{locale_pt.json => locale_pt_BR.json} (100%)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index b45497076f..a0317d84e6 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,26 +3,14 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate',
+        'orderSetService', '$q', 'locationService', 'spinner', '$translate',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, localeService, spinner, $translate) {
+                  orderSetService, $q, locationService, spinner, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
 
-            var defaultLocale = "en";
-            localeService.defaultLocale().then(function (response) {
-                defaultLocale = response.data;
-                $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
-                treatmentConfig.durationUnits.forEach(function (durationUnit) {
-                    if (_.isEqual(durationUnit, $scope.treatment.durationUnit)) {
-                        $scope.treatment.durationUnit = durationUnit;
-                    }
-                });
-                return response.data;
-            });
-
             $scope.showOrderSetDetails = true;
             $scope.addTreatment = true;
             $scope.canOrderSetBeAdded = true;
@@ -132,9 +120,9 @@ angular.module('bahmni.clinical')
                     $scope.treatment.durationUnit = durationUnit;
                 }
             });
+
             var watchFunctionForQuantity = function () {
                 var treatment = $scope.treatment;
-                treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                 return {
                     uniformDosingType: treatment.uniformDosingType,
                     variableDosingType: treatment.variableDosingType,
diff --git a/ui/app/clinical/consultation/services/treatmentConfig.js b/ui/app/clinical/consultation/services/treatmentConfig.js
index 62cb4cd3a6..71b469fd62 100644
--- a/ui/app/clinical/consultation/services/treatmentConfig.js
+++ b/ui/app/clinical/consultation/services/treatmentConfig.js
@@ -1,22 +1,13 @@
 'use strict';
 
 angular.module('bahmni.clinical').factory('treatmentConfig',
-    ['treatmentService', 'spinner', 'configurationService', 'appService', 'localeService', '$q', '$translate',
-        function (treatmentService, spinner, configurationService, appService, localeService, $q, $translate) {
-            var defaultLocale = "en";
-            var getDefaultLocale = function () {
-                return localeService.defaultLocale().then(function (response) {
-                    defaultLocale = response.data;
-                    return response.data;
-                });
-            };
-
+    ['treatmentService', 'spinner', 'configurationService', 'appService', '$q', '$translate',
+        function (treatmentService, spinner, configurationService, appService, $q, $translate) {
             var getConfigFromServer = function (baseTreatmentConfig) {
                 return treatmentService.getConfig().then(function (result) {
                     var config = angular.extend(baseTreatmentConfig, result.data);
-                    var durationConceptName = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                     config.durationUnits = [
-                        {name: durationConceptName, factor: 1}
+                        {name: "Day(s)", factor: 1}
                     ];
                     config.frequencies = _(config.frequencies)
                         .reverse()
@@ -47,7 +38,6 @@ angular.module('bahmni.clinical').factory('treatmentConfig',
 
             return function (tabConfigName) {
                 var drugOrderOptions;
-                getDefaultLocale();
                 var baseTreatmentConfig = {
                     allowNonCodedDrugs: function () {
                         return drugOrderOptions.allowNonCodedDrugs;
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 9f776009a4..098edb1f63 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -140,7 +140,6 @@
         <script src="../common/domain/services/dispositionService.js"></script>
         <script src="../common/domain/services/visitDocumentService.js"></script>
         <script src="../common/domain/services/bedService.js"></script>
-        <script src="../common/domain/services/localeService.js"></script>
 
         <script src="../common/domain/services/providerService.js"></script>
         <script src="../common/domain/services/providerTypeService.js"></script>
diff --git a/ui/app/i18n/admin/locale_pt.json b/ui/app/i18n/admin/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/admin/locale_pt.json
rename to ui/app/i18n/admin/locale_pt_BR.json
diff --git a/ui/app/i18n/adt/locale_pt.json b/ui/app/i18n/adt/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/adt/locale_pt.json
rename to ui/app/i18n/adt/locale_pt_BR.json
diff --git a/ui/app/i18n/appointments/locale_pt.json b/ui/app/i18n/appointments/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/appointments/locale_pt.json
rename to ui/app/i18n/appointments/locale_pt_BR.json
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/clinical/locale_pt.json
rename to ui/app/i18n/clinical/locale_pt_BR.json
diff --git a/ui/app/i18n/home/locale_pt.json b/ui/app/i18n/home/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/home/locale_pt.json
rename to ui/app/i18n/home/locale_pt_BR.json
diff --git a/ui/app/i18n/orders/locale_pt.json b/ui/app/i18n/orders/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/orders/locale_pt.json
rename to ui/app/i18n/orders/locale_pt_BR.json
diff --git a/ui/app/i18n/registration/locale_pt.json b/ui/app/i18n/registration/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/registration/locale_pt.json
rename to ui/app/i18n/registration/locale_pt_BR.json
diff --git a/ui/app/i18n/reports/locale_pt.json b/ui/app/i18n/reports/locale_pt_BR.json
similarity index 100%
rename from ui/app/i18n/reports/locale_pt.json
rename to ui/app/i18n/reports/locale_pt_BR.json

From 1116888e5526b8b7474b024e8fb6510265aeaed2 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Thu, 1 Aug 2019 16:29:29 +0200
Subject: [PATCH 026/131] Revert "Revert "Merge branch 'MPOC-459' into
 develop""

This reverts commit b236cbe9f876776c36cf31e0385dc2f8478ef94d.
---
 .../controllers/addTreatmentController.js      | 18 +++++++++++++++---
 .../consultation/services/treatmentConfig.js   | 16 +++++++++++++---
 ui/app/clinical/index.html                     |  1 +
 .../{locale_pt_BR.json => locale_pt.json}      |  0
 .../adt/{locale_pt_BR.json => locale_pt.json}  |  0
 .../{locale_pt_BR.json => locale_pt.json}      |  0
 .../{locale_pt_BR.json => locale_pt.json}      |  0
 .../home/{locale_pt_BR.json => locale_pt.json} |  0
 .../{locale_pt_BR.json => locale_pt.json}      |  0
 .../{locale_pt_BR.json => locale_pt.json}      |  0
 .../{locale_pt_BR.json => locale_pt.json}      |  0
 11 files changed, 29 insertions(+), 6 deletions(-)
 rename ui/app/i18n/admin/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/adt/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/appointments/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/clinical/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/home/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/orders/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/registration/{locale_pt_BR.json => locale_pt.json} (100%)
 rename ui/app/i18n/reports/{locale_pt_BR.json => locale_pt.json} (100%)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index a0317d84e6..b45497076f 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,14 +3,26 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'spinner', '$translate',
+        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, spinner, $translate) {
+                  orderSetService, $q, locationService, localeService, spinner, $translate) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
 
+            var defaultLocale = "en";
+            localeService.defaultLocale().then(function (response) {
+                defaultLocale = response.data;
+                $scope.treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
+                treatmentConfig.durationUnits.forEach(function (durationUnit) {
+                    if (_.isEqual(durationUnit, $scope.treatment.durationUnit)) {
+                        $scope.treatment.durationUnit = durationUnit;
+                    }
+                });
+                return response.data;
+            });
+
             $scope.showOrderSetDetails = true;
             $scope.addTreatment = true;
             $scope.canOrderSetBeAdded = true;
@@ -120,9 +132,9 @@ angular.module('bahmni.clinical')
                     $scope.treatment.durationUnit = durationUnit;
                 }
             });
-
             var watchFunctionForQuantity = function () {
                 var treatment = $scope.treatment;
+                treatment.durationUnit = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                 return {
                     uniformDosingType: treatment.uniformDosingType,
                     variableDosingType: treatment.variableDosingType,
diff --git a/ui/app/clinical/consultation/services/treatmentConfig.js b/ui/app/clinical/consultation/services/treatmentConfig.js
index 71b469fd62..62cb4cd3a6 100644
--- a/ui/app/clinical/consultation/services/treatmentConfig.js
+++ b/ui/app/clinical/consultation/services/treatmentConfig.js
@@ -1,13 +1,22 @@
 'use strict';
 
 angular.module('bahmni.clinical').factory('treatmentConfig',
-    ['treatmentService', 'spinner', 'configurationService', 'appService', '$q', '$translate',
-        function (treatmentService, spinner, configurationService, appService, $q, $translate) {
+    ['treatmentService', 'spinner', 'configurationService', 'appService', 'localeService', '$q', '$translate',
+        function (treatmentService, spinner, configurationService, appService, localeService, $q, $translate) {
+            var defaultLocale = "en";
+            var getDefaultLocale = function () {
+                return localeService.defaultLocale().then(function (response) {
+                    defaultLocale = response.data;
+                    return response.data;
+                });
+            };
+
             var getConfigFromServer = function (baseTreatmentConfig) {
                 return treatmentService.getConfig().then(function (result) {
                     var config = angular.extend(baseTreatmentConfig, result.data);
+                    var durationConceptName = defaultLocale === "pt" ? "Dia (s)" : "Day(s)";
                     config.durationUnits = [
-                        {name: "Day(s)", factor: 1}
+                        {name: durationConceptName, factor: 1}
                     ];
                     config.frequencies = _(config.frequencies)
                         .reverse()
@@ -38,6 +47,7 @@ angular.module('bahmni.clinical').factory('treatmentConfig',
 
             return function (tabConfigName) {
                 var drugOrderOptions;
+                getDefaultLocale();
                 var baseTreatmentConfig = {
                     allowNonCodedDrugs: function () {
                         return drugOrderOptions.allowNonCodedDrugs;
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 098edb1f63..9f776009a4 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -140,6 +140,7 @@
         <script src="../common/domain/services/dispositionService.js"></script>
         <script src="../common/domain/services/visitDocumentService.js"></script>
         <script src="../common/domain/services/bedService.js"></script>
+        <script src="../common/domain/services/localeService.js"></script>
 
         <script src="../common/domain/services/providerService.js"></script>
         <script src="../common/domain/services/providerTypeService.js"></script>
diff --git a/ui/app/i18n/admin/locale_pt_BR.json b/ui/app/i18n/admin/locale_pt.json
similarity index 100%
rename from ui/app/i18n/admin/locale_pt_BR.json
rename to ui/app/i18n/admin/locale_pt.json
diff --git a/ui/app/i18n/adt/locale_pt_BR.json b/ui/app/i18n/adt/locale_pt.json
similarity index 100%
rename from ui/app/i18n/adt/locale_pt_BR.json
rename to ui/app/i18n/adt/locale_pt.json
diff --git a/ui/app/i18n/appointments/locale_pt_BR.json b/ui/app/i18n/appointments/locale_pt.json
similarity index 100%
rename from ui/app/i18n/appointments/locale_pt_BR.json
rename to ui/app/i18n/appointments/locale_pt.json
diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt.json
similarity index 100%
rename from ui/app/i18n/clinical/locale_pt_BR.json
rename to ui/app/i18n/clinical/locale_pt.json
diff --git a/ui/app/i18n/home/locale_pt_BR.json b/ui/app/i18n/home/locale_pt.json
similarity index 100%
rename from ui/app/i18n/home/locale_pt_BR.json
rename to ui/app/i18n/home/locale_pt.json
diff --git a/ui/app/i18n/orders/locale_pt_BR.json b/ui/app/i18n/orders/locale_pt.json
similarity index 100%
rename from ui/app/i18n/orders/locale_pt_BR.json
rename to ui/app/i18n/orders/locale_pt.json
diff --git a/ui/app/i18n/registration/locale_pt_BR.json b/ui/app/i18n/registration/locale_pt.json
similarity index 100%
rename from ui/app/i18n/registration/locale_pt_BR.json
rename to ui/app/i18n/registration/locale_pt.json
diff --git a/ui/app/i18n/reports/locale_pt_BR.json b/ui/app/i18n/reports/locale_pt.json
similarity index 100%
rename from ui/app/i18n/reports/locale_pt_BR.json
rename to ui/app/i18n/reports/locale_pt.json

From 573f009c07b71399f5586470a133fd8da6460936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Fri, 2 Aug 2019 09:58:26 +0200
Subject: [PATCH 027/131] Add the Patient Status information in patient
 dashboard at th top banner (#275)

---
 .../patientContext/directives/patientContext.js          | 9 +++++++++
 .../patientContext/views/patientContext.html             | 1 +
 ui/app/i18n/clinical/locale_en.json                      | 3 ++-
 ui/app/i18n/clinical/locale_pt.json                      | 3 ++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js b/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
index aa0a3e5ba1..2cd193bd74 100644
--- a/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
+++ b/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
@@ -6,6 +6,15 @@ angular.module('bahmni.clinical')
             var patientContextConfig = appService.getAppDescriptor().getConfigValue('patientContext') || {};
             $scope.initPromise = patientService.getPatientContext($scope.patient.uuid, $state.params.enrollment, patientContextConfig.personAttributes, patientContextConfig.programAttributes, patientContextConfig.additionalPatientIdentifiers);
 
+            patientService.getPatient($scope.patient.uuid).then(function (response) {
+                var patientInfo = response.data.person.attributes;
+                for (var i = 0; i < patientInfo.length; i++) {
+                    if (patientInfo[i].attributeType.display === 'PATIENT_STATUS') {
+                        $scope.patientStatus = patientInfo[i].display;
+                    }
+                }
+            });
+
             $scope.initPromise.then(function (response) {
                 $scope.patientContext = response.data;
                 var programAttributes = $scope.patientContext.programAttributes;
diff --git a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
index 48b51f7061..22bddb54f5 100644
--- a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
+++ b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
@@ -12,6 +12,7 @@
             </li>
             <li>{{patientContext.gender | translate}}</li>
             <li>{{patientContext.birthdate | birthDateToAgeText}}</li>
+            <li><span ng-if="patientStatus === 'Pre TARV' || patientStatus === 'TARV'">{{'CLINICAL_PATIENT_STATUS' | translate}}</span> {{patientStatus}}</li>
             <li ng-repeat="(key, value) in patientContext.additionalPatientIdentifiers">
                 {{key}}: {{value}}
             </li>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index e9da529aaa..dd01bf0b15 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -409,5 +409,6 @@
     "CLINICAL_NO_NUTRITIONAL_STATUS": "No Nutritional Status Available",
     "VALUE_RANGE_MESSAGE":"The value is out of range",
     "CLINICAL_APP_TITLE":"OPD",
-    "SERVICES_APP_TITLE": "Services"
+    "SERVICES_APP_TITLE": "Services",
+    "CLINICAL_PATIENT_STATUS": "Active in:"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index b5f24163fe..57794e518f 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -432,5 +432,6 @@
   "CLINICAL_NO_NUTRITIONAL_STATUS": "Nenhum estado nutricional disponivel",
   "VALUE_RANGE_MESSAGE": "Os valores introduzidos estão fora do intervalo",
   "CLINICAL_APP_TITLE":"Clínico",
-  "SERVICES_APP_TITLE": "Serviços"
+  "SERVICES_APP_TITLE": "Serviços",
+  "CLINICAL_PATIENT_STATUS": "Activo em"
 }

From 8820f5c065b8903475bf532b6eefc5d7564c7471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Fri, 2 Aug 2019 10:52:41 +0200
Subject: [PATCH 028/131] Translations on Landing Page (#276)

---
 ui/app/home/views/login.html    | 4 ----
 ui/app/i18n/home/locale_en.json | 2 +-
 ui/app/i18n/home/locale_pt.json | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ui/app/home/views/login.html b/ui/app/home/views/login.html
index e58be533c9..bdd2318177 100644
--- a/ui/app/home/views/login.html
+++ b/ui/app/home/views/login.html
@@ -77,10 +77,6 @@
 
     </form>
 
-    <div class="warning-message">
-        <span ng-if="warning"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {{warning}}</span>
-        <p>{{warningMessage | translate :timeZoneObject}} </p>
-    </div>
 
     <div ng-show="bottomLogos" class="bottom-logos-wrapper">
         <img ng-repeat="logo in bottomLogos" id="bottom-logos-image" src={{logo}}>
diff --git a/ui/app/i18n/home/locale_en.json b/ui/app/i18n/home/locale_en.json
index 842d4c3bc5..3b8245512d 100644
--- a/ui/app/i18n/home/locale_en.json
+++ b/ui/app/i18n/home/locale_en.json
@@ -48,7 +48,7 @@
     "LOGIN_PAGE_HEADER_TEXT": "BAHMNI EMR LOGIN",
     "LOGIN_PAGE_HEADER_TEXT_1": "REPUBLIC OF MOZAMBIQUE",
     "LOGIN_PAGE_HEADER_TEXT_2": "MINISTRY OF HEALTH",
-    "LOGIN_PAGE_HEADER_TEXT_3": "ELECTRONIC PATIENT TRACKING SYSTEM (EPTS)",
+    "LOGIN_PAGE_HEADER_TEXT_3": "ELECTRONIC PATIENT TRACKING SYSTEM (EPTS) - POC",
     "LOGIN_PAGE_TITLE_TEXT": "TITLE TEXT",
     "LOGIN_UNSUPPORTED_BROWSER_KEY" : "Bahmni is supported on Chrome Browser",
     "DOB_LABEL": "Date of Birth",
diff --git a/ui/app/i18n/home/locale_pt.json b/ui/app/i18n/home/locale_pt.json
index 0bcf3f7a22..426502b26d 100644
--- a/ui/app/i18n/home/locale_pt.json
+++ b/ui/app/i18n/home/locale_pt.json
@@ -32,7 +32,7 @@
 	"LOGIN_PAGE_HEADER_TEXT": "SESP - POC",
 	"LOGIN_PAGE_HEADER_TEXT_1": "REPÚBLICA DE MOÇAMBIQUE",
 	"LOGIN_PAGE_HEADER_TEXT_2": "MINISTÉRIO DA SAÚDE",
-	"LOGIN_PAGE_HEADER_TEXT_3": "Sistema Electrónico de Seguimento de Pacientes (SESP)",
+	"LOGIN_PAGE_HEADER_TEXT_3": "SISTEMA ELETRÓNICO DE SEGUIMENTO DE PACIENTES (SESP) - POC",
 	"LOGIN_PAGE_TITLE_TEXT": "MINISTÉRIO DA SAÚDE",
 	"LOGIN_UNSUPPORTED_BROWSER_KEY": "Bahmni é suportado pelo navegador Chrome",
 	"MESSAGE_DIALOG_OPTION_COPY": "Erro de Cópia",

From b2e3b567c3fb4cac3452c16da0496b122c44b0e7 Mon Sep 17 00:00:00 2001
From: satvix <pratikthaakare@gmail.com>
Date: Fri, 2 Aug 2019 17:37:43 +0530
Subject: [PATCH 029/131] Pratik | Worked on MPOC-189 Medication Print

---
 ui/app/adt/index.html                         |   1 +
 ui/app/bedmanagement/index.html               |   1 +
 ui/app/clinical/app.js                        |   4 +
 .../controllers/consultationController.js     |  46 +++-
 .../printPrescriptionReportController.js      |   8 +
 .../directives/prescriptionReport.js          |  28 +++
 .../printPrescriptionReportService.js         | 196 ++++++++++++++++
 .../views/clinicalDashboardHeader.html        |  13 +-
 .../views/printPrescriptionReport.html        | 211 ++++++++++++++++++
 ui/app/clinical/index.html                    |   6 +
 .../ui-helper/directives/splitButton.js       |   2 +-
 .../ui-helper/directives/splitButtonNew.js    |  54 +++++
 ui/app/i18n/clinical/locale_en.json           |  46 +++-
 ui/app/i18n/clinical/locale_pt.json           |  29 ++-
 ui/app/ot/index.html                          |   1 +
 ui/app/registration/index.html                |   1 +
 .../bahmni-components/_splitButton.scss       |   7 +
 ui/app/styles/bahmni-helper/_variables.scss   |   6 +-
 18 files changed, 647 insertions(+), 13 deletions(-)
 create mode 100644 ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js
 create mode 100644 ui/app/clinical/dashboard/directives/prescriptionReport.js
 create mode 100644 ui/app/clinical/dashboard/services/printPrescriptionReportService.js
 create mode 100644 ui/app/clinical/dashboard/views/printPrescriptionReport.html
 create mode 100644 ui/app/common/ui-helper/directives/splitButtonNew.js

diff --git a/ui/app/adt/index.html b/ui/app/adt/index.html
index ed8f1a37d1..407f39c106 100644
--- a/ui/app/adt/index.html
+++ b/ui/app/adt/index.html
@@ -150,6 +150,7 @@
         <script src="../common/ui-helper/services/contextChangeHandler.js"></script>
         <script src="../common/ui-helper/directives/popOver.js"></script>
         <script src="../common/ui-helper/directives/splitButton.js"></script>
+        <script src="../common/ui-helper/directives/splitButtonNew.js"></script>
         <script src="../common/ui-helper/directives/backLinks.js"></script>
         <script src="../common/ui-helper/directives/focusOn.js"></script>
         <script src="../common/ui-helper/directives/bmShow.js"></script>
diff --git a/ui/app/bedmanagement/index.html b/ui/app/bedmanagement/index.html
index 14b33920d4..dc29b939f3 100644
--- a/ui/app/bedmanagement/index.html
+++ b/ui/app/bedmanagement/index.html
@@ -150,6 +150,7 @@
 <script src="../common/ui-helper/services/contextChangeHandler.js"></script>
 <script src="../common/ui-helper/directives/popOver.js"></script>
 <script src="../common/ui-helper/directives/splitButton.js"></script>
+<script src="../common/ui-helper/directives/splitButtonNew.js"></script>
 <script src="../common/ui-helper/directives/backLinks.js"></script>
 <script src="../common/ui-helper/directives/focusOn.js"></script>
 <script src="../common/ui-helper/directives/bmShow.js"></script>
diff --git a/ui/app/clinical/app.js b/ui/app/clinical/app.js
index 500fe20729..3f36e85bd0 100644
--- a/ui/app/clinical/app.js
+++ b/ui/app/clinical/app.js
@@ -157,6 +157,10 @@ angular.module('consultation')
                     'dashboard-content': {
                         templateUrl: 'dashboard/views/dashboard.html',
                         controller: 'PatientDashboardController'
+                    },
+                    'print-prescription': {
+                        templateUrl: 'dashboard/views/printPrescriptionReport.html',
+                        controller: 'PrintPrescriptionReportController'
                     }
                 }
             })
diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index d7c23d3091..f9e2c5fa95 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -4,13 +4,11 @@ angular.module('bahmni.clinical').controller('ConsultationController',
     ['$scope', '$rootScope', '$state', '$location', '$translate', 'clinicalAppConfigService', 'diagnosisService', 'urlHelper', 'contextChangeHandler',
         'spinner', 'encounterService', 'messagingService', 'sessionService', 'retrospectiveEntryService', 'patientContext', '$q',
         'patientVisitHistoryService', '$stateParams', '$window', 'visitHistory', 'clinicalDashboardConfig', 'appService',
-        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService',
-        'providerTypeService',
+        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService','printer', 'printPrescriptionReportService','providerTypeService',
         function ($scope, $rootScope, $state, $location, $translate, clinicalAppConfigService, diagnosisService, urlHelper, contextChangeHandler,
                   spinner, encounterService, messagingService, sessionService, retrospectiveEntryService, patientContext, $q,
                   patientVisitHistoryService, $stateParams, $window, visitHistory, clinicalDashboardConfig, appService,
-                  ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService,
-                  providerTypeService) {
+                  ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService,providerTypeService) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var getPreviousActiveCondition = Bahmni.Common.Domain.Conditions.getPreviousActiveCondition;
             var currentProviderType;
@@ -62,16 +60,54 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             };
 
             _.each(visitConfig.tabs, setVisitTabPrintAction);
+
             _.each(clinicalDashboardConfig.tabs, setDashboardPrintAction);
             $scope.printList = _.concat(clinicalDashboardConfig.tabs, visitConfig.tabs);
 
             clinicalDashboardConfig.quickPrints = appService.getAppDescriptor().getConfigValue('quickPrints');
+            
+           /*
             $scope.printDashboard = function (tab) {
                 if (tab) {
                     tab.print();
                 } else {
                     clinicalDashboardConfig.currentTab.print();
                 }
+            };*/
+
+            var clinicalDashboardUuid = '0623e3b6-8701-4c07-8493-2930bd67f11a';
+            var prescriptionReportUuid = '2c6c27b0-3eef-4010-bfbb-9133d0016d25';
+            //var tarvPrescriptionReportUuid = '31f15798-9983-4066-9b06-6868e1ba7210';
+
+            $scope.printButtonDropdownOptions = [
+                {name: $translate.instant('PRINT_CLINICAL_DASHBOARD_LABEL'), uuid: clinicalDashboardUuid},
+                {name: $translate.instant('PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL'), uuid: prescriptionReportUuid}
+                // {name: $translate.instant('PRESCRIPTION_REPORT_PRINT_TARV_PRESCRIPTION_LABEL'), uuid: tarvPrescriptionReportUuid}
+            ];
+
+            $scope.optionText = function (value) {
+                return value.name;
+            };
+
+            $scope.printDashboardOrPrescription = function (option) {
+             
+                if (option.uuid === clinicalDashboardUuid) {
+                    clinicalDashboardConfig.currentTab.print();
+                } else {
+                    if (option.uuid === prescriptionReportUuid) {
+                        $rootScope.isTarvReport = false;
+                    }
+                    //  else if (option.uuid === tarvPrescriptionReportUuid) {
+                    //     $rootScope.isTarvReport = true;
+                    // }
+
+                    printPrescriptionReportService.getReportModel($stateParams.patientUuid, $rootScope.isTarvReport)
+                    .then(function (reportData) {
+                        $rootScope.prescriptionReportData = reportData;
+                        //console.log($rootScope.prescriptionReportData);
+                        printer.printFromScope("dashboard/views/printPrescriptionReport.html", $rootScope, function () { });
+                    });
+                }
             };
 
             $scope.allowConsultation = function () {
@@ -504,7 +540,6 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                         });
                 }));
             };
-
             $scope.filterTabByProviderType = function (boardIndex) {
                 if (currentProviderType == "APSS") {
                     if ($scope.availableBoards[boardIndex].translationKey == 'DIAGNOSIS_BOARD_LABEL_KEY'
@@ -517,5 +552,6 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 return true;
             };
 
+
             initialize();
         }]);
diff --git a/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js b/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js
new file mode 100644
index 0000000000..5de96fd307
--- /dev/null
+++ b/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js
@@ -0,0 +1,8 @@
+'use strict';
+angular.module('bahmni.clinical')
+    .controller('PrintPrescriptionReportController', ['$scope', '$rootScope',
+        function ($scope, $rootScope) {
+            $scope.isTarvReport = $rootScope.isTarvReport;
+            $scope.data = $rootScope.prescriptionReportData;
+           console.log($scope.data);
+        }]);
\ No newline at end of file
diff --git a/ui/app/clinical/dashboard/directives/prescriptionReport.js b/ui/app/clinical/dashboard/directives/prescriptionReport.js
new file mode 100644
index 0000000000..c4dc0a24eb
--- /dev/null
+++ b/ui/app/clinical/dashboard/directives/prescriptionReport.js
@@ -0,0 +1,28 @@
+'use strict';
+
+angular.module('bahmni.clinical')
+    .directive('prescriptionReport', function () {
+        var controller = function ($scope) {
+            $scope.getCurrentDate = function () {
+                return moment().format('DD/MM/YYYY');
+            };
+
+            $scope.getFullname = function () {
+                if ($scope.isTarvReport) {
+                    return $scope.data.patientInfo.firstName.substring(0, 3) + ' ' + $scope.data.patientInfo.lastName.substring(0, 3);
+                } else {
+                    return $scope.data.patientInfo.firstName + ' ' + $scope.data.patientInfo.lastName;
+                }
+            };
+        };
+
+        return {
+            restrict: 'E',
+            controller: controller,
+            scope: {
+                data: "=",
+                isTarvReport: "="
+            },
+            templateUrl: "dashboard/views/prescriptionReport.html"
+        };
+    });
\ No newline at end of file
diff --git a/ui/app/clinical/dashboard/services/printPrescriptionReportService.js b/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
new file mode 100644
index 0000000000..3844a97a96
--- /dev/null
+++ b/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
@@ -0,0 +1,196 @@
+'use strict';
+
+angular.module('bahmni.clinical')
+    .service('printPrescriptionReportService', ['$rootScope', '$translate', 'patientService', 'observationsService', 'programService', 'treatmentService', 'localeService', 'patientVisitHistoryService', 'conceptSetService',
+        function ($rootScope, $translate, patientService, observationsService, programService, treatmentService, localeService, patientVisitHistoryService, conceptSetService) {
+            var count = 0;
+            var reportModel = {
+                username: $rootScope.currentUser.username,
+                hospitalLogo: '',
+                hospitalName: '',
+                patientInfo: {
+                    firstName: '',
+                    lastName: '',
+                    age: '',
+                    sex: '',
+                    weight: '',
+                    patientId: '',
+                    address : ''
+                },
+                tbComorbidity: '',
+                tarvNumber: '',
+                prescriber: '',
+                prescriptionDate: '',
+                location: '',
+                orders: []
+            };
+
+            var patientUuid = '';
+            var isTARVReport;
+
+            var arvConceptUuids = [];
+
+            this.getReportModel = function (_patientUuid, _isTARVReport) {
+                patientUuid = _patientUuid;
+                isTARVReport = _isTARVReport;
+                
+                return new Promise(function (resolve, reject) {
+                   
+                        var p1 = populatePatientDemographics();
+                        var p2 = populatePatientWeightAndHeight();
+                      
+                        var p4 = populateLocationAndDrugOrders(0);
+                        var p5 = populateHospitalNameAndLogo();
+
+                        Promise.all([p1,p2,p4,p5]).then(function () {
+                            resolve(reportModel);
+                        }).catch(function (error) {
+                            reject(error);
+                        });
+                    }).catch(function (error) {
+                        reject(error);
+                    });
+              
+            };
+
+           
+            var drugConceptIsARV = function (drugConceptUuid) {
+               
+                return arvConceptUuids.includes(drugConceptUuid);
+            };
+
+            var populatePatientDemographics = function () {
+                        var add2 = "";
+                        var add3 = "";
+                        var cityVillage = "";
+                return new Promise(function (resolve, reject) {
+                    patientService.getPatient(patientUuid).then(function (response) {
+                        
+                        var patientMapper = new Bahmni.PatientMapper($rootScope.patientConfig, $rootScope, $translate);
+                        var patient = patientMapper.map(response.data);
+                       
+                        reportModel.patientInfo.firstName = patient.givenName;
+                        reportModel.patientInfo.lastName = patient.familyName;
+                        reportModel.patientInfo.sex = patient.gender;
+                        reportModel.patientInfo.age = patient.age;
+                        reportModel.patientInfo.patientId = patient.identifier;
+                        if (patient.address.address2 != null) {
+                            add2 = patient.address.address2 + ", ";
+                        }
+                        if (patient.address.address3 != null) {
+                            add3 = patient.address.address3 + ", ";
+                        }
+                        if (patient.address.cityVillage != null) {
+                            cityVillage = patient.address.cityVillage + ", ";
+                        }
+                        reportModel.patientInfo.address = patient.address.address1 + ", " + add2 + add3 + patient.address.cityVillage + patient.address.stateProvince;
+                        resolve();
+                    }).catch(function (error) {
+                        reject(error);
+                    });
+                });
+            };
+
+           
+
+            var populatePatientWeightAndHeight = function () {
+                return new Promise(function (resolve, reject) {
+                    var patientWeightConceptName = 'Weight';
+                    var patientHeightConceptName = 'Height';
+                    observationsService.fetch(patientUuid, [patientWeightConceptName,patientHeightConceptName]).then(function (response) {
+                        if (response.data && response.data.length > 0) {
+                         
+                            reportModel.patientInfo.weight = response.data[0].value;
+                         
+                        }
+                        resolve();
+                    }).catch(function (error) {
+                        reject(error);
+                    });
+                });
+            };
+
+            var populateDrugOrders = function (visitUuid) {
+                    return new Promise(function (resolve, reject) {
+                    treatmentService.getPrescribedDrugOrders(patientUuid, true).then(function (response) {
+                        var currentVisitOrders = response.filter(function (order) {
+                           
+                                
+                                return order.visit.uuid === visitUuid && !drugConceptIsARV(order.concept.uuid);
+                           
+                        });
+                        if (currentVisitOrders.length <= 0) {
+                            count = count + 1;
+                            populateLocationAndDrugOrders(count)
+                        }
+                        reportModel.orders = [];
+                        currentVisitOrders.forEach(function (order) {
+                           
+                            var drug = order.drugNonCoded;
+                            if (order.drug) {
+                                drug = order.drug.name;
+                            }
+                            var instructions = '';
+                            if (order.dosingInstructions.administrationInstructions) {
+                                instructions = JSON.parse(order.dosingInstructions.administrationInstructions).instructions;
+                                if (JSON.parse(order.dosingInstructions.administrationInstructions).additionalInstructions) {
+                                    instructions += '. ' + JSON.parse(order.dosingInstructions.administrationInstructions).additionalInstructions;
+                                }
+                            }
+                            var newOrder = {
+                                drugName: drug,
+                                dosage: order.dosingInstructions.dose,
+                                drugUnit: order.dosingInstructions.doseUnits,
+                                frequency: order.dosingInstructions.frequency,
+                                duration: order.duration,
+                                route: order.dosingInstructions.route,
+                                durationUnit: order.durationUnits,
+                                quantity : order.dosingInstructions.quantity,
+                                provider : order.provider.name,
+                                strength : order.drug.strength,
+                                startDate: moment(order.scheduledDate).format('DD/MM/YYYY'),
+                                instructions: instructions
+                            };
+
+                            reportModel.orders.push(newOrder);
+                            reportModel.prescriber = order.provider.name;
+                            reportModel.prescriptionDate = moment(order.dateActivated).format('DD/MM/YYYY');
+                        });
+                        resolve();
+                    }).catch(function (error) {
+                        reject(error);
+                    });
+                });
+            };
+
+            var populateLocationAndDrugOrders = function (lastVisit) {
+                return new Promise(function (resolve, reject) {
+                    patientVisitHistoryService.getVisitHistory(patientUuid, null).then(function (response) {
+                        if (response.visits && response.visits.length > 0) {
+                         
+                            reportModel.location = response.visits[lastVisit].location.display;
+                            populateDrugOrders(response.visits[lastVisit].uuid);
+                          
+                        }
+                        resolve();
+                    }).catch(function (error) {
+                        reject(error);
+                    });
+                });
+            };
+
+            var populateHospitalNameAndLogo = function () {
+                return new Promise(function (resolve, reject) {
+                    localeService.getLoginText().then(function (response) {
+                        reportModel.hospitalName = response.data.loginPage.hospitalName;
+                        reportModel.hospitalLogo = response.data.homePage.logo;
+                        resolve();
+                    }).catch(function (error) {
+                        reject(error);
+                    });
+                });
+            };
+
+            
+
+        }]);
diff --git a/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html b/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html
index 088ea585ae..78f911452d 100644
--- a/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html
+++ b/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html
@@ -95,11 +95,20 @@
                         </li>
                     </ul>
                 </div>
-                <button ng-if="::!clinicalDashboardConfig.quickPrints" class="dialog-button-group print" ng-click="printDashboard()"
+
+                <div split-buttonNew
+                    options="::printButtonDropdownOptions"
+                    primary-option="::printButtonDropdownOptions[0]"
+                    option-text="optionText"
+                    option-click="printDashboardOrPrescription"
+                    class="dialog-button-group">
+                </div>
+
+                <!-- <button ng-if="::!clinicalDashboardConfig.quickPrints" class="dialog-button-group print" ng-click="printDashboard()"
                         accesskey="{{'CLINICAL_PRINT_ACCESS_KEY'| translate}}" ng-bind-html="'CLINICAL_PRINT_TRANSLATION_KEY'|translate">
                     <i class="fa fa-print"></i>
 
-                </button>
+                </button> -->
                 <div class="dashboard-date-picker" ng-controller="PatientListHeaderController">
                     <div class="retro-date-widget-wrapper fr">
                         <div class="retro-date-widget-header fr">
diff --git a/ui/app/clinical/dashboard/views/printPrescriptionReport.html b/ui/app/clinical/dashboard/views/printPrescriptionReport.html
new file mode 100644
index 0000000000..e58ea96e10
--- /dev/null
+++ b/ui/app/clinical/dashboard/views/printPrescriptionReport.html
@@ -0,0 +1,211 @@
+<html>
+
+<head>
+    <link rel="stylesheet" href="../styles/clinicalPrint.css" media="print" />
+    <style>
+        .ver-rot {
+            writing-mode: vertical-rl;
+            transform: rotate(180deg);
+            color: white;
+        }
+
+        table,
+        th,
+        td {
+            border: 1px solid black;
+            border-collapse: collapse;
+        }
+
+        th,
+        td {
+            padding: 5px;
+            text-align: left;
+        }
+
+        .lftcss {
+            height: min-content;
+        }
+
+        td.td_box1 {
+            position: relative;
+            width: 15%;
+            line-height: 2;
+        }
+
+        td.td_box2 {
+            position: relative;
+            width: 75%;
+            line-height: 2;
+        }
+        tr.abc {
+    position: relative;
+    display: flex;
+}
+
+td.td_box4 {
+    position: relative;
+    display: flex;
+    width: 60%;
+    line-height: 2;
+}
+td.td_box5 {
+    display: flex;
+    position: relative;
+    width: 12%;
+    line-height: 2;
+}
+td.cng {
+    width: 100%;
+}
+    </style>
+</head>
+
+<body>
+
+    <div ng-controller="PrintPrescriptionReportController">
+
+        <div ng-if="data">
+
+            <div style="border: 1px solid black; margin:10px;">
+
+                <div style="border: 1px solid black; padding: 5px">
+                    <div style="border :1px solid black; padding: 5px">
+                        <table style="width: 100%">
+                            <tr>
+                                <td rowspan="4" style="width: 15x; background-color:black" class="lftcss">
+                                    <div class="ver-rot prescribe-report-label">CMAM-Modelo 06</div>
+                                </td>
+
+                                <td colspan="9"
+                                    style="font-weight: bold ;text-align: center;font-size: 20px;background-color :rgb(149, 218, 172)">
+                                    <span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_NATIONAL_HEALTH_SERVICE' | translate }}</span>
+                                </td>
+                            </tr>
+                            <td rowspan="3"><img ng-if="data.hospitalLogo" height="80px" width="80px"
+                                src="{{ data.hospitalLogo }}" class="prescribe-report-logo"></td>
+                            <tr class="abc">
+                                <td class="td_box1">&#x2116 054655</td>
+                                <td class="td_box2"><span
+                                        >{{ 'PRESCRIPTION_REPORT_HOSPITAL_NAME' | translate }}</span>: <span
+                                        > {{ data.hospitalName }}</span></td>
+                                <td class="td_box3"><span
+                                        >{{ 'PRESCRIPTION_REPORT_PRESCRIPTION_DATE' | translate }}</span>:
+                                    {{data.prescriptionDate}}</td>
+                            </tr>
+                            <tr class="abc">
+                                <td class="td_box4">
+                                    <span>{{ 'PRESCRIPTION_REPORT_PATIENT_NAME' | translate }}</span>:
+                                    <span> &nbsp; {{ data.patientInfo.firstName }}&nbsp;{{ data.patientInfo.lastName }}</span>
+                                </td>
+                                <td class="td_box5"><span
+                                       >{{ 'PRESCRIPTION_REPORT_PATIENT_AGE_AND_SEX' | translate }}</span>:<span
+                                       > {{ data.patientInfo.age }}</span></td>
+                                <td class="td_box6">
+                                    <span>{{ 'PRESCRIPTION_REPORT_PATIENT_ID' | translate }}</span>:
+                                    <span> {{ data.patientInfo.patientId }}</span></td>
+
+                            </tr>
+                            <tr class="abc">
+                                <td colspan="9" class="cng"> 
+                                    <span class="cng">{{ 'PRESCRIPTION_REPORT_PATIENT_ADDRESS' | translate }}</span>:
+                                    <span class="cng2">{{ data.patientInfo.address }}</span></td>
+                            </tr>
+                        </table>
+
+
+                        <br>
+
+                        <table style="width: 100%">
+
+                            <tr style="text-align: center;font-weight: bold">
+                                <td colspan="10" style="text-align: center"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_DESCRIPTION' | translate }}
+                                    </span></td>
+                                <td rowspan="2" colspan="3"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_POSOLOGY' | translate }}
+                                    </span></td>
+                                <td rowspan="2" colspan="2"> <span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_TREATMENT_DURATION' | translate }}
+                                    </span></td>
+                                <td rowspan="2" colspan="2"> <span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_QUANTITY_PRESCRIBED' | translate }}
+                                    </span></td>
+                                <td colspan="4" rowspan="{{2+data.orders.length}}">Receita sujeita a taxa única</td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">FNM</td>
+                                <td colspan="3"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_GENERIC_NAME' | translate }}
+                                    </span></td>
+                                <td colspan="2"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_DOSAGE' | translate }}
+                                    </span></td>
+                                <td colspan="3"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_PHARMACEUTICAL_FORM' | translate }}
+                                    </span></td>
+                            </tr>
+
+
+
+                            <tr ng-repeat="order in data.orders">
+                                <td colspan="2"></td>
+                                <td colspan="3">{{ order.drugName }}</td>
+                                <td colspan="2">{{ order.dosage }}</td>
+                                <td colspan="3">{{order.drugUnit}}</td>
+                                <td colspan="2"><span>{{ order.frequency | translate}},{{ data.route | translate }}
+                                    </span></td>
+                                <td colspan="3">{{ order.duration | translate }}{{ order.durationUnit | translate }}
+                                </td>
+                                <td colspan="2">{{ order.quantity}}</td>
+                            </tr>
+
+
+                            <tr>
+                                <td rowspan="3" colspan="7" style="text-align: center"><span
+                                        class="prescribe-report-label">{{'PRESCRIPTION_REPORT_PRESCRIBED' | translate }}<br>{{data.prescriber}}<br><br>{{'PRESCRIPTION_REPORT_SIGNATURE' | translate}}</span>
+                                </td>
+                                <td rowspan="3" colspan="7" style="text-align: center"><span
+                                        class="prescribe-report-label">{{'PRESCRIPTION_REPORT_PHARMACY' | translate }}<br>{{}}<br><br>{{'PRESCRIPTION_REPORT_SIGNATURE' | translate}}</span>
+                                </td>
+                                <td colspan="3"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_AMOUNT' | translate }}</span>
+                                </td>
+                                <td colspan="1"></td>
+                                <td colspan="1"></td>
+                                <td colspan="1">00</td>
+                            </tr>
+                            <tr>
+                                <td colspan="3"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_SUBSIDIZED_AMOUNT' | translate }}</span>
+                                </td>
+                                <td colspan="1"></td>
+                                <td colspan="1"></td>
+                                <td colspan="1">00</td>
+                            </tr>
+                            <tr>
+                                <td colspan="3"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_AMOUNT_CHARGED' | translate }}</span>
+                                </td>
+                                <td colspan="1"></td>
+                                <td colspan="1"></td>
+                                <td colspan="1">00</td>
+                            </tr>
+                            <tr>
+                                <td colspan="14"><span
+                                        class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_NOTE' | translate }}
+                                    </span></td>
+                            </tr>
+
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 9f776009a4..84fa2a9943 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -166,6 +166,8 @@
         <script src="../common/ui-helper/directives.js"></script>
         <script src="../common/ui-helper/directives/bahmniAutocomplete.js"></script>
         <script src="../common/ui-helper/directives/popOver.js"></script>
+        <script src="../common/ui-helper/directives/splitButton.js"></script>
+        <script src="../common/ui-helper/directives/splitButtonNew.js"></script>
         <script src="../common/ui-helper/directives/conceptAutocomplete.js"></script>
         <script src="../common/ui-helper/directives/datetimepicker.js"></script>
         <script src="../common/ui-helper/directives/monthyearpicker.js"></script>
@@ -349,6 +351,7 @@
 
         <script src="dashboard/services/clinicalDashboardConfig.js"></script>
         <script src="dashboard/directives/diseaseTemplate.js"></script>
+        <script src="dashboard/directives/prescriptionReport.js"></script>
         <script src="dashboard/directives/recentPatients.js"></script>
         <script src="dashboard/controllers/diseaseTemplateController.js"></script>
         <script src="dashboard/controllers/editObservationFormController.js"></script>
@@ -357,6 +360,7 @@
         <script src="dashboard/controllers/patientDashboardLabSummaryController.js"></script>
         <script src="dashboard/controllers/patientDashboardRadiologyController.js"></script>
         <script src="dashboard/controllers/patientDashboardAllDiseaseTemplateController.js"></script>
+        <script src="dashboard/controllers/printPrescriptionReportController.js"></script>
         <script src="dashboard/controllers/patientDashboardController.js"></script>
         <script src="dashboard/controllers/patientDashboardVisitsController.js"></script>
         <script src="dashboard/controllers/patientDashboardAllVisitsController.js"></script>
@@ -513,6 +517,8 @@
         <script src="../common/app-framework/services/loadConfigService.js"></script>
         <script src="../common/domain/services/encounterService.js"></script>
         <script src="dashboard/services/diseaseTemplateService.js"></script>
+        <script src="dashboard/services/printPrescriptionReportService.js"></script>
+
         <script src="../common/domain/services/observationsService.js"></script>
         <script src="../common/concept-set/services/conceptSetServices.js"></script>
         <script src="../common/util/dateTimeFormatter.js"></script>
diff --git a/ui/app/common/ui-helper/directives/splitButton.js b/ui/app/common/ui-helper/directives/splitButton.js
index 5bfa0d30f2..152fb75a26 100644
--- a/ui/app/common/ui-helper/directives/splitButton.js
+++ b/ui/app/common/ui-helper/directives/splitButton.js
@@ -29,7 +29,7 @@ angular.module('bahmni.common.uiHelper')
         return {
             restrict: 'A',
             template: '<div class="split-button" bm-pop-over>' +
-                        '<button bm-pop-over-trigger class="toggle-button fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button"></button>' +
+                        '<button bm-pop-over-trigger class="toggle-button fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>'  +
                         '<ul class="options">' +
                             '<li class="primaryOption">' +
                                 '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +
diff --git a/ui/app/common/ui-helper/directives/splitButtonNew.js b/ui/app/common/ui-helper/directives/splitButtonNew.js
new file mode 100644
index 0000000000..8687d13345
--- /dev/null
+++ b/ui/app/common/ui-helper/directives/splitButtonNew.js
@@ -0,0 +1,54 @@
+'use strict';
+
+angular.module('bahmni.common.uiHelper')
+    .directive('splitButtonnew', ['$timeout', function ($timeout) {
+        var controller = function ($scope) {
+            $scope.primaryOption = $scope.primaryOption || $scope.options[0];
+            $scope.secondaryOptions = _.without($scope.options, $scope.primaryOption);
+            $scope.hasMultipleOptions = function () {
+                return $scope.secondaryOptions.length > 0;
+            };
+        };
+
+        var link = function (scope, element) {
+            var shouldScroll = function (elementPosition, elementHeight) {
+                var windowHeight = window.innerHeight + $(window).scrollTop();
+                return windowHeight < (elementHeight + elementPosition);
+            };
+
+            scope.scrollToBottom = function () {
+                var timeout = $timeout(function () {
+                    var scrollHeight = $(element)[0].scrollHeight;
+                    if (shouldScroll(element.position().top, scrollHeight)) {
+                        window.scrollBy(0, scrollHeight);
+                        $timeout.cancel(timeout);
+                    }
+                });
+            };
+        };
+        return {
+            restrict: 'A',
+            template: '<div class="split-button" bm-pop-over>' +
+                        '<button bm-pop-over-trigger class="toggle-buttonNew fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>'  +
+                        '<ul class="options">' +
+                            '<li>' +
+                                '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +
+                            '</li>' +
+                            '<ul class="hidden-optionsNew">' +
+                            '<li bm-pop-over-target ng-repeat="option in ::secondaryOptions" class="secondaryOptionNew">' +
+                                '<button class="buttonClass" ng-click="optionClick()(option)" accesskey="{{::option.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(option) | translate"></button>' +
+                            '</li>' +
+                            '</ul>' +
+                        '</ul>' +
+                      '</div>',
+            controller: controller,
+            link: link,
+            scope: {
+                options: '=',
+                primaryOption: '=',
+                optionText: '&',
+                optionClick: '&',
+                optionDisabled: '='
+            }
+        };
+    }]);
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index e9da529aaa..59ec6bf7d2 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -409,5 +409,49 @@
     "CLINICAL_NO_NUTRITIONAL_STATUS": "No Nutritional Status Available",
     "VALUE_RANGE_MESSAGE":"The value is out of range",
     "CLINICAL_APP_TITLE":"OPD",
-    "SERVICES_APP_TITLE": "Services"
+    "SERVICES_APP_TITLE": "Services",
+    "PRESCRIPTION_REPORT_PATIENT_NAME": "Patient Name",
+    "PRESCRIPTION_REPORT_PATIENT_AGE_AND_SEX": "Age",
+    "PRESCRIPTION_REPORT_PATIENT_WEIGHT": "Weight (Kg)",
+    "PRESCRIPTION_REPORT_PATIENT_ID": "Patient ID",
+    "PRESCRIPTION_REPORT_GENERIC_NAME": "Generic Name",
+    "PRESCRIPTION_REPORT_DOSAGE": "Dosage",
+    "PRESCRIPTION_REPORT_POSOLOGY": "Posology",
+    "PRESCRIPTION_REPORT_PHARMACEUTICAL_FORM": "Pharmaceutical Form",
+    "PRESCRIPTION_REPORT_TREATMENT_DURATION": "Treatment Duration",
+    "PRESCRIPTION_REPORT_SIGNATURE": "Signature",
+    "PRESCRIPTION_REPORT_QUANTITY_PRESCRIBED": "Quantity Prescribed",
+    "PRESCRIPTION_REPORT_PATIENT_ADDRESS": "Address",
+    "PRESCRIPTION_REPORT_PATIENT_AGE": "Age",
+    "PRESCRIPTION_REPORT_DESCRIPTION": "Description",
+    "PRESCRIPTION_REPORT_TB_COMORBIDITY": "TB Comorbidity",
+    "PRESCRIPTION_REPORT_TARV_NUMBER": "TARV Number",
+    "PRESCRIPTION_REPORT_PRESCRIBER": "Prescriber",
+    "PRESCRIPTION_REPORT_HOSPITAL_NAME": "Health Unit",
+    "PRESCRIPTION_REPORT_PHARMACY": "Pharmacy",
+    "PRESCRIPTION_REPORT_PRESCRIPTION_REPORT": "Prescription Report",
+    "PRESCRIPTION_REPORT_NATIONAL_HEALTH_SERVICE": "National Health Service",
+    "PRESCRIPTION_REPORT_PRESCRIPTION_DATE": "Date",
+    "PRESCRIPTION_REPORT_PRESCRIBED": "Prescriber",
+    "PRESCRIPTION_REPORT_LOCATION": "Location",
+    "PRESCRIPTION_REPORT_MEDICATION_ORDER": "Medication Order",
+    "PRESCRIPTION_REPORT_DOSE": "Dose",
+    "PRESCRIPTION_REPORT_START_DATE": "Start Date",
+    "PRESCRIPTION_REPORT_INSTRUCTIONS": "Instructions",
+    "PRESCRIPTION_REPORT_PRESCRIBER_SIGNATURE": "Prescriber signature",
+    "PRESCRIPTION_REPORT_PRINTED_BY": "Printed by",
+    "PRESCRIPTION_REPORT_PRINTED_DATE": "Printed date",
+    "PRINT_CLINICAL_DASHBOARD_LABEL": "Print Dashboard",
+    "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Print Prescription",
+    "PRESCRIPTION_REPORT_PRINT_TARV_PRESCRIPTION_LABEL": "Print TARV Prescription",
+    "NO_FORM_FOUND_FOR_PATIENT": "No Form found for this patient",
+    "PRESCRIPTION_REPORT_NOTE": "Always bring this prescription to new consulters",
+    "PRESCRIPTION_REPORT_LABEL_FOR": "for",
+    "PRESCRIPTION_REPORT_AMOUNT" : "Amount" ,
+    "PRESCRIPTION_REPORT_SUBSIDIZED_AMOUNT" : "Subsidized Amount",
+    "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Amount Charged",
+    "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Print Dashboard",
+    "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Print Prescription"
+
+
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index b5f24163fe..fdf86114b1 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -432,5 +432,32 @@
   "CLINICAL_NO_NUTRITIONAL_STATUS": "Nenhum estado nutricional disponivel",
   "VALUE_RANGE_MESSAGE": "Os valores introduzidos estão fora do intervalo",
   "CLINICAL_APP_TITLE":"Clínico",
-  "SERVICES_APP_TITLE": "Serviços"
+  "SERVICES_APP_TITLE": "Serviços",
+  
+  "PRESCRIPTION_REPORT_GENERIC_NAME": "Nome genérico",
+  "PRESCRIPTION_REPORT_DOSAGE": "Dosagem",
+  "PRESCRIPTION_REPORT_PRESCRIBED": "Prescritor",
+  "PRESCRIPTION_REPORT_PRESCRIPTION_REPORT": "Receita Médica",
+  "PRESCRIPTION_REPORT_NATIONAL_HEALTH_SERVICE": "Serviço Nacional de Saúde",
+  "PRESCRIPTION_REPORT_PHARMACY": "Farmácia",
+  "PRESCRIPTION_REPORT_HOSPITAL_NAME": "Unidade Sanitária",
+  "PRESCRIPTION_REPORT_TREATMENT_DURATION": "Duração tratamento",
+  "PRESCRIPTION_REPORT_QUANTITY_PRESCRIBED": "Quantidade receitada",
+  "PRESCRIPTION_REPORT_DESCRIPTION": "Descrição",
+  "PRESCRIPTION_REPORT_PHARMACEUTICAL_FORM": "Forma farmacêutica",
+  "PRESCRIPTION_REPORT_SIGNATURE": "Assinatura",
+  "PRESCRIPTION_REPORT_NOTE": "Trazer sempre esta receita médica a  novas Consultas",
+  "PRESCRIPTION_REPORT_POSOLOGY": "Posologia",
+  "PRESCRIPTION_REPORT_PATIENT_NAME": "Nome do doente",
+  "PRESCRIPTION_REPORT_PATIENT_ID": "ID do paciente",
+  "PRESCRIPTION_REPORT_PATIENT_AGE_AND_SEX": "Idade",
+  "PRESCRIPTION_REPORT_PRESCRIPTION_DATE": "Data",
+  "PRESCRIPTION_REPORT_PATIENT_ADDRESS": "Morada",
+  "PRESCRIPTION_REPORT_AMOUNT" : "Valor Total" ,
+    "PRESCRIPTION_REPORT_SUBSIDIZED_AMOUNT" : "Valor Subsidiado",
+    "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Valor Cobrado",
+    "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Imprimir painel",
+    "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
+    "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir Todos",
+    "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Imprimir Prescrição"
 }
diff --git a/ui/app/ot/index.html b/ui/app/ot/index.html
index 3cfb3b5fe9..6094b60115 100644
--- a/ui/app/ot/index.html
+++ b/ui/app/ot/index.html
@@ -153,6 +153,7 @@
     <script src="../common/ui-helper/services/contextChangeHandler.js"></script>
     <script src="../common/ui-helper/directives/popOver.js"></script>
     <script src="../common/ui-helper/directives/splitButton.js"></script>
+    <script src="../common/ui-helper/directives/splitButtonNew.js"></script>
     <script src="../common/ui-helper/directives/backLinks.js"></script>
     <script src="../common/ui-helper/directives/focusOn.js"></script>
     <script src="../common/ui-helper/directives/bmShow.js"></script>
diff --git a/ui/app/registration/index.html b/ui/app/registration/index.html
index afed6460a6..181e012cc3 100644
--- a/ui/app/registration/index.html
+++ b/ui/app/registration/index.html
@@ -88,6 +88,7 @@
         <script src="../common/ui-helper/directives/toggle.js"></script>
         <script src="../common/ui-helper/directives/popOver.js"></script>
         <script src="../common/ui-helper/directives/splitButton.js"></script>
+        <script src="../common/ui-helper/directives/splitButtonNew.js"></script>
         <script src="../common/ui-helper/directives/focusOn.js"></script>
         <script src="../common/ui-helper/directives/conceptAutocomplete.js"></script>
         <script src="../common/ui-helper/directives/focusMe.js"></script>
diff --git a/ui/app/styles/bahmni-components/_splitButton.scss b/ui/app/styles/bahmni-components/_splitButton.scss
index 94db698fd0..04753e6a51 100644
--- a/ui/app/styles/bahmni-components/_splitButton.scss
+++ b/ui/app/styles/bahmni-components/_splitButton.scss
@@ -1,3 +1,4 @@
+
 .split-button {
     overflow:hidden;
     margin: 2px;
@@ -80,3 +81,9 @@
 .print-action-items {
     margin: 8px 10px 0 0;
 }
+
+.button.buttonClass.ng-binding {
+    background: #fff;
+}
+
+
diff --git a/ui/app/styles/bahmni-helper/_variables.scss b/ui/app/styles/bahmni-helper/_variables.scss
index ec1dda556d..962d145ca7 100644
--- a/ui/app/styles/bahmni-helper/_variables.scss
+++ b/ui/app/styles/bahmni-helper/_variables.scss
@@ -195,8 +195,8 @@ $bahmniTertiaryColor: #457FAC;
 
 $bahmniLinkColor: #2b95ff;
 
-$bahmniPrimaryBtnColor: #a1d030;
-$bahmniPrimaryBtnColorHover: #88af28;
+$bahmniPrimaryBtnColor: #ecf0e4;
+$bahmniPrimaryBtnColorHover: #f5f8ec;
 
 $bahmniSectionHeaderColor: #66b298;
 
@@ -255,7 +255,7 @@ $subtlerText: $darkerGrey;
 $link: #007FFF;
 $focus: #FFFDF7;
 
-$success: #A1D030;
+$success: rgb(237, 240, 231);
 $alert: #FFA000;
 $error: #ff6666;
 $successBackground: #ddffdd;

From 08cad77edae56c3a09c7fc68c4840dd3a2ec46e1 Mon Sep 17 00:00:00 2001
From: satvix <pratikthaakare@gmail.com>
Date: Fri, 2 Aug 2019 18:34:36 +0530
Subject: [PATCH 030/131] Pratik | MPOC-189 Fixed Medication Print

---
 .../controllers/consultationController.js     | 106 +++++++-----------
 .../printPrescriptionReportController.js      |   2 +-
 .../directives/prescriptionReport.js          |   3 +-
 .../printPrescriptionReportService.js         |  64 ++++-------
 .../ui-helper/directives/splitButton.js       |  24 ++--
 .../ui-helper/directives/splitButtonNew.js    |  24 ++--
 6 files changed, 87 insertions(+), 136 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index f9e2c5fa95..45404e83e6 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -4,11 +4,11 @@ angular.module('bahmni.clinical').controller('ConsultationController',
     ['$scope', '$rootScope', '$state', '$location', '$translate', 'clinicalAppConfigService', 'diagnosisService', 'urlHelper', 'contextChangeHandler',
         'spinner', 'encounterService', 'messagingService', 'sessionService', 'retrospectiveEntryService', 'patientContext', '$q',
         'patientVisitHistoryService', '$stateParams', '$window', 'visitHistory', 'clinicalDashboardConfig', 'appService',
-        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService','printer', 'printPrescriptionReportService','providerTypeService',
+        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService', 'printer', 'printPrescriptionReportService', 'providerTypeService',
         function ($scope, $rootScope, $state, $location, $translate, clinicalAppConfigService, diagnosisService, urlHelper, contextChangeHandler,
-                  spinner, encounterService, messagingService, sessionService, retrospectiveEntryService, patientContext, $q,
-                  patientVisitHistoryService, $stateParams, $window, visitHistory, clinicalDashboardConfig, appService,
-                  ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService,providerTypeService) {
+            spinner, encounterService, messagingService, sessionService, retrospectiveEntryService, patientContext, $q,
+            patientVisitHistoryService, $stateParams, $window, visitHistory, clinicalDashboardConfig, appService,
+            ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService, providerTypeService) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var getPreviousActiveCondition = Bahmni.Common.Domain.Conditions.getPreviousActiveCondition;
             var currentProviderType;
@@ -60,29 +60,15 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             };
 
             _.each(visitConfig.tabs, setVisitTabPrintAction);
-
             _.each(clinicalDashboardConfig.tabs, setDashboardPrintAction);
             $scope.printList = _.concat(clinicalDashboardConfig.tabs, visitConfig.tabs);
-
             clinicalDashboardConfig.quickPrints = appService.getAppDescriptor().getConfigValue('quickPrints');
-            
-           /*
-            $scope.printDashboard = function (tab) {
-                if (tab) {
-                    tab.print();
-                } else {
-                    clinicalDashboardConfig.currentTab.print();
-                }
-            };*/
-
             var clinicalDashboardUuid = '0623e3b6-8701-4c07-8493-2930bd67f11a';
             var prescriptionReportUuid = '2c6c27b0-3eef-4010-bfbb-9133d0016d25';
-            //var tarvPrescriptionReportUuid = '31f15798-9983-4066-9b06-6868e1ba7210';
-
             $scope.printButtonDropdownOptions = [
-                {name: $translate.instant('PRINT_CLINICAL_DASHBOARD_LABEL'), uuid: clinicalDashboardUuid},
-                {name: $translate.instant('PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL'), uuid: prescriptionReportUuid}
-                // {name: $translate.instant('PRESCRIPTION_REPORT_PRINT_TARV_PRESCRIPTION_LABEL'), uuid: tarvPrescriptionReportUuid}
+                { name: $translate.instant('PRINT_CLINICAL_DASHBOARD_LABEL'), uuid: clinicalDashboardUuid },
+                { name: $translate.instant('PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL'), uuid: prescriptionReportUuid }
+
             ];
 
             $scope.optionText = function (value) {
@@ -90,23 +76,18 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             };
 
             $scope.printDashboardOrPrescription = function (option) {
-             
                 if (option.uuid === clinicalDashboardUuid) {
                     clinicalDashboardConfig.currentTab.print();
                 } else {
                     if (option.uuid === prescriptionReportUuid) {
                         $rootScope.isTarvReport = false;
                     }
-                    //  else if (option.uuid === tarvPrescriptionReportUuid) {
-                    //     $rootScope.isTarvReport = true;
-                    // }
-
                     printPrescriptionReportService.getReportModel($stateParams.patientUuid, $rootScope.isTarvReport)
-                    .then(function (reportData) {
-                        $rootScope.prescriptionReportData = reportData;
-                        //console.log($rootScope.prescriptionReportData);
-                        printer.printFromScope("dashboard/views/printPrescriptionReport.html", $rootScope, function () { });
-                    });
+                        .then(function (reportData) {
+                            $rootScope.prescriptionReportData = reportData;
+
+                            printer.printFromScope("dashboard/views/printPrescriptionReport.html", $rootScope, function () { });
+                        });
                 }
             };
 
@@ -185,7 +166,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
 
             var initialize = function () {
                 var appExtensions = clinicalAppConfigService.getAllConsultationBoards();
-                $scope.adtNavigationConfig = {forwardUrl: Bahmni.Clinical.Constants.adtForwardUrl, title: $translate.instant("CLINICAL_GO_TO_DASHBOARD_LABEL"), privilege: Bahmni.Clinical.Constants.adtPrivilege };
+                $scope.adtNavigationConfig = { forwardUrl: Bahmni.Clinical.Constants.adtForwardUrl, title: $translate.instant("CLINICAL_GO_TO_DASHBOARD_LABEL"), privilege: Bahmni.Clinical.Constants.adtPrivilege };
                 $scope.availableBoards = $scope.availableBoards.concat(appExtensions);
                 $scope.showSaveConfirmDialogConfig = appService.getAppDescriptor().getConfigValue('showSaveConfirmDialog');
                 var adtNavigationConfig = appService.getAppDescriptor().getConfigValue('adtNavigationConfig');
@@ -212,7 +193,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                             event.preventDefault();
                             spinner.hide(toState.spinnerToken);
                             ngDialog.close();
-                            $scope.toStateConfig = {toState: toState, toParams: toParams};
+                            $scope.toStateConfig = { toState: toState, toParams: toParams };
                             $scope.displayConfirmationDialog();
                         }
                     }
@@ -221,7 +202,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             });
 
             $scope.adtNavigationURL = function (visitUuid) {
-                return appService.getAppDescriptor().formatUrl($scope.adtNavigationConfig.forwardUrl, {'patientUuid': $scope.patient.uuid, 'visitUuid': visitUuid});
+                return appService.getAppDescriptor().formatUrl($scope.adtNavigationConfig.forwardUrl, { 'patientUuid': $scope.patient.uuid, 'visitUuid': visitUuid });
             };
 
             var cleanUpListenerErrorsOnForm = $scope.$on("event:errorsOnForm", function () {
@@ -234,7 +215,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                         event.preventDefault();
                         $scope.targetUrl = event.currentTarget.getAttribute('href');
                     }
-                    ngDialog.openConfirm({template: '../common/ui-helper/views/saveConfirmation.html', scope: $scope});
+                    ngDialog.openConfirm({ template: '../common/ui-helper/views/saveConfirmation.html', scope: $scope });
                 }
             };
 
@@ -329,7 +310,6 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 if ($scope.lastConsultationTabUrl.url) {
                     $location.url($scope.lastConsultationTabUrl.url);
                 } else {
-                    // Default tab
                     getUrl($scope.availableBoards[0]);
                 }
             };
@@ -359,7 +339,6 @@ angular.module('bahmni.clinical').controller('ConsultationController',
 
             var preSavePromise = function () {
                 var deferred = $q.defer();
-
                 var observationFilter = new Bahmni.Common.Domain.ObservationFilter();
                 $scope.consultation.preSaveHandler.fire();
                 $scope.lastvisited = $scope.consultation.lastvisited;
@@ -369,7 +348,6 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 tempConsultation.consultationNote = observationFilter.filter([tempConsultation.consultationNote])[0];
                 tempConsultation.whoStage = observationFilter.filter([tempConsultation.whoStage])[0];
                 tempConsultation.labOrderNote = observationFilter.filter([tempConsultation.labOrderNote])[0];
-
                 addFormObservations(tempConsultation);
                 storeTemplatePreference(selectedObsTemplate);
                 var visitTypeForRetrospectiveEntries = clinicalAppConfigService.getVisitTypeForRetrospectiveEntries();
@@ -501,7 +479,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     params.cachebuster = Math.random();
                     return encounterService.create(encounterData)
                         .then(function (saveResponse) {
-                            var messageParams = {encounterUuid: saveResponse.data.encounterUuid, encounterType: saveResponse.data.encounterType};
+                            var messageParams = { encounterUuid: saveResponse.data.encounterUuid, encounterType: saveResponse.data.encounterType };
                             auditLogService.log($scope.patient.uuid, "EDIT_ENCOUNTER", messageParams, "MODULE_LABEL_CLINICAL_KEY");
                             var consultationMapper = new Bahmni.ConsultationMapper(configurations.dosageFrequencyConfig(), configurations.dosageInstructionConfig(),
                                 configurations.consultationNoteConcept(), configurations.whoStageConcept(), configurations.labOrderNotesConcept(), $scope.followUpConditionConcept);
@@ -510,30 +488,30 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                             return consultation;
                         }).then(function (savedConsultation) {
                             return spinner.forPromise(diagnosisService.populateDiagnosisInformation($scope.patient.uuid, savedConsultation)
-                                                          .then(function (consultationWithDiagnosis) {
-                                                              return saveConditions().then(function (savedConditions) {
-                                                                  consultationWithDiagnosis.conditions = savedConditions;
-                                                                  messagingService.showMessage('info', "{{'CLINICAL_SAVE_SUCCESS_MESSAGE_KEY' | translate}}");
-                                                              }, function () {
-                                                                  consultationWithDiagnosis.conditions = $scope.consultation.conditions;
-                                                              }).then(saveAllergies().then(function (savedAllergies) {
-                                                                  consultationWithDiagnosis.allergies = savedAllergies;
-                                                                  messagingService.showMessage('info', "{{'CLINICAL_SAVE_SUCCESS_MESSAGE_KEY' | translate}}");
-                                                              }, function () {
-                                                                  consultationWithDiagnosis.conditions = $scope.consultation.conditions;
-                                                                  consultationWithDiagnosis.allergies = $scope.consultation.allergies;
-                                                              })).then(function () {
-                                                                  copyConsultationToScope(consultationWithDiagnosis);
-                                                                  if ($scope.targetUrl) {
-                                                                      return $window.open($scope.targetUrl, "_self");
-                                                                  }
-                                                                  return $state.transitionTo(toStateConfig ? toStateConfig.toState : $state.current, toStateConfig ? toStateConfig.toParams : params, {
-                                                                      inherit: false,
-                                                                      notify: true,
-                                                                      reload: (toStateConfig !== undefined)
-                                                                  });
-                                                              });
-                                                          }));
+                                .then(function (consultationWithDiagnosis) {
+                                    return saveConditions().then(function (savedConditions) {
+                                        consultationWithDiagnosis.conditions = savedConditions;
+                                        messagingService.showMessage('info', "{{'CLINICAL_SAVE_SUCCESS_MESSAGE_KEY' | translate}}");
+                                    }, function () {
+                                        consultationWithDiagnosis.conditions = $scope.consultation.conditions;
+                                    }).then(saveAllergies().then(function (savedAllergies) {
+                                        consultationWithDiagnosis.allergies = savedAllergies;
+                                        messagingService.showMessage('info', "{{'CLINICAL_SAVE_SUCCESS_MESSAGE_KEY' | translate}}");
+                                    }, function () {
+                                        consultationWithDiagnosis.conditions = $scope.consultation.conditions;
+                                        consultationWithDiagnosis.allergies = $scope.consultation.allergies;
+                                    })).then(function () {
+                                        copyConsultationToScope(consultationWithDiagnosis);
+                                        if ($scope.targetUrl) {
+                                            return $window.open($scope.targetUrl, "_self");
+                                        }
+                                        return $state.transitionTo(toStateConfig ? toStateConfig.toState : $state.current, toStateConfig ? toStateConfig.toParams : params, {
+                                            inherit: false,
+                                            notify: true,
+                                            reload: (toStateConfig !== undefined)
+                                        });
+                                    });
+                                }));
                         }).catch(function (error) {
                             var message = Bahmni.Clinical.Error.translate(error) || "{{'CLINICAL_SAVE_FAILURE_MESSAGE_KEY' | translate}}";
                             messagingService.showMessage('error', message);
@@ -551,7 +529,5 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 }
                 return true;
             };
-
-
             initialize();
         }]);
diff --git a/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js b/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js
index 5de96fd307..2832665384 100644
--- a/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js
+++ b/ui/app/clinical/dashboard/controllers/printPrescriptionReportController.js
@@ -1,8 +1,8 @@
+/* eslint-disable eol-last */
 'use strict';
 angular.module('bahmni.clinical')
     .controller('PrintPrescriptionReportController', ['$scope', '$rootScope',
         function ($scope, $rootScope) {
             $scope.isTarvReport = $rootScope.isTarvReport;
             $scope.data = $rootScope.prescriptionReportData;
-           console.log($scope.data);
         }]);
\ No newline at end of file
diff --git a/ui/app/clinical/dashboard/directives/prescriptionReport.js b/ui/app/clinical/dashboard/directives/prescriptionReport.js
index c4dc0a24eb..b9e64ab01f 100644
--- a/ui/app/clinical/dashboard/directives/prescriptionReport.js
+++ b/ui/app/clinical/dashboard/directives/prescriptionReport.js
@@ -1,5 +1,4 @@
 'use strict';
-
 angular.module('bahmni.clinical')
     .directive('prescriptionReport', function () {
         var controller = function ($scope) {
@@ -25,4 +24,4 @@ angular.module('bahmni.clinical')
             },
             templateUrl: "dashboard/views/prescriptionReport.html"
         };
-    });
\ No newline at end of file
+    });
diff --git a/ui/app/clinical/dashboard/services/printPrescriptionReportService.js b/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
index 3844a97a96..111296ec4c 100644
--- a/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
+++ b/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
@@ -15,7 +15,7 @@ angular.module('bahmni.clinical')
                     sex: '',
                     weight: '',
                     patientId: '',
-                    address : ''
+                    address: ''
                 },
                 tbComorbidity: '',
                 tarvNumber: '',
@@ -33,42 +33,33 @@ angular.module('bahmni.clinical')
             this.getReportModel = function (_patientUuid, _isTARVReport) {
                 patientUuid = _patientUuid;
                 isTARVReport = _isTARVReport;
-                
                 return new Promise(function (resolve, reject) {
-                   
-                        var p1 = populatePatientDemographics();
-                        var p2 = populatePatientWeightAndHeight();
-                      
-                        var p4 = populateLocationAndDrugOrders(0);
-                        var p5 = populateHospitalNameAndLogo();
-
-                        Promise.all([p1,p2,p4,p5]).then(function () {
-                            resolve(reportModel);
-                        }).catch(function (error) {
-                            reject(error);
-                        });
+                    var p1 = populatePatientDemographics();
+                    var p2 = populatePatientWeightAndHeight();
+                    var p4 = populateLocationAndDrugOrders(0);
+                    var p5 = populateHospitalNameAndLogo();
+                    Promise.all([p1, p2, p4, p5]).then(function () {
+                        resolve(reportModel);
                     }).catch(function (error) {
                         reject(error);
                     });
-              
+                }).catch(function (error) {
+                    reject(error);
+                });
             };
 
-           
             var drugConceptIsARV = function (drugConceptUuid) {
-               
                 return arvConceptUuids.includes(drugConceptUuid);
             };
 
             var populatePatientDemographics = function () {
-                        var add2 = "";
-                        var add3 = "";
-                        var cityVillage = "";
+                var add2 = "";
+                var add3 = "";
+                var cityVillage = "";
                 return new Promise(function (resolve, reject) {
                     patientService.getPatient(patientUuid).then(function (response) {
-                        
                         var patientMapper = new Bahmni.PatientMapper($rootScope.patientConfig, $rootScope, $translate);
                         var patient = patientMapper.map(response.data);
-                       
                         reportModel.patientInfo.firstName = patient.givenName;
                         reportModel.patientInfo.lastName = patient.familyName;
                         reportModel.patientInfo.sex = patient.gender;
@@ -90,18 +81,13 @@ angular.module('bahmni.clinical')
                     });
                 });
             };
-
-           
-
             var populatePatientWeightAndHeight = function () {
                 return new Promise(function (resolve, reject) {
                     var patientWeightConceptName = 'Weight';
                     var patientHeightConceptName = 'Height';
-                    observationsService.fetch(patientUuid, [patientWeightConceptName,patientHeightConceptName]).then(function (response) {
+                    observationsService.fetch(patientUuid, [patientWeightConceptName, patientHeightConceptName]).then(function (response) {
                         if (response.data && response.data.length > 0) {
-                         
                             reportModel.patientInfo.weight = response.data[0].value;
-                         
                         }
                         resolve();
                     }).catch(function (error) {
@@ -111,21 +97,17 @@ angular.module('bahmni.clinical')
             };
 
             var populateDrugOrders = function (visitUuid) {
-                    return new Promise(function (resolve, reject) {
+                return new Promise(function (resolve, reject) {
                     treatmentService.getPrescribedDrugOrders(patientUuid, true).then(function (response) {
                         var currentVisitOrders = response.filter(function (order) {
-                           
-                                
-                                return order.visit.uuid === visitUuid && !drugConceptIsARV(order.concept.uuid);
-                           
+                            return order.visit.uuid === visitUuid && !drugConceptIsARV(order.concept.uuid);
                         });
                         if (currentVisitOrders.length <= 0) {
                             count = count + 1;
-                            populateLocationAndDrugOrders(count)
+                            populateLocationAndDrugOrders(count);
                         }
                         reportModel.orders = [];
                         currentVisitOrders.forEach(function (order) {
-                           
                             var drug = order.drugNonCoded;
                             if (order.drug) {
                                 drug = order.drug.name;
@@ -145,13 +127,12 @@ angular.module('bahmni.clinical')
                                 duration: order.duration,
                                 route: order.dosingInstructions.route,
                                 durationUnit: order.durationUnits,
-                                quantity : order.dosingInstructions.quantity,
-                                provider : order.provider.name,
-                                strength : order.drug.strength,
+                                quantity: order.dosingInstructions.quantity,
+                                provider: order.provider.name,
+                                strength: order.drug.strength,
                                 startDate: moment(order.scheduledDate).format('DD/MM/YYYY'),
                                 instructions: instructions
                             };
-
                             reportModel.orders.push(newOrder);
                             reportModel.prescriber = order.provider.name;
                             reportModel.prescriptionDate = moment(order.dateActivated).format('DD/MM/YYYY');
@@ -167,10 +148,8 @@ angular.module('bahmni.clinical')
                 return new Promise(function (resolve, reject) {
                     patientVisitHistoryService.getVisitHistory(patientUuid, null).then(function (response) {
                         if (response.visits && response.visits.length > 0) {
-                         
                             reportModel.location = response.visits[lastVisit].location.display;
                             populateDrugOrders(response.visits[lastVisit].uuid);
-                          
                         }
                         resolve();
                     }).catch(function (error) {
@@ -190,7 +169,4 @@ angular.module('bahmni.clinical')
                     });
                 });
             };
-
-            
-
         }]);
diff --git a/ui/app/common/ui-helper/directives/splitButton.js b/ui/app/common/ui-helper/directives/splitButton.js
index 152fb75a26..7620fcd3ea 100644
--- a/ui/app/common/ui-helper/directives/splitButton.js
+++ b/ui/app/common/ui-helper/directives/splitButton.js
@@ -29,18 +29,18 @@ angular.module('bahmni.common.uiHelper')
         return {
             restrict: 'A',
             template: '<div class="split-button" bm-pop-over>' +
-                        '<button bm-pop-over-trigger class="toggle-button fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>'  +
-                        '<ul class="options">' +
-                            '<li class="primaryOption">' +
-                                '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +
-                            '</li>' +
-                            '<ul class="hidden-options">' +
-                            '<li bm-pop-over-target ng-repeat="option in ::secondaryOptions" class="secondaryOption">' +
-                                '<button class="buttonClass" ng-click="optionClick()(option)" accesskey="{{::option.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(option) | translate"></button>' +
-                            '</li>' +
-                            '</ul>' +
-                        '</ul>' +
-                      '</div>',
+                '<button bm-pop-over-trigger class="toggle-button fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>' +
+                '<ul class="options">' +
+                '<li class="primaryOption">' +
+                '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +
+                '</li>' +
+                '<ul class="hidden-options">' +
+                '<li bm-pop-over-target ng-repeat="option in ::secondaryOptions" class="secondaryOption">' +
+                '<button class="buttonClass" ng-click="optionClick()(option)" accesskey="{{::option.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(option) | translate"></button>' +
+                '</li>' +
+                '</ul>' +
+                '</ul>' +
+                '</div>',
             controller: controller,
             link: link,
             scope: {
diff --git a/ui/app/common/ui-helper/directives/splitButtonNew.js b/ui/app/common/ui-helper/directives/splitButtonNew.js
index 8687d13345..0907004239 100644
--- a/ui/app/common/ui-helper/directives/splitButtonNew.js
+++ b/ui/app/common/ui-helper/directives/splitButtonNew.js
@@ -29,18 +29,18 @@ angular.module('bahmni.common.uiHelper')
         return {
             restrict: 'A',
             template: '<div class="split-button" bm-pop-over>' +
-                        '<button bm-pop-over-trigger class="toggle-buttonNew fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>'  +
-                        '<ul class="options">' +
-                            '<li>' +
-                                '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +
-                            '</li>' +
-                            '<ul class="hidden-optionsNew">' +
-                            '<li bm-pop-over-target ng-repeat="option in ::secondaryOptions" class="secondaryOptionNew">' +
-                                '<button class="buttonClass" ng-click="optionClick()(option)" accesskey="{{::option.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(option) | translate"></button>' +
-                            '</li>' +
-                            '</ul>' +
-                        '</ul>' +
-                      '</div>',
+                '<button bm-pop-over-trigger class="toggle-buttonNew fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>' +
+                '<ul class="options">' +
+                '<li>' +
+                '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +
+                '</li>' +
+                '<ul class="hidden-optionsNew">' +
+                '<li bm-pop-over-target ng-repeat="option in ::secondaryOptions" class="secondaryOptionNew">' +
+                '<button class="buttonClass" ng-click="optionClick()(option)" accesskey="{{::option.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(option) | translate"></button>' +
+                '</li>' +
+                '</ul>' +
+                '</ul>' +
+                '</div>',
             controller: controller,
             link: link,
             scope: {

From aea76ea084e11028ac62161b183fa64cfa01c698 Mon Sep 17 00:00:00 2001
From: satvix <pratikthaakare@gmail.com>
Date: Wed, 7 Aug 2019 10:58:59 +0530
Subject: [PATCH 031/131] Pratik | MPOC-189 fixed Print Medication Prescription

---
 .../views/printPrescriptionReport.html        | 54 +++++++++++++------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/ui/app/clinical/dashboard/views/printPrescriptionReport.html b/ui/app/clinical/dashboard/views/printPrescriptionReport.html
index e58ea96e10..20f237a59a 100644
--- a/ui/app/clinical/dashboard/views/printPrescriptionReport.html
+++ b/ui/app/clinical/dashboard/views/printPrescriptionReport.html
@@ -1,14 +1,8 @@
 <html>
 
 <head>
-    <link rel="stylesheet" href="../styles/clinicalPrint.css" media="print" />
     <style>
-        .ver-rot {
-            writing-mode: vertical-rl;
-            transform: rotate(180deg);
-            color: white;
-        }
-
+       
         table,
         th,
         td {
@@ -22,21 +16,23 @@
             text-align: left;
         }
 
-        .lftcss {
-            height: min-content;
-        }
-
         td.td_box1 {
             position: relative;
-            width: 15%;
+            width: 16%;
             line-height: 2;
         }
 
         td.td_box2 {
             position: relative;
-            width: 75%;
+            width: 64%;
+            line-height: 2;
+        }
+        td.td_box1 {
+            position: relative;
+            width: 20%;
             line-height: 2;
         }
+
         tr.abc {
     position: relative;
     display: flex;
@@ -56,6 +52,32 @@
 }
 td.cng {
     width: 100%;
+}
+
+@media print {
+    .hi {
+        background-color: #000 !important;
+        -webkit-print-color-adjust: exact; 
+        width: 15px;
+        height: 100%;
+    }
+
+    .ver-rot {
+            writing-mode: vertical-rl;
+            -webkit-writing-mode: vertical-rl;
+            transform: rotate(180deg);
+            color: white;
+        }
+
+        .mainName{
+            font-weight: bold ;
+            text-align: center;
+            font-size: 20px;
+            background-color :rgb(149, 218, 172) !important;
+            -webkit-print-color-adjust: exact;
+        }
+    
+
 }
     </style>
 </head>
@@ -72,12 +94,12 @@
                     <div style="border :1px solid black; padding: 5px">
                         <table style="width: 100%">
                             <tr>
-                                <td rowspan="4" style="width: 15x; background-color:black" class="lftcss">
-                                    <div class="ver-rot prescribe-report-label">CMAM-Modelo 06</div>
+                                <td rowspan="4" class="hi">
+                                    <div class="ver-rot">CMAM<span>&#8208;</span>Modelo&nbsp;06</div>
                                 </td>
 
                                 <td colspan="9"
-                                    style="font-weight: bold ;text-align: center;font-size: 20px;background-color :rgb(149, 218, 172)">
+                                    class="mainName">
                                     <span
                                         class="prescribe-report-label">{{ 'PRESCRIPTION_REPORT_NATIONAL_HEALTH_SERVICE' | translate }}</span>
                                 </td>

From abb75767ada3efa95ae372a2e08a152a4bc1d29c Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Wed, 7 Aug 2019 10:05:05 +0200
Subject: [PATCH 032/131] Changed some strings as per BA's request.

---
 .../services/printPrescriptionReportService.js   |  6 +++++-
 ui/app/i18n/clinical/locale_pt.json              | 16 ++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ui/app/clinical/dashboard/services/printPrescriptionReportService.js b/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
index 111296ec4c..2db447e5ee 100644
--- a/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
+++ b/ui/app/clinical/dashboard/services/printPrescriptionReportService.js
@@ -53,6 +53,7 @@ angular.module('bahmni.clinical')
             };
 
             var populatePatientDemographics = function () {
+                var add1 = "";
                 var add2 = "";
                 var add3 = "";
                 var cityVillage = "";
@@ -65,6 +66,9 @@ angular.module('bahmni.clinical')
                         reportModel.patientInfo.sex = patient.gender;
                         reportModel.patientInfo.age = patient.age;
                         reportModel.patientInfo.patientId = patient.identifier;
+                        if (patient.address.address1 != null) {
+                            add1 = patient.address.address1 + ", ";
+                        }
                         if (patient.address.address2 != null) {
                             add2 = patient.address.address2 + ", ";
                         }
@@ -74,7 +78,7 @@ angular.module('bahmni.clinical')
                         if (patient.address.cityVillage != null) {
                             cityVillage = patient.address.cityVillage + ", ";
                         }
-                        reportModel.patientInfo.address = patient.address.address1 + ", " + add2 + add3 + patient.address.cityVillage + patient.address.stateProvince;
+                        reportModel.patientInfo.address = add1 + add2 + add3 + cityVillage + patient.address.stateProvince;
                         resolve();
                     }).catch(function (error) {
                         reject(error);
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index f31ec389b2..ffc9558a11 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -447,17 +447,17 @@
   "PRESCRIPTION_REPORT_SIGNATURE": "Assinatura",
   "PRESCRIPTION_REPORT_NOTE": "Trazer sempre esta receita médica a  novas Consultas",
   "PRESCRIPTION_REPORT_POSOLOGY": "Posologia",
-  "PRESCRIPTION_REPORT_PATIENT_NAME": "Nome do doente",
-  "PRESCRIPTION_REPORT_PATIENT_ID": "ID do paciente",
+  "PRESCRIPTION_REPORT_PATIENT_NAME": "Nome do paciente",
+  "PRESCRIPTION_REPORT_PATIENT_ID": "Nº de NID",
   "PRESCRIPTION_REPORT_PATIENT_AGE_AND_SEX": "Idade",
   "PRESCRIPTION_REPORT_PRESCRIPTION_DATE": "Data",
   "PRESCRIPTION_REPORT_PATIENT_ADDRESS": "Morada",
   "PRESCRIPTION_REPORT_AMOUNT" : "Valor Total" ,
-    "PRESCRIPTION_REPORT_SUBSIDIZED_AMOUNT" : "Valor Subsidiado",
-    "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Valor Cobrado",
-    "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Imprimir painel",
-    "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
-    "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir Todos",
-    "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Imprimir Prescrição",
+  "PRESCRIPTION_REPORT_SUBSIDIZED_AMOUNT" : "Valor Subsidiado",
+  "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Valor Cobrado",
+  "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Imprimir painel",
+  "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
+  "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir Todos",
+  "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Imprimir Prescrição",
   "CLINICAL_PATIENT_STATUS": "Activo em"
 }

From d40c1d23712963de39c74e4eeb0edcd9167da6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Wed, 7 Aug 2019 10:22:38 +0200
Subject: [PATCH 033/131] Change label "introduzido em" to "Requisitado a"

---
 ui/app/i18n/clinical/locale_pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 4d1d198248..5385182596 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -1,6 +1,6 @@
 {
   "ACCEPT": "Aceitar",
-  "ACCESSION_AT_LABEL": "Introduzido em",
+  "ACCESSION_AT_LABEL": "Requisitado a",
   "ADD_FORM_KEY": "Adicionar formulário",
   "ADD_MORE_KEY": "Adicionar",
   "ADD_NEW_OBSERVATION": "Adicionar formulário de observação",

From 1a23ab78d8fc3917f99d0f50cf42e4263ac46659 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Wed, 7 Aug 2019 11:17:34 +0200
Subject: [PATCH 034/131] Fixed portuguese translation for Reports UI on Bahmni

---
 ui/app/i18n/reports/locale_pt.json | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/ui/app/i18n/reports/locale_pt.json b/ui/app/i18n/reports/locale_pt.json
index 2a6e368b4b..ff99cb83ff 100644
--- a/ui/app/i18n/reports/locale_pt.json
+++ b/ui/app/i18n/reports/locale_pt.json
@@ -8,25 +8,26 @@
     "REPORTS_NAME_HEADER_KEY": "Nome",
     "REPORTS_START_DATE_HEADER_KEY": "Data Inicial",
     "REPORTS_END_DATE_HEADER_KEY": "Data Final",
-    "RUN_NOW_BUTTON_KEY": "Run Now",
+    "RUN_NOW_BUTTON_KEY": "Executar",
     "RUN_REPORT_BUTTON_KEY": "Rodar Relatório",
-    "QUEUE_BUTTON_KEY": "Queue",
+    "QUEUE_BUTTON_KEY": "Agendar",
     "REPORT_FORMAT_KEY": "Formato",
-    "REPORTS_TITLE_KEY": "Relatório",
+    "REPORTS_TITLE_KEY": "Relatórios",
     "REPORTS_TITLE_WITHOUT_DATE_RANGE_KEY": "Relatórios sem Período",
     "REPORTS_MISSING_WARNING_MESSAGE_KEY": "Novos relatórios podem ser configurados em um arquivo JSON dentro de openmrs/apps/reports/reports.json. Consulte a documentação para obter mais informações sobre a configuração de relatórios",
-    "MESSAGE_DIALOG_OPTION_COPY": "Erro de Cópia",
+    "MESSAGE_DIALOG_OPTION_COPY": "Copiar erro",
     "MESSAGE_DIALOG_OPTION_OKAY": "OK",
-    "REPORTS_QUEUE": "Reports Queue",
-    "REPORTS_SEARCH_PLACEHOLDER": "Search By Report Name",
-    "REPORT_STATUS": "Status",
-    "REPORT_REQUEST_TIME": "Request time",
-    "REPORT_DELETE_SUCCESSFUL": "Successfully deleted report",
-    "REPORT_DELETE_ERROR": "Error in deleting report",
-    "REPORT_DELETE_DIALOG": "Do you want to delete the report?",
-    "REPORT_DOWNLOAD": "Download",
+    "REPORTS_QUEUE": "Pilha de Relatórios",
+    "REPORTS_SEARCH_PLACEHOLDER": "Pesquisar por Nome do Relatório",
+    "REPORT_STATUS": "Estado",
+    "REPORT_REQUEST_TIME": "Hora do pedido",
+    "REPORT_DELETE_SUCCESSFUL": "Relatório removido com sucesso",
+    "REPORT_DELETE_ERROR": "Erro ao remover o relatório",
+    "REPORT_DELETE_DIALOG": "Tem certeza que deseja remover o relatório?",
+    "REPORT_DOWNLOAD": "Descarregar",
     "REPORT_ERROR": "Error",
-    "REPORT_DELETE": "Delete",
-    "REPORTS_HEADER_REPORTS": "Reports",
-    "REPORTS_HEADER_MY_REPORTS": "My Reports"
+    "REPORT_DELETE": "Apagar",
+    "REPORTS_HEADER_REPORTS": "Relatórios",
+    "REPORTS_HEADER_MY_REPORTS": "Meus relatórios",
+    "CHOOSE_REPORT_FORMAT": "Seleccione formato"
 }
\ No newline at end of file

From 0a96c35cf25f3837be6c771a215a64e43c448e85 Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Wed, 7 Aug 2019 15:25:25 +0530
Subject: [PATCH 035/131] Amol | Revert back changes of css (#279)

---
 ui/app/styles/bahmni-helper/_variables.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/app/styles/bahmni-helper/_variables.scss b/ui/app/styles/bahmni-helper/_variables.scss
index 962d145ca7..ec1dda556d 100644
--- a/ui/app/styles/bahmni-helper/_variables.scss
+++ b/ui/app/styles/bahmni-helper/_variables.scss
@@ -195,8 +195,8 @@ $bahmniTertiaryColor: #457FAC;
 
 $bahmniLinkColor: #2b95ff;
 
-$bahmniPrimaryBtnColor: #ecf0e4;
-$bahmniPrimaryBtnColorHover: #f5f8ec;
+$bahmniPrimaryBtnColor: #a1d030;
+$bahmniPrimaryBtnColorHover: #88af28;
 
 $bahmniSectionHeaderColor: #66b298;
 
@@ -255,7 +255,7 @@ $subtlerText: $darkerGrey;
 $link: #007FFF;
 $focus: #FFFDF7;
 
-$success: rgb(237, 240, 231);
+$success: #A1D030;
 $alert: #FFA000;
 $error: #ff6666;
 $successBackground: #ddffdd;

From 9045abdeffa97bf6c4fffe2f2b74fa99f43cd7cd Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Wed, 7 Aug 2019 12:46:34 +0200
Subject: [PATCH 036/131] Fixed portuguese translation for Reports UI

---
 ui/app/i18n/reports/locale_pt.json              | 6 +++---
 ui/app/reports/controllers/reportsController.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/app/i18n/reports/locale_pt.json b/ui/app/i18n/reports/locale_pt.json
index ff99cb83ff..c96e8cc649 100644
--- a/ui/app/i18n/reports/locale_pt.json
+++ b/ui/app/i18n/reports/locale_pt.json
@@ -1,5 +1,5 @@
 {
-    "userName": "Nome de Usuário",
+    "userName": "Nome do Usuário",
     "password": "Senha",
     "location": "Local",
     "login": "Entrar",
@@ -10,14 +10,14 @@
     "REPORTS_END_DATE_HEADER_KEY": "Data Final",
     "RUN_NOW_BUTTON_KEY": "Executar",
     "RUN_REPORT_BUTTON_KEY": "Rodar Relatório",
-    "QUEUE_BUTTON_KEY": "Agendar",
+    "QUEUE_BUTTON_KEY": "Fixar",
     "REPORT_FORMAT_KEY": "Formato",
     "REPORTS_TITLE_KEY": "Relatórios",
     "REPORTS_TITLE_WITHOUT_DATE_RANGE_KEY": "Relatórios sem Período",
     "REPORTS_MISSING_WARNING_MESSAGE_KEY": "Novos relatórios podem ser configurados em um arquivo JSON dentro de openmrs/apps/reports/reports.json. Consulte a documentação para obter mais informações sobre a configuração de relatórios",
     "MESSAGE_DIALOG_OPTION_COPY": "Copiar erro",
     "MESSAGE_DIALOG_OPTION_OKAY": "OK",
-    "REPORTS_QUEUE": "Pilha de Relatórios",
+    "REPORTS_QUEUE": "Lista de Relatórios",
     "REPORTS_SEARCH_PLACEHOLDER": "Pesquisar por Nome do Relatório",
     "REPORT_STATUS": "Estado",
     "REPORT_REQUEST_TIME": "Hora do pedido",
diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
index a69f47d6a5..90d6787267 100644
--- a/ui/app/reports/controllers/reportsController.js
+++ b/ui/app/reports/controllers/reportsController.js
@@ -29,7 +29,7 @@ angular.module('bahmni.reports')
 
         var validateReport = function (report) {
             if (!report.responseType) {
-                messagingService.showMessage("error", "Select format for the report: " + report.name);
+                messagingService.showMessage("error", "Seleccione o formato do relatório: " + report.name);
                 return false;
             }
             if (report.responseType === 'application/vnd.ms-excel-custom' && !report.reportTemplateLocation) {

From 62b959790a3d2ec5f4669b1197b21c4f8e9b1e20 Mon Sep 17 00:00:00 2001
From: satvix <pratikthaakare@gmail.com>
Date: Wed, 7 Aug 2019 17:30:03 +0530
Subject: [PATCH 037/131] Pratik | Fixed Print prescription dropdown button

---
 ui/app/common/ui-helper/directives/splitButtonNew.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/common/ui-helper/directives/splitButtonNew.js b/ui/app/common/ui-helper/directives/splitButtonNew.js
index 0907004239..8e1105dbae 100644
--- a/ui/app/common/ui-helper/directives/splitButtonNew.js
+++ b/ui/app/common/ui-helper/directives/splitButtonNew.js
@@ -29,7 +29,7 @@ angular.module('bahmni.common.uiHelper')
         return {
             restrict: 'A',
             template: '<div class="split-button" bm-pop-over>' +
-                '<button bm-pop-over-trigger class="toggle-buttonNew fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>' +
+                '<button bm-pop-over-trigger style="height:31px;width:40px" class="toggle-buttonNew fa fa-caret-down" ng-show="::hasMultipleOptions()" ng-click="scrollToBottom()" ng-disabled="optionDisabled" type="button style="color:"black"></button>' +
                 '<ul class="options">' +
                 '<li>' +
                 '<button class="buttonClass" ng-click="optionClick()(primaryOption)" accesskey="{{::primaryOption.shortcutKey}}" ng-disabled="optionDisabled" ng-bind-html="::optionText()(primaryOption,\'primary\') | translate "></button>' +

From f42bbf6339fc2c773a5250db4a2b63492fca3106 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Wed, 7 Aug 2019 15:20:49 +0200
Subject: [PATCH 038/131] Rename file

---
 ui/app/i18n/clinical/{locale_pt_BR.json => locale_pt.json} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ui/app/i18n/clinical/{locale_pt_BR.json => locale_pt.json} (100%)

diff --git a/ui/app/i18n/clinical/locale_pt_BR.json b/ui/app/i18n/clinical/locale_pt.json
similarity index 100%
rename from ui/app/i18n/clinical/locale_pt_BR.json
rename to ui/app/i18n/clinical/locale_pt.json

From e28e7279d8a565c5d27cec4366b2d3cb95a7272d Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Wed, 7 Aug 2019 21:58:13 +0200
Subject: [PATCH 039/131] Show all the Positive Prevention with answer Yes

---
 .../concept-set/views/conceptSetGroup.html    | 20 ++++++++++---------
 .../common/concept-set/views/observation.html | 11 ++++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ui/app/common/concept-set/views/conceptSetGroup.html b/ui/app/common/concept-set/views/conceptSetGroup.html
index 3d99d7845e..646a774b11 100644
--- a/ui/app/common/concept-set/views/conceptSetGroup.html
+++ b/ui/app/common/concept-set/views/conceptSetGroup.html
@@ -11,15 +11,17 @@
                 <ul>
                     <li ng-repeat="conceptSet in allTemplates track by $index"
                         ng-if="conceptSet.isAvailable(context) && (conceptSet.isAdded || conceptSet.alwaysShow)"  ng-class="openActiveForm(conceptSet)">
-                        <a ng-click="showLeftPanelConceptSet(conceptSet)">
-                            <span class="concept-set-name" ng-class="{'concept-set-name-extra':conceptSet.isValid === false}">
-                                {{conceptSet.label}}
-                                <span ng-if="conceptSet.observations[0].observationDateTime"> ( {{conceptSet.observations[0].observationDateTime|bahmniDate}} )</span>
-                            </span>
-                        </a>
-                        <div class="button-wrap">
-                            <label class="fa fa-exclamation-triangle fa-red" ng-show="conceptSet.isValid === false" ng-click="conceptSet.klass =='active' && focusOnErrors()"></label>
-                            <label class="fr" ng-click="clonePanelConceptSet(conceptSet)" ng-if="isLastClonedSection(conceptSet) && conceptSet.canAddMore()"> <i class="fa fa-plus"></i></label>
+                        <div ng-hide="patient.PATIENT_STATUS.value.display === 'TARV' && conceptSet.label === 'Section IV'">
+                            <a ng-click="showLeftPanelConceptSet(conceptSet)">
+                                <span class="concept-set-name" ng-class="{'concept-set-name-extra':conceptSet.isValid === false}">
+                                    {{conceptSet.label}}
+                                    <span ng-if="conceptSet.observations[0].observationDateTime"> ( {{conceptSet.observations[0].observationDateTime|bahmniDate}} )</span>
+                                </span>
+                            </a>
+                            <div class="button-wrap">
+                                <label class="fa fa-exclamation-triangle fa-red" ng-show="conceptSet.isValid === false" ng-click="conceptSet.klass =='active' && focusOnErrors()"></label>
+                                <label class="fr" ng-click="clonePanelConceptSet(conceptSet)" ng-if="isLastClonedSection(conceptSet) && conceptSet.canAddMore()"> <i class="fa fa-plus"></i></label>
+                            </div>
                         </div>
                     </li>
                     <li class="emptymsg">{{::'EMPTY_TEMPLATE_MESSAGE' | translate}}</li>
diff --git a/ui/app/common/concept-set/views/observation.html b/ui/app/common/concept-set/views/observation.html
index a946e77766..6c82bc2200 100644
--- a/ui/app/common/concept-set/views/observation.html
+++ b/ui/app/common/concept-set/views/observation.html
@@ -435,10 +435,13 @@
                     </div>
                     <div class="form-field form-field-group" ng-repeat="member in observation.groupMembers"
                          ng-if="!(member.hidden || member.hide)" ng-class="{'image-upload-wrapper': member.concept.name == 'Image'}">
-                        <concept collapse-inner-sections="collapseInnerSections" observation="member"
-                                 root-observation="observation" at-least-one-value-is-set="atLeastOneValueIsSet"
-                                 patient="::patient" show-title="::true"
-                                 concept-set-required="conceptSetRequired" concept-set-name="::conceptSetName" hide-abnormal-button="hideAbnormalButton"></concept>
+                         <div ng-if="member.concept.name != 'Apss_Disclosure_Diagnosis_results_child_adolescent' || (member.concept.name === 'Apss_Disclosure_Diagnosis_results_child_adolescent' && (patient.age >=8 && patient.age <=14))">
+                            <concept collapse-inner-sections="collapseInnerSections" observation="member"
+                                root-observation="observation" at-least-one-value-is-set="atLeastOneValueIsSet"
+                                patient="::patient" show-title="::true"
+                                concept-set-required="conceptSetRequired" concept-set-name="::conceptSetName" hide-abnormal-button="hideAbnormalButton">
+                            </concept>
+                        </div>
                     </div>
                 </div>
             </div>

From 35d4e0211f684f86deb1ec3931389eb5efc79823 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Thu, 8 Aug 2019 10:51:39 +0200
Subject: [PATCH 040/131] Dashboard for Positive Prevention Section updates

---
 ui/app/i18n/clinical/locale_en.json | 1 +
 ui/app/i18n/clinical/locale_pt.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index dd01bf0b15..4cd7bf1c46 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -13,6 +13,7 @@
     "NO_SPECIMEN_FOUND_MESSAGE":"No specimen for this patient",
     "NO_DATA_MESSAGE": "No data captured.",
     "NO_DRUG_DETAILS_MESSAGE": "No Drugs to show for this patient",
+    "NO_POSITIVE_PREVENTION_WITH_YES_MESSAGE": "No answers with yes",
     "DOB_LABEL": "Date of Birth",
     "ALL_LAB_RESULTS_LABEL": "All Lab Results",
     "ACCESSION_AT_LABEL": "Accession at",
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 57794e518f..f461b45592 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -241,6 +241,7 @@
   "NO_SPECIMEN_FOUND_MESSAGE": "Nenhuma amostra para este paciente",
   "NO_SPECIMEN_RESULT_FOUND_MESSAGE": "Nenhum resultado encontrado para esta amostra",
   "NO_TREATMENTS_MESSAGE": "Nenhum tratamento para este paciente.",
+  "NO_POSITIVE_PREVENTION_WITH_YES_MESSAGE": "Nenhuma resposta com sim",
   "NOTES_LABEL": "Notas",
   "OBS_ABNORMAL_TRANSLATE_KEY": "Anormal",
   "OBS_BOOLEAN_NO_KEY": "Não",

From 565f9edc75154402d80d03ae1b8d77e577221144 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Fri, 9 Aug 2019 11:09:18 +0200
Subject: [PATCH 041/131] Changes: Observation Form: Sinais Vitais: Anormal
 Display Button

---
 .../common/concept-set/directives/concept.js  | 78 +++++++++++++++++++
 .../observationDataTypes/html5DataType.html   |  2 +-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index a389065089..4a12bfe5eb 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -78,6 +78,45 @@ angular.module('bahmni.common.conceptSet')
                     }
                 };
 
+
+                scope.onVitalSignalChange = function () {
+                    if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
+                        var bloodPressureDiastolic = scope.observation.value;
+                        if (bloodPressureDiastolic <= 80 || bloodPressureDiastolic === undefined) {
+                            scope.hideAbnormalButton = true;
+                        } else {
+                            scope.hideAbnormalButton = false;
+                        }
+                    }
+
+                    if (scope.observation.concept.name === 'Blood_Pressure_–_Systolic_VitalS') {
+                        var bloodPressureSystolic = scope.observation.value;
+                        if (bloodPressureSystolic <= 120 || bloodPressureSystolic === undefined) {
+                            scope.hideAbnormalButton = true;
+                        } else {
+                            scope.hideAbnormalButton = false;
+                        }
+                    }
+
+                    if (scope.observation.concept.name === 'Heart_Rate_VS_VitalsNew') {
+                        var heartRate = scope.observation.value;
+                        if ((heartRate >= 60 && heartRate <= 100) || heartRate === undefined) {
+                            scope.hideAbnormalButton = true;
+                        } else {
+                            scope.hideAbnormalButton = false;
+                        }
+                    }
+
+                    if (scope.observation.concept.name === 'Temperature_VS1') {
+                        var temperature = scope.observation.value;
+                        if ((temperature >= 36.5 && temperature <= 37.5)  || temperature === undefined) {
+                            scope.hideAbnormalButton = true;
+                        } else {
+                            scope.hideAbnormalButton = false;
+                        }
+                    }
+                };
+
                 if (scope.observation !== null && scope.observation !== undefined && currentUrl.includes("registration")) {
                     scope.observation.value = "";
                 }
@@ -104,6 +143,45 @@ angular.module('bahmni.common.conceptSet')
                             prophylaxisData = $rootScope.prophylaxisObservationData.possibleAnswers;
                         }
                     }
+                    
+                    if (scope.conceptSetName === 'Clinical_Observation_form') {
+                        if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
+                            var bloodPressureDiastolic = scope.observation.value;
+                            console.log(bloodPressureDiastolic);
+                            if (bloodPressureDiastolic <= 80 || bloodPressureDiastolic === undefined) {
+                                scope.hideAbnormalButton = true;
+                            } else {
+                                scope.hideAbnormalButton = false;
+                            }
+                        }
+
+                        if (scope.observation.concept.name === 'Blood_Pressure_–_Systolic_VitalS') {
+                            var bloodPressureSystolic = scope.observation.value;
+                            if (bloodPressureSystolic <= 120 || bloodPressureSystolic === undefined) {
+                                scope.hideAbnormalButton = true;
+                            } else {
+                                scope.hideAbnormalButton = false;
+                            }
+                        }
+
+                        if (scope.observation.concept.name === 'Heart_Rate_VS_VitalsNew') {
+                            var heartRate = scope.observation.value;
+                            if ((heartRate >= 60 && heartRate <= 100) || heartRate === undefined) {
+                                scope.hideAbnormalButton = true;
+                            } else {
+                                scope.hideAbnormalButton = false;
+                            }
+                        }
+
+                        if (scope.observation.concept.name === 'Temperature_VS1') {
+                            var temperature = scope.observation.value;
+                            if ((temperature >= 36.5 && temperature <= 37.5)  || temperature === undefined) {
+                                scope.hideAbnormalButton = true;
+                            } else {
+                                scope.hideAbnormalButton = false;
+                            }
+                        }
+                    } 
                 }
 
                 scope.nutritionalStateDisplay = $rootScope.nutritionalStatusObject || "CLINICAL_NO_NUTRITIONAL_STATUS";
diff --git a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
index 26e1174467..0e7256d219 100644
--- a/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
+++ b/ui/app/common/concept-set/views/observationDataTypes/html5DataType.html
@@ -24,7 +24,7 @@
 
 <input id="{{::observation.uniqueId}}" ng-if="::(observation.isNumeric() && !observation.isStepperControl() && observation.concept.name !== 'WEIGHT' && observation.concept.name !== 'HEIGHT' && observation.concept.name !== 'Brachial_perimeter_new')"
        obs-constraints obs="::observation"
-       ng-model="observation.value" ng-change="handleUpdate()"
+       ng-model="observation.value" ng-change="handleUpdate();onVitalSignalChange()"
        ng-disabled="observation.disabled"
        ng-class="{'is-abnormal': observation.abnormalObs.value, 'illegalValue': !observation.isValid(atLeastOneValueIsSet,conceptSetRequired), 'computed-field': observation.isComputedAndEditable()}"
        type="number"

From a4b816b50d94d47c60218c531ccd45cc08e8d8b0 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Mon, 12 Aug 2019 08:38:28 +0200
Subject: [PATCH 042/131] Change: Set time format to hh:mm

---
 ui/app/common/logging/services/auditLogService.js | 2 +-
 ui/app/common/util/dateUtil.js                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/app/common/logging/services/auditLogService.js b/ui/app/common/logging/services/auditLogService.js
index d755ce8791..05c6792dcf 100644
--- a/ui/app/common/logging/services/auditLogService.js
+++ b/ui/app/common/logging/services/auditLogService.js
@@ -5,7 +5,7 @@ angular.module('bahmni.common.logging')
 
         var convertToLocalDate = function (date) {
             var localDate = DateUtil.parseLongDateToServerFormat(date);
-            return DateUtil.getDateTimeInSpecifiedFormat(localDate, 'MMMM Do, YYYY [at] h:mm:ss A');
+            return DateUtil.getDateTimeInSpecifiedFormat(localDate, 'MMMM Do, YYYY [at] HH:mm');
         };
 
         this.getLogs = function (params) {
diff --git a/ui/app/common/util/dateUtil.js b/ui/app/common/util/dateUtil.js
index 19b023e8d4..d6a4eeb4df 100644
--- a/ui/app/common/util/dateUtil.js
+++ b/ui/app/common/util/dateUtil.js
@@ -89,7 +89,7 @@ Bahmni.Common.Util.DateUtil = {
         if (!moment(dateRepresentation).isValid()) {
             return datetime;
         }
-        return dateRepresentation ? moment(dateRepresentation).format("DD MMM YY h:mm a") : null;
+        return dateRepresentation ? moment(dateRepresentation).format("DD MMM YY HH:mm") : null;
     },
 
     formatDateWithoutTime: function (date) {
@@ -116,7 +116,7 @@ Bahmni.Common.Util.DateUtil = {
         if (!moment(dateRepresentation).isValid()) {
             return date;
         }
-        return dateRepresentation ? moment(dateRepresentation).format("h:mm a") : null;
+        return dateRepresentation ? moment(dateRepresentation).format("HH:mm") : null;
     },
 
     getDate: function (dateTime) {
@@ -276,6 +276,6 @@ Bahmni.Common.Util.DateUtil = {
         return date ? moment(date).toDate().toISOString() : null;
     },
     isBeforeTime: function (time, otherTime) {
-        return moment(time, 'hh:mm a').format('YYYY-MM-DD');
+        return moment(time, 'HH:mm').format('YYYY-MM-DD');
     }
 };

From ffcc53ca4421cd15400da4a83f2732bb3b701017 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Mon, 12 Aug 2019 09:24:23 +0200
Subject: [PATCH 043/131] Fixed grunt errors

---
 ui/app/common/concept-set/directives/concept.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 4a12bfe5eb..4bb1dd2bf5 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -78,7 +78,6 @@ angular.module('bahmni.common.conceptSet')
                     }
                 };
 
-
                 scope.onVitalSignalChange = function () {
                     if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
                         var bloodPressureDiastolic = scope.observation.value;
@@ -109,7 +108,7 @@ angular.module('bahmni.common.conceptSet')
 
                     if (scope.observation.concept.name === 'Temperature_VS1') {
                         var temperature = scope.observation.value;
-                        if ((temperature >= 36.5 && temperature <= 37.5)  || temperature === undefined) {
+                        if ((temperature >= 36.5 && temperature <= 37.5) || temperature === undefined) {
                             scope.hideAbnormalButton = true;
                         } else {
                             scope.hideAbnormalButton = false;
@@ -143,7 +142,7 @@ angular.module('bahmni.common.conceptSet')
                             prophylaxisData = $rootScope.prophylaxisObservationData.possibleAnswers;
                         }
                     }
-                    
+
                     if (scope.conceptSetName === 'Clinical_Observation_form') {
                         if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
                             var bloodPressureDiastolic = scope.observation.value;
@@ -175,13 +174,13 @@ angular.module('bahmni.common.conceptSet')
 
                         if (scope.observation.concept.name === 'Temperature_VS1') {
                             var temperature = scope.observation.value;
-                            if ((temperature >= 36.5 && temperature <= 37.5)  || temperature === undefined) {
+                            if ((temperature >= 36.5 && temperature <= 37.5) || temperature === undefined) {
                                 scope.hideAbnormalButton = true;
                             } else {
                                 scope.hideAbnormalButton = false;
                             }
                         }
-                    } 
+                    }
                 }
 
                 scope.nutritionalStateDisplay = $rootScope.nutritionalStatusObject || "CLINICAL_NO_NUTRITIONAL_STATUS";

From 2a1a1935a682fce3d33db78e0bc6250a31f05946 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Tue, 13 Aug 2019 11:17:41 +0200
Subject: [PATCH 044/131] Add Positive Prevention dashboard details

---
 .../concept-set/views/conceptSetGroup.html     |  2 +-
 .../positivePreventionDashboardDialog.html     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html

diff --git a/ui/app/common/concept-set/views/conceptSetGroup.html b/ui/app/common/concept-set/views/conceptSetGroup.html
index 646a774b11..dacf18a093 100644
--- a/ui/app/common/concept-set/views/conceptSetGroup.html
+++ b/ui/app/common/concept-set/views/conceptSetGroup.html
@@ -11,7 +11,7 @@
                 <ul>
                     <li ng-repeat="conceptSet in allTemplates track by $index"
                         ng-if="conceptSet.isAvailable(context) && (conceptSet.isAdded || conceptSet.alwaysShow)"  ng-class="openActiveForm(conceptSet)">
-                        <div ng-hide="patient.PATIENT_STATUS.value.display === 'TARV' && conceptSet.label === 'Section IV'">
+                        <div ng-hide="patient.PATIENT_STATUS.value.display === 'TARV' && conceptSet.conceptName === 'Apss_Section_IV_form'">
                             <a ng-click="showLeftPanelConceptSet(conceptSet)">
                                 <span class="concept-set-name" ng-class="{'concept-set-name-extra':conceptSet.isValid === false}">
                                     {{conceptSet.label}}
diff --git a/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html b/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html
new file mode 100644
index 0000000000..767649f732
--- /dev/null
+++ b/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html
@@ -0,0 +1,18 @@
+<section class="template-container" style="overflow-y: scroll;">
+    <h2 ng-class="::{'section-title': !isFulfilmentDisplayControl, 'form-field': isFulfilmentDisplayControl}">{{::title | titleTranslate}}</h2>
+    <p ng-if="visitsList.length == 0" style="background-color:#ffffff;color:#444444;padding:5px">{{::'NO_POSITIVE_PREVENTION_WITH_YES_MESSAGE' | translate}} </p>
+    <ul style="font-size: 14px;color: #000000">
+        <li ng-repeat="dateTime in visitsList track by $index" style="background-color:#ddd;">
+            <span class="tree-list-item row-click toggle-container ng-scope ng-isolate-scope active" id="visit{{section.visitDomId[$index]}}" toggle="obsGroup.isOpen">
+                <i class="fa fa-caret-right"></i>
+                <i class="fa fa-caret-down"></i>
+                <span class="obs-date">
+                    {{dateTime | bahmniDateTime}}
+                </span>
+            </span>
+            <div ng-repeat="concept in conceptsWithYes[$index] track by $index" class="print-observations hidden-print" style="background-color:#fff;margin-bottom:1px;padding-left:20px;padding-top:4px;padding-bottom:4px">
+                {{concept}}
+            </div>
+        </li>
+    </ul>
+</section>
\ No newline at end of file

From aef7789fb1146457945fb55e0c10342810bc70e0 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Tue, 13 Aug 2019 15:36:51 +0300
Subject: [PATCH 045/131] MPOC-512 Add dispensation type on medications tab

---
 ui/app/clinical/consultation/services/treatmentConfig.js  | 2 +-
 .../views/treatmentSections/addTreatment.html             | 8 ++++----
 ui/app/i18n/clinical/locale_en.json                       | 2 ++
 ui/app/i18n/clinical/locale_pt.json                       | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/app/clinical/consultation/services/treatmentConfig.js b/ui/app/clinical/consultation/services/treatmentConfig.js
index 62cb4cd3a6..2af2eb23a6 100644
--- a/ui/app/clinical/consultation/services/treatmentConfig.js
+++ b/ui/app/clinical/consultation/services/treatmentConfig.js
@@ -100,7 +100,7 @@ angular.module('bahmni.clinical').factory('treatmentConfig',
                     showAdditionalInformation: function () {
                         var additionalInformationFields = ["sos", "additionalInstructions", "dosingInstructions"];
                         var hiddenAdditionalInformationFields = _.intersection(additionalInformationFields, drugOrderOptions.hiddenFields);
-                        return hiddenAdditionalInformationFields.length < additionalInformationFields.length;
+                        return false;
                     },
                     translate: function (field, defaultKey) {
                         var labelKey = drugOrderOptions.labels[field];
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 2a9134d0ee..6082c6c154 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -240,12 +240,12 @@ <h3 class="orderSet-additional-info" ng-show="treatmentConfig.showAdditionalInfo
                     </article>
                     <article class="form-field" ng-if="!treatmentConfig.isHiddenField('dosingInstructions')">
                         <div class="field-attribute">
-                            <label  class="start-date-label fl">{{::treatmentConfig.translate('dosingInstructions', 'MEDICATION_LABEL_DOSING_INSTRUCTIONS')}}</label>
+                            <label  class="start-date-label fl">{{::treatmentConfig.translate('dosingInstructions', 'MEDICATION_LABEL_DISPENSATION_TYPE')}}<span class="asterick">*</span></label>
                         </div>
                         <div class="field-value">
                             <select id="instructions" class="instruction" ng-model="treatment.instructions"
-                                    ng-options="item.name as item.name for item in treatmentConfig.getDosingInstructions()">
-                                <option value="">{{::treatmentConfig.translate('dosingInstructionsPlaceHolder', 'MEDICATION_DOSING_INSTRUCTIONS_PLACEHOLDER')}}</option>
+                                    ng-options="item.name as item.name for item in treatmentConfig.getDosingInstructions()" required>
+                                <option value="">{{::treatmentConfig.translate('dosingInstructionsPlaceHolder', 'MEDICATION_DISPENSATION_TYPE_PLACEHOLDER')}}</option>
                             </select>
                         </div>
                     </article>
@@ -330,4 +330,4 @@ <h2 class="section-title orderSet-orderAnOrderSet toggle-container" toggle="show
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 0c3771f037..cac13ee381 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -167,6 +167,8 @@
     "MEDICATION_STOPPED_ON": "Stopped on",
     "MEDICATION_DUE_TO": "due to",
     "MEDICATIONN_FROM": "from",
+    "MEDICATION_LABEL_DISPENSATION_TYPE" : "Type of Dispense",
+    "MEDICATION_DISPENSATION_TYPE_PLACEHOLDER" : "Choose Dispensation Type",
 
     "REMOVE_CONFIRMATION_KEY": "Are you sure you want to remove?",
     "CLEAR_CONFIRMATION_KEY": "Are you sure you want to clear?",
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index ace950776f..5888286777 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -219,6 +219,8 @@
   "MEDICATIONS_ACTIONS_LABEL": "Acções",
   "MEDICATIONS_REFILL_LABEL": "Reabastecer",
   "MEDICATIONS_STOP_LABEL": "Parar",
+  "MEDICATION_LABEL_DISPENSATION_TYPE" : "Tipo de Dispensa",
+  "MEDICATION_DISPENSATION_TYPE_PLACEHOLDER" : "Escolher Tipo de Dispensa",
   "MESSAGE_DIALOG_OPTION_COPY": "Erro de cópia",
   "MESSAGE_DIALOG_OPTION_OKAY": "OK",
   "MONTH_LABEL": "Mês",

From 235498f247ec94cfb48fb0bc72e9d44785d4ecd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:01:50 +0200
Subject: [PATCH 046/131] Hide transferred-out section (#286)

---
 ui/app/registration/views/patientcommon.html | 118 +++++++++----------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index a6967a3e82..60d1776409 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -496,65 +496,65 @@
         </div>
     </div>
 
-    <div ng-show="patient.uuid!==undefined" ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
-         class="additional-info-wrapper" ng-if="section.title!='patientHIVTestInformation' &&  section.title!='patientContactInformation'
-         &&  section.title!='patientProfessionInformation'">
-
-
-        <div>
-            <div class="box-container form">
-                <legend class="additional-attribute" toggle="section.expand">
-                    <span>
-                        <i class="fa fa-caret-right"></i>
-                        <i class="fa fa-caret-down"></i>
-                        <strong>
-                            <a ng-if="::section.translationKey" href accesskey="{{::section.shortcutKey | translate}}"
-                               ng-bind-html="::'REGISTRATION_TRANSFER_OUT_INFO_KEY' | translate">
-                            </a>
-                        </strong>
-                    </span>
-                </legend>
-
-                <section class="form-field-inline clearfix">
-                    <article class="form-field" ng-repeat="attribute in ::section.attributes"
-                             ng-class="::{'right-form-field' : $index%2 != 0}">
-                        <attribute-types target-model="patient" attribute="::attribute"
-                                         field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
-                                         get-auto-complete-list="getAutoCompleteList" get-data-results="getDataResults"
-                                         is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name !== 'PATIENT_STATUS' && attribute.name !== 'TRANSFERRED_OUT_HF_NAME'"></attribute-types>
-                    </article>
-
-                    <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
-                        <article class="form-field" ng-repeat="attribute in ::attributeRow"
-                                 ng-class="::{'right-form-field' : $index%2 != 0}" ng-if="attribute.name == 'Is_Transferred_Out'">
-                            <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                             is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
-                                             get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" update-location-required="updateLocationRequired">
-                            </attribute-types>
-                        </article>
-
-                        <article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'Transfer_Date'"
-                                 ng-class="::{'right-form-field' : $index%2 != 0}">
-                            <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                             is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
-                                             get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
-                        </article>
-
-                        <article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'Observations'"
-                                 ng-class="::{'right-form-field' : $index%2 != 0}">
-                            <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                             is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
-                                             get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
-                        </article>
-
-                    </section>
-                    <section transfer-Out-Address-Fields data-address-levels="::addressLevels" data-address="patient.address"
-                             field-validation="::fieldValidation" ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"
-                             strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel"></section>
-                </section>
-            </div>
-        </div>
-    </div>
+    <!--<div ng-show="patient.uuid!==undefined" ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"-->
+         <!--class="additional-info-wrapper" ng-if="section.title!='patientHIVTestInformation' &&  section.title!='patientContactInformation'-->
+         <!--&&  section.title!='patientProfessionInformation'">-->
+
+
+        <!--<div>-->
+            <!--<div class="box-container form">-->
+                <!--<legend class="additional-attribute" toggle="section.expand">-->
+                    <!--<span>-->
+                        <!--<i class="fa fa-caret-right"></i>-->
+                        <!--<i class="fa fa-caret-down"></i>-->
+                        <!--<strong>-->
+                            <!--<a ng-if="::section.translationKey" href accesskey="{{::section.shortcutKey | translate}}"-->
+                               <!--ng-bind-html="::'REGISTRATION_TRANSFER_OUT_INFO_KEY' | translate">-->
+                            <!--</a>-->
+                        <!--</strong>-->
+                    <!--</span>-->
+                <!--</legend>-->
+
+                <!--<section class="form-field-inline clearfix">-->
+                    <!--<article class="form-field" ng-repeat="attribute in ::section.attributes"-->
+                             <!--ng-class="::{'right-form-field' : $index%2 != 0}">-->
+                        <!--<attribute-types target-model="patient" attribute="::attribute"-->
+                                         <!--field-validation="::fieldValidation" is-auto-complete="isAutoComplete"-->
+                                         <!--get-auto-complete-list="getAutoCompleteList" get-data-results="getDataResults"-->
+                                         <!--is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name !== 'PATIENT_STATUS' && attribute.name !== 'TRANSFERRED_OUT_HF_NAME'"></attribute-types>-->
+                    <!--</article>-->
+
+                    <!--<section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">-->
+                        <!--<article class="form-field" ng-repeat="attribute in ::attributeRow"-->
+                                 <!--ng-class="::{'right-form-field' : $index%2 != 0}" ng-if="attribute.name == 'Is_Transferred_Out'">-->
+                            <!--<attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"-->
+                                             <!--is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"-->
+                                             <!--get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" update-location-required="updateLocationRequired">-->
+                            <!--</attribute-types>-->
+                        <!--</article>-->
+
+                        <!--<article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'Transfer_Date'"-->
+                                 <!--ng-class="::{'right-form-field' : $index%2 != 0}">-->
+                            <!--<attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"-->
+                                             <!--is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"-->
+                                             <!--get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>-->
+                        <!--</article>-->
+
+                        <!--<article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'Observations'"-->
+                                 <!--ng-class="::{'right-form-field' : $index%2 != 0}">-->
+                            <!--<attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"-->
+                                             <!--is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"-->
+                                             <!--get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>-->
+                        <!--</article>-->
+
+                    <!--</section>-->
+                    <!--<section transfer-Out-Address-Fields data-address-levels="::addressLevels" data-address="patient.address"-->
+                             <!--field-validation="::fieldValidation" ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"-->
+                             <!--strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel"></section>-->
+                <!--</section>-->
+            <!--</div>-->
+        <!--</div>-->
+    <!--</div>-->
 
     <div ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
          class="additional-info-wrapper" ng-if="section.title=='patientHIVTestInformation'">

From 64a1c927d19970cd2a602e4a3dc04ada98fa79a4 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Tue, 13 Aug 2019 16:03:06 +0200
Subject: [PATCH 047/131] Update Calendar view in Appointment Module to PT Time
 Format

---
 .../manage/calendar/appointmentsDayCalendarController.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js b/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js
index acf29f97cc..9d18f6947d 100644
--- a/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js
+++ b/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js
@@ -103,7 +103,8 @@ angular.module('bahmni.appointments')
                         eventDrop: $scope.alertOnDrop,
                         eventResize: $scope.alertOnResize,
                         eventRender: $scope.eventRender,
-                        schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source'
+                        schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
+                        slotLabelFormat: ['HH(:mm)' ]
                     }
                 };
 

From 833bb699776a83cf08df35d13a2a28c3795b0408 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Tue, 13 Aug 2019 16:10:37 +0200
Subject: [PATCH 048/131] Update Calendar view in Appointment Module to PT Time
 Format

---
 .../manage/calendar/appointmentsDayCalendarController.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js b/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js
index 9d18f6947d..73c0342224 100644
--- a/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js
+++ b/ui/app/appointments/controllers/manage/calendar/appointmentsDayCalendarController.js
@@ -104,7 +104,7 @@ angular.module('bahmni.appointments')
                         eventResize: $scope.alertOnResize,
                         eventRender: $scope.eventRender,
                         schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source',
-                        slotLabelFormat: ['HH(:mm)' ]
+                        slotLabelFormat: ['HH:mm']
                     }
                 };
 

From 2db8780a9b3846210fa1a5a9873c1eebeab7e447 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Wed, 14 Aug 2019 17:18:08 +0300
Subject: [PATCH 049/131] MPOC-512 Fix drug name input validation

---
 .../consultation/views/treatmentSections/addTreatment.html     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 6082c6c154..08d18028b6 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -20,7 +20,8 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                                 <input id="drug-name" type="text" bahmni-autocomplete focus-on="startNewDrugEntry"
                                        source="getDrugs" response-map="getDataResults" ng-required="!treatment.drugNameDisplay"
                                        ng-class="{
-                                active: treatment.isNonCodedDrug
+                                active: treatment.isNonCodedDrug,
+                                illegalValue: !treatment.drug.uuid && !treatment.concept.uuid && treatment.drugNameDisplay && !treatment.isNonCodedDrug
                            }"
                                        ng-change="onChange()"
                                        ng-model="treatment.drugNameDisplay" on-select="onSelect" autofocus

From 58fc3ff58adf96de8b3603a0158dd6e0363f105f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Wed, 14 Aug 2019 18:49:46 +0200
Subject: [PATCH 050/131] Work in progress

---
 .../controllers/addTreatmentController.js     | 123 +++++++++++++++++-
 .../views/treatmentSections/addTreatment.html |  33 ++++-
 ui/app/i18n/clinical/locale_pt.json           |   4 +-
 3 files changed, 151 insertions(+), 9 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index b45497076f..69663f546c 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,10 +3,10 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate',
+        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate','conceptSetService',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
-                  orderSetService, $q, locationService, localeService, spinner, $translate) {
+                  orderSetService, $q, locationService, localeService, spinner, $translate, conceptSetService) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var scrollTop = _.partial($window.scrollTo, 0, 0);
@@ -27,6 +27,80 @@ angular.module('bahmni.clinical')
             $scope.addTreatment = true;
             $scope.canOrderSetBeAdded = true;
             $scope.isSearchDisabled = false;
+            $scope.categories = [];
+            $scope.selectedCategory = "";
+            $scope.selectedTreatmentLine = "";
+            $scope.selectedLineDrugs = [];
+            $scope.disableTreatmentLine = true;
+            $scope.suggestedDruglist = [];
+            $scope.counter = 0;
+
+
+            $scope.fetchCategories = function (conceptName) {
+                return conceptSetService.getConcept({
+                    name: conceptName,
+                    v: "custom:(answers:(uuid,name,names))"
+                }, true).then(function (response) {
+                    var resp = response.data.results[0].answers;
+                    for (var i = 0; i < resp.length; i++) {
+                        $scope.categories.push(resp[i].names[0]);
+                    }
+                    return $scope.categories;
+                });
+            };
+
+            $scope.selectCategoryFromDropdown = function () {
+                if ($scope.selectedCategory != undefined) {
+                    if ($scope.selectedCategory.display === "ARV") {
+                        $scope.selectedTreatmentLineCategory = "treatment_line_arv";
+                        $scope.disableTreatmentLine = false;
+                        $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
+                    } else if ($scope.selectedCategory.display.toUpperCase() === "Anti-Tuberculosis Drugs".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Drogas Anti-Tuberculose".toUpperCase()) {
+                        $scope.selectedTreatmentLineCategory = "treatment_line_tb";
+                        $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
+                        $scope.disableTreatmentLine = false;
+                    } else {
+                        $scope.selectedTreatmentLineCategory = "";
+                        $scope.disableTreatmentLine = true;
+                    }
+                }
+            };
+
+            $scope.fetchTreatmentLines = function (conceptName) {
+                return conceptSetService.getConcept({
+                    name: conceptName,
+                    v: "custom:(answers:(uuid,name,names))"
+                }, true).then(function (response) {
+                    $scope.treatmentLines = [];
+                    var resp = response.data.results[0].answers;
+                    for (var i = 0; i < resp.length; i++) {
+                        $scope.treatmentLines.push(resp[i].names[0]);
+                    }
+                    return $scope.treatmentLines;
+                });
+            };
+
+
+            $scope.getDrugsFromTreatmentLineOrCategory = function () {
+                var conceptName = "";
+                if ($scope.selectedTreatmentLine !== undefined && $scope.selectedTreatmentLine !== "") {
+                    conceptName = $scope.selectedTreatmentLine.name;
+                } else if ($scope.selectedCategory !== undefined && $scope.selectedCategory !== "") {
+                    conceptName = $scope.selectedCategory.name;
+                }
+                return conceptSetService.getConcept({
+                    name: conceptName,
+                    v: "custom:(answers:(uuid,name,names))"
+                }, true).then(function (response) {
+                    var resp = response.data.results[0].answers;
+                    for (var i = 0; i < resp.length; i++) {
+                        $scope.selectedLineDrugs.push(resp[i].names[0]);
+                    }
+                    return $scope.selectedLineDrugs;
+                });
+            };
+
+
 
             $scope.getFilteredOrderSets = function (searchTerm) {
                 if (searchTerm && searchTerm.length >= 3) {
@@ -498,18 +572,53 @@ angular.module('bahmni.clinical')
                 treatment.isBeingEdited = false;
             };
 
+
             $scope.getDataResults = function (drugs) {
-                var searchString = $scope.treatment.drugNameDisplay;
-                var listOfDrugSynonyms = _.map(drugs, function (drug) {
-                    return Bahmni.Clinical.DrugSearchResult.getAllMatchingSynonyms(drug, searchString);
+                if ($scope.counter == 0){
+               var allDrugs = _.map(drugs, function (drug) {
+                    return Bahmni.Clinical.DrugSearchResult.getAllMatchingSynonyms(drug, "");
                 });
-                return _.flatten(listOfDrugSynonyms);
+               $scope.suggestedDruglist =_.flatten(allDrugs);
+                }
+                $scope.counter ++;
+                var searchString = $scope.treatment.drugNameDisplay;
+                if ($scope.selectedCategory !== "" && $scope.selectedCategory !== undefined) {
+                    $scope.getDrugsFromTreatmentLineOrCategory();
+                    var auxiliarDrugsList = [];
+                    $scope.drugResultUuid = [];
+                    $scope.selectedLineDrugs.forEach(function (element) {
+                        element.label = element.name;
+                        element.value = element.name;
+
+                        if (element.value.includes(searchString)) {
+                            auxiliarDrugsList.push(element);
+                        }
+                    });
+                    $scope.selectedLineDrugs = [];
+                    return auxiliarDrugsList;
+                } else {
+                    var listOfDrugSynonyms = _.map(drugs, function (drug) {
+                        return Bahmni.Clinical.DrugSearchResult.getAllMatchingSynonyms(drug, searchString);
+                    });
+
+                    return _.flatten(listOfDrugSynonyms);
+                }
             };
 
+
             (function () {
                 var selectedItem;
                 $scope.onSelect = function (item) {
-                    selectedItem = item;
+                    if($scope.selectedCategory !== ""){
+                    console.log($scope.suggestedDruglist);
+                    for(let i = 0; i < $scope.suggestedDruglist.length; i++){
+                        if(item.name === $scope.suggestedDruglist[i].drug.name){
+                            selectedItem = $scope.suggestedDruglist[i];
+                        }
+                    }
+                    }else{
+                        selectedItem = item;
+                    }
                     $scope.onChange();
                 };
                 $scope.onAccept = function () {
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 6082c6c154..e2dd1aa89b 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -7,6 +7,37 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
         <div class="order-section-container"  ng-show="addTreatment">
             <div class="Order-section-orderDrug clearfix">
                 <form name="addForm" ng-class="{ 'show-invalid': formInvalid}"  ng-submit="add()" bm-form class="edit-drug-order-container" novalidate>
+
+
+                    <article class="form-field fl">
+                        <div class="field-attribute">
+                            <label class="fl unit-text"> {{::'MEDICATION_ADD_DRUG_CATEGORY' | translate}} <span
+                                    class="asterick">*</span> </label>
+                        </div>
+                        <div class="field-value">
+                            <select ng-init="fetchCategories('medication_category')" id="cat-dropdown" class="fl"
+                                    ng-model="selectedCategory" ng-change="selectCategoryFromDropdown()" ng-click=""
+                                    ng-options="item.display for item in categories" required>
+                                <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                            </select>
+                        </div>
+                    </article>
+
+                    <article class="form-field fl">
+                        <div class="field-attribute">
+                            <label class="fl unit-text"> {{::'MEDICATION_ADD_DRUG_LINE' | translate}} <span
+                                    class="asterick">*</span> </label>
+                        </div>
+                        <div class="field-value">
+                            <select id="line-dropdown" class="fl"
+                                    ng-model="selectedTreatmentLine" ng-disabled="disableTreatmentLine"
+                                    ng-options="item.display for item in treatmentLines" required>
+                                <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                            </select>
+                        </div>
+                    </article>
+
+
                     <article class="form-field">
                         <div class="field-attribute">
                             <label>{{::treatmentConfig.translate('drugName','MEDICATION_DRUG_NAME_TITLE')}} <span class="asterick">*</span></label>
@@ -17,7 +48,7 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                                 <option value="">{{ ::treatmentConfig.translate('drugNamePlaceHolder', 'MEDICATION_DRUG_NAME_PLACEHOLDER') }} </option>
                             </select>
                             <div ng-if="treatmentConfig.isAutoComplete()">
-                                <input id="drug-name" type="text" bahmni-autocomplete focus-on="startNewDrugEntry"
+                                <input id="drug-name" type="text" bahmni-autocomplete focus-on="startNewDrugEntry" ng-disabled="disableTreatmentLine"
                                        source="getDrugs" response-map="getDataResults" ng-required="!treatment.drugNameDisplay"
                                        ng-class="{
                                 active: treatment.isNonCodedDrug
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 5888286777..969291e5f8 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -463,5 +463,7 @@
   "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
   "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir Todos",
   "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Imprimir Prescrição",
-  "CLINICAL_PATIENT_STATUS": "Activo em"
+  "CLINICAL_PATIENT_STATUS": "Activo em",
+  "MEDICATION_ADD_DRUG_CATEGORY": "Categoria",
+  "MEDICATION_ADD_DRUG_LINE": "Linha de Tratamento"
 }

From eefd1e357a2407f163021532ef449b8f5113edb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Thu, 15 Aug 2019 12:33:23 +0200
Subject: [PATCH 051/131] WIP on category and treatment line

---
 .../controllers/addTreatmentController.js     | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 69663f546c..1f1e9694ce 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -3,7 +3,7 @@
 angular.module('bahmni.clinical')
     .controller('AddTreatmentController', ['$scope', '$rootScope', 'contextChangeHandler', 'treatmentConfig', 'drugService',
         '$timeout', 'clinicalAppConfigService', 'ngDialog', '$window', 'messagingService', 'appService', 'activeDrugOrders',
-        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate','conceptSetService',
+        'orderSetService', '$q', 'locationService', 'localeService', 'spinner', '$translate', 'conceptSetService',
         function ($scope, $rootScope, contextChangeHandler, treatmentConfig, drugService, $timeout,
                   clinicalAppConfigService, ngDialog, $window, messagingService, appService, activeDrugOrders,
                   orderSetService, $q, locationService, localeService, spinner, $translate, conceptSetService) {
@@ -35,7 +35,6 @@ angular.module('bahmni.clinical')
             $scope.suggestedDruglist = [];
             $scope.counter = 0;
 
-
             $scope.fetchCategories = function (conceptName) {
                 return conceptSetService.getConcept({
                     name: conceptName,
@@ -80,7 +79,6 @@ angular.module('bahmni.clinical')
                 });
             };
 
-
             $scope.getDrugsFromTreatmentLineOrCategory = function () {
                 var conceptName = "";
                 if ($scope.selectedTreatmentLine !== undefined && $scope.selectedTreatmentLine !== "") {
@@ -94,14 +92,14 @@ angular.module('bahmni.clinical')
                 }, true).then(function (response) {
                     var resp = response.data.results[0].answers;
                     for (var i = 0; i < resp.length; i++) {
-                        $scope.selectedLineDrugs.push(resp[i].names[0]);
+                        var respons = resp[i].names[0];
+                        respons.uuid = resp[i].uuid;
+                        $scope.selectedLineDrugs.push(respons);
                     }
                     return $scope.selectedLineDrugs;
                 });
             };
 
-
-
             $scope.getFilteredOrderSets = function (searchTerm) {
                 if (searchTerm && searchTerm.length >= 3) {
                     orderSetService.getOrderSetsByQuery(searchTerm).then(function (response) {
@@ -572,16 +570,13 @@ angular.module('bahmni.clinical')
                 treatment.isBeingEdited = false;
             };
 
-
             $scope.getDataResults = function (drugs) {
-                if ($scope.counter == 0){
-               var allDrugs = _.map(drugs, function (drug) {
+                var searchString = $scope.treatment.drugNameDisplay;
+                var allDrugs = _.map(drugs, function (drug) {
                     return Bahmni.Clinical.DrugSearchResult.getAllMatchingSynonyms(drug, "");
                 });
-               $scope.suggestedDruglist =_.flatten(allDrugs);
-                }
+                $scope.suggestedDruglist = _.flatten(allDrugs);
                 $scope.counter ++;
-                var searchString = $scope.treatment.drugNameDisplay;
                 if ($scope.selectedCategory !== "" && $scope.selectedCategory !== undefined) {
                     $scope.getDrugsFromTreatmentLineOrCategory();
                     var auxiliarDrugsList = [];
@@ -605,18 +600,18 @@ angular.module('bahmni.clinical')
                 }
             };
 
-
             (function () {
                 var selectedItem;
                 $scope.onSelect = function (item) {
-                    if($scope.selectedCategory !== ""){
-                    console.log($scope.suggestedDruglist);
-                    for(let i = 0; i < $scope.suggestedDruglist.length; i++){
-                        if(item.name === $scope.suggestedDruglist[i].drug.name){
-                            selectedItem = $scope.suggestedDruglist[i];
+                    console.log(item);
+                    if ($scope.selectedCategory !== "") {
+                        console.log($scope.suggestedDruglist);
+                        for (let i = 0; i < $scope.suggestedDruglist.length; i++) {
+                            if (item.uuid === $scope.suggestedDruglist[i].drug.concept.uuid) {
+                                selectedItem = $scope.suggestedDruglist[i];
+                            }
                         }
-                    }
-                    }else{
+                    } else {
                         selectedItem = item;
                     }
                     $scope.onChange();

From dd809a59adc4c1589ffe0cce4fd0870e987f87a1 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Thu, 15 Aug 2019 14:32:08 +0200
Subject: [PATCH 052/131] Update the criteria in tuberculosis and prophylaxis
 section

---
 ui/app/common/concept-set/directives/concept.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index a389065089..43fe872c5f 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -47,7 +47,7 @@ angular.module('bahmni.common.conceptSet')
                         answer = tuberculosisData[0];
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
-                    if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate)) {
+                    if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate || treatmentEndDate === undefined)) {
                         answer = tuberculosisData[1];
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
@@ -64,7 +64,7 @@ angular.module('bahmni.common.conceptSet')
                         answer = prophylaxisData[0];
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
-                    if ((startDateProphylaxis < scope.today) && (scope.today < enDateProphylaxis)) {
+                    if ((startDateProphylaxis < scope.today) && (scope.today < enDateProphylaxis || enDateProphylaxis === undefined)) {
                         answer = prophylaxisData[1];
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }

From 53d3aed4933a5da3feb07d119c415f20073d4e8c Mon Sep 17 00:00:00 2001
From: satvix <pratikthaakare@gmail.com>
Date: Fri, 16 Aug 2019 13:20:58 +0530
Subject: [PATCH 053/131] MPOC-189_fix2 | Suggested Print tab changes.

---
 ui/app/clinical/dashboard/views/printPrescriptionReport.html | 2 +-
 ui/app/i18n/clinical/locale_pt.json                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/app/clinical/dashboard/views/printPrescriptionReport.html b/ui/app/clinical/dashboard/views/printPrescriptionReport.html
index 20f237a59a..be2cc5193f 100644
--- a/ui/app/clinical/dashboard/views/printPrescriptionReport.html
+++ b/ui/app/clinical/dashboard/views/printPrescriptionReport.html
@@ -107,7 +107,7 @@
                             <td rowspan="3"><img ng-if="data.hospitalLogo" height="80px" width="80px"
                                 src="{{ data.hospitalLogo }}" class="prescribe-report-logo"></td>
                             <tr class="abc">
-                                <td class="td_box1">&#x2116 054655</td>
+                                <td class="td_box1">&#x2116 </td>
                                 <td class="td_box2"><span
                                         >{{ 'PRESCRIPTION_REPORT_HOSPITAL_NAME' | translate }}</span>: <span
                                         > {{ data.hospitalName }}</span></td>
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 5888286777..ec2527935f 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -461,7 +461,7 @@
   "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Valor Cobrado",
   "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Imprimir painel",
   "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
-  "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir Todos",
-  "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Imprimir Prescrição",
+  "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir",
+  "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Prescrição",
   "CLINICAL_PATIENT_STATUS": "Activo em"
 }

From 065fa05d8b4133a9c88ac6fe3efb6c496c65e32a Mon Sep 17 00:00:00 2001
From: krishnanspace <34261449+krishnanspace@users.noreply.github.com>
Date: Fri, 16 Aug 2019 14:15:44 +0530
Subject: [PATCH 054/131] Krishnan | MPOC-405 Added Translations and unhid the
 original Diagnosis Section (#271)

---
 .../consultation/controllers/diagnosisController.js        | 4 ++++
 ui/app/clinical/consultation/views/conditions.html         | 2 +-
 ui/app/clinical/consultation/views/diagnosis.html          | 2 --
 ui/app/common/constants.js                                 | 1 +
 ui/app/common/domain/services/diagnosisService.js          | 7 +++++++
 ui/app/i18n/clinical/locale_pt.json                        | 6 +++---
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/diagnosisController.js b/ui/app/clinical/consultation/controllers/diagnosisController.js
index dc1a4e633a..a641fe7d36 100644
--- a/ui/app/clinical/consultation/controllers/diagnosisController.js
+++ b/ui/app/clinical/consultation/controllers/diagnosisController.js
@@ -61,6 +61,10 @@ angular.module('bahmni.clinical')
                 return diagnosisService.getAllFor(params.term).then(mapConcept);
             };
 
+            $scope.getConditions = function (params) {
+                return diagnosisService.getAllConditionsFor(params.term).then(mapConcept);
+            };
+
             $scope.getAllergyDiagnosis = function (params) {
                 return diagnosisService.getAllForAllergy(params.term).then(mapConcept);
             };
diff --git a/ui/app/clinical/consultation/views/conditions.html b/ui/app/clinical/consultation/views/conditions.html
index 33be572063..e391c3fce3 100644
--- a/ui/app/clinical/consultation/views/conditions.html
+++ b/ui/app/clinical/consultation/views/conditions.html
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col col1">
                 <input ng-model="consultation.condition.concept.name" type="text" name="name" id="name"
-                       bahmni-autocomplete source="getDiagnosis"
+                       bahmni-autocomplete source="getConditions"
                        on-select="getAddConditionMethod()"
                        ng-change="consultation.condition.clearConcept()"
                        ng-class="{illegalValue: !(consultation.condition.concept.name || consultation.condition.isEmpty())}">
diff --git a/ui/app/clinical/consultation/views/diagnosis.html b/ui/app/clinical/consultation/views/diagnosis.html
index 23da7934ea..1a2cb74722 100644
--- a/ui/app/clinical/consultation/views/diagnosis.html
+++ b/ui/app/clinical/consultation/views/diagnosis.html
@@ -2,7 +2,6 @@
     <fieldset>
         <div class="diagnosis" focus-on-input-errors>
             <div id="selectedNodesArea">
-                <div class="ng-hide">
                 <div class="table new-diagnosis primary-section-grid">
                     <div class="row table-header">
                         <div class="col col1"><span>{{ ::'CLINICAL_DIAGNOSIS' | translate }}</span></div>
@@ -105,7 +104,6 @@ <h2 class="section-title">{{ ::'CLINICAL_CURRENT' | translate }}</h2>
                         </div>
                     </div>
                 </div>
-                </div>
                 <ng-include ng-if="!hideConditions" src="'consultation/views/conditions.html'"/>
             </div>
         </div>
diff --git a/ui/app/common/constants.js b/ui/app/common/constants.js
index 9a868bb6dc..3ac436390b 100644
--- a/ui/app/common/constants.js
+++ b/ui/app/common/constants.js
@@ -72,6 +72,7 @@ Bahmni.Common = Bahmni.Common || {};
         diseaseTemplateUrl: BAHMNI_CORE + "/diseaseTemplates",
         AllDiseaseTemplateUrl: BAHMNI_CORE + "/diseaseTemplate",
         emrapiConceptUrl: EMRAPI + "/concept",
+        emrapiConditionConceptUrl: EMRAPI + "/conditionconcept",
         emrapiAllergyConceptUrl: EMRAPI + "/allergyconcept",
         encounterConfigurationUrl: BAHMNI_CORE + "/config/bahmniencounter",
         patientConfigurationUrl: BAHMNI_CORE + "/config/patient",
diff --git a/ui/app/common/domain/services/diagnosisService.js b/ui/app/common/domain/services/diagnosisService.js
index c1c4c82773..508caa37aa 100644
--- a/ui/app/common/domain/services/diagnosisService.js
+++ b/ui/app/common/domain/services/diagnosisService.js
@@ -10,6 +10,13 @@ angular.module('bahmni.common.domain')
             });
         };
 
+        this.getAllConditionsFor = function (searchTerm) {
+            var url = Bahmni.Common.Constants.emrapiConditionConceptUrl;
+            return $http.get(url, {
+                params: {term: searchTerm, limit: 20}
+            });
+        };
+
         this.getAllForAllergy = function (searchTerm) {
             var url = Bahmni.Common.Constants.emrapiAllergyConceptUrl;
             return $http.get(url, {
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 5888286777..051b46d1d5 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -35,7 +35,7 @@
   "CLINICAL_ACTION": "Acção",
   "CLINICAL_ADD_AS_CONDITION": "Adicionar como condição",
   "CLINICAL_ADD_NOTES": "Adicionar notas",
-  "CLINICAL_CERTAINTY": "Certeza",
+  "CLINICAL_CERTAINTY": "Confirmação",
   "CLINICAL_CHANGED": "Alterado",
   "CLINICAL_CURRENT": "Actual",
   "CLINICAL_DAYS_TRANSLATION_KEY": "dias",
@@ -64,7 +64,7 @@
   "CLINICAL_MONTHS_TRANSLATION_KEY": "meses",
   "CLINICAL_ORDER_RADIOLOGY_NEED_PRINT_BUTTON": " Precisa de impressão",
   "CLINICAL_ORDER_RADIOLOGY_NEED_PRINT": " Precisa de impressão para esta requisição",
-  "CLINICAL_ORDER": "Pedido",
+  "CLINICAL_ORDER": "Tipo",
   "CLINICAL_PAST_DIAGNOSIS": "Diagnóstico anterior",
   "CLINICAL_PRINT_ACCESS_KEY": "i",
   "CLINICAL_PRINT_TRANSLATION_KEY": "<u>I</u>mprimir",
@@ -89,7 +89,7 @@
   "CONDITION_LIST_ADD": "Adicionar",
   "CONDITION_LIST_ALREADY_EXISTS_AS_ACTIVE": "Condição já existe como activa",
   "CONDITION_LIST_ALREADY_EXISTS": "Condição já existe com o estado '{{status}}' na lista de condições ({{lastActive}})",
-  "CONDITION_LIST_CONDITION": "Condição",
+  "CONDITION_LIST_CONDITION": "Estadio OMS (Condições)",
   "CONDITION_LIST_CONDITIONS_ACTIVE": "Condições activas",
   "CONDITION_LIST_CONDITIONS_HISTORY_OF": "Historico de condições",
   "CONDITION_LIST_CONDITIONS_INACTIVE": "Condições inactivas ",

From b57ff345744ffb398e42d918667f3c5a2bdd605e Mon Sep 17 00:00:00 2001
From: Paul Ekirapa <ekirapapaul@gmail.com>
Date: Fri, 16 Aug 2019 11:53:34 +0300
Subject: [PATCH 055/131] MPOC-442 Fix visit types on visit summary (#290)

* MPOC-442 Fix visit types on visit summary

* MPOC-442  Fix dates not showing on retrospective visit

* MPOC-442 rename clinical consultation
---
 ui/app/clinical/app.js                                        | 3 +++
 .../displaycontrols/allvisits/directives/visitsTable.js       | 3 ++-
 .../clinical/displaycontrols/allvisits/views/visitsTable.html | 4 ++--
 ui/app/i18n/clinical/locale_en.json                           | 2 +-
 ui/app/i18n/clinical/locale_pt.json                           | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/app/clinical/app.js b/ui/app/clinical/app.js
index 3f36e85bd0..b575fe979f 100644
--- a/ui/app/clinical/app.js
+++ b/ui/app/clinical/app.js
@@ -347,6 +347,9 @@ angular.module('consultation')
                 resolve: {
                     visitSummary: function (visitSummaryInitialization, $stateParams) {
                         return visitSummaryInitialization($stateParams.visitUuid);
+                    },
+                    visitHistory: function (visitHistoryInitialization, $stateParams) {
+                        return visitHistoryInitialization($stateParams.patientUuid);
                     }
                 }
             })
diff --git a/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js b/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
index 9c47452ac1..33fe653a0a 100644
--- a/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
+++ b/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
@@ -7,7 +7,8 @@ angular.module('bahmni.clinical')
                 var emitNoDataPresentEvent = function () {
                     $scope.$emit("no-data-present-event");
                 };
-                $scope.openVisit = function (visit) {
+                $scope.openVisit = function (key) {
+                    var visit = $scope.visits[key];
                     if ($scope.$parent.closeThisDialog) {
                         $scope.$parent.closeThisDialog("closing modal");
                     }
diff --git a/ui/app/clinical/displaycontrols/allvisits/views/visitsTable.html b/ui/app/clinical/displaycontrols/allvisits/views/visitsTable.html
index 380b233497..452b9ebc1c 100644
--- a/ui/app/clinical/displaycontrols/allvisits/views/visitsTable.html
+++ b/ui/app/clinical/displaycontrols/allvisits/views/visitsTable.html
@@ -6,12 +6,12 @@ <h2 class="section-title" ng-show="::params.translationKey" >
         {{::params.translationKey|translate}}
     </h2>
 
-    <div ng-repeat="visit in ::visits | limitTo:3">
+    <div ng-repeat="(key, visit) in ::visits | limitTo:3">
         <p class="placeholder-text" ng-if="!hasVisits()">{{::noVisitsMessage}}</p>
         <table class="visits dashboard-table" id="visitDisplayTable" ng-if="::hasVisits()">
             <tbody>
                 <td class="name" width="30%">
-                    <a class="visit" ng-click="openVisit(visit)">
+                    <a class="visit" ng-click="openVisit(key)">
                         <span>{{::visit.startDatetime | bahmniDate}}</span>
                         <span ng-if="::!visit.isActive()">- {{::visit.stopDatetime | bahmniDate }}</span>
                         <i class="fa fa-star current-visit-icon" id="currentVisitIcon" ng-if="::visit.isActive()"
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index cac13ee381..34fc97f52a 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -388,7 +388,7 @@
     "BIRTHDATE_ESTIMATED": "Estimated",
     "SPECIAL_OPD": "Retrospective Visit",
     "Special OPD" : "Retrospective Visit",
-    "Patient_Start_Visit" :"Start Visit",
+    "Patient_Start_Visit" :"Consultation",
     "ENCOUNTER_APSS_FIRST": "APSS First",
     "ENCOUNTER_APSS_FOLLOWUP": "APSS Follow Up",
     "ENCOUNTER_CLINICAL_FIRST": "Clinical First",
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 051b46d1d5..029c101a53 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -372,7 +372,7 @@
   "CLINICAL_ORDER_URGENT_TITLE": "Urgente",
   "SPECIAL_OPD": "Consulta Retrospectiva",
   "Special OPD": "Consulta Retrospectiva",
-  "Patient_Start_Visit" :"Iniciar Consulta",
+  "Patient_Start_Visit" :"Consulta",
   "NO_VITALS_MESSAGE": "Nenhum dado registado para este paciente",
   "ENCOUNTER_APSS_FIRST": "APSS - Primeira Consulta",
   "ENCOUNTER_APSS_FOLLOWUP": "APSS - Consulta de Seguimento",

From f7920f883760be45f4d38f0631dab9527559c7ba Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Mon, 19 Aug 2019 12:22:46 +0300
Subject: [PATCH 056/131] MPOC-551 fix form edit error

---
 ui/app/common/concept-set/directives/concept.js | 1 -
 ui/app/common/obs/directives/editObservation.js | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 4bb1dd2bf5..2f62ac4be8 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -146,7 +146,6 @@ angular.module('bahmni.common.conceptSet')
                     if (scope.conceptSetName === 'Clinical_Observation_form') {
                         if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
                             var bloodPressureDiastolic = scope.observation.value;
-                            console.log(bloodPressureDiastolic);
                             if (bloodPressureDiastolic <= 80 || bloodPressureDiastolic === undefined) {
                                 scope.hideAbnormalButton = true;
                             } else {
diff --git a/ui/app/common/obs/directives/editObservation.js b/ui/app/common/obs/directives/editObservation.js
index 86e594ee67..8cf7055d79 100644
--- a/ui/app/common/obs/directives/editObservation.js
+++ b/ui/app/common/obs/directives/editObservation.js
@@ -44,8 +44,12 @@ angular.module('bahmni.common.obs')
                         $q.all([patientService.getPatient($scope.encounter.patientUuid), getHeight($scope.patient.uuid), getWeight($scope.patient.uuid)]).then(function (response) {
                             $scope.patient.gender = response[0].data.person.gender;
                             $scope.patient.age = response[0].data.person.age;
-                            $scope.patient.height = response[1].data[0].value;
-                            $scope.patient.weight = response[2].data[0].value;
+                            if(response[1].length > 0) {
+                                $scope.patient.height = response[1].data[0].value;
+                            }
+                            if(response[2].length > 0) {
+                                $scope.patient.weight = response[2].data[0].value;
+                            }
                             return;
                         });
                     });

From e353a1d48c6a1cda6918aa83d21ae2702dbf17cf Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Mon, 19 Aug 2019 15:12:22 +0300
Subject: [PATCH 057/131] MPOC-556 change duration label on prescription

---
 ui/app/clinical/consultation/views/newDrugOrders.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/consultation/views/newDrugOrders.html b/ui/app/clinical/consultation/views/newDrugOrders.html
index b812e03c18..2963fc8c6e 100644
--- a/ui/app/clinical/consultation/views/newDrugOrders.html
+++ b/ui/app/clinical/consultation/views/newDrugOrders.html
@@ -11,7 +11,7 @@ <h2 class="section-title fl">{{ ::'MEDICATION_NEW_PRESCRIPTION' | translate}}</h
                    ng-change="selectAllCheckbox()"/>
             <div class="fr bulk-btn-container">
                 <button type="button" ng-click="updateDuration(-1)" class="stepper__btn stepper__minus">-</button>
-                <input class="form-field duration bulkDuration" type="number" min=0 placeholder="Duration"
+                <input class="form-field duration bulkDuration" type="number" min=0 placeholder="{{::'MEDICATION_LABEL_DURATION' | translate}}"
                        ng-model="bulkDurationData.bulkDuration" required ng-pattern="/^[0-9]+$/"/>
                 <button type="button" ng-click="updateDuration(+1)" class="stepper__btn stepper__plus">+</button>
                 <select class="form-field bulk-duration-unit" ng-model="bulkDurationData.bulkDurationUnit"
@@ -41,7 +41,7 @@ <h2 class="section-title fl">{{ ::'MEDICATION_NEW_PRESCRIPTION' | translate}}</h
                             ng-disabled="showBulkChangeToggle"><i class="fa fa-remove"></i></button>
                     <button class="toggle" ng-class="{'has-notes': newTreatment.additionalInstructions}"
                             toggle="newTreatment.showAdditionalInstructions"
-                             ng-disabled="showBulkChangeToggle">
+                            ng-disabled="showBulkChangeToggle">
                         <i class="fa fa-minus-circle" ng-show="newTreatment.showAdditionalInstructions"></i>
                         <i class="fa fa-plus-circle" ng-hide="newTreatment.showAdditionalInstructions"></i>
                     </button>

From ec936ec139986a79cf00f1a1e12d9ffac77c3d91 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Mon, 19 Aug 2019 16:42:50 +0200
Subject: [PATCH 058/131] Bug Fix On TB and Prophylaxis Sextions

---
 .../controllers/consultationController.js     | 65 +++++++++++++++++++
 .../common/concept-set/directives/concept.js  | 35 +++++++++-
 ui/app/styles/bahmni-components/_forms.scss   |  6 ++
 3 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index d7c23d3091..4dbcc638be 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -432,6 +432,71 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             };
 
             var isFormValid = function () {
+                var treatmentStartDateTBValue, treatmentEndDateTBValue, treatmentStartDateINHValue, treatmentEndDateINHValue, treatmenStartDateCTZValue, treatmentEndDateCTZValue, treatmentStartDateFluconazolValue, treatmentEndDateFluconazolValue;
+
+                var treatmentStartDateTB = angular.element("#observation_38")[0];
+                var treatmentEndDateTB = angular.element("#observation_40")[0];
+
+                var treatmentStartDateINH = angular.element("#observation_43")[0];
+                var treatmentEndDateINH = angular.element("#observation_45")[0];
+
+                var treatmenStartDateCTZ = angular.element("#observation_49")[0];
+                var treatmentEndDateCTZ = angular.element("#observation_51")[0];
+
+                var treatmentStartDateFluconazol = angular.element("#observation_55")[0];
+                var treatmentEndDateFluconazol = angular.element("#observation_57")[0];
+
+                if (treatmentStartDateTB === undefined) {
+                    treatmentStartDateTBValue = 0;
+                } else {
+                    treatmentStartDateTBValue = treatmentStartDateTB.value;
+                }
+                if (treatmentEndDateTB === undefined) {
+                    treatmentEndDateTBValue = 0;
+                } else {
+                    treatmentEndDateTBValue = treatmentEndDateTB.value;
+                }
+
+                if (treatmentStartDateINH === undefined) {
+                    treatmentStartDateINHValue = 0;
+                } else {
+                    treatmentStartDateINHValue = treatmentStartDateINH.value;
+                }
+                if (treatmentEndDateINH === undefined) {
+                    treatmentEndDateINHValue = 0;
+                } else {
+                    treatmentEndDateINHValue = treatmentEndDateINH.value;
+                }
+
+                if (treatmenStartDateCTZ === undefined) {
+                    treatmenStartDateCTZValue = 0;
+                } else {
+                    treatmenStartDateCTZValue = treatmenStartDateCTZ.value;
+                }
+                if (treatmentEndDateCTZ === undefined) {
+                    treatmentEndDateCTZValue = 0;
+                } else {
+                    treatmentEndDateCTZValue = treatmentEndDateCTZ.value;
+                }
+
+                if (treatmentStartDateFluconazol === undefined) {
+                    treatmentStartDateFluconazolValue = 0;
+                } else {
+                    treatmentStartDateFluconazolValue = treatmentStartDateFluconazol.value;
+                }
+                if (treatmentEndDateFluconazol === undefined) {
+                    treatmentEndDateFluconazolValue = 0;
+                } else {
+                    treatmentEndDateFluconazolValue = treatmentEndDateFluconazol.value;
+                }
+
+                if (treatmentEndDateTBValue < treatmentStartDateTBValue || treatmentEndDateINHValue < treatmentStartDateINHValue || treatmentEndDateCTZValue < treatmenStartDateCTZValue || treatmentEndDateFluconazolValue < treatmentStartDateFluconazolValue) {
+                    messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
+                    angular.element("#observation_40").css("border", "1px solid red");
+                    angular.element("#observation_40").css("background", "#ffcdcd");
+                    angular.element("#observation_40").css("outline", "0");
+                    return false;
+                }
                 var contxChange = contextChange();
                 var shouldAllow = contxChange["allow"];
                 var discontinuedDrugOrderValidationMessage = discontinuedDrugOrderValidation($scope.consultation.discontinuedDrugs);
diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 43fe872c5f..c3b963738b 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -73,8 +73,41 @@ angular.module('bahmni.common.conceptSet')
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
 
-                    if (treatmentStartDate > treatmentEndDate || startDateProphylaxis > enDateProphylaxis) {
+                    if (treatmentStartDate > treatmentEndDate) {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
+                        angular.element("#observation_40").css("border", "1px solid red");
+                        angular.element("#observation_40").css("background", "#ffcdcd");
+                        angular.element("#observation_40").css("outline", "0");
+                    } else {
+                        angular.element("#observation_40").css("border", "1px solid #DDD");
+                        angular.element("#observation_40").css("background", "#fff");
+                        angular.element("#observation_40").css("outline", "0");
+                    }
+                    if (startDateProphylaxis > enDateProphylaxis) {
+                        messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
+                        angular.element("#observation_45").css("border", "1px solid red");
+                        angular.element("#observation_45").css("background", "#ffcdcd");
+                        angular.element("#observation_45").css("outline", "0");
+
+                        angular.element("#observation_51").css("border", "1px solid red");
+                        angular.element("#observation_51").css("background", "#ffcdcd");
+                        angular.element("#observation_51").css("outline", "0");
+
+                        angular.element("#observation_57").css("border", "1px solid red");
+                        angular.element("#observation_57").css("background", "#ffcdcd");
+                        angular.element("#observation_57").css("outline", "0");
+                    } else {
+                        angular.element("#observation_45").css("border", "1px solid #DDD");
+                        angular.element("#observation_45").css("background", "#fff");
+                        angular.element("#observation_45").css("outline", "0");
+
+                        angular.element("#observation_51").css("border", "1px solid #DDD");
+                        angular.element("#observation_51").css("background", "#fff");
+                        angular.element("#observation_51").css("outline", "0");
+
+                        angular.element("#observation_57").css("border", "1px solid #DDD");
+                        angular.element("#observation_57").css("background", "#fff");
+                        angular.element("#observation_57").css("outline", "0");
                     }
                 };
 
diff --git a/ui/app/styles/bahmni-components/_forms.scss b/ui/app/styles/bahmni-components/_forms.scss
index e6c27d90de..10f0532dd1 100644
--- a/ui/app/styles/bahmni-components/_forms.scss
+++ b/ui/app/styles/bahmni-components/_forms.scss
@@ -517,6 +517,12 @@ buttons-radio.illegalValue { border: 0 !important; background: none !important;}
   }
 }
 
+.legalValue {
+  border: 1px solid #DDD !important;
+  background: #fff !important;
+  outline: 0;
+}
+
 input[type="time"]{
   padding: 1px 10px;
   margin-left: 2px;

From 709fb61edbf7cbec324430ce8a6b3110b037d74c Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Mon, 19 Aug 2019 16:56:43 +0200
Subject: [PATCH 059/131] Decrease lines inside of file

---
 .../controllers/consultationController.js     | 49 +++++++++++++++++++
 .../common/concept-set/directives/concept.js  | 35 ++++++++++++-
 ui/app/styles/bahmni-components/_forms.scss   |  6 +++
 3 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index d7c23d3091..cac9284af2 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -432,6 +432,55 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             };
 
             var isFormValid = function () {
+                var treatmentStartDateTBValue, treatmentEndDateTBValue, treatmentStartDateINHValue, treatmentEndDateINHValue, treatmenStartDateCTZValue, treatmentEndDateCTZValue, treatmentStartDateFluconazolValue, treatmentEndDateFluconazolValue;
+
+                var treatmentStartDateTB = angular.element("#observation_38")[0];
+                var treatmentEndDateTB = angular.element("#observation_40")[0];
+
+                var treatmentStartDateINH = angular.element("#observation_43")[0];
+                var treatmentEndDateINH = angular.element("#observation_45")[0];
+
+                var treatmenStartDateCTZ = angular.element("#observation_49")[0];
+                var treatmentEndDateCTZ = angular.element("#observation_51")[0];
+
+                var treatmentStartDateFluconazol = angular.element("#observation_55")[0];
+                var treatmentEndDateFluconazol = angular.element("#observation_57")[0];
+
+                if (treatmentStartDateTB != undefined) {
+                    treatmentStartDateTBValue = treatmentStartDateTB.value;
+                }
+                if (treatmentEndDateTB != undefined) {
+                    treatmentEndDateTBValue = treatmentEndDateTB.value;
+                }
+
+                if (treatmentStartDateINH != undefined) {
+                    treatmentStartDateINHValue = treatmentStartDateINH.value;
+                }
+                if (treatmentEndDateINH != undefined) {
+                    treatmentEndDateINHValue = treatmentEndDateINH.value;
+                }
+
+                if (treatmenStartDateCTZ != undefined) {
+                    treatmenStartDateCTZValue = treatmenStartDateCTZ.value;
+                }
+                if (treatmentEndDateCTZ != undefined) {
+                    treatmentEndDateCTZValue = treatmentEndDateCTZ.value;
+                }
+
+                if (treatmentStartDateFluconazol != undefined) {
+                    treatmentStartDateFluconazolValue = treatmentStartDateFluconazol.value;
+                }
+                if (treatmentEndDateFluconazol != undefined) {
+                    treatmentEndDateFluconazolValue = treatmentEndDateFluconazol.value;
+                }
+
+                if (treatmentEndDateTBValue < treatmentStartDateTBValue || treatmentEndDateINHValue < treatmentStartDateINHValue || treatmentEndDateCTZValue < treatmenStartDateCTZValue || treatmentEndDateFluconazolValue < treatmentStartDateFluconazolValue) {
+                    messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
+                    angular.element("#observation_40").css("border", "1px solid red");
+                    angular.element("#observation_40").css("background", "#ffcdcd");
+                    angular.element("#observation_40").css("outline", "0");
+                    return false;
+                }
                 var contxChange = contextChange();
                 var shouldAllow = contxChange["allow"];
                 var discontinuedDrugOrderValidationMessage = discontinuedDrugOrderValidation($scope.consultation.discontinuedDrugs);
diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 43fe872c5f..c3b963738b 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -73,8 +73,41 @@ angular.module('bahmni.common.conceptSet')
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
 
-                    if (treatmentStartDate > treatmentEndDate || startDateProphylaxis > enDateProphylaxis) {
+                    if (treatmentStartDate > treatmentEndDate) {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
+                        angular.element("#observation_40").css("border", "1px solid red");
+                        angular.element("#observation_40").css("background", "#ffcdcd");
+                        angular.element("#observation_40").css("outline", "0");
+                    } else {
+                        angular.element("#observation_40").css("border", "1px solid #DDD");
+                        angular.element("#observation_40").css("background", "#fff");
+                        angular.element("#observation_40").css("outline", "0");
+                    }
+                    if (startDateProphylaxis > enDateProphylaxis) {
+                        messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
+                        angular.element("#observation_45").css("border", "1px solid red");
+                        angular.element("#observation_45").css("background", "#ffcdcd");
+                        angular.element("#observation_45").css("outline", "0");
+
+                        angular.element("#observation_51").css("border", "1px solid red");
+                        angular.element("#observation_51").css("background", "#ffcdcd");
+                        angular.element("#observation_51").css("outline", "0");
+
+                        angular.element("#observation_57").css("border", "1px solid red");
+                        angular.element("#observation_57").css("background", "#ffcdcd");
+                        angular.element("#observation_57").css("outline", "0");
+                    } else {
+                        angular.element("#observation_45").css("border", "1px solid #DDD");
+                        angular.element("#observation_45").css("background", "#fff");
+                        angular.element("#observation_45").css("outline", "0");
+
+                        angular.element("#observation_51").css("border", "1px solid #DDD");
+                        angular.element("#observation_51").css("background", "#fff");
+                        angular.element("#observation_51").css("outline", "0");
+
+                        angular.element("#observation_57").css("border", "1px solid #DDD");
+                        angular.element("#observation_57").css("background", "#fff");
+                        angular.element("#observation_57").css("outline", "0");
                     }
                 };
 
diff --git a/ui/app/styles/bahmni-components/_forms.scss b/ui/app/styles/bahmni-components/_forms.scss
index e6c27d90de..10f0532dd1 100644
--- a/ui/app/styles/bahmni-components/_forms.scss
+++ b/ui/app/styles/bahmni-components/_forms.scss
@@ -517,6 +517,12 @@ buttons-radio.illegalValue { border: 0 !important; background: none !important;}
   }
 }
 
+.legalValue {
+  border: 1px solid #DDD !important;
+  background: #fff !important;
+  outline: 0;
+}
+
 input[type="time"]{
   padding: 1px 10px;
   margin-left: 2px;

From 0c33bdf8e587c5e5e98f53cc69da940ffadecdb2 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Tue, 20 Aug 2019 11:20:41 +0200
Subject: [PATCH 060/131] Fixed grunt errors. Added space after "if" keyword

---
 ui/app/common/obs/directives/editObservation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/common/obs/directives/editObservation.js b/ui/app/common/obs/directives/editObservation.js
index 8cf7055d79..eaa91267db 100644
--- a/ui/app/common/obs/directives/editObservation.js
+++ b/ui/app/common/obs/directives/editObservation.js
@@ -44,10 +44,10 @@ angular.module('bahmni.common.obs')
                         $q.all([patientService.getPatient($scope.encounter.patientUuid), getHeight($scope.patient.uuid), getWeight($scope.patient.uuid)]).then(function (response) {
                             $scope.patient.gender = response[0].data.person.gender;
                             $scope.patient.age = response[0].data.person.age;
-                            if(response[1].length > 0) {
+                            if (response[1].length > 0) {
                                 $scope.patient.height = response[1].data[0].value;
                             }
-                            if(response[2].length > 0) {
+                            if (response[2].length > 0) {
                                 $scope.patient.weight = response[2].data[0].value;
                             }
                             return;

From 402c47e6700a1cc533e13d80b5d88458a6199735 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Tue, 20 Aug 2019 15:48:46 +0300
Subject: [PATCH 061/131] MPOC-554 Correct spelling

---
 ui/app/registration/views/patientcommon.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index 60d1776409..b8e46ef2ee 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -212,8 +212,8 @@
                                                      nationalityDocs.includes('NUIT') && nationalityDocs.includes('NUIC') || nationalityDocs.includes('DIRE')"
                                         value="REGISTRATION_OPTION_NONE">{{::'REGISTRATION_OPTION_NONE' | translate}}</option>
                                 <option ng-show="nationalityDocs.includes('BI') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="BI">BI</option>
-                                <option ng-show="nationalityDocs.includes('CARTAO_DE_ELEITOR') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="CARTAO_DE_ELEITOR">Cartao de Eleitor</option>
-                                <option ng-show="nationalityDocs.includes('CEDULA_DE_NASCIMENTO') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="CEDULA_DE_NASCIMENTO">Cedula de Nascimento</option>
+                                <option ng-show="nationalityDocs.includes('CARTAO_DE_ELEITOR') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="CARTAO_DE_ELEITOR">Cartão Eleitor</option>
+                                <option ng-show="nationalityDocs.includes('CEDULA_DE_NASCIMENTO') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="CEDULA_DE_NASCIMENTO">Cédula de Nascimento</option>
                                 <option ng-show="nationalityDocs.includes('DIRE') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="DIRE">DIRE</option>
                                 <option ng-show="nationalityDocs.includes('NUIT') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="NUIT">NUIT</option>
                                 <option ng-show="nationalityDocs.includes('NUIC') && nationalityDocs.includes('REGISTRATION_OPTION_NONE')" value="NUIC">NUIC</option>

From 8e54aa2c33dc58fb321b704d5071bc793f31641e Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Tue, 20 Aug 2019 16:57:08 +0300
Subject: [PATCH 062/131] MPOC-555 Make age type mandatory

---
 ui/app/common/concept-set/views/observation.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/app/common/concept-set/views/observation.html b/ui/app/common/concept-set/views/observation.html
index 6c82bc2200..b6ced03666 100644
--- a/ui/app/common/concept-set/views/observation.html
+++ b/ui/app/common/concept-set/views/observation.html
@@ -290,6 +290,7 @@
                     </div>
 
                     <div ng-switch-when="dropdown" class="field-value info fa fa-info-sign" ng-if="observation.concept.name === 'CONFIDENT_AGE_TYPE'">
+                        <span style="float: left; margin-top:-50px; margin-left:450px; color: red;" >*</span>
                         <concept-dropdown style="float: left; margin-top:-50px; margin-left:460px"
                                 on-change="update"
                                 ng-disabled="observation.disabled"

From abbb6d213df64fd8b839b61cad692c2d8b72f674 Mon Sep 17 00:00:00 2001
From: Sushant Patil <43531186+sushantpatil1214@users.noreply.github.com>
Date: Tue, 20 Aug 2019 19:39:36 +0530
Subject: [PATCH 063/131] Sushant | MPOC-486 Bahmni Part of MPOC - 476 (#294)

---
 .attach_pid30762                              |  0
 ui/app/adt/index.html                         |  1 +
 ui/app/clinical/app.js                        |  2 +-
 .../clinical/common/views/visitSummary.html   |  3 +
 .../controllers/consultationController.js     | 82 +++++++++++++++----
 ui/app/clinical/index.html                    |  3 +-
 ui/app/common/constants.js                    |  1 +
 .../dashboard/models/dashboardSection.js      |  3 +-
 .../views/sections/treatmentDate.html         |  1 +
 .../directives/TreatmentDate.js               | 34 ++++++++
 .../views/treatmentDate.html                  | 12 +++
 ui/app/i18n/adt/locale_en.json                |  3 +-
 ui/app/i18n/appointments/locale_en.json       |  3 +-
 ui/app/i18n/appointments/locale_pt.json       |  3 +-
 ui/app/i18n/clinical/locale_en.json           |  4 +-
 ui/app/i18n/clinical/locale_fr.json           |  3 +-
 ui/app/i18n/clinical/locale_pt.json           |  2 +
 ui/app/i18n/document-upload/locale_en.json    |  3 +-
 ui/app/i18n/home/locale_en.json               |  3 +-
 ui/app/i18n/home/locale_pt.json               |  3 +-
 ui/app/i18n/ipd/locale_en.json                |  3 +-
 ui/app/i18n/orders/locale_en.json             |  3 +-
 22 files changed, 147 insertions(+), 28 deletions(-)
 create mode 100644 .attach_pid30762
 create mode 100644 ui/app/common/displaycontrols/dashboard/views/sections/treatmentDate.html
 create mode 100644 ui/app/common/displaycontrols/treatmentStartdate/directives/TreatmentDate.js
 create mode 100644 ui/app/common/displaycontrols/treatmentStartdate/views/treatmentDate.html

diff --git a/.attach_pid30762 b/.attach_pid30762
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ui/app/adt/index.html b/ui/app/adt/index.html
index 407f39c106..f64534291f 100644
--- a/ui/app/adt/index.html
+++ b/ui/app/adt/index.html
@@ -197,6 +197,7 @@
         <script src="../common/displaycontrols/disposition/directives/disposition.js"></script>
         <script src="../common/displaycontrols/conditionsList/directives/conditionsList.js"></script>
         <script src="../common/displaycontrols/allergiesList/directives/allergiesList.js"></script>
+        <script src="../common/displaycontrols/treatmentStartdate/directives/TreatmentDate.js"></script>
 
         <script src="../common/displaycontrols/admissiondetails/init.js"></script>
         <script src="../common/displaycontrols/admissiondetails/directives/admissionDetails.js"></script>
diff --git a/ui/app/clinical/app.js b/ui/app/clinical/app.js
index b575fe979f..b0d9d07883 100644
--- a/ui/app/clinical/app.js
+++ b/ui/app/clinical/app.js
@@ -8,7 +8,7 @@ angular.module('consultation', ['ui.router', 'bahmni.clinical', 'bahmni.common.c
     'bahmni.common.displaycontrol.disposition', 'bahmni.common.displaycontrol.custom', 'bahmni.common.displaycontrol.admissiondetails',
     'bahmni.common.routeErrorHandler', 'bahmni.common.displaycontrol.disposition',
     'httpErrorInterceptor', 'pasvaz.bindonce', 'infinite-scroll', 'bahmni.common.util', 'ngAnimate', 'ngDialog',
-    'bahmni.common.displaycontrol.patientprofile', 'bahmni.common.displaycontrol.diagnosis', 'bahmni.common.displaycontrol.conditionsList', 'bahmni.common.displaycontrol.allergiesList', 'RecursionHelper', 'ngSanitize',
+    'bahmni.common.displaycontrol.patientprofile', 'bahmni.common.displaycontrol.diagnosis', 'bahmni.common.displaycontrol.conditionsList', 'bahmni.common.displaycontrol.allergiesList', 'bahmni.common.displaycontrol.treatmentDate', 'RecursionHelper', 'ngSanitize',
     'bahmni.common.orders', 'bahmni.common.displaycontrol.orders', 'bahmni.common.displaycontrol.prescription',
     'bahmni.common.displaycontrol.navigationlinks', 'bahmni.common.displaycontrol.programs',
     'bahmni.common.displaycontrol.pacsOrders', 'bahmni.common.uicontrols', 'bahmni.common.uicontrols.programmanagment', 'pascalprecht.translate',
diff --git a/ui/app/clinical/common/views/visitSummary.html b/ui/app/clinical/common/views/visitSummary.html
index a53c1ed1fb..74f09fbb2a 100644
--- a/ui/app/clinical/common/views/visitSummary.html
+++ b/ui/app/clinical/common/views/visitSummary.html
@@ -121,6 +121,9 @@
             <div data-ng-switch-when="allergiesList">
                 <allergies-list params="section" patient="patient"></allergies-list>
             </div>
+            <div data-ng-switch-when="treatmentDate">
+                    <treatment-date params="section" patient="patient"></treatment-date>
+                </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 45404e83e6..52a33f5cf3 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -4,11 +4,11 @@ angular.module('bahmni.clinical').controller('ConsultationController',
     ['$scope', '$rootScope', '$state', '$location', '$translate', 'clinicalAppConfigService', 'diagnosisService', 'urlHelper', 'contextChangeHandler',
         'spinner', 'encounterService', 'messagingService', 'sessionService', 'retrospectiveEntryService', 'patientContext', '$q',
         'patientVisitHistoryService', '$stateParams', '$window', 'visitHistory', 'clinicalDashboardConfig', 'appService',
-        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService', 'printer', 'printPrescriptionReportService', 'providerTypeService',
+        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService', 'printer', 'printPrescriptionReportService', 'providerTypeService', '$http',
         function ($scope, $rootScope, $state, $location, $translate, clinicalAppConfigService, diagnosisService, urlHelper, contextChangeHandler,
             spinner, encounterService, messagingService, sessionService, retrospectiveEntryService, patientContext, $q,
             patientVisitHistoryService, $stateParams, $window, visitHistory, clinicalDashboardConfig, appService,
-            ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService, providerTypeService) {
+            ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService, providerTypeService, $http) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var getPreviousActiveCondition = Bahmni.Common.Domain.Conditions.getPreviousActiveCondition;
             var currentProviderType;
@@ -65,9 +65,14 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             clinicalDashboardConfig.quickPrints = appService.getAppDescriptor().getConfigValue('quickPrints');
             var clinicalDashboardUuid = '0623e3b6-8701-4c07-8493-2930bd67f11a';
             var prescriptionReportUuid = '2c6c27b0-3eef-4010-bfbb-9133d0016d25';
-            $scope.printButtonDropdownOptions = [
-                { name: $translate.instant('PRINT_CLINICAL_DASHBOARD_LABEL'), uuid: clinicalDashboardUuid },
-                { name: $translate.instant('PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL'), uuid: prescriptionReportUuid }
+            $scope.printButtonDropdownOptions = [{
+                name: $translate.instant('PRINT_CLINICAL_DASHBOARD_LABEL'),
+                uuid: clinicalDashboardUuid
+            },
+            {
+                name: $translate.instant('PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL'),
+                uuid: prescriptionReportUuid
+            }
 
             ];
 
@@ -86,7 +91,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                         .then(function (reportData) {
                             $rootScope.prescriptionReportData = reportData;
 
-                            printer.printFromScope("dashboard/views/printPrescriptionReport.html", $rootScope, function () { });
+                            printer.printFromScope("dashboard/views/printPrescriptionReport.html", $rootScope, function () {});
                         });
                 }
             };
@@ -166,7 +171,11 @@ angular.module('bahmni.clinical').controller('ConsultationController',
 
             var initialize = function () {
                 var appExtensions = clinicalAppConfigService.getAllConsultationBoards();
-                $scope.adtNavigationConfig = { forwardUrl: Bahmni.Clinical.Constants.adtForwardUrl, title: $translate.instant("CLINICAL_GO_TO_DASHBOARD_LABEL"), privilege: Bahmni.Clinical.Constants.adtPrivilege };
+                $scope.adtNavigationConfig = {
+                    forwardUrl: Bahmni.Clinical.Constants.adtForwardUrl,
+                    title: $translate.instant("CLINICAL_GO_TO_DASHBOARD_LABEL"),
+                    privilege: Bahmni.Clinical.Constants.adtPrivilege
+                };
                 $scope.availableBoards = $scope.availableBoards.concat(appExtensions);
                 $scope.showSaveConfirmDialogConfig = appService.getAppDescriptor().getConfigValue('showSaveConfirmDialog');
                 var adtNavigationConfig = appService.getAppDescriptor().getConfigValue('adtNavigationConfig');
@@ -193,7 +202,10 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                             event.preventDefault();
                             spinner.hide(toState.spinnerToken);
                             ngDialog.close();
-                            $scope.toStateConfig = { toState: toState, toParams: toParams };
+                            $scope.toStateConfig = {
+                                toState: toState,
+                                toParams: toParams
+                            };
                             $scope.displayConfirmationDialog();
                         }
                     }
@@ -202,7 +214,10 @@ angular.module('bahmni.clinical').controller('ConsultationController',
             });
 
             $scope.adtNavigationURL = function (visitUuid) {
-                return appService.getAppDescriptor().formatUrl($scope.adtNavigationConfig.forwardUrl, { 'patientUuid': $scope.patient.uuid, 'visitUuid': visitUuid });
+                return appService.getAppDescriptor().formatUrl($scope.adtNavigationConfig.forwardUrl, {
+                    'patientUuid': $scope.patient.uuid,
+                    'visitUuid': visitUuid
+                });
             };
 
             var cleanUpListenerErrorsOnForm = $scope.$on("event:errorsOnForm", function () {
@@ -215,7 +230,10 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                         event.preventDefault();
                         $scope.targetUrl = event.currentTarget.getAttribute('href');
                     }
-                    ngDialog.openConfirm({ template: '../common/ui-helper/views/saveConfirmation.html', scope: $scope });
+                    ngDialog.openConfirm({
+                        template: '../common/ui-helper/views/saveConfirmation.html',
+                        scope: $scope
+                    });
                 }
             };
 
@@ -479,7 +497,10 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     params.cachebuster = Math.random();
                     return encounterService.create(encounterData)
                         .then(function (saveResponse) {
-                            var messageParams = { encounterUuid: saveResponse.data.encounterUuid, encounterType: saveResponse.data.encounterType };
+                            var messageParams = {
+                                encounterUuid: saveResponse.data.encounterUuid,
+                                encounterType: saveResponse.data.encounterType
+                            };
                             auditLogService.log($scope.patient.uuid, "EDIT_ENCOUNTER", messageParams, "MODULE_LABEL_CLINICAL_KEY");
                             var consultationMapper = new Bahmni.ConsultationMapper(configurations.dosageFrequencyConfig(), configurations.dosageInstructionConfig(),
                                 configurations.consultationNoteConcept(), configurations.whoStageConcept(), configurations.labOrderNotesConcept(), $scope.followUpConditionConcept);
@@ -518,11 +539,41 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                         });
                 }));
             };
+
+            function isEmpty (obj) {
+                for (var key in obj) {
+                    if (obj.hasOwnProperty(key)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            $scope.dispenseddrug = function () {
+                $http.get(Bahmni.Common.Constants.dispenseDrugOrderUrl, {
+                    params: {
+                        locId: 16,
+                        patientUuid: $scope.patient.uuid
+                    },
+                    withCredentials: true
+                }).then(function (results) {
+                    $rootScope.dispenseData = results.data;
+
+                    if (isEmpty(results.data)) {
+                        $rootScope.arvdispenseddate = null;
+                    } else {
+                        $rootScope.arvdispenseddate = results.data[0].dispenseddate;
+                    }
+                });
+            };
+
+            $scope.dispenseddrug();
+
             $scope.filterTabByProviderType = function (boardIndex) {
                 if (currentProviderType == "APSS") {
-                    if ($scope.availableBoards[boardIndex].translationKey == 'DIAGNOSIS_BOARD_LABEL_KEY'
-                        || $scope.availableBoards[boardIndex].translationKey == 'ORDERS_BOARD_LABEL_KEY'
-                        || $scope.availableBoards[boardIndex].translationKey == 'MEDICATIONS_BOARD_LABEL_KEY'
+                    if ($scope.availableBoards[boardIndex].translationKey == 'DIAGNOSIS_BOARD_LABEL_KEY' ||
+                        $scope.availableBoards[boardIndex].translationKey == 'ORDERS_BOARD_LABEL_KEY' ||
+                        $scope.availableBoards[boardIndex].translationKey == 'MEDICATIONS_BOARD_LABEL_KEY'
                     ) {
                         return false;
                     }
@@ -530,4 +581,5 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 return true;
             };
             initialize();
-        }]);
+        }
+    ]);
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 84fa2a9943..c2adefeb68 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -265,7 +265,8 @@
 
         <script src="../common/displaycontrols/conditionsList/directives/conditionsList.js"></script>
         <script src="../common/displaycontrols/allergiesList/directives/allergiesList.js"></script>
-
+        <script src="../common/displaycontrols/treatmentStartdate/directives/TreatmentDate.js"></script>
+        
 
         <script src="../common/displaycontrols/dashboard/init.js"></script>
         <script src="../common/displaycontrols/dashboard/directives/dashboardSection.js"></script>
diff --git a/ui/app/common/constants.js b/ui/app/common/constants.js
index 3ac436390b..c88b6ff59a 100644
--- a/ui/app/common/constants.js
+++ b/ui/app/common/constants.js
@@ -253,6 +253,7 @@ Bahmni.Common = Bahmni.Common || {};
         appointmentServiceUrl: RESTWS_V1 + "/appointmentService",
         conditionUrl: EMRAPI + '/condition',
         allergyUrl: EMRAPI + '/allergy',
+        dispenseDrugOrderUrl: EMRAPI + '/dispensedrugorder',
         conditionHistoryUrl: EMRAPI + '/conditionhistory',
         allergyHistoryUrl: EMRAPI + '/allergyhistory',
         followUpConditionConcept: 'Follow-up Condition',
diff --git a/ui/app/common/displaycontrols/dashboard/models/dashboardSection.js b/ui/app/common/displaycontrols/dashboard/models/dashboardSection.js
index 96d3cca1b0..89df9c2d38 100644
--- a/ui/app/common/displaycontrols/dashboard/models/dashboardSection.js
+++ b/ui/app/common/displaycontrols/dashboard/models/dashboardSection.js
@@ -18,7 +18,8 @@
         "pacsOrders",
         "patientInformation",
         "conditionsList",
-        "allergiesList"
+        "allergiesList",
+        "treatmentDate"
     ];
 
     var getViewUrl = function (section) {
diff --git a/ui/app/common/displaycontrols/dashboard/views/sections/treatmentDate.html b/ui/app/common/displaycontrols/dashboard/views/sections/treatmentDate.html
new file mode 100644
index 0000000000..0d96259ece
--- /dev/null
+++ b/ui/app/common/displaycontrols/dashboard/views/sections/treatmentDate.html
@@ -0,0 +1 @@
+<treatment-date params="section" patient="patient"></treatment-date>
\ No newline at end of file
diff --git a/ui/app/common/displaycontrols/treatmentStartdate/directives/TreatmentDate.js b/ui/app/common/displaycontrols/treatmentStartdate/directives/TreatmentDate.js
new file mode 100644
index 0000000000..84a251ed0e
--- /dev/null
+++ b/ui/app/common/displaycontrols/treatmentStartdate/directives/TreatmentDate.js
@@ -0,0 +1,34 @@
+'use strict';
+
+angular.module('bahmni.common.displaycontrol.treatmentDate', []);
+angular.module('bahmni.common.displaycontrol.treatmentDate')
+    .directive('treatmentDate', ['ngDialog', function (ngDialog) {
+        var controller = function ($scope, $rootScope) {
+            $scope.statuses = ['ACTIVE'];
+
+            $scope.openSummaryDialog = function () {
+                ngDialog.open({
+                    template: '../common/displaycontrols/treatmentStartdate/views/treatmentDate.html',
+                    className: 'ngdialog-theme-default ng-dialog-all-details-page',
+                    data: {
+                        allergies: $scope.allergies
+                    },
+                    controller: function ($scope) {
+                        $scope.hideTitle = true;
+                        $scope.statuses = ['ACTIVE'];
+                        $scope.allergies = $scope.ngDialogData.allergies;
+                    }
+                });
+            };
+            $scope.treatmentStartDate = $rootScope.arvdispenseddate;
+        };
+        return {
+            restrict: 'E',
+            controller: controller,
+            templateUrl: "../common/displaycontrols/treatmentStartdate/views/treatmentDate.html",
+            scope: {
+                params: "=",
+                patient: "="
+            }
+        };
+    }]);
diff --git a/ui/app/common/displaycontrols/treatmentStartdate/views/treatmentDate.html b/ui/app/common/displaycontrols/treatmentStartdate/views/treatmentDate.html
new file mode 100644
index 0000000000..f4cd587e57
--- /dev/null
+++ b/ui/app/common/displaycontrols/treatmentStartdate/views/treatmentDate.html
@@ -0,0 +1,12 @@
+<div ng-class="{'template-container':hideTitle}">
+        <div class="allergies-display-contorl-overflow">
+            <div class="block hierarchy dashboard-section">
+                      <table class="patient dashboard-table">
+                        <td class="name">{{ 'TREATMENT_START_DATE' | translate }}</td>
+                        <td class="value">{{::treatmentStartDate | bahmniDate}}
+                            
+                        </td>
+                    </table>               
+            </div>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/ui/app/i18n/adt/locale_en.json b/ui/app/i18n/adt/locale_en.json
index 1132db4fbb..1d2a0b8c2f 100644
--- a/ui/app/i18n/adt/locale_en.json
+++ b/ui/app/i18n/adt/locale_en.json
@@ -63,5 +63,6 @@
     "BED_LABEL": "Bed",
     "ASSIGN_BED_LABEL": "Assign",
     "TRANSFER_BED_LABEL": "Transfer",
-    "EMPTY_WARD_MESSAGE": "There are no patients in this ward."
+    "EMPTY_WARD_MESSAGE": "There are no patients in this ward.",
+    "TREATMENT_START_DATE": "Data Início TARV"
 }
diff --git a/ui/app/i18n/appointments/locale_en.json b/ui/app/i18n/appointments/locale_en.json
index cca82325cc..f0585539cc 100644
--- a/ui/app/i18n/appointments/locale_en.json
+++ b/ui/app/i18n/appointments/locale_en.json
@@ -178,5 +178,6 @@
   "APPOINTMENT_CREATE_SAVE_ADD_NEW": "Save and add New Visit",
   "APPOINTMENT_DATE_WARNING": "Appointment date cannot be before today",
   "APPOINTMENT_INVALID_DATE": "Ivanlid appointment date",
-  "APPOINTMENTS_APP_TITLE": "Appointment Scheduling"
+  "APPOINTMENTS_APP_TITLE": "Appointment Scheduling",
+  "TREATMENT_START_DATE": "Data Início TARV"
 }
diff --git a/ui/app/i18n/appointments/locale_pt.json b/ui/app/i18n/appointments/locale_pt.json
index e514f38c43..694ed95bee 100644
--- a/ui/app/i18n/appointments/locale_pt.json
+++ b/ui/app/i18n/appointments/locale_pt.json
@@ -178,5 +178,6 @@
   "APPOINTMENT_CREATE_SAVE_ADD_NEW": "Salvar e adicionar nova visita",
   "APPOINTMENT_DATE_WARNING": "A data da consulta não pode ser inferior à data de hoje",
   "APPOINTMENT_INVALID_DATE": "Data de consulta inválida",
-  "APPOINTMENTS_APP_TITLE": "Marcações"
+  "APPOINTMENTS_APP_TITLE": "Marcações",
+  "TREATMENT_START_DATE": "Data Início TARV"
 }
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 34fc97f52a..945eb40c10 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -457,5 +457,7 @@
     "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Amount Charged",
     "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Print Dashboard",
     "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Print Prescription",
-    "CLINICAL_PATIENT_STATUS": "Active in:"
+    "CLINICAL_PATIENT_STATUS": "Active in:",
+    "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Treatment Start Date",
+    "TREATMENT_START_DATE": "Treatment Start Date"
 }
diff --git a/ui/app/i18n/clinical/locale_fr.json b/ui/app/i18n/clinical/locale_fr.json
index 0efbeb2063..ac394c7d50 100644
--- a/ui/app/i18n/clinical/locale_fr.json
+++ b/ui/app/i18n/clinical/locale_fr.json
@@ -230,5 +230,6 @@
   "OBS_BOOLEAN_NO_KEY": "Non",
   "DIAGNOSIS_INITIAL_STAGE_LABEL": "Initiale",
   "DIAGNOSIS_CURRENT_STAGE_LABEL": "Actuel",
-  "CONDITION_LIST_NO_RETRO_MODE": "<strong>Conditions cannot</strong> be edited in retrospective mode"
+  "CONDITION_LIST_NO_RETRO_MODE": "<strong>Conditions cannot</strong> be edited in retrospective mode",
+  "TREATMENT_START_DATE": "Data Início TARV"
 }
\ No newline at end of file
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 936e323aed..aba89dd0eb 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -461,6 +461,8 @@
   "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Valor Cobrado",
   "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Imprimir painel",
   "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
+  "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Data Início TARV",
+  "TREATMENT_START_DATE": "Data Início TARV",
   "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir",
   "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Prescrição",
   "CLINICAL_PATIENT_STATUS": "Activo em"
diff --git a/ui/app/i18n/document-upload/locale_en.json b/ui/app/i18n/document-upload/locale_en.json
index 4e8c8b20e9..57616d7e38 100644
--- a/ui/app/i18n/document-upload/locale_en.json
+++ b/ui/app/i18n/document-upload/locale_en.json
@@ -17,5 +17,6 @@
     "YEARS_LABEL": "Years",
     "CHOOSE_ANSWER_FROM_DROPDOWN_LABEL": "Choose Answer",
     "DELETE_LABEL": "Delete",
-    "EDIT_LABEL": "Edit"
+    "EDIT_LABEL": "Edit",
+    "TREATMENT_START_DATE": "Data Início TARV"
 }
\ No newline at end of file
diff --git a/ui/app/i18n/home/locale_en.json b/ui/app/i18n/home/locale_en.json
index 3b8245512d..d30b44f6f9 100644
--- a/ui/app/i18n/home/locale_en.json
+++ b/ui/app/i18n/home/locale_en.json
@@ -59,5 +59,6 @@
     "ACCEPT":"Accept",
     "SELECT_VALUE_FROM_AUTOCOMPLETE_DEFAULT_MESSAGE": "Please select a value from auto complete",
     "POC_VERSION" : "2.0.0",
-    "HOME_APP_TITLE": "Home"
+    "HOME_APP_TITLE": "Home",
+    "TREATMENT_START_DATE": "Data Início TARV"
 }
diff --git a/ui/app/i18n/home/locale_pt.json b/ui/app/i18n/home/locale_pt.json
index 426502b26d..b0bbcd1bc7 100644
--- a/ui/app/i18n/home/locale_pt.json
+++ b/ui/app/i18n/home/locale_pt.json
@@ -59,5 +59,6 @@
 	"WARNING_SERVER_TIME_ZONE_MISMATCH": "O fuso horário do servidor ({{serverTime}}) é diferente do fuso horário / hora do seu navegador ({{localeTimeZone}}). Isso pode fazer com que alguns dados ou relatórios pareçam incorretos. Por favor entre em contato com o administrador para mais detalhes.",
 	"YOU_HAVE_NOT_BEEN_SETUP_PROVIDER": "Não está configurado como Provedor, por favor entre em contacto com o Administrador.",
 	"POC_VERSION" : "2.0.0",
-    "HOME_APP_TITLE": "Página Inicial"
+	"HOME_APP_TITLE": "Página Inicial",
+	"TREATMENT_START_DATE": "Data Início TARV"
 }
diff --git a/ui/app/i18n/ipd/locale_en.json b/ui/app/i18n/ipd/locale_en.json
index a2879e146e..a4066a181e 100644
--- a/ui/app/i18n/ipd/locale_en.json
+++ b/ui/app/i18n/ipd/locale_en.json
@@ -56,5 +56,6 @@
     "GENDER_OTHER_KEY": "Other",
     "ADMISSION_DATE_LABEL": "Admission Date",
     "DOB_LABEL": "Date of Birth",
-    "PATIENT_BED_MANAGEMENT_PAGE_KEY": "Patient Bed Management" 
+    "PATIENT_BED_MANAGEMENT_PAGE_KEY": "Patient Bed Management",
+    "TREATMENT_START_DATE": "Data Início TARV"
 }
diff --git a/ui/app/i18n/orders/locale_en.json b/ui/app/i18n/orders/locale_en.json
index f90f7bd836..6100cf5a8d 100644
--- a/ui/app/i18n/orders/locale_en.json
+++ b/ui/app/i18n/orders/locale_en.json
@@ -26,5 +26,6 @@
     "EDIT_LABEL": "Edit",
     "NO_ORDERS_PRESENT": "No order of type {{orderType}} for this patient.",
     "DEFAULT_SERVER_ERROR_MESSAGE": "An error has occurred on the server. Information not saved.",
-    "VISIT_CLOSED_CREATE_NEW_ERROR_MESSAGE": "Visit already closed, create new visit to fulfill the order"
+    "VISIT_CLOSED_CREATE_NEW_ERROR_MESSAGE": "Visit already closed, create new visit to fulfill the order",
+    "TREATMENT_START_DATE": "Data Início TARV"
 }

From e7d69d592092c90a949c91e13cfab0626cf9472c Mon Sep 17 00:00:00 2001
From: Sushant Patil <43531186+sushantpatil1214@users.noreply.github.com>
Date: Tue, 20 Aug 2019 21:11:58 +0530
Subject: [PATCH 064/131] Sushant | MPOC-486 revert (#302)

---
 .../clinical/consultation/controllers/consultationController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 52a33f5cf3..41977b10af 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -567,7 +567,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 });
             };
 
-            $scope.dispenseddrug();
+           // $scope.dispenseddrug();
 
             $scope.filterTabByProviderType = function (boardIndex) {
                 if (currentProviderType == "APSS") {

From dce1a9332bc4acd0697d81c6f456f2978480ed2f Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Thu, 22 Aug 2019 09:10:29 +0200
Subject: [PATCH 065/131] Positive Prevention dashboard: Add functionality to
 toggle button

---
 .../views/positivePreventionDashboardDialog.html      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html b/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html
index 767649f732..c7d7b50ef0 100644
--- a/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html
+++ b/ui/app/common/displaycontrols/observation/views/positivePreventionDashboardDialog.html
@@ -3,15 +3,16 @@ <h2 ng-class="::{'section-title': !isFulfilmentDisplayControl, 'form-field': isF
     <p ng-if="visitsList.length == 0" style="background-color:#ffffff;color:#444444;padding:5px">{{::'NO_POSITIVE_PREVENTION_WITH_YES_MESSAGE' | translate}} </p>
     <ul style="font-size: 14px;color: #000000">
         <li ng-repeat="dateTime in visitsList track by $index" style="background-color:#ddd;">
-            <span class="tree-list-item row-click toggle-container ng-scope ng-isolate-scope active" id="visit{{section.visitDomId[$index]}}" toggle="obsGroup.isOpen">
-                <i class="fa fa-caret-right"></i>
-                <i class="fa fa-caret-down"></i>
+            <span class="tree-list-item row-click toggle-container ng-scope ng-isolate-scope active" id="visit{{section.visitDomId[$index]}}" toggle="isOpen[$index]">
+                <i ng-class="isOpen[$index] ? 'fa fa-caret-down' : 'fa fa-caret-right'"></i>
                 <span class="obs-date">
                     {{dateTime | bahmniDateTime}}
                 </span>
             </span>
-            <div ng-repeat="concept in conceptsWithYes[$index] track by $index" class="print-observations hidden-print" style="background-color:#fff;margin-bottom:1px;padding-left:20px;padding-top:4px;padding-bottom:4px">
-                {{concept}}
+            <div ng-if="isOpen[$index] == true">
+                <div ng-repeat="concept in conceptsWithYes[$index] track by $index" class="print-observations hidden-print" style="background-color:#fff;margin-bottom:1px;padding-left:20px;padding-top:4px;padding-bottom:4px">
+                    {{concept}}
+                </div>
             </div>
         </li>
     </ul>

From ef30064e7ff744fdd78e9cbf8adde3a0e43f0b3f Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Thu, 22 Aug 2019 14:29:08 +0300
Subject: [PATCH 066/131] [FIX] one encounter type per visit

---
 .../allvisits/directives/visitsTable.js       | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js b/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
index 33fe653a0a..2e5c2fae43 100644
--- a/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
+++ b/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
@@ -127,21 +127,40 @@ angular.module('bahmni.clinical')
                             }
                         }
 
+                        var appsTracker = new Map();
+                        var clinicalTracker = new Map();
+
                         for (var i = 0; i < APSSEncounters.length; i++) {
                             if (i == APSSEncounters.length - 1) {
+                                if (appsTracker.get(APSSEncounters[i].visit.uuid) !== undefined) {
+                                    var position = appsTracker.get(APSSEncounters[i].visit.uuid);
+                                    APSSEncounters[position].actualEncounterType = undefined;
+                                }
                                 APSSEncounters[i].actualEncounterType = "ENCOUNTER_APSS_FIRST";
+                                appsTracker.set(APSSEncounters[i].visit.uuid, i);
                             }
                             else {
-                                APSSEncounters[i].actualEncounterType = "ENCOUNTER_APSS_FOLLOWUP";
+                                if (appsTracker.get(APSSEncounters[i].visit.uuid) === undefined) {
+                                    APSSEncounters[i].actualEncounterType = "ENCOUNTER_APSS_FOLLOWUP";
+                                    appsTracker.set(APSSEncounters[i].visit.uuid, i);
+                                }
                             }
                         }
 
                         for (var i = 0; i < clinicalEncounters.length; i++) {
                             if (i == clinicalEncounters.length - 1) {
+                                if (clinicalTracker.get(clinicalEncounters[i].visit.uuid) !== undefined) {
+                                    var j = clinicalTracker.get(clinicalEncounters[i].visit.uuid);
+                                    clinicalEncounters[j].actualEncounterType = undefined;
+                                }
                                 clinicalEncounters[i].actualEncounterType = "ENCOUNTER_CLINICAL_FIRST";
+                                clinicalTracker.set(clinicalEncounters[i].visit.uuid, i);
                             }
                             else {
-                                clinicalEncounters[i].actualEncounterType = "ENCOUNTER_CLINICAL_FOLLOWUP";
+                                if (clinicalTracker.get(clinicalEncounters[i].visit.uuid) === undefined) {
+                                    clinicalEncounters[i].actualEncounterType = "ENCOUNTER_CLINICAL_FOLLOWUP";
+                                    clinicalTracker.set(clinicalEncounters[i].visit.uuid, i);
+                                }
                             }
                         }
 

From 1b433f27e808c35e069a6d9b49f88d2f302b28d8 Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Thu, 22 Aug 2019 18:58:53 +0530
Subject: [PATCH 067/131] Amol | Resolved issue and removed comment (#305)

---
 .../clinical/consultation/controllers/consultationController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index c02452eb0c..83ae6d4834 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -616,7 +616,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                 });
             };
 
-           // $scope.dispenseddrug();
+            $scope.dispenseddrug();
 
             $scope.filterTabByProviderType = function (boardIndex) {
                 if (currentProviderType == "APSS") {

From b7ee0e163dcd90af9cd6458dd5d6f157786f39da Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Thu, 22 Aug 2019 15:33:51 +0200
Subject: [PATCH 068/131] Bug Fix on TB and Prophylaxis section (End date
 field)

---
 .../consultation/controllers/consultationController.js    | 2 +-
 ui/app/common/concept-set/directives/concept.js           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index cac9284af2..bfff454dd8 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -474,7 +474,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     treatmentEndDateFluconazolValue = treatmentEndDateFluconazol.value;
                 }
 
-                if (treatmentEndDateTBValue < treatmentStartDateTBValue || treatmentEndDateINHValue < treatmentStartDateINHValue || treatmentEndDateCTZValue < treatmenStartDateCTZValue || treatmentEndDateFluconazolValue < treatmentStartDateFluconazolValue) {
+                if ((treatmentEndDateTBValue < treatmentStartDateTBValue && treatmentEndDateTBValue != '') || (treatmentEndDateINHValue < treatmentStartDateINHValue && treatmentEndDateINHValue != '') || (treatmentEndDateCTZValue < treatmenStartDateCTZValue && treatmentEndDateCTZValue != '') || (treatmentEndDateFluconazolValue < treatmentStartDateFluconazolValue && treatmentEndDateFluconazolValue != '')) {
                     messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                     angular.element("#observation_40").css("border", "1px solid red");
                     angular.element("#observation_40").css("background", "#ffcdcd");
diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index c3b963738b..c3d0e01efe 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -39,7 +39,7 @@ angular.module('bahmni.common.conceptSet')
                         enDateProphylaxis = scope.observation.value;
                     }
 
-                    if (treatmentStartDate === '' || treatmentEndDate === '') {
+                    if (treatmentStartDate === '' && treatmentEndDate === '') {
                         answer = null;
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
@@ -56,7 +56,7 @@ angular.module('bahmni.common.conceptSet')
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
 
-                    if (startDateProphylaxis === '' || enDateProphylaxis === '') {
+                    if (startDateProphylaxis === '' && enDateProphylaxis === '') {
                         answer = null;
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
@@ -73,7 +73,7 @@ angular.module('bahmni.common.conceptSet')
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
 
-                    if (treatmentStartDate > treatmentEndDate) {
+                    if (treatmentStartDate > treatmentEndDate && treatmentEndDate != '') {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                         angular.element("#observation_40").css("border", "1px solid red");
                         angular.element("#observation_40").css("background", "#ffcdcd");
@@ -83,7 +83,7 @@ angular.module('bahmni.common.conceptSet')
                         angular.element("#observation_40").css("background", "#fff");
                         angular.element("#observation_40").css("outline", "0");
                     }
-                    if (startDateProphylaxis > enDateProphylaxis) {
+                    if (startDateProphylaxis > enDateProphylaxis && enDateProphylaxis != '') {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                         angular.element("#observation_45").css("border", "1px solid red");
                         angular.element("#observation_45").css("background", "#ffcdcd");

From 50f5619ae6715254ebb07c525d775bfedaae7763 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Fri, 23 Aug 2019 10:33:28 +0200
Subject: [PATCH 069/131] Mark fields below range as "Anormal"

---
 ui/app/common/concept-set/directives/concept.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 7ee64904fa..935165d274 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -114,7 +114,7 @@ angular.module('bahmni.common.conceptSet')
                 scope.onVitalSignalChange = function () {
                     if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
                         var bloodPressureDiastolic = scope.observation.value;
-                        if (bloodPressureDiastolic <= 80 || bloodPressureDiastolic === undefined) {
+                        if ((bloodPressureDiastolic >= 60 && bloodPressureDiastolic <= 80) || bloodPressureDiastolic === undefined) {
                             scope.hideAbnormalButton = true;
                         } else {
                             scope.hideAbnormalButton = false;
@@ -123,7 +123,7 @@ angular.module('bahmni.common.conceptSet')
 
                     if (scope.observation.concept.name === 'Blood_Pressure_–_Systolic_VitalS') {
                         var bloodPressureSystolic = scope.observation.value;
-                        if (bloodPressureSystolic <= 120 || bloodPressureSystolic === undefined) {
+                        if ((bloodPressureSystolic >= 90 && bloodPressureSystolic <= 120) || bloodPressureSystolic === undefined) {
                             scope.hideAbnormalButton = true;
                         } else {
                             scope.hideAbnormalButton = false;

From de3d9342228c3b9fd95463ead8f2e96df920c156 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Mon, 26 Aug 2019 09:18:15 +0200
Subject: [PATCH 070/131] Add Middle Name into the Similar Patients table

---
 ui/app/registration/views/duplicatePatientTable.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/app/registration/views/duplicatePatientTable.html b/ui/app/registration/views/duplicatePatientTable.html
index 82eaaafb0c..0d94988c44 100644
--- a/ui/app/registration/views/duplicatePatientTable.html
+++ b/ui/app/registration/views/duplicatePatientTable.html
@@ -6,6 +6,7 @@ <h6>{{::'REGISTRATION_LABEL_SIMILAR_PATIENT_FOUND' | translate}}</h6>
                 <th><strong>{{ ::'REGISTRATION_LABEL_ID' | translate}}</strong></th>
                 <th ng-repeat = "type in ::extraIdentifierTypes track by $index"><strong>{{type.name}}</strong></th>
                 <th><strong>{{ ::'REGISTRATION_LABEL_NAME' | translate}}</strong></th>
+                <th><strong>{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}</strong></th>
                 <th><strong>{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}</strong></th>
                 <th ng-repeat = "field in ::personSearchResultsConfig"><strong>{{field | translate}}</strong></th>
                 <th><strong>{{ ::'REGISTRATION_LABEL_DOB' | translate}}</strong></th>
@@ -21,6 +22,7 @@ <h6>{{::'REGISTRATION_LABEL_SIMILAR_PATIENT_FOUND' | translate}}</h6>
                     </a>
                 </td>
                 <td>{{result.givenName}}</td>
+                <td>{{result.middleName}}</td>
                 <td>{{result.familyName}}</td>
                 <td ng-repeat = "field in ::personSearchResultsConfig">{{::result.customAttribute[field] || "" | bahmniDateInStrictMode}}</td>
                 <td>{{result.birthDate | date : 'dd-MM-yyyy'}}</td>

From bb7ec45c86e88114a44be32e81432a062033696b Mon Sep 17 00:00:00 2001
From: Paul Ekirapa <ekirapapaul@gmail.com>
Date: Mon, 26 Aug 2019 10:49:52 +0300
Subject: [PATCH 071/131] MPOC-562 limit type of dispense to ARV drugs only
 (#308)

---
 .../clinical/consultation/controllers/addTreatmentController.js | 2 ++
 .../consultation/views/treatmentSections/addTreatment.html      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index b45497076f..b87771a7b9 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -27,6 +27,7 @@ angular.module('bahmni.clinical')
             $scope.addTreatment = true;
             $scope.canOrderSetBeAdded = true;
             $scope.isSearchDisabled = false;
+            $scope.isARV = false;
 
             $scope.getFilteredOrderSets = function (searchTerm) {
                 if (searchTerm && searchTerm.length >= 3) {
@@ -519,6 +520,7 @@ angular.module('bahmni.clinical')
 
                 $scope.onChange = function () {
                     if (selectedItem) {
+                        $scope.isARV = selectedItem.drug.dosageForm && selectedItem.drug.dosageForm.display === "ARV";
                         $scope.treatment.isNonCodedDrug = false;
                         delete $scope.treatment.drugNonCoded;
                         $scope.treatment.changeDrug({
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 08d18028b6..e9d468c685 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -239,7 +239,7 @@ <h3 class="orderSet-additional-info" ng-show="treatmentConfig.showAdditionalInfo
                             </button>
                         </div>
                     </article>
-                    <article class="form-field" ng-if="!treatmentConfig.isHiddenField('dosingInstructions')">
+                    <article class="form-field" ng-if="!treatmentConfig.isHiddenField('dosingInstructions') && isARV">
                         <div class="field-attribute">
                             <label  class="start-date-label fl">{{::treatmentConfig.translate('dosingInstructions', 'MEDICATION_LABEL_DISPENSATION_TYPE')}}<span class="asterick">*</span></label>
                         </div>

From 364534906a7ffb73a93f66c5338616acc7ca78b3 Mon Sep 17 00:00:00 2001
From: Amol Chavan <amol@satvix.com>
Date: Mon, 26 Aug 2019 16:24:02 +0530
Subject: [PATCH 072/131] Amol | Added translation for patient viist

---
 ui/app/i18n/registration/locale_en.json | 3 ++-
 ui/app/i18n/registration/locale_pt.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/app/i18n/registration/locale_en.json b/ui/app/i18n/registration/locale_en.json
index 68987bff43..92315323bb 100644
--- a/ui/app/i18n/registration/locale_en.json
+++ b/ui/app/i18n/registration/locale_en.json
@@ -205,5 +205,6 @@
   "REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE" : "Eg: 12345",
   "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "YYYY",
   "REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE" : "Eg: 12345678",
-  "US_REG_DATE_MESSAGE" : "Enter a valid date."
+  "US_REG_DATE_MESSAGE" : "Enter a valid date.",
+  "Patient_Start_Visit_A" : "Clinical Consultation"
 }
\ No newline at end of file
diff --git a/ui/app/i18n/registration/locale_pt.json b/ui/app/i18n/registration/locale_pt.json
index 6a3ea451fa..152ff76219 100644
--- a/ui/app/i18n/registration/locale_pt.json
+++ b/ui/app/i18n/registration/locale_pt.json
@@ -179,5 +179,6 @@
     "REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE" : "Ex: 12345",
     "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "AAAA",
     "REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE" : "Ex: 12345678",
-    "US_REG_DATE_MESSAGE" : "Digite uma data válida."
+    "US_REG_DATE_MESSAGE" : "Digite uma data válida.",
+    "Patient_Start_Visit_A" : "Consulta Clinica"
 }
\ No newline at end of file

From 32ca2462cc59bfe61487aba352ea343f55335340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Tue, 27 Aug 2019 09:27:04 +0200
Subject: [PATCH 073/131] Improvements in the validations. (#310)

---
 .../common/concept-set/directives/concept.js  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 4caabd17b0..4f890bcea5 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -39,41 +39,41 @@ angular.module('bahmni.common.conceptSet')
                         enDateProphylaxis = scope.observation.value;
                     }
 
-                    if (treatmentStartDate === '' && treatmentEndDate === '') {
+                    if (treatmentStartDate === '') {
                         answer = null;
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
-                    if (treatmentStartDate === scope.today && treatmentStartDate !== '') {
+                    if (treatmentStartDate === scope.today) {
                         answer = tuberculosisData[0];
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
-                    if ((treatmentStartDate < scope.today) && (scope.today < treatmentEndDate || treatmentEndDate === undefined)) {
+                    if (treatmentStartDate < scope.today && treatmentStartDate !== '') {
                         answer = tuberculosisData[1];
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
-                    if ((treatmentEndDate <= scope.today) && (treatmentEndDate >= treatmentStartDate) && (treatmentEndDate != '')) {
+                    if ((treatmentEndDate <= scope.today) && (treatmentEndDate >= treatmentStartDate) && (treatmentEndDate !== '')) {
                         answer = tuberculosisData[2];
                         $rootScope.observationData.toggleSelectionTBState(answer);
                     }
 
-                    if (startDateProphylaxis === '' && enDateProphylaxis === '') {
+                    if (startDateProphylaxis === '') {
                         answer = null;
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
-                    if (startDateProphylaxis === scope.today && startDateProphylaxis !== '') {
+                    if (startDateProphylaxis === scope.today) {
                         answer = prophylaxisData[0];
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
-                    if ((startDateProphylaxis < scope.today) && (scope.today < enDateProphylaxis || enDateProphylaxis === undefined)) {
+                    if (startDateProphylaxis < scope.today && startDateProphylaxis !== '') {
                         answer = prophylaxisData[1];
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
-                    if ((enDateProphylaxis <= scope.today) && (enDateProphylaxis >= startDateProphylaxis) && (enDateProphylaxis != '')) {
+                    if ((enDateProphylaxis <= scope.today) && (enDateProphylaxis >= startDateProphylaxis) && (enDateProphylaxis !== '')) {
                         answer = prophylaxisData[2];
                         $rootScope.prophylaxisObservationData.toggleSelectionProphylaxisState(answer);
                     }
 
-                    if (treatmentStartDate > treatmentEndDate && treatmentEndDate != '') {
+                    if (treatmentStartDate > treatmentEndDate && treatmentEndDate !== '') {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                         angular.element("#observation_40").css("border", "1px solid red");
                         angular.element("#observation_40").css("background", "#ffcdcd");
@@ -83,7 +83,7 @@ angular.module('bahmni.common.conceptSet')
                         angular.element("#observation_40").css("background", "#fff");
                         angular.element("#observation_40").css("outline", "0");
                     }
-                    if (startDateProphylaxis > enDateProphylaxis && enDateProphylaxis != '') {
+                    if (startDateProphylaxis > enDateProphylaxis && enDateProphylaxis !== '') {
                         messagingService.showMessage('error', "INVALID_TREATMENT_END_DATE");
                         angular.element("#observation_45").css("border", "1px solid red");
                         angular.element("#observation_45").css("background", "#ffcdcd");

From bcee2d1a48d4ed9cfbd4b4742f1ea5d241e93b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Tue, 27 Aug 2019 09:32:05 +0200
Subject: [PATCH 074/131] Adds option to check if drug order is being revised

---
 .../controllers/addTreatmentController.js     | 24 +++++++++++++++++--
 .../mappers/encounterTransactionMapper.js     |  2 ++
 .../views/treatmentSections/addTreatment.html |  6 ++---
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 1f1e9694ce..5850df2cc8 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -34,6 +34,8 @@ angular.module('bahmni.clinical')
             $scope.disableTreatmentLine = true;
             $scope.suggestedDruglist = [];
             $scope.counter = 0;
+            $scope.drugOrderRelationShipList = [];
+            $scope.iBeingRevised= false;
 
             $scope.fetchCategories = function (conceptName) {
                 return conceptSetService.getConcept({
@@ -42,6 +44,7 @@ angular.module('bahmni.clinical')
                 }, true).then(function (response) {
                     var resp = response.data.results[0].answers;
                     for (var i = 0; i < resp.length; i++) {
+                        resp[i].names[0].uuid = resp[i].uuid;
                         $scope.categories.push(resp[i].names[0]);
                     }
                     return $scope.categories;
@@ -73,6 +76,7 @@ angular.module('bahmni.clinical')
                     $scope.treatmentLines = [];
                     var resp = response.data.results[0].answers;
                     for (var i = 0; i < resp.length; i++) {
+                        resp[i].names[0].uuid = resp[i].uuid;
                         $scope.treatmentLines.push(resp[i].names[0]);
                     }
                     return $scope.treatmentLines;
@@ -404,6 +408,15 @@ angular.module('bahmni.clinical')
                 $scope.treatment.setUniformDoseFraction();
                 var newDrugOrder = $scope.treatment;
                 setNonCodedDrugConcept($scope.treatment);
+                $scope.treatment.category = $scope.selectedCategory;
+                $scope.treatment.treatmentLine = $scope.selectedTreatmentLine;
+                var drugOrderRelationShip = {};
+                drugOrderRelationShip.drugUuid = $scope.treatment.drug.uuid;
+                drugOrderRelationShip.categoryUuid = $scope.selectedCategory.uuid;
+                drugOrderRelationShip.treatmentLineUuid = $scope.selectedTreatmentLine.uuid;
+
+
+                $scope.drugOrderRelationShipList.push(drugOrderRelationShip);
 
                 newDrugOrder.calculateEffectiveStopDate();
 
@@ -427,6 +440,7 @@ angular.module('bahmni.clinical')
                 if ($scope.treatment.isBeingEdited) {
                     treatments.splice($scope.treatment.currentIndex, 1, $scope.treatment);
                     $scope.treatment.isBeingEdited = false;
+                    $scope.isBeingRevised = false;
                 } else {
                     treatments.push($scope.treatment);
                 }
@@ -521,7 +535,14 @@ angular.module('bahmni.clinical')
 
             var edit = function (drugOrder, index) {
                 clearHighlights();
+                $scope.isBeingRevised = true;
                 var treatment = drugOrder;
+                if(treatment.category === undefined || treatment.category === ""){
+                    //fetch from database
+                }else{
+                    $scope.selectedCategory = treatment.category;
+                    $scope.selectedTreatmentLine = treatment.treatmentLine;
+                }
                 markEitherVariableDrugOrUniformDrug(treatment);
                 treatment.isBeingEdited = true;
                 $scope.treatment = treatment.cloneForEdit(index, treatmentConfig);
@@ -603,9 +624,7 @@ angular.module('bahmni.clinical')
             (function () {
                 var selectedItem;
                 $scope.onSelect = function (item) {
-                    console.log(item);
                     if ($scope.selectedCategory !== "") {
-                        console.log($scope.suggestedDruglist);
                         for (let i = 0; i < $scope.suggestedDruglist.length; i++) {
                             if (item.uuid === $scope.suggestedDruglist[i].drug.concept.uuid) {
                                 selectedItem = $scope.suggestedDruglist[i];
@@ -702,6 +721,7 @@ angular.module('bahmni.clinical')
                 var includedOrderSetTreatments = _.filter(orderSetTreatmentsAcrossTabs, function (treatment) {
                     return treatment.orderSetUuid ? treatment.include : true;
                 });
+                $scope.consultation.drugOrderRelationShipList=$scope.drugOrderRelationShipList;
                 $scope.consultation.newlyAddedTreatments = allTreatmentsAcrossTabs.concat(includedOrderSetTreatments);
                 if ($scope.consultation.discontinuedDrugs) {
                     $scope.consultation.discontinuedDrugs.forEach(function (discontinuedDrug) {
diff --git a/ui/app/clinical/consultation/mappers/encounterTransactionMapper.js b/ui/app/clinical/consultation/mappers/encounterTransactionMapper.js
index ae8a4a9079..83048a9e81 100644
--- a/ui/app/clinical/consultation/mappers/encounterTransactionMapper.js
+++ b/ui/app/clinical/consultation/mappers/encounterTransactionMapper.js
@@ -91,6 +91,8 @@ Bahmni.Clinical.EncounterTransactionMapper = function () {
 
         encounterData.drugOrders = consultation.drugOrders;
 
+        encounterData.drugOrderRelationshipList = consultation.drugOrderRelationShipList;
+
         encounterData.disposition = consultation.disposition;
 
         var addObservationsToEncounter = function () {
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index ec1ae5d552..66b26dd5b0 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -16,8 +16,8 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                         </div>
                         <div class="field-value">
                             <select ng-init="fetchCategories('medication_category')" id="cat-dropdown" class="fl"
-                                    ng-model="selectedCategory" ng-change="selectCategoryFromDropdown()" ng-click=""
-                                    ng-options="item.display for item in categories" required>
+                                    ng-model="selectedCategory" ng-disabled="isBeingRevised" ng-change="selectCategoryFromDropdown()" ng-click=""
+                                    ng-options="item.display for item in categories" required >
                                 <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
                             </select>
                         </div>
@@ -30,7 +30,7 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                         </div>
                         <div class="field-value">
                             <select id="line-dropdown" class="fl"
-                                    ng-model="selectedTreatmentLine" ng-disabled="disableTreatmentLine"
+                                    ng-model="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
                                     ng-options="item.display for item in treatmentLines" required>
                                 <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
                             </select>

From 6e688eb37b00f6286749a5d22691976ec93cff6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Tue, 27 Aug 2019 09:43:48 +0200
Subject: [PATCH 075/131] Blocks fields properly

---
 .../consultation/controllers/addTreatmentController.js      | 6 ++++++
 .../consultation/views/treatmentSections/addTreatment.html  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 5850df2cc8..38e3764d64 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -36,6 +36,7 @@ angular.module('bahmni.clinical')
             $scope.counter = 0;
             $scope.drugOrderRelationShipList = [];
             $scope.iBeingRevised= false;
+            $scope.disableMedication = true;
 
             $scope.fetchCategories = function (conceptName) {
                 return conceptSetService.getConcept({
@@ -56,14 +57,19 @@ angular.module('bahmni.clinical')
                     if ($scope.selectedCategory.display === "ARV") {
                         $scope.selectedTreatmentLineCategory = "treatment_line_arv";
                         $scope.disableTreatmentLine = false;
+                        $scope.disableMedication = false;
                         $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
                     } else if ($scope.selectedCategory.display.toUpperCase() === "Anti-Tuberculosis Drugs".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Drogas Anti-Tuberculose".toUpperCase()) {
                         $scope.selectedTreatmentLineCategory = "treatment_line_tb";
                         $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
                         $scope.disableTreatmentLine = false;
+                        $scope.disableMedication = false;
+                    } else if ($scope.selectedCategory.display.toUpperCase() === "Other".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Outra".toUpperCase()) {
+                        $scope.disableMedication = false;
                     } else {
                         $scope.selectedTreatmentLineCategory = "";
                         $scope.disableTreatmentLine = true;
+                        $scope.disableMedication = false;
                     }
                 }
             };
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 66b26dd5b0..4592dbb3ed 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -48,7 +48,7 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                                 <option value="">{{ ::treatmentConfig.translate('drugNamePlaceHolder', 'MEDICATION_DRUG_NAME_PLACEHOLDER') }} </option>
                             </select>
                             <div ng-if="treatmentConfig.isAutoComplete()">
-                                <input id="drug-name" type="text" bahmni-autocomplete focus-on="startNewDrugEntry" ng-disabled="disableTreatmentLine"
+                                <input id="drug-name" type="text" bahmni-autocomplete focus-on="startNewDrugEntry" ng-disabled="disableMedication"
                                        source="getDrugs" response-map="getDataResults" ng-required="!treatment.drugNameDisplay"
                                        ng-class="{
                                 active: treatment.isNonCodedDrug,

From b054a1e752fed00831cda02656cb23606d5b68b7 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Tue, 27 Aug 2019 15:16:00 +0200
Subject: [PATCH 076/131] Clinical Dashboard: Limit Historical Data displayed

---
 .../observation/views/labResultsDashboardDialog.html     | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ui/app/common/displaycontrols/observation/views/labResultsDashboardDialog.html

diff --git a/ui/app/common/displaycontrols/observation/views/labResultsDashboardDialog.html b/ui/app/common/displaycontrols/observation/views/labResultsDashboardDialog.html
new file mode 100644
index 0000000000..20bb33d561
--- /dev/null
+++ b/ui/app/common/displaycontrols/observation/views/labResultsDashboardDialog.html
@@ -0,0 +1,9 @@
+<section class="template-container">
+    <h6>{{ 'ALL_LAB_RESULTS_LABEL'|translate  }}</h6>
+    <div class="concept-set-container concept-set-container-lab">
+        <div>
+            <investigation-chart ng-if="showChart" accessions="tabular" params="params"></investigation-chart>
+            <investigation-table ng-if="showTable" accessions="labAccessions" params="params"></investigation-table>
+        </div>
+    </div>
+</section>
\ No newline at end of file

From 46ca6433895a5ab8a3fa3ba098942e375cfb4361 Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Wed, 28 Aug 2019 15:25:26 +0200
Subject: [PATCH 077/131] BUG: Clinical: Diagnosis: Words reflecting in English

---
 ui/app/clinical/consultation/views/diagnosisRow.html      | 4 ++--
 .../diagnosis/views/diagnosisDisplayControl.html          | 8 ++++----
 ui/app/i18n/clinical/locale_en.json                       | 4 +++-
 ui/app/i18n/clinical/locale_pt.json                       | 4 +++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ui/app/clinical/consultation/views/diagnosisRow.html b/ui/app/clinical/consultation/views/diagnosisRow.html
index 382f7cc2c2..3f915595ba 100644
--- a/ui/app/clinical/consultation/views/diagnosisRow.html
+++ b/ui/app/clinical/consultation/views/diagnosisRow.html
@@ -25,8 +25,8 @@
     <div ng-show="!diagnosis.firstDiagnosis.revised" class="col col2"></div>
     <div class="col col3">
         <div class="view">
-            <span class="certainty">{{diagnosis.certainty}}</span>
-            <span class="order">{{diagnosis.order}}</span>
+            <span class="certainty">{{diagnosis.certainty | translate}}</span>
+            <span class="order">{{diagnosis.order | translate}}</span>
             <span class="status">{{diagnosis.diagnosisStatus}}</span>
         </div>
         <div>
diff --git a/ui/app/common/displaycontrols/diagnosis/views/diagnosisDisplayControl.html b/ui/app/common/displaycontrols/diagnosis/views/diagnosisDisplayControl.html
index e1d9ee92c4..8484f5c740 100644
--- a/ui/app/common/displaycontrols/diagnosis/views/diagnosisDisplayControl.html
+++ b/ui/app/common/displaycontrols/diagnosis/views/diagnosisDisplayControl.html
@@ -21,9 +21,9 @@ <h2 ng-hide="::hideTitle" class="section-title" ng-class="::{'hidden-print': (al
 
                 <td ng-if="::!isLatestDiagnosis(diagnosis)" class="view">
                 <span id="certainty" ng-hide="::(config.showCertainty == false)"
-                      class="certainty">{{::diagnosis.certainty}}</span>
+                      class="certainty">{{::diagnosis.certainty | translate}}</span>
                              <span id="order" ng-hide="::(config.showOrder == false)"
-                                   class="order">{{::diagnosis.order}}</span>
+                                   class="order">{{::diagnosis.order | translate}}</span>
                 <span id="status" class="status">{{::diagnosis.diagnosisStatus}}</span>
                 <span class="toggle-btn-date-wrapper">
                 <span id="diagnosisDate" class="date">{{::diagnosis.diagnosisDateTime | bahmniDate}}</span>
@@ -39,9 +39,9 @@ <h2 ng-hide="::hideTitle" class="section-title" ng-class="::{'hidden-print': (al
                 <td ng-if="::isLatestDiagnosis(diagnosis)" class="view"></td>
                 <td class="view" ng-if="::(showLatestDiagnosis == 'true')">
                         <span id="certainty" ng-hide="::(config.showCertainty == false)" class="certainty">
-                            {{::diagnosis.latestDiagnosis.certainty}}</span>
+                            {{::diagnosis.latestDiagnosis.certainty | translate}}</span>
                 <span id="order" ng-hide="::(config.showOrder == false)"
-                      class="order">{{::diagnosis.latestDiagnosis.order}}</span>
+                      class="order">{{::diagnosis.latestDiagnosis.order | translate}}</span>
                 <span id="status" class="status">{{::diagnosis.latestDiagnosis.diagnosisStatus}}</span>
                 <span class="toggle-btn-date-wrapper">
                     <span id="diagnosisDate"
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 945eb40c10..54aed41900 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -459,5 +459,7 @@
     "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Print Prescription",
     "CLINICAL_PATIENT_STATUS": "Active in:",
     "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Treatment Start Date",
-    "TREATMENT_START_DATE": "Treatment Start Date"
+    "TREATMENT_START_DATE": "Treatment Start Date",
+    "CONFIRMED": "Confirmed",
+    "PRIMARY": "Primary"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index aba89dd0eb..67e222020b 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -465,5 +465,7 @@
   "TREATMENT_START_DATE": "Data Início TARV",
   "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir",
   "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Prescrição",
-  "CLINICAL_PATIENT_STATUS": "Activo em"
+  "CLINICAL_PATIENT_STATUS": "Activo em",
+  "CONFIRMED": "Confirmado",
+  "PRIMARY": "Primário"
 }

From ca2be666fd884ff35d8011bcda841687dcc5f872 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Wed, 28 Aug 2019 16:13:11 +0200
Subject: [PATCH 078/131] Mark field as Abnormal for Below Range after saving

---
 ui/app/common/concept-set/directives/concept.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/common/concept-set/directives/concept.js b/ui/app/common/concept-set/directives/concept.js
index 4caabd17b0..c888f6cfb5 100644
--- a/ui/app/common/concept-set/directives/concept.js
+++ b/ui/app/common/concept-set/directives/concept.js
@@ -179,7 +179,7 @@ angular.module('bahmni.common.conceptSet')
                     if (scope.conceptSetName === 'Clinical_Observation_form') {
                         if (scope.observation.concept.name === 'Blood_Pressure_–_Diastolic_VSNew') {
                             var bloodPressureDiastolic = scope.observation.value;
-                            if (bloodPressureDiastolic <= 80 || bloodPressureDiastolic === undefined) {
+                            if ((bloodPressureDiastolic >= 60 && bloodPressureDiastolic <= 80) || bloodPressureDiastolic === undefined) {
                                 scope.hideAbnormalButton = true;
                             } else {
                                 scope.hideAbnormalButton = false;
@@ -188,7 +188,7 @@ angular.module('bahmni.common.conceptSet')
 
                         if (scope.observation.concept.name === 'Blood_Pressure_–_Systolic_VitalS') {
                             var bloodPressureSystolic = scope.observation.value;
-                            if (bloodPressureSystolic <= 120 || bloodPressureSystolic === undefined) {
+                            if ((bloodPressureSystolic >= 90 && bloodPressureSystolic <= 120) || bloodPressureSystolic === undefined) {
                                 scope.hideAbnormalButton = true;
                             } else {
                                 scope.hideAbnormalButton = false;

From 7788095056616c4cd644a46341a9e8d2b6f787b4 Mon Sep 17 00:00:00 2001
From: Sushant Patil <43531186+sushantpatil1214@users.noreply.github.com>
Date: Wed, 28 Aug 2019 20:08:30 +0530
Subject: [PATCH 079/131] Sushant | MPOC-486 Fix the variable name (#313)

---
 .../clinical/consultation/controllers/consultationController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 91570a675e..1f5e107027 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -611,7 +611,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     if (isEmpty(results.data)) {
                         $rootScope.arvdispenseddate = null;
                     } else {
-                        $rootScope.arvdispenseddate = results.data[0].dispenseddate;
+                        $rootScope.arvdispenseddate = results.data[0].dispensed_date;
                     }
                 });
             };

From ef932f43fbc12cef78f92b33efe3c83ecdb225b1 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Thu, 29 Aug 2019 08:57:11 +0200
Subject: [PATCH 080/131] Remove the "Aceitar" Button

---
 ui/app/clinical/consultation/views/allergies.html  | 10 ----------
 ui/app/clinical/consultation/views/conditions.html | 10 ----------
 ui/app/clinical/consultation/views/diagnosis.html  | 12 ------------
 3 files changed, 32 deletions(-)

diff --git a/ui/app/clinical/consultation/views/allergies.html b/ui/app/clinical/consultation/views/allergies.html
index dd7eb5a9c0..7bd8f8d32e 100644
--- a/ui/app/clinical/consultation/views/allergies.html
+++ b/ui/app/clinical/consultation/views/allergies.html
@@ -18,16 +18,6 @@
                        on-select="getAddAllergyMethod()"
                        ng-change="consultation.allergy.clearConcept()"
                        ng-class="{illegalValue: !(consultation.allergy.concept.name || consultation.allergy.isEmpty())}">
-                <button type="button" ng-model="consultation.allergy.isNonCoded"
-                        class="small-btn accept-btn" id="accept-button"
-                        ng-click="consultation.allergy.toggleNonCoded()"
-                        ng-class="{
-                                                illegalValue: !consultation.allergy.isValidConcept(),
-                                                active: consultation.allergy.isNonCoded
-                                            }"
-                        ng-disabled="consultation.allergy.concept.uuid">
-                    <span>{{'ACCEPT'|translate}} {{consultation.allergy.isNonCoded}}</span>
-                </button>
             </div>
             <div class="col col2">
                 <buttons-radio class="btn-group" model='consultation.allergy.status'
diff --git a/ui/app/clinical/consultation/views/conditions.html b/ui/app/clinical/consultation/views/conditions.html
index e391c3fce3..2d06bb1350 100644
--- a/ui/app/clinical/consultation/views/conditions.html
+++ b/ui/app/clinical/consultation/views/conditions.html
@@ -18,16 +18,6 @@
                        on-select="getAddConditionMethod()"
                        ng-change="consultation.condition.clearConcept()"
                        ng-class="{illegalValue: !(consultation.condition.concept.name || consultation.condition.isEmpty())}">
-                <button type="button" ng-model="consultation.condition.isNonCoded"
-                        class="small-btn accept-btn" id="accept-button"
-                        ng-click="consultation.condition.toggleNonCoded()"
-                        ng-class="{
-                                                illegalValue: !consultation.condition.isValidConcept(),
-                                                active: consultation.condition.isNonCoded
-                                            }"
-                        ng-disabled="consultation.condition.concept.uuid">
-                    <span>{{'ACCEPT'|translate}}</span>
-                </button>
             </div>
             <div class="col col2">
                 <buttons-radio class="btn-group" model='consultation.condition.status'
diff --git a/ui/app/clinical/consultation/views/diagnosis.html b/ui/app/clinical/consultation/views/diagnosis.html
index 1a2cb74722..5cb835037a 100644
--- a/ui/app/clinical/consultation/views/diagnosis.html
+++ b/ui/app/clinical/consultation/views/diagnosis.html
@@ -22,18 +22,6 @@
                                             active: diagnosis.isNonCodedAnswer
                                        }"
                                        ng-change="restEmptyRowsToOne($index); diagnosis.clearCodedAnswerUuid(); checkInvalidDiagnoses()">
-
-                                <span ng-if="!allowOnlyCodedDiagnosis">
-                                    <button type="button" ng-model="diagnosis.isNonCodedAnswer"
-                                            class="small-btn accept-btn" id="accept-button-{{$index}}"
-                                            ng-click="diagnosis.setAsNonCodedAnswer() && restEmptyRowsToOne($index)"
-                                            ng-class="{
-                                                illegalValue: diagnosis.codedAnswer.name && !diagnosis.codedAnswer.uuid && !diagnosis.isNonCodedAnswer,
-                                                active: diagnosis.isNonCodedAnswer
-                                            }"
-                                            ng-disabled="diagnosis.codedAnswer.uuid"><span></span>{{ ::'ACCEPT' | translate }}</button>
-                                </span>
-
                             </div>
                             <div class="col col2">
                                 <buttons-radio class="btn-group" model='diagnosis.order' id="order-{{$index}}"

From 8a5a0b8b74508b6be835d65549db103b41890a23 Mon Sep 17 00:00:00 2001
From: krishnanspace <34261449+krishnanspace@users.noreply.github.com>
Date: Thu, 29 Aug 2019 16:46:03 +0530
Subject: [PATCH 081/131] Mpoc 403 (#292)

* Krishnan | MPOC-403 Init Commit

* Updated the Patient Context

* Added the ability to change to the last Active State

* Clearing out the Transferred Out Fields if Transference Info Section is filled

* Added missing translations and fixed the issue related to default patient state

* Krishnan | MPOC-403 Added an autocomplete Cause of Death field

* Made changes to use the new APIs for Patient State/Status

* Removed unwanted changes
---
 .../manage/appointmentsCreateController.js    |   2 +-
 .../directives/patientContext.js              |  11 +-
 .../patientContext/views/patientContext.html  |   2 +-
 ui/app/clinical/patientInitialization.js      |   6 +-
 .../directives/attributeTypes.js              |  30 +++-
 .../views/attributeInformation.html           |  38 ++++-
 ui/app/common/constants.js                    |   1 +
 .../forms/directives/formsTable.js            |  11 ++
 .../forms/views/formsTable.html               |   3 +-
 .../common/patient/services/patientService.js |  20 +++
 ui/app/i18n/clinical/locale_en.json           |   3 +
 ui/app/i18n/clinical/locale_pt.json           |   6 +
 ui/app/i18n/registration/locale_en.json       |  12 +-
 ui/app/i18n/registration/locale_pt.json       |  12 +-
 .../controllers/createPatientController.js    |  13 +-
 .../controllers/editPatientController.js      |  69 ++++++--
 .../controllers/patientCommonController.js    |  43 ++++-
 .../registration/directives/patientAction.js  |   3 +
 .../registration/services/patientService.js   |  23 +++
 ui/app/registration/views/patientAction.html  |   2 +-
 ui/app/registration/views/patientcommon.html  | 152 +++++++++++-------
 21 files changed, 356 insertions(+), 106 deletions(-)

diff --git a/ui/app/appointments/controllers/manage/appointmentsCreateController.js b/ui/app/appointments/controllers/manage/appointmentsCreateController.js
index e0f29d47f2..2d6e417d9e 100644
--- a/ui/app/appointments/controllers/manage/appointmentsCreateController.js
+++ b/ui/app/appointments/controllers/manage/appointmentsCreateController.js
@@ -185,7 +185,7 @@ angular.module('bahmni.appointments')
                     };
                     formattedUrl = appService.getAppDescriptor().formatUrl(patientSearchURL, params);
                 }
-                return (spinner.forPromise(formattedUrl ? $http.get(Bahmni.Common.Constants.RESTWS_V1 + formattedUrl) : patientService.search($scope.appointment.patient.label)).then(function (response) {
+                return (spinner.forPromise(formattedUrl ? $http.get(Bahmni.Common.Constants.RESTWS_V1 + formattedUrl) : patientService.statusBasedSearch($scope.appointment.patient.label)).then(function (response) {
                     return response.data.pageOfResults;
                 }));
             };
diff --git a/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js b/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
index 2cd193bd74..d968af6941 100644
--- a/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
+++ b/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
@@ -5,15 +5,8 @@ angular.module('bahmni.clinical')
         var controller = function ($scope, $rootScope) {
             var patientContextConfig = appService.getAppDescriptor().getConfigValue('patientContext') || {};
             $scope.initPromise = patientService.getPatientContext($scope.patient.uuid, $state.params.enrollment, patientContextConfig.personAttributes, patientContextConfig.programAttributes, patientContextConfig.additionalPatientIdentifiers);
-
-            patientService.getPatient($scope.patient.uuid).then(function (response) {
-                var patientInfo = response.data.person.attributes;
-                for (var i = 0; i < patientInfo.length; i++) {
-                    if (patientInfo[i].attributeType.display === 'PATIENT_STATUS') {
-                        $scope.patientStatus = patientInfo[i].display;
-                    }
-                }
-            });
+            $scope.patientStatus = $scope.patient.patientStatus;
+            $scope.patientState = $scope.patient.patientState;
 
             $scope.initPromise.then(function (response) {
                 $scope.patientContext = response.data;
diff --git a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
index 22bddb54f5..85bcc24763 100644
--- a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
+++ b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
@@ -12,7 +12,7 @@
             </li>
             <li>{{patientContext.gender | translate}}</li>
             <li>{{patientContext.birthdate | birthDateToAgeText}}</li>
-            <li><span ng-if="patientStatus === 'Pre TARV' || patientStatus === 'TARV'">{{'CLINICAL_PATIENT_STATUS' | translate}}</span> {{patientStatus}}</li>
+            <li>{{patientStatus}} - {{patientState | translate}}</li>
             <li ng-repeat="(key, value) in patientContext.additionalPatientIdentifiers">
                 {{key}}: {{value}}
             </li>
diff --git a/ui/app/clinical/patientInitialization.js b/ui/app/clinical/patientInitialization.js
index 75558f08fe..a088ddf86f 100644
--- a/ui/app/clinical/patientInitialization.js
+++ b/ui/app/clinical/patientInitialization.js
@@ -6,8 +6,10 @@ angular.module('bahmni.clinical').factory('patientInitialization',
             return function (patientUuid) {
                 var getPatient = function () {
                     var patientMapper = new Bahmni.PatientMapper(configurations.patientConfig(), $rootScope, $translate);
-                    return patientService.getPatient(patientUuid).then(function (openMRSPatientResponse) {
-                        var patient = patientMapper.map(openMRSPatientResponse.data);
+                    return $q.all([patientService.getPatient(patientUuid), patientService.getPatientStatusState(patientUuid)]).then(function (openMRSPatientResponse) {
+                        var patient = patientMapper.map(openMRSPatientResponse[0].data);
+                        patient.patientStatus = openMRSPatientResponse[1].data[0].patient_status;
+                        patient.patientState = openMRSPatientResponse[1].data[0].patient_state;
                         return {"patient": patient};
                     });
                 };
diff --git a/ui/app/common/attributeTypes/directives/attributeTypes.js b/ui/app/common/attributeTypes/directives/attributeTypes.js
index 92d3f76a0d..c9322c337b 100644
--- a/ui/app/common/attributeTypes/directives/attributeTypes.js
+++ b/ui/app/common/attributeTypes/directives/attributeTypes.js
@@ -13,6 +13,7 @@ angular.module('bahmni.common.attributeTypes', []).directive('attributeTypes', [
             getAutoCompleteList: '&',
             getDataResults: '&',
             handleUpdate: '&',
+            updatePatientState: '&',
             isReadOnly: '&',
             isForm: '=?'
         },
@@ -27,6 +28,7 @@ angular.module('bahmni.common.attributeTypes', []).directive('attributeTypes', [
             $scope.isAutoComplete = $scope.isAutoComplete() || function () { return false; };
             $scope.isReadOnly = $scope.isReadOnly() || function () { return false; };
             $scope.handleUpdate = $scope.handleUpdate() || function () { return false; };
+            $scope.updatePatientState = $scope.updatePatientState() || function () { return false; };
             $scope.handleLocationChange = $scope.handleLocationChange() || function () { return false; };
             $scope.handleSectorChange = $scope.handleSectorChange() || function () { return false; };
             $scope.updateLocationRequired = $scope.updateLocationRequired() || function () { return false; };
@@ -111,7 +113,7 @@ angular.module('bahmni.common.attributeTypes', []).directive('attributeTypes', [
                             output.push(suggestion);
                         }
                     });
-                    $scope.filterOcuppation = output;
+                    $scope.filterSuggestions = output;
                 } else {
                     $scope.hideList = true;
                 }
@@ -127,7 +129,7 @@ angular.module('bahmni.common.attributeTypes', []).directive('attributeTypes', [
                 $scope.backgroundColor = "#fff";
             };
 
-            $scope.validateField = function (isMouse) {
+            $scope.validateField = function (isMouse, fieldName) {
                 if ($scope.targetModel[$scope.attribute.name] !== undefined && $scope.targetModel[$scope.attribute.name].value !== "" && $scope.targetModel[$scope.attribute.name] !== null) {
                     var alert = true;
                     $timeout(function () {
@@ -137,13 +139,25 @@ angular.module('bahmni.common.attributeTypes', []).directive('attributeTypes', [
                             }
                         }
                         if (alert) {
-                            $scope.borderColor = "1px solid #ff5252";
-                            $scope.backgroundColor = "#ffcdcd";
-                            if (!isMouse) {
-                                messagingService.showMessage("error", "INVALID_OCCUPATION");
-                                $scope.hideList = true;
+                            if (fieldName == 'PATIENT_OCCUPATION') {
+                                $scope.borderColor = "1px solid #ff5252";
+                                $scope.backgroundColor = "#ffcdcd";
+                                if (!isMouse) {
+                                    messagingService.showMessage("error", "INVALID_OCCUPATION");
+                                    $scope.hideList = true;
+                                }
+                                $rootScope.canSave = false;
+                            }
+
+                            if (fieldName == 'CAUSE_OF_DEATH') {
+                                $scope.borderColor = "1px solid #ff5252";
+                                $scope.backgroundColor = "#ffcdcd";
+                                if (!isMouse) {
+                                    messagingService.showMessage("error", "INVALID_DEATH_CAUSE_MESSAGE");
+                                    $scope.hideList = true;
+                                }
+                                $rootScope.canSave = false;
                             }
-                            $rootScope.canSave = false;
                         }
                     }, 500);
                 } else {
diff --git a/ui/app/common/attributeTypes/views/attributeInformation.html b/ui/app/common/attributeTypes/views/attributeInformation.html
index 5c732386be..7718ded4dc 100644
--- a/ui/app/common/attributeTypes/views/attributeInformation.html
+++ b/ui/app/common/attributeTypes/views/attributeInformation.html
@@ -49,12 +49,31 @@
                name="{{::attribute.name}}"
                ng-model="targetModel[attribute.name].value"
                ng-keyup="suggest(targetModel[attribute.name])"
-               ng-blur="validateField(false)"
-               ng-mouseleave="validateField(true)"
+               ng-blur="validateField(false,attribute.name)"
+               ng-mouseleave="validateField(true,attribute.name)"
                ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}">
-        <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterOcuppation.length > 0" ng-hide="hideList"
+        <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterSuggestions.length > 0" ng-hide="hideList"
             style="position:absolute; top:31px;  width:192px">
-            <li class="ui-menu-item" role="presentation" ng-repeat="info in filterOcuppation"
+            <li class="ui-menu-item" role="presentation" ng-repeat="info in filterSuggestions"
+                ng-click="hideSuggestions(info)">
+                <a class="ui-corner-all" tabindex="-1">{{info.description}}</a>
+            </li>
+        </ul>
+    </div>
+
+    <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name == 'CAUSE_OF_DEATH'" style="position: absolute">
+        <input type="text" autocomplete="off"
+               class="ui-autocomplete-input"
+               id="{{::attribute.name}}"
+               name="{{::attribute.name}}"
+               ng-model="targetModel[attribute.name].value"
+               ng-keyup="suggest(targetModel[attribute.name])"
+               ng-blur="validateField(false,attribute.name)"
+               ng-mouseleave="validateField(true,attribute.name)"
+               ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}">
+        <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterSuggestions.length > 0" ng-hide="hideList"
+            style="position:absolute; top:31px;  width:192px">
+            <li class="ui-menu-item" role="presentation" ng-repeat="info in filterSuggestions"
                 ng-click="hideSuggestions(info)">
                 <a class="ui-corner-all" tabindex="-1">{{info.description}}</a>
             </li>
@@ -73,7 +92,8 @@
     </div>
 
 
-    <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name != 'LOCATION_OF_TEST' && attribute.name != 'SECTOR_SELECT' && attribute.name != 'PATIENT_OCCUPATION' && attribute.name != 'TYPE_OF_REGISTRATION' && attribute.name != 'PATIENT_STATUS'">
+    <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name != 'LOCATION_OF_TEST' && attribute.name != 'SECTOR_SELECT' && attribute.name != 'PATIENT_OCCUPATION' && attribute.name != 'TYPE_OF_REGISTRATION' && attribute.name != 'PATIENT_STATUS' && attribute.name != 'PATIENT_STATE_CHANGE'
+     && attribute.name != 'CAUSE_OF_DEATH'">
         <select id="{{::attribute.name}}" ng-model="targetModel[attribute.name].conceptUuid"
                 ng-options="a.conceptId as a.description | translate for a in ::attribute.answers"
                 ng-disabled="::isReadOnly(attribute.name)" ng-required="{{::attribute.required}}" ng-change="appendConceptNameToModel(attribute); handleUpdate(attribute.name)">
@@ -81,6 +101,14 @@
         </select>
     </div>
 
+    <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name == 'PATIENT_STATE_CHANGE'">
+        <select id="{{::attribute.name}}" ng-model="targetModel[attribute.name].conceptUuid"
+                ng-options="a.conceptId as a.description | translate for a in ::attribute.answers"
+                ng-required="{{::attribute.required}}" ng-change="appendConceptNameToModel(attribute);handleUpdate(attribute.name);updatePatientState(targetModel[attribute.name])">
+            <option disabled value="">{{::'REGISTRATION_CHOOSE_AN_OPTION' | translate}}</option>
+        </select>
+    </div>
+
 
     <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name === 'PATIENT_STATUS'">
         <select id="{{::attribute.name}}" ng-model="targetModel[attribute.name].conceptUuid"
diff --git a/ui/app/common/constants.js b/ui/app/common/constants.js
index c88b6ff59a..2ed99263e9 100644
--- a/ui/app/common/constants.js
+++ b/ui/app/common/constants.js
@@ -87,6 +87,7 @@ Bahmni.Common = Bahmni.Common || {};
         bahmniDispositionByPatientUrl: BAHMNI_CORE + "/disposition/patient",
         bahmniSearchUrl: BAHMNI_CORE + "/search",
         bahmniDuplicateSearchUrl: BAHMNI_CORE + "/duplicatesearch",
+        bahmniStatusBasedSearchUrl: BAHMNI_CORE + "/patientStatusBasedSearch",
         bahmniLabOrderResultsUrl: BAHMNI_CORE + "/labOrderResults",
         bahmniEncounterUrl: BAHMNI_CORE + "/bahmniencounter",
         conceptUrl: RESTWS_V1 + "/concept",
diff --git a/ui/app/common/displaycontrols/forms/directives/formsTable.js b/ui/app/common/displaycontrols/forms/directives/formsTable.js
index 2ae905e235..0b2c9fd6e8 100644
--- a/ui/app/common/displaycontrols/forms/directives/formsTable.js
+++ b/ui/app/common/displaycontrols/forms/directives/formsTable.js
@@ -16,6 +16,17 @@ angular.module('bahmni.common.displaycontrol.forms')
                     });
                 };
 
+                $scope.isFormEditable = true;
+                if ($scope.patient.patientState) {
+                    if ($scope.patient.patientState == 'INACTIVE_SUSPENDED' || $scope.patient.patientState == 'INACTIVE_TRANSFERRED_OUT' || $scope.patient.patientState == 'INACTIVE_DEATH') {
+                        $scope.isFormEditable = false;
+                    } else {
+                        $scope.isFormEditable = true;
+                    }
+                } else {
+                    $scope.isFormEditable = true;
+                }
+
                 var obsFormData = function () {
                     return visitFormService.formData($scope.patient.uuid, $scope.section.dashboardConfig.maximumNoOfVisits, $scope.section.formGroup, $state.params.enrollment);
                 };
diff --git a/ui/app/common/displaycontrols/forms/views/formsTable.html b/ui/app/common/displaycontrols/forms/views/formsTable.html
index 472804f291..52b34d040d 100644
--- a/ui/app/common/displaycontrols/forms/views/formsTable.html
+++ b/ui/app/common/displaycontrols/forms/views/formsTable.html
@@ -26,7 +26,8 @@
                                   ng-dialog-data="{{getConfigToFetchDataAndShow(data)}}">
                                 <i class="fa fa-eye"></i>
                             </span>
-                            <span class="has-link fl formDataEdit"
+                            <span ng-if="isFormEditable"
+                                  class="has-link fl formDataEdit"
                                   ng-dialog="dashboard/views/dashboardSections/editObservationForm.html"
                                   ng-dialog-class="ngdialog-theme-default ng-dialog-all-details-page ng-dialog-edit"
                                   ng-dialog-data="{{getEditObsData(data)}}"
diff --git a/ui/app/common/patient/services/patientService.js b/ui/app/common/patient/services/patientService.js
index 67f23c965f..877c1ac07b 100644
--- a/ui/app/common/patient/services/patientService.js
+++ b/ui/app/common/patient/services/patientService.js
@@ -27,6 +27,12 @@ angular.module('bahmni.common.patient')
             });
         };
 
+        this.getPatientStatusState = function (patientUuid) {
+            return $http.get(Bahmni.Common.Constants.openmrsUrl + "/ws/rest/emrapi/patientStatusState?patientUuid=" + patientUuid, {
+                method: "GET"
+            });
+        };
+
         this.search = function (query, offset, identifier) {
             offset = offset || 0;
             var patientSearchResultsConfig = ['NICK_NAME', 'PRIMARY_CONTACT_NUMBER_1', 'PATIENT_STATUS'];
@@ -43,6 +49,20 @@ angular.module('bahmni.common.patient')
             });
         };
 
+        this.statusBasedSearch = function (query, offset, identifier) {
+            offset = offset || 0;
+            return $http.get(Bahmni.Common.Constants.bahmniStatusBasedSearchUrl + "/patient", {
+                method: "GET",
+                params: {
+                    q: query,
+                    startIndex: offset,
+                    identifier: identifier,
+                    loginLocationUuid: sessionService.getLoginLocationUuid()
+                },
+                withCredentials: true
+            });
+        };
+
         this.getPatientContext = function (patientUuid, programUuid, personAttributes, programAttributes, patientIdentifiers) {
             return $http.get('/openmrs/ws/rest/v1/bahmnicore/patientcontext', {
                 params: {
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 54aed41900..5a2e799db6 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -458,6 +458,9 @@
     "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Print Dashboard",
     "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Print Prescription",
     "CLINICAL_PATIENT_STATUS": "Active in:",
+    "INACTIVE_TRANSFERRED_OUT": "Inactive Transferred-out",
+    "INACTIVE_SUSPENDED": "Inactive Patient Suspension ",
+    "INACTIVE_DEATH": "Inactive Death",
     "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Treatment Start Date",
     "TREATMENT_START_DATE": "Treatment Start Date",
     "CONFIRMED": "Confirmed",
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 67e222020b..1636a5d0f3 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -461,6 +461,12 @@
   "PRESCRIPTION_REPORT_AMOUNT_CHARGED" :"Valor Cobrado",
   "CLINICAL_PRINT_DASHBOARD_TRANSLATION_KEY" : "Imprimir painel",
   "CLINICAL_PRINT_PRESCRIPTION_TRANSLATION_KEY" : "Prescrição de impressão",
+  "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir Todos",
+  "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Imprimir Prescrição",
+  "CLINICAL_PATIENT_STATUS": "Activo em",
+  "INACTIVE_TRANSFERRED_OUT": "Inactivo Transferir para",
+  "INACTIVE_SUSPENDED": "Inactivo Paciente Suspensão",
+  "INACTIVE_DEATH": "Inactive Óbito",
   "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Data Início TARV",
   "TREATMENT_START_DATE": "Data Início TARV",
   "PRINT_CLINICAL_DASHBOARD_LABEL": "Imprimir",
diff --git a/ui/app/i18n/registration/locale_en.json b/ui/app/i18n/registration/locale_en.json
index 92315323bb..a248171ef6 100644
--- a/ui/app/i18n/registration/locale_en.json
+++ b/ui/app/i18n/registration/locale_en.json
@@ -196,7 +196,7 @@
   "INVALID_AGE_DAY": "Invalid days",
   "REGISTRATION_REQUIRED_FIELD": "Please. Fill the fields correctly",
   "REGISTRATION_DUPLICATE_ENTRY_ERROR": "The NID already in use by another patient",
-  "REGISTRATION_TRANSFER_OUT_INFO_KEY": "Patient Transfer Out",
+  "REGISTRATION_STATE_INFO_KEY": "Patient State",
   "REGISTRATION_TRANSFER_OUT_HF_NAME_INFO":"Destination Health Facility",
   "Is_Transferred_Out":"Is Transferred Out",
   "Transfer_Date":"Transfer Date",
@@ -206,5 +206,15 @@
   "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "YYYY",
   "REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE" : "Eg: 12345678",
   "US_REG_DATE_MESSAGE" : "Enter a valid date.",
+  "PATIENT_STATE_CHANGE": "State Change",
+  "DATE_OF_DEATH":"Date Of Death",
+  "CAUSE_OF_DEATH": "Cause Of Death",
+  "DEATH_OBSERVATIONS": "Observations",
+  "DATE_OF_SUSPENSION": "Date of Suspension",
+  "SUSPENSION_OBSERVATIONS": "Observations",
+  "Patient_Transferred_Out":"Transferred-out",
+  "Inactive_Death":"Inactive Death",
+  "Patient_Suspension": "Suspension",
+  "INVALID_DEATH_CAUSE_MESSAGE":"Invalid Cause of Death",
   "Patient_Start_Visit_A" : "Clinical Consultation"
 }
\ No newline at end of file
diff --git a/ui/app/i18n/registration/locale_pt.json b/ui/app/i18n/registration/locale_pt.json
index 152ff76219..c107432164 100644
--- a/ui/app/i18n/registration/locale_pt.json
+++ b/ui/app/i18n/registration/locale_pt.json
@@ -170,7 +170,7 @@
     "REGISTRATION_DUPLICATE_ENTRY_ERROR": "O NID introduzido está sendo usando por um outro paciente.",
     "BMI STATUS": "Estado Nutricional",
     "BMI": "IMC",
-    "REGISTRATION_TRANSFER_OUT_INFO_KEY": "Transferido Para",
+    "REGISTRATION_STATE_INFO_KEY": "Estado de Permanência",
     "REGISTRATION_TRANSFER_OUT_HF_NAME_INFO":"Unidade Sanitária de Destino",
     "Is_Transferred_Out":"Transferir Para",
     "Transfer_Date":"Data de Transferência",
@@ -180,5 +180,15 @@
     "REGISTRATION_PLACEHOLDER_FOR_NID_YEAR" : "AAAA",
     "REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE" : "Ex: 12345678",
     "US_REG_DATE_MESSAGE" : "Digite uma data válida.",
+    "PATIENT_STATE_CHANGE": "Mudança de Estado",
+    "DATE_OF_DEATH":"Data de Óbito",
+    "CAUSE_OF_DEATH": "Causa de Óbito",
+    "DEATH_OBSERVATIONS": "Observações",
+    "DATE_OF_SUSPENSION": "Data de Suspenso",
+    "SUSPENSION_OBSERVATIONS": "Observação",
+    "Patient_Transferred_Out":"Transferir Para",
+    "Inactive_Death":"Inactive Óbito",
+    "Patient_Suspension": "Suspensão",
+    "INVALID_DEATH_CAUSE_MESSAGE": "Inválido Causa de Óbito",
     "Patient_Start_Visit_A" : "Consulta Clinica"
 }
\ No newline at end of file
diff --git a/ui/app/registration/controllers/createPatientController.js b/ui/app/registration/controllers/createPatientController.js
index 9c6e5e1164..ae1c306a20 100644
--- a/ui/app/registration/controllers/createPatientController.js
+++ b/ui/app/registration/controllers/createPatientController.js
@@ -1,8 +1,8 @@
 'use strict';
 
 angular.module('bahmni.registration')
-    .controller('CreatePatientController', ['$scope', '$rootScope', '$state', 'patientService', 'patient', 'spinner', 'appService', 'messagingService', 'ngDialog', '$q',
-        function ($scope, $rootScope, $state, patientService, patient, spinner, appService, messagingService, ngDialog, $q) {
+    .controller('CreatePatientController', ['$scope', '$rootScope', '$state', 'patientService', 'patient', 'spinner', 'appService', 'messagingService', 'ngDialog', '$q', '$http',
+        function ($scope, $rootScope, $state, patientService, patient, spinner, appService, messagingService, ngDialog, $q, $http) {
             var dateUtil = Bahmni.Common.Util.DateUtil;
             $scope.actions = {};
             var errorMessage;
@@ -20,6 +20,7 @@ angular.module('bahmni.registration')
             $rootScope.regexDigits = '\\d+';
             $rootScope.regexCharacters = '^[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ ]+$';
             $scope.myForms = {};
+            $rootScope.isEligibleForVisit = true;
 
             var getPersonAttributeTypes = function () {
                 return $rootScope.patientConfiguration.attributeTypes;
@@ -146,6 +147,14 @@ angular.module('bahmni.registration')
 
             var createPatient = function (jumpAccepted) {
                 return patientService.create($scope.patient, jumpAccepted).then(function (response) {
+                    var patientStatus = _.filter(response.data.patient.person.attributes, function (currentObj) {
+                        if (currentObj.attributeType.display == 'PATIENT_STATUS') {
+                            return currentObj.value.display;
+                        }
+                    });
+                    var creatorUuid = response.data.patient.auditInfo.creator.uuid;
+                    var patientUuid = response.data.patient.person.uuid;
+                    patientService.savePatientStatusState(patientStatus[0].value.display, patientUuid, creatorUuid, 'ACTIVE');
                     copyPatientProfileDataToScope(response);
                 }, function (response) {
                     if (response.status === 412) {
diff --git a/ui/app/registration/controllers/editPatientController.js b/ui/app/registration/controllers/editPatientController.js
index bf87927350..33232ec850 100644
--- a/ui/app/registration/controllers/editPatientController.js
+++ b/ui/app/registration/controllers/editPatientController.js
@@ -2,9 +2,9 @@
 
 angular.module('bahmni.registration')
     .controller('EditPatientController', ['$scope', 'patientService', 'encounterService', '$stateParams', 'openmrsPatientMapper',
-        '$window', '$q', 'spinner', 'appService', 'messagingService', '$rootScope', 'auditLogService',
+        '$window', '$q', 'spinner', 'appService', 'messagingService', '$rootScope', 'auditLogService', '$state',
         function ($scope, patientService, encounterService, $stateParams, openmrsPatientMapper, $window, $q, spinner,
-            appService, messagingService, $rootScope, auditLogService) {
+            appService, messagingService, $rootScope, auditLogService, $state) {
             var dateUtil = Bahmni.Common.Util.DateUtil;
             var uuid = $stateParams.patientUuid;
             $scope.patient = {};
@@ -13,6 +13,7 @@ angular.module('bahmni.registration')
             $scope.addressHierarchyConfigs = appService.getAppDescriptor().getConfigValue("addressHierarchy");
             $scope.disablePhotoCapture = appService.getAppDescriptor().getConfigValue("disablePhotoCapture");
             $scope.today = dateUtil.getDateWithoutTime(dateUtil.now());
+            $rootScope.isEligibleForVisit = true;
             var setReadOnlyFields = function () {
                 $scope.readOnlyFields = {};
                 var readOnlyFields = appService.getAppDescriptor().getConfigValue("readOnlyFields");
@@ -22,12 +23,36 @@ angular.module('bahmni.registration')
                     }
                 });
             };
-
             var successCallBack = function (openmrsPatient) {
                 $scope.openMRSPatient = openmrsPatient["patient"];
                 $scope.patient = openmrsPatientMapper.map(openmrsPatient);
-                $scope.editPatientDocuments = [];
+                patientService.getPatientStatusState(uuid).then(function (response) {
+                    $scope.patient.patientStatus = response.data[0].patient_status;
+                    $scope.patient.patientState = response.data[0].patient_state;
+
+                    _.map(response.data, function (currentObj) {
+                        if (currentObj.patient_state != 'INACTIVE_TRANSFERRED_OUT' || currentObj.patient_state != 'INACTIVE_SUSPENDED' || currentObj.patient_state != 'INACTIVE_DEATH') {
+                            $scope.patient.lastActiveState = currentObj.patient_state;
+                        }
+                    });
+
+                    if ($scope.patient.patientState == "INACTIVE_SUSPENDED" || $scope.patient.patientState === "INACTIVE_TRANSFERRED_OUT" || $scope.patient.patientState === "INACTIVE_DEATH") {
+                        $rootScope.isEligibleForVisit = false;
+                    }
+
+                    if ($scope.patient.patientState == "INACTIVE_TRANSFERRED_OUT") {
+                        $scope.$broadcast("IN_TF", true);
+                    }
+
+                    if ($scope.patient.patientState == "INACTIVE_SUSPENDED") {
+                        $scope.$broadcast("IN_SU", true);
+                    }
 
+                    if ($scope.patient.patientState == "INACTIVE_DEATH") {
+                        $scope.$broadcast("IN_DT", true);
+                    }
+                });
+                $scope.editPatientDocuments = [];
                 var nationalityVar = function () {
                     if ($scope.patient.NATIONALITY == undefined) {
                         $scope.patient.NATIONALITY = "";
@@ -171,7 +196,27 @@ angular.module('bahmni.registration')
                 spinner.forPromise($q.all([getPatientPromise, isDigitized]));
             })();
 
+            $scope.$on("PTO", function (evt, data) {
+                $scope.patient.patientState = data;
+            });
+
             $scope.update = function () {
+                var patientStatus = $scope.patient.patientStatus;
+                var patientUuid = $scope.patient.uuid;
+                var creatorUuid = $rootScope.currentUser.uuid;
+                var patientState = $scope.patient.patientState;
+
+                if ($scope.patient.patientState == 'INACTIVE_TRANSFERRED_OUT') {
+                    if ($scope.patient['TRANSFERENCE_HF_NAME']) {
+                        $scope.patient['PATIENT_STATE_CHANGE'] = '';
+                        $scope.patient['TRANSFER_OUT_DISTRICT'] = '';
+                        $scope.patient['TRANSFER_OUT_NAME'] = '';
+                        $scope.patient['TRANSFER_OUT_PROVINCE'] = '';
+                        $scope.patient['Transfer_Date'] = '';
+                        $scope.patient['Observations'] = '';
+                        patientState = $scope.patient.lastActiveState;
+                    }
+                }
                 addNewRelationships();
                 var errorMessages = Bahmni.Common.Util.ValidationUtil.validate($scope.patient, $scope.patientConfiguration.attributeTypes);
                 if (errorMessages.length > 0) {
@@ -181,13 +226,15 @@ angular.module('bahmni.registration')
                     return $q.when({});
                 }
 
-                return spinner.forPromise(patientService.update($scope.patient, $scope.openMRSPatient).then(function (result) {
-                    var patientProfileData = result.data;
-                    if (!patientProfileData.error) {
-                        successCallBack(patientProfileData);
-                        $scope.actions.followUpAction(patientProfileData);
-                    }
-                }));
+                return spinner.forPromise($q.all([patientService.update($scope.patient, $scope.openMRSPatient),
+                    patientService.savePatientStatusState(patientStatus, patientUuid, creatorUuid, patientState)]).then(function (result) {
+                        var patientProfileData = result[0].data;
+                        if (!patientProfileData.error) {
+                            successCallBack(patientProfileData);
+                            $state.go($state.current, {}, {reload: true});
+                            $scope.actions.followUpAction(patientProfileData);
+                        }
+                    }));
             };
 
             var addNewRelationships = function () {
diff --git a/ui/app/registration/controllers/patientCommonController.js b/ui/app/registration/controllers/patientCommonController.js
index eee0ae9e72..adb3bbe5ab 100644
--- a/ui/app/registration/controllers/patientCommonController.js
+++ b/ui/app/registration/controllers/patientCommonController.js
@@ -23,6 +23,22 @@ angular.module('bahmni.registration')
             $rootScope.duplicatePatients;
             $rootScope.duplicatePatientCount = 0;
             $scope.isAddressRequired = "false";
+            $scope.showTransferredOutSection = false;
+            $scope.showSuspensionSection = false;
+            $scope.showDeathSection = false;
+
+            $scope.$on("IN_TF", function (evt, data) {
+                $scope.showTransferredOutSection = data;
+            });
+
+            $scope.$on("IN_SU", function (evt, data) {
+                $scope.showSuspensionSection = data;
+            });
+
+            $scope.$on("IN_DT", function (evt, data) {
+                $scope.showDeathSection = data;
+            });
+
             $rootScope.personSearchResultsConfig = ["NICK_NAME", "PRIMARY_CONTACT_NUMBER_1", "PATIENT_STATUS", "US_REG_DATE"];
             $rootScope.searchActions = appService.getAppDescriptor().getExtensions("org.bahmni.registration.patient.search.result.action");
             $scope.checkDuplicatePatients = function () {
@@ -214,6 +230,32 @@ angular.module('bahmni.registration')
                 }
             };
 
+            $scope.updatePatientState = function (value) {
+                if (value.value == 'Patient_Transferred_Out') {
+                    $scope.$emit('PTO', 'INACTIVE_TRANSFERRED_OUT');
+                    $scope.showTransferredOutSection = true;
+                    $scope.patient['TRANSFERENCE_HF_NAME'] = '';
+                    $scope.patient['TRANSFERENCE_HF_DISTRICT'] = '';
+                    $scope.patient['TRANSFERENCE_HF_PROVINCE'] = '';
+                    $scope.showDeathSection = false;
+                    $scope.showSuspensionSection = false;
+                } else if (value.value == 'Inactive_Death') {
+                    $scope.showDeathSection = true;
+                    $scope.$emit('PTO', 'INACTIVE_DEATH');
+                    $scope.showTransferredOutSection = false;
+                    $scope.showSuspensionSection = false;
+                } else if (value.value == 'Patient_Suspension') {
+                    $scope.showSuspensionSection = true;
+                    $scope.$emit('PTO', 'INACTIVE_SUSPENDED');
+                    $scope.showDeathSection = false;
+                    $scope.showTransferredOutSection = false;
+                } else {
+                    $scope.showDeathSection = false;
+                    $scope.showTransferredOutSection = false;
+                    $scope.showSuspensionSection = false;
+                }
+            };
+
             $scope.updateLocationRequired = function (value) {
                 $scope.$broadcast('HFEvent', value);
             };
@@ -294,7 +336,6 @@ angular.module('bahmni.registration')
                     }
                 }
             });
-
             $scope.nationalityAttribute = function (docz) {
                 $scope.nationalAttribute = docz;
                 $scope.patient.attribute = $scope.nationalAttribute;
diff --git a/ui/app/registration/directives/patientAction.js b/ui/app/registration/directives/patientAction.js
index f07229a012..21f6cae8d6 100644
--- a/ui/app/registration/directives/patientAction.js
+++ b/ui/app/registration/directives/patientAction.js
@@ -21,6 +21,9 @@ angular.module('bahmni.registration')
                 var visitLocationUuid = $rootScope.visitLocation;
                 var forwardUrls = forwardUrlsForVisitTypes || false;
                 $scope.visitTable = [];
+                $scope.isEligibleForVisit = function () {
+                    return $rootScope.isEligibleForVisit;
+                };
                 $scope.allVisits = $rootScope.regEncounterConfiguration.getVisitTypesAsArray();
                 var getForwardUrlEntryForVisitFromTheConfig = function () {
                     var matchedEntry = _.find(forwardUrls, function (entry) {
diff --git a/ui/app/registration/services/patientService.js b/ui/app/registration/services/patientService.js
index 20823481ac..ef793f7978 100644
--- a/ui/app/registration/services/patientService.js
+++ b/ui/app/registration/services/patientService.js
@@ -44,6 +44,27 @@ angular.module('bahmni.registration')
             return patientServiceStrategy.searchDuplicatePatients(config);
         };
 
+        var getPatientStatusState = function (patientUuid) {
+            return $http.get(Bahmni.Common.Constants.openmrsUrl + "/ws/rest/emrapi/patientStatusState?patientUuid=" + patientUuid, {
+                method: "GET"
+            });
+        };
+
+        var savePatientStatusState = function (patientStatus, patientUuid, creatorUuid, patientState) {
+            var emrApiURL = Bahmni.Registration.Constants.emrApiRESTBaseURL;
+            var url = emrApiURL + "/setPatientStatusState";
+            var data = {
+                "patientUuid": patientUuid,
+                "patient_state": patientState,
+                "patient_status": patientStatus,
+                "creatorUuid": creatorUuid
+            };
+            return $http.post(url, data, {
+                withCredentials: true,
+                headers: {"Accept": "application/json", "Content-Type": "application/json"}
+            });
+        };
+
         var searchByIdentifier = function (identifier) {
             return $http.get(Bahmni.Common.Constants.bahmniSearchUrl + "/patient", {
                 method: "GET",
@@ -100,6 +121,8 @@ angular.module('bahmni.registration')
             create: create,
             update: update,
             get: get,
+            getPatientStatusState: getPatientStatusState,
+            savePatientStatusState: savePatientStatusState,
             updateImage: updateImage,
             searchByNameOrIdentifier: searchByNameOrIdentifier
         };
diff --git a/ui/app/registration/views/patientAction.html b/ui/app/registration/views/patientAction.html
index dbe11c0416..20fdfee9e6 100644
--- a/ui/app/registration/views/patientAction.html
+++ b/ui/app/registration/views/patientAction.html
@@ -14,7 +14,7 @@
                         ng-bind-html="::activeVisitConfig.translationKey | translate">
                 </button>
         </span>
-        <span ng-if="::showStartVisitButton()" data-ng-switch-when="startVisit">
+        <span ng-if="isEligibleForVisit()" data-ng-switch-when="startVisit">
             <div split-button options="::visitControl.visitTypes"
                              primary-option="::visitControl.defaultVisitType"
                  option-text="visitControl.startButtonText"
diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index b8e46ef2ee..e11e0a95cc 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -460,12 +460,12 @@
                 </div>
             </section>
         </section>
-    </div>
-
+    </div>  
     <div ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
          class="additional-info-wrapper" ng-if="section.title!='patientHIVTestInformation' &&  section.title!='patientContactInformation' &&  section.title!='patientTrnsferOUTInformation'
          &&  section.title!='patientProfessionInformation'">
-        <div ng-if="section.canShow && patient.TYPE_OF_REGISTRATION.value === 'TRANSFERRED_PATIENT'">
+        <div ng-if="section.canShow && (patient.TYPE_OF_REGISTRATION.value === 'TRANSFERRED_PATIENT' || patient.patientState === 'INACTIVE_TRANSFERRED_OUT'
+        || patient.TRANSFERENCE_HF_NAME)">
             <div class="box-container form" ng-if="::(section.attributes.length > 0 && section.title)">
                 <legend class="additional-attribute" toggle="section.expand">
                     <span>
@@ -496,65 +496,93 @@
         </div>
     </div>
 
-    <!--<div ng-show="patient.uuid!==undefined" ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"-->
-         <!--class="additional-info-wrapper" ng-if="section.title!='patientHIVTestInformation' &&  section.title!='patientContactInformation'-->
-         <!--&&  section.title!='patientProfessionInformation'">-->
-
-
-        <!--<div>-->
-            <!--<div class="box-container form">-->
-                <!--<legend class="additional-attribute" toggle="section.expand">-->
-                    <!--<span>-->
-                        <!--<i class="fa fa-caret-right"></i>-->
-                        <!--<i class="fa fa-caret-down"></i>-->
-                        <!--<strong>-->
-                            <!--<a ng-if="::section.translationKey" href accesskey="{{::section.shortcutKey | translate}}"-->
-                               <!--ng-bind-html="::'REGISTRATION_TRANSFER_OUT_INFO_KEY' | translate">-->
-                            <!--</a>-->
-                        <!--</strong>-->
-                    <!--</span>-->
-                <!--</legend>-->
-
-                <!--<section class="form-field-inline clearfix">-->
-                    <!--<article class="form-field" ng-repeat="attribute in ::section.attributes"-->
-                             <!--ng-class="::{'right-form-field' : $index%2 != 0}">-->
-                        <!--<attribute-types target-model="patient" attribute="::attribute"-->
-                                         <!--field-validation="::fieldValidation" is-auto-complete="isAutoComplete"-->
-                                         <!--get-auto-complete-list="getAutoCompleteList" get-data-results="getDataResults"-->
-                                         <!--is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name !== 'PATIENT_STATUS' && attribute.name !== 'TRANSFERRED_OUT_HF_NAME'"></attribute-types>-->
-                    <!--</article>-->
-
-                    <!--<section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">-->
-                        <!--<article class="form-field" ng-repeat="attribute in ::attributeRow"-->
-                                 <!--ng-class="::{'right-form-field' : $index%2 != 0}" ng-if="attribute.name == 'Is_Transferred_Out'">-->
-                            <!--<attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"-->
-                                             <!--is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"-->
-                                             <!--get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" update-location-required="updateLocationRequired">-->
-                            <!--</attribute-types>-->
-                        <!--</article>-->
-
-                        <!--<article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'Transfer_Date'"-->
-                                 <!--ng-class="::{'right-form-field' : $index%2 != 0}">-->
-                            <!--<attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"-->
-                                             <!--is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"-->
-                                             <!--get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>-->
-                        <!--</article>-->
-
-                        <!--<article class="form-field" ng-repeat="attribute in ::attributeRow" ng-if="attribute.name == 'Observations'"-->
-                                 <!--ng-class="::{'right-form-field' : $index%2 != 0}">-->
-                            <!--<attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"-->
-                                             <!--is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"-->
-                                             <!--get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>-->
-                        <!--</article>-->
-
-                    <!--</section>-->
-                    <!--<section transfer-Out-Address-Fields data-address-levels="::addressLevels" data-address="patient.address"-->
-                             <!--field-validation="::fieldValidation" ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"-->
-                             <!--strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel"></section>-->
-                <!--</section>-->
-            <!--</div>-->
-        <!--</div>-->
-    <!--</div>-->
+    <div ng-show="patient.uuid!==undefined" ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
+         class="additional-info-wrapper" ng-if="section.title!='patientHIVTestInformation' &&  section.title!='patientContactInformation'
+         &&  section.title!='patientProfessionInformation'">
+
+
+        <div>
+            <div class="box-container form">
+                <legend class="additional-attribute" toggle="section.expand">
+                    <span>
+                        <i class="fa fa-caret-right"></i>
+                        <i class="fa fa-caret-down"></i>
+                        <strong>
+                            <a ng-if="::section.translationKey" href accesskey="{{::section.shortcutKey | translate}}"
+                               ng-bind-html="::'REGISTRATION_STATE_INFO_KEY' | translate">
+                            </a>
+                        </strong>
+                    </span>
+                </legend>
+
+                <section class="form-field-inline clearfix">
+                    <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
+                        <article class="form-field" ng-repeat="attribute in ::attributeRow" 
+                                 ng-class="::{'right-form-field' : $index%2 != 0}">
+                            <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                             is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
+                                             get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name == 'PATIENT_STATE_CHANGE'" update-patient-state="updatePatientState"></attribute-types >
+                        </article>                     
+                    </section>
+                    <div ng-if="showTransferredOutSection">    
+                        <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
+                            <article class="form-field" ng-repeat="attribute in ::attributeRow" 
+                                     ng-class="::{'right-form-field' : $index%2 != 0}">
+                                <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
+                                                 get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name == 'Transfer_Date'"></attribute-types>
+                                                
+                        </section>    
+
+                        <section transfer-Out-Address-Fields data-address-levels="::addressLevels" data-address="patient.address"
+                                 field-validation="::fieldValidation" ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"
+                                 strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel"></section>
+
+                        <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
+                            <article class="form-field" ng-repeat="attribute in ::attributeRow" 
+                                     ng-class="::{'right-form-field' : $index%2 != 0}">
+                                     <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
+                                                 get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name == 'Observations'"></attribute-types>
+                            </article> 
+                        </section> 
+                    </div>
+
+                    <div ng-if="showDeathSection">    
+                        <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
+                            <article class="form-field" ng-repeat="attribute in ::attributeRow" 
+                                     ng-class="::{'right-form-field' : $index%2 != 0}">
+                                     <!-- {{attribute.name}} -->
+                                <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 handle-update="handleUpdate" ng-if="attribute.name == 'DATE_OF_DEATH'"></attribute-types>
+                            
+                                <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 handle-update="handleUpdate" ng-if="attribute.name == 'CAUSE_OF_DEATH'"></attribute-types>
+
+                                <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 handle-update="handleUpdate" ng-if="attribute.name == 'DEATH_OBSERVATIONS'"></attribute-types>
+                            </article>                     
+                        </section>
+                    </div>
+
+                    <div ng-if="showSuspensionSection">    
+                        <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
+                            <article class="form-field" ng-repeat="attribute in ::attributeRow" 
+                                     ng-class="::{'right-form-field' : $index%2 != 0}">
+                                <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
+                                                 get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name == 'DATE_OF_SUSPENSION'"></attribute-types>
+                            
+                                <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
+                                                 is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
+                                                 get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate" ng-if="attribute.name == 'SUSPENSION_OBSERVATIONS'"></attribute-types>
+                            </article>                     
+                        </section>
+                    </div>
+                </section>
+            </div>
+        </div>
+    </div>
 
     <div ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
          class="additional-info-wrapper" ng-if="section.title=='patientHIVTestInformation'">

From 8c5e96c6b8d8c7f60a904b414b6b3b224c5b737e Mon Sep 17 00:00:00 2001
From: krishnanspace <34261449+krishnanspace@users.noreply.github.com>
Date: Thu, 29 Aug 2019 17:53:27 +0530
Subject: [PATCH 082/131] Krishnan | MPOC-405 Removed unwanted sections (#317)

---
 .../conditionsList/directives/conditionsList.js               | 4 ++--
 .../displaycontrols/conditionsList/views/conditionsList.html  | 2 +-
 ui/app/i18n/clinical/locale_en.json                           | 1 -
 ui/app/i18n/clinical/locale_pt.json                           | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/app/common/displaycontrols/conditionsList/directives/conditionsList.js b/ui/app/common/displaycontrols/conditionsList/directives/conditionsList.js
index 406953d9c0..149766c55b 100644
--- a/ui/app/common/displaycontrols/conditionsList/directives/conditionsList.js
+++ b/ui/app/common/displaycontrols/conditionsList/directives/conditionsList.js
@@ -4,7 +4,7 @@ angular.module('bahmni.common.displaycontrol.conditionsList', []);
 angular.module('bahmni.common.displaycontrol.conditionsList')
     .directive('conditionsList', ['conditionsService', 'ngDialog', function (conditionsService, ngDialog) {
         var controller = function ($scope) {
-            $scope.statuses = ['ACTIVE', 'HISTORY_OF'];
+            $scope.statuses = ['ACTIVE'];
 
             $scope.openSummaryDialog = function () {
                 ngDialog.open({
@@ -13,7 +13,7 @@ angular.module('bahmni.common.displaycontrol.conditionsList')
                     data: {conditions: $scope.conditions},
                     controller: function ($scope) {
                         $scope.hideTitle = true;
-                        $scope.statuses = ['ACTIVE', 'HISTORY_OF', 'INACTIVE'];
+                        $scope.statuses = ['ACTIVE', 'INACTIVE'];
                         $scope.conditions = $scope.ngDialogData.conditions;
                     }
                 });
diff --git a/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html b/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html
index d5d4e0dffa..244d7f210d 100644
--- a/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html
+++ b/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html
@@ -24,7 +24,7 @@
                                     <div class="activeSince">
 
                                     <span class="value-text-only" ng-if="condition.activeSince">
-                                        {{'CONDITION_LIST_ACTIVE_SINCE'|translate}} {{condition.activeSince | bahmniDate}}
+                                        {{condition.activeSince | bahmniDate}}
                                     </span>
                                         <button class="toggle fr" ng-if="::!condition.additionalDetail"
                                                 ng-class="{'has-notes': condition.additionalDetail}"
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 5a2e799db6..f0562c63a1 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -271,7 +271,6 @@
     "CONDITION_LIST_ALREADY_EXISTS_AS_ACTIVE": "Already exists as active condition",
     "CONDITION_LIST_CREATED_BY": "by",
     "CONDITION_LIST_FOLLOW_UP": "Follow up",
-    "CONDITION_LIST_ACTIVE_SINCE": "condition from",
     "CONDITION_LIST_NO_CONDITIONS": "No Conditions available",
     "CONDITION_LIST_NO_RETRO_MODE":"<strong>Conditions cannot</strong> be edited in retrospective mode",
     "SEARCH_BY_PATIENT_ID_KEY": "Search Patient by ID",
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 1636a5d0f3..2654cace25 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -84,7 +84,6 @@
   "CONCEPT_SET_GROUP_PIN_UNPIN_KEY": "Marcar/Desmarcar",
   "CONCEPT_SET_GROUP_REMOVE_KEY": "Remover",
   "CONCEPT_SET_GROUP_SEARCH_LABEL": "Pesquisar formulários de observação",
-  "CONDITION_LIST_ACTIVE_SINCE": "Condição do formulário",
   "CONDITION_LIST_ACTIVE": "Activo",
   "CONDITION_LIST_ADD": "Adicionar",
   "CONDITION_LIST_ALREADY_EXISTS_AS_ACTIVE": "Condição já existe como activa",

From aaba055fdb3ced834ae31aa2ff067ed5324d9a18 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Thu, 29 Aug 2019 16:24:07 +0300
Subject: [PATCH 083/131] MPOC-355 Add translations support for reports app

---
 ui/app/i18n/reports/locale_en.json            | 15 +++++++++++-
 ui/app/i18n/reports/locale_pt.json            | 21 ++++++++++++----
 .../reports/controllers/reportsController.js  | 24 ++++++++++++-------
 ui/app/reports/services/reportService.js      |  5 ++--
 ui/app/reports/views/reports.html             |  8 +++----
 5 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/ui/app/i18n/reports/locale_en.json b/ui/app/i18n/reports/locale_en.json
index e0c7d0230f..24aaa8c3e7 100644
--- a/ui/app/i18n/reports/locale_en.json
+++ b/ui/app/i18n/reports/locale_en.json
@@ -43,5 +43,18 @@
     "YEARS_LABEL": "Years",
     "CHOOSE_ANSWER_FROM_DROPDOWN_LABEL": "Choose Answer",
     "DELETE_LABEL": "Delete",
-    "EDIT_LABEL": "Edit"
+    "EDIT_LABEL": "Edit",
+    "PLEASE_SELECT_KEY" : "Please select the ",
+    "AND_KEY" : " and ",
+    "ADDED_TO_MY_REPORTS" : " added to My Reports",
+    "ERROR_SCHEDULING_REPORT" : "Error in scheduling report",
+    "SELECT_REPORT_FORMAT" : "Select format for the report: ",
+    "CSV_FORMAT_CONCATENATED_REPORTS_ERROR" : "CSV format is not supported for concatenated reports",
+    "WORKBOOK_TEMPLATE_ERROR" : "Workbook template should be selected for generating report: ",
+    "CSV" : "CSV",
+    "EXCEL" : "EXCEL",
+    "HTML" : "HTML",
+    "PDF" : "PDF",
+    "CUSTOM EXCEL" : "CUSTOM EXCEL",
+    "ODS" : "ODS"
 }
diff --git a/ui/app/i18n/reports/locale_pt.json b/ui/app/i18n/reports/locale_pt.json
index c96e8cc649..bb4ee5b356 100644
--- a/ui/app/i18n/reports/locale_pt.json
+++ b/ui/app/i18n/reports/locale_pt.json
@@ -6,8 +6,8 @@
     "selectLocation": "Selecionar Local",
     "clinical_key": "Clínico",
     "REPORTS_NAME_HEADER_KEY": "Nome",
-    "REPORTS_START_DATE_HEADER_KEY": "Data Inicial",
-    "REPORTS_END_DATE_HEADER_KEY": "Data Final",
+    "REPORTS_START_DATE_HEADER_KEY": "Data de Inicio",
+    "REPORTS_END_DATE_HEADER_KEY": "Data de Fim",
     "RUN_NOW_BUTTON_KEY": "Executar",
     "RUN_REPORT_BUTTON_KEY": "Rodar Relatório",
     "QUEUE_BUTTON_KEY": "Fixar",
@@ -29,5 +29,18 @@
     "REPORT_DELETE": "Apagar",
     "REPORTS_HEADER_REPORTS": "Relatórios",
     "REPORTS_HEADER_MY_REPORTS": "Meus relatórios",
-    "CHOOSE_REPORT_FORMAT": "Seleccione formato"
-}
\ No newline at end of file
+    "CHOOSE_REPORT_FORMAT": "Seleccione formato",
+    "PLEASE_SELECT_KEY" : "Seleccione de ",
+    "AND_KEY" : " até ",
+    "ADDED_TO_MY_REPORTS" : " Adicionar meus relatórios",
+    "ERROR_SCHEDULING_REPORT" : "Erro ao agendar relatório",
+    "SELECT_REPORT_FORMAT" : "Seleccione o formato do relatório: ",
+    "CSV_FORMAT_CONCATENATED_REPORTS_ERROR" : "O formato CSV não suporta a combinação de relatórios",
+    "WORKBOOK_TEMPLATE_ERROR" : "Para gerar o relatório seleccione um ficheiro modelo: ",
+    "CSV" : "CSV",
+    "EXCEL" : "EXCEL",
+    "HTML" : "HTML",
+    "PDF" : "PDF",
+    "CUSTOM EXCEL" : "Personalizado para Excel",
+    "ODS" : "ODS"
+}
diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
index 90d6787267..a3a699165d 100644
--- a/ui/app/reports/controllers/reportsController.js
+++ b/ui/app/reports/controllers/reportsController.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('bahmni.reports')
-    .controller('ReportsController', ['$scope', 'appService', 'reportService', 'FileUploader', 'messagingService', 'spinner', '$rootScope', 'auditLogService', function ($scope, appService, reportService, FileUploader, messagingService, spinner, $rootScope, auditLogService) {
+    .controller('ReportsController', ['$scope', 'appService', 'reportService', 'FileUploader', 'messagingService', 'spinner', '$rootScope', '$translate', 'auditLogService', function ($scope, appService, reportService, FileUploader, messagingService, spinner, $rootScope, $translate, auditLogService) {
         $scope.uploader = new FileUploader({
             url: Bahmni.Common.Constants.uploadReportTemplateUrl,
             removeAfterUpload: true,
@@ -29,12 +29,12 @@ angular.module('bahmni.reports')
 
         var validateReport = function (report) {
             if (!report.responseType) {
-                messagingService.showMessage("error", "Seleccione o formato do relatório: " + report.name);
+                messagingService.showMessage("error", getTranslatedMessage("SELECT_REPORT_FORMAT") + report.name);
                 return false;
             }
             if (report.responseType === 'application/vnd.ms-excel-custom' && !report.reportTemplateLocation) {
                 if (!report.config.macroTemplatePath) {
-                    messagingService.showMessage("error", "Workbook template should be selected for generating report: " + report.name);
+                    messagingService.showMessage("error", getTranslatedMessage("WORKBOOK_TEMPLATE_ERROR") + report.name);
                     return false;
                 }
                 report.reportTemplateLocation = report.config.macroTemplatePath;
@@ -44,21 +44,25 @@ angular.module('bahmni.reports')
             if (isDateRangeRequiredFor(report) && (!report.startDate || !report.stopDate)) {
                 var msg = [];
                 if (!report.startDate) {
-                    msg.push("start date");
+                    msg.push(getTranslatedMessage("REPORTS_START_DATE_HEADER_KEY"));
                 }
                 if (!report.stopDate) {
-                    msg.push("end date");
+                    msg.push(getTranslatedMessage("REPORTS_END_DATE_HEADER_KEY"));
                 }
-                messagingService.showMessage("error", "Please select the " + msg.join(" and "));
+                messagingService.showMessage("error", getTranslatedMessage("PLEASE_SELECT_KEY") + msg.join(getTranslatedMessage("AND_KEY")));
                 return false;
             }
             if (report.type == 'concatenated' && report.responseType == reportService.getMimeTypeForFormat('CSV')) {
-                messagingService.showMessage('error', 'CSV format is not supported for concatenated reports');
+                messagingService.showMessage('error', getTranslatedMessage("CSV_FORMAT_CONCATENATED_REPORTS_ERROR"));
                 return false;
             }
             return true;
         };
 
+        var getTranslatedMessage = function (key) {
+            return $translate.instant(key);
+        };
+
         $scope.downloadReport = function (report) {
             if (validateReport(report)) {
                 reportService.generateReport(report);
@@ -77,9 +81,9 @@ angular.module('bahmni.reports')
         $scope.scheduleReport = function (report) {
             if (validateReport(report)) {
                 spinner.forPromise(reportService.scheduleReport(report)).then(function () {
-                    messagingService.showMessage("info", report.name + " added to My Reports");
+                    messagingService.showMessage("info", report.name + getTranslatedMessage("ADDED_TO_MY_REPORTS"));
                 }, function () {
-                    messagingService.showMessage("error", "Error in scheduling report");
+                    messagingService.showMessage("error", getTranslatedMessage("ERROR_SCHEDULING_REPORT"));
                 });
                 if (report.responseType === 'application/vnd.ms-excel-custom') {
                     report.reportTemplateLocation = undefined;
@@ -100,9 +104,11 @@ angular.module('bahmni.reports')
         var initialization = function () {
             var reportList = appService.getAppDescriptor().getConfigForPage("reports");
             $rootScope.reportsRequiringDateRange = _.isUndefined($rootScope.reportsRequiringDateRange) ? _.values(reportList).filter(function (report) {
+                report.titleKey  = report.titleKey ?  getTranslatedMessage(report.titleKey) : report.name;
                 return !(report.config && report.config.dateRangeRequired === false);
             }) : $rootScope.reportsRequiringDateRange;
             $rootScope.reportsNotRequiringDateRange = _.isUndefined($rootScope.reportsNotRequiringDateRange) ? _.values(reportList).filter(function (report) {
+                report.titleKey  = report.titleKey ?  getTranslatedMessage(report.titleKey) : report.name;
                 return (report.config && report.config.dateRangeRequired === false);
             }) : $rootScope.reportsNotRequiringDateRange;
             $scope.reportsDefined = _.values(reportList).length > 0;
diff --git a/ui/app/reports/services/reportService.js b/ui/app/reports/services/reportService.js
index 319c39b914..1d1a87a403 100644
--- a/ui/app/reports/services/reportService.js
+++ b/ui/app/reports/services/reportService.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('bahmni.reports')
-    .service('reportService', ['appService', '$bahmniCookieStore', '$http', function (appService, $bahmniCookieStore, $http) {
+    .service('reportService', ['appService', '$bahmniCookieStore', '$http', '$window', function (appService, $bahmniCookieStore, $http, $window) {
         var paperSize = appService.getAppDescriptor().getConfigValue("paperSize");
         var appName = appService.getAppName() ? appService.getAppName() : "reports";
         var availableFormats = {
@@ -52,7 +52,8 @@ angular.module('bahmni.reports')
 
         var generateReport = function (report) {
             var url = Bahmni.Common.Constants.reportsUrl + "/report";
-            url = (url + "?name={0}&startDate={1}&endDate={2}&responseType={3}&paperSize={4}&appName={5}").format(report.name, report.startDate, report.stopDate, report.responseType, paperSize, appName);
+            var lang = $window.localStorage["NG_TRANSLATE_LANG_KEY"] || "pt";
+            url = (url + "?name={0}&startDate={1}&endDate={2}&responseType={3}&paperSize={4}&appName={5}&titleKey={6}&locale={7}").format(report.name, report.startDate, report.stopDate, report.responseType, paperSize, appName, report.titleKey, lang);
             if (report.reportTemplateLocation && report.responseType == 'application/vnd.ms-excel-custom') {
                 url = (url + "&macroTemplateLocation=" + report.reportTemplateLocation);
             }
diff --git a/ui/app/reports/views/reports.html b/ui/app/reports/views/reports.html
index 362cb2652a..f352e1558c 100644
--- a/ui/app/reports/views/reports.html
+++ b/ui/app/reports/views/reports.html
@@ -22,7 +22,7 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
                     {{::'REPORT_FORMAT_KEY' | translate}}
                     <span class="asterick">*</span>
                     <select ng-model="default.reportsRequiringDateRange.responseType"
-                            ng-options="type as label for (label , type) in ::formats"
+                            ng-options="type as label | translate for (label , type) in ::formats"
                             ng-change="setDefault('responseType', 'reportsRequiringDateRange')">
                         <option value="">{{'CHOOSE_REPORT_FORMAT'|translate}}</option>
                     </select>
@@ -33,7 +33,7 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
             </thead>
             <tbody>
             <tr ng-repeat="report in ::reportsRequiringDateRange">
-                <td>{{:: report.name }}</td>
+                <td>{{:: report.titleKey | translate}}</td>
                 <td class="reports-start-date">
                     <input date-converter class="form-field start-date" type="date" max="{{report.stopDate | date:'yyyy-MM-dd'}}"
                            ng-model="report.startDate">
@@ -43,7 +43,7 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
                             ng-model="report.stopDate">
                 </td>
                 <td class="reports-format">
-                    <select ng-model="report.responseType" ng-options="type as label for (label , type) in ::formats">
+                    <select ng-model="report.responseType" ng-options="type as label | translate for (label , type) in ::formats">
                         <option value="">{{'CHOOSE_REPORT_FORMAT'|translate}}</option>
                     </select>
                     <input ng-if="report.responseType=='application/vnd.ms-excel-custom' && !report.config.macroTemplatePath"
@@ -102,4 +102,4 @@ <h2 class="section-title">{{::'REPORTS_TITLE_WITHOUT_DATE_RANGE_KEY' | translate
         </table>
     </section>
 
-</div>
\ No newline at end of file
+</div>

From 13210f5c24bdfec736b74280d3172b7bf5243211 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Thu, 29 Aug 2019 17:32:52 +0300
Subject: [PATCH 084/131] Fix#1 codacy error

---
 ui/app/reports/controllers/reportsController.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
index a3a699165d..a702a37af6 100644
--- a/ui/app/reports/controllers/reportsController.js
+++ b/ui/app/reports/controllers/reportsController.js
@@ -108,7 +108,11 @@ angular.module('bahmni.reports')
                 return !(report.config && report.config.dateRangeRequired === false);
             }) : $rootScope.reportsRequiringDateRange;
             $rootScope.reportsNotRequiringDateRange = _.isUndefined($rootScope.reportsNotRequiringDateRange) ? _.values(reportList).filter(function (report) {
-                report.titleKey  = report.titleKey ?  getTranslatedMessage(report.titleKey) : report.name;
+                if (report.titleKey !== undefined) {
+                    report.titleKey = getTranslatedMessage(report.titleKey);
+                } else {
+                    report.titleKey = report.name;
+                }
                 return (report.config && report.config.dateRangeRequired === false);
             }) : $rootScope.reportsNotRequiringDateRange;
             $scope.reportsDefined = _.values(reportList).length > 0;

From df3c71297459afc56cf0b39c7627a4e53182579a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Fri, 30 Aug 2019 10:12:13 +0200
Subject: [PATCH 085/131] Adds service to fetch selected drug order
 relationship

---
 .../controllers/addTreatmentController.js           |  7 ++++++-
 .../views/treatmentSections/addTreatment.html       |  1 -
 .../concept-set/services/conceptSetServices.js      | 13 ++++++++++++-
 ui/app/common/constants.js                          |  3 ++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 38e3764d64..ab947bf505 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -396,6 +396,12 @@ angular.module('bahmni.clinical')
                     $scope.treatment.isUniformFrequency = false;
                 }
                 $scope.treatment.quantity = $scope.treatment.quantity ? $scope.treatment.quantity : null;
+
+                conceptSetService.getDrugOrderRelationship("7b95f90a-7a78-4be9-9838-247a77b680ce").then(function (response) {
+                    $scope.selectedCategory = response.data.category;
+                    $scope.selectedTreatmentLine = response.data.treatmentLine;
+                });
+
             });
 
             $scope.$watch(watchFunctionForQuantity, function () {
@@ -544,7 +550,6 @@ angular.module('bahmni.clinical')
                 $scope.isBeingRevised = true;
                 var treatment = drugOrder;
                 if(treatment.category === undefined || treatment.category === ""){
-                    //fetch from database
                 }else{
                     $scope.selectedCategory = treatment.category;
                     $scope.selectedTreatmentLine = treatment.treatmentLine;
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 4592dbb3ed..e66e63063a 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -22,7 +22,6 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                             </select>
                         </div>
                     </article>
-
                     <article class="form-field fl">
                         <div class="field-attribute">
                             <label class="fl unit-text"> {{::'MEDICATION_ADD_DRUG_LINE' | translate}} <span
diff --git a/ui/app/common/concept-set/services/conceptSetServices.js b/ui/app/common/concept-set/services/conceptSetServices.js
index 3a8925516b..6cf6064bc7 100644
--- a/ui/app/common/concept-set/services/conceptSetServices.js
+++ b/ui/app/common/concept-set/services/conceptSetServices.js
@@ -29,10 +29,21 @@ angular.module('bahmni.common.conceptSet')
             });
         };
 
+        var getDrugOrderRelationship = function (orderUuid) {
+            var url = Bahmni.Common.Constants.drugOrderRelationShipUrl;
+            return $http.get(url, {
+                params: {
+                    orderUuid: orderUuid
+                }
+            });
+        };
+
+
         return {
             getConcept: getConcept,
             getComputedValue: getComputedValue,
-            getObsTemplatesForProgram: getObsTemplatesForProgram
+            getObsTemplatesForProgram: getObsTemplatesForProgram,
+            getDrugOrderRelationship: getDrugOrderRelationship
         };
     }]);
 
diff --git a/ui/app/common/constants.js b/ui/app/common/constants.js
index c88b6ff59a..9eeb014085 100644
--- a/ui/app/common/constants.js
+++ b/ui/app/common/constants.js
@@ -259,7 +259,8 @@ Bahmni.Common = Bahmni.Common || {};
         followUpConditionConcept: 'Follow-up Condition',
         localeLangs: "/bahmni_config/openmrs/apps/home/locale_languages.json",
         privilegeRequiredErrorMessage: "PRIVILEGE_REQUIRED",
-        defaultPossibleRelativeSearchLimit: 10
+        defaultPossibleRelativeSearchLimit: 10,
+        drugOrderRelationShipUrl: BAHMNI_CORE+"/drugOrders/drugOrderRelationship"
     };
 })();
 

From 55d6888dca17278de58a363d74ac10b4cec0a1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Fri, 30 Aug 2019 11:10:50 +0200
Subject: [PATCH 086/131] Fetches selected category

---
 .../consultation/controllers/addTreatmentController.js    | 3 +--
 .../views/treatmentSections/addTreatment.html             | 8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index ab947bf505..c4321c939c 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -237,6 +237,7 @@ angular.module('bahmni.clinical')
             };
 
             var clearOtherDrugOrderActions = function (drugOrders) {
+
                 drugOrders.forEach(function (drugOrder) {
                     drugOrder.isDiscontinuedAllowed = true;
                     drugOrder.isBeingEdited = false;
@@ -396,12 +397,10 @@ angular.module('bahmni.clinical')
                     $scope.treatment.isUniformFrequency = false;
                 }
                 $scope.treatment.quantity = $scope.treatment.quantity ? $scope.treatment.quantity : null;
-
                 conceptSetService.getDrugOrderRelationship("7b95f90a-7a78-4be9-9838-247a77b680ce").then(function (response) {
                     $scope.selectedCategory = response.data.category;
                     $scope.selectedTreatmentLine = response.data.treatmentLine;
                 });
-
             });
 
             $scope.$watch(watchFunctionForQuantity, function () {
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index e66e63063a..92950e9db2 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -16,9 +16,10 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                         </div>
                         <div class="field-value">
                             <select ng-init="fetchCategories('medication_category')" id="cat-dropdown" class="fl"
-                                    ng-model="selectedCategory" ng-disabled="isBeingRevised" ng-change="selectCategoryFromDropdown()" ng-click=""
+                                    ng-model="selectedCategory" ng-disabled="isBeingRevised" ng-value="selectedCategory" ng-change="selectCategoryFromDropdown()" ng-click=""
                                     ng-options="item.display for item in categories" required >
-                                <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                                <option value="" ng-if="selectedCategory === ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                                <option value="" ng-if="selectedCategory !== ''">{{selectedCategory.display}}</option>
                             </select>
                         </div>
                     </article>
@@ -31,7 +32,8 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                             <select id="line-dropdown" class="fl"
                                     ng-model="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
                                     ng-options="item.display for item in treatmentLines" required>
-                                <option value="">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                                <option value="" ng-if="selectedCategory === ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                                <option value="" ng-if="selectedCategory !== ''">{{selectedCategory.display}}</option>
                             </select>
                         </div>
                     </article>

From 702a74f8bc0e7ad57c4f456b81b117512b4a9410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Fri, 30 Aug 2019 13:46:16 +0200
Subject: [PATCH 087/131] Update words from En to Pt (#318)

---
 ui/app/i18n/clinical/locale_en.json | 4 +++-
 ui/app/i18n/clinical/locale_pt.json | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index f0562c63a1..2998fe9ac0 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -463,5 +463,7 @@
     "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Treatment Start Date",
     "TREATMENT_START_DATE": "Treatment Start Date",
     "CONFIRMED": "Confirmed",
-    "PRIMARY": "Primary"
+    "PRIMARY": "Primary",
+    "PRESUMED": "Presumed",
+    "SECONDARY": "Secundary"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 2654cace25..ded6b8355e 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -472,5 +472,7 @@
   "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Prescrição",
   "CLINICAL_PATIENT_STATUS": "Activo em",
   "CONFIRMED": "Confirmado",
-  "PRIMARY": "Primário"
+  "PRIMARY": "Primária",
+  "PRESUMED": "Presumido",
+  "SECONDARY": "Secundária"
 }

From 7dfc48065423c45db65e12d1e2d9670c8837085f Mon Sep 17 00:00:00 2001
From: krishnanspace <krishnanspace@gmail.com>
Date: Fri, 30 Aug 2019 17:32:35 +0530
Subject: [PATCH 088/131] Krishnan | MPOC-504 Added functionality to update
 Status if ARV drug is suspended

---
 .../controllers/consultationController.js         | 13 ++++++++++---
 .../views/treatmentSections/drugOrderHistory.html |  1 +
 .../patientContext/views/patientContext.html      |  2 +-
 ui/app/common/patient/services/patientService.js  | 15 +++++++++++++++
 ui/app/i18n/clinical/locale_en.json               |  4 +++-
 ui/app/i18n/clinical/locale_pt.json               |  4 +++-
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 1f5e107027..38a6f25c58 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -4,11 +4,11 @@ angular.module('bahmni.clinical').controller('ConsultationController',
     ['$scope', '$rootScope', '$state', '$location', '$translate', 'clinicalAppConfigService', 'diagnosisService', 'urlHelper', 'contextChangeHandler',
         'spinner', 'encounterService', 'messagingService', 'sessionService', 'retrospectiveEntryService', 'patientContext', '$q',
         'patientVisitHistoryService', '$stateParams', '$window', 'visitHistory', 'clinicalDashboardConfig', 'appService',
-        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService', 'printer', 'printPrescriptionReportService', 'providerTypeService', '$http',
+        'ngDialog', '$filter', 'configurations', 'visitConfig', 'conditionsService', 'configurationService', 'auditLogService', 'allergiesService', 'printer', 'printPrescriptionReportService', 'providerTypeService', '$http', 'patientService',
         function ($scope, $rootScope, $state, $location, $translate, clinicalAppConfigService, diagnosisService, urlHelper, contextChangeHandler,
             spinner, encounterService, messagingService, sessionService, retrospectiveEntryService, patientContext, $q,
             patientVisitHistoryService, $stateParams, $window, visitHistory, clinicalDashboardConfig, appService,
-            ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService, providerTypeService, $http) {
+            ngDialog, $filter, configurations, visitConfig, conditionsService, configurationService, auditLogService, allergiesService, printer, printPrescriptionReportService, providerTypeService, $http, patientService) {
             var DateUtil = Bahmni.Common.Util.DateUtil;
             var getPreviousActiveCondition = Bahmni.Common.Domain.Conditions.getPreviousActiveCondition;
             var currentProviderType;
@@ -544,6 +544,13 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     encounterData.encounterTypeUuid = results[1].uuid;
                     var params = angular.copy($state.params);
                     params.cachebuster = Math.random();
+                    _.map(encounterData.drugOrders, function (currentObj) {
+                        if (currentObj.drug.form == 'ARV') {
+                            if (currentObj.action == 'DISCONTINUE') {
+                                patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
+                            }
+                        }
+                    });
                     return encounterService.create(encounterData)
                         .then(function (saveResponse) {
                             var messageParams = {
@@ -578,7 +585,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                                         return $state.transitionTo(toStateConfig ? toStateConfig.toState : $state.current, toStateConfig ? toStateConfig.toParams : params, {
                                             inherit: false,
                                             notify: true,
-                                            reload: (toStateConfig !== undefined)
+                                            reload: true
                                         });
                                     });
                                 }));
diff --git a/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html b/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
index 339938ec05..8f5f78ee87 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
@@ -88,6 +88,7 @@
                                             <div class="field-value">
                                                 <textarea ng-disabled="!drugOrder.orderReasonNotesEnabled" rows="1" id="stopped-reason-non-coded" class="form-field drug-order-notes" placeholder="{{ 'MEDICATION_RECENT_TAB_STOP_NOTES' | translate}}"
                                                           ng-model="drugOrder.orderReasonText"></textarea>
+                                                 <div ng-if="drugOrder.drug.form =='ARV'">{{'DRUG_SUSPEND_WARNING' | translate}}</div>
                                             </div>
                                         </article>
                                     </div>
diff --git a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
index 85bcc24763..f98c8b7d06 100644
--- a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
+++ b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
@@ -12,7 +12,7 @@
             </li>
             <li>{{patientContext.gender | translate}}</li>
             <li>{{patientContext.birthdate | birthDateToAgeText}}</li>
-            <li>{{patientStatus}} - {{patientState | translate}}</li>
+            <li>{{patientStatus | translate}} - {{patientState | translate}}</li>
             <li ng-repeat="(key, value) in patientContext.additionalPatientIdentifiers">
                 {{key}}: {{value}}
             </li>
diff --git a/ui/app/common/patient/services/patientService.js b/ui/app/common/patient/services/patientService.js
index 877c1ac07b..651777c51a 100644
--- a/ui/app/common/patient/services/patientService.js
+++ b/ui/app/common/patient/services/patientService.js
@@ -33,6 +33,21 @@ angular.module('bahmni.common.patient')
             });
         };
 
+        this.savePatientStatusState = function (patientStatus, patientUuid, creatorUuid, patientState) {
+            var emrApiURL = Bahmni.Common.Constants.hostURL + '/openmrs/ws/rest/emrapi';
+            var url = emrApiURL + "/setPatientStatusState";
+            var data = {
+                "patientUuid": patientUuid,
+                "patient_state": patientState,
+                "patient_status": patientStatus,
+                "creatorUuid": creatorUuid
+            };
+            return $http.post(url, data, {
+                withCredentials: true,
+                headers: {"Accept": "application/json", "Content-Type": "application/json"}
+            });
+        };
+
         this.search = function (query, offset, identifier) {
             offset = offset || 0;
             var patientSearchResultsConfig = ['NICK_NAME', 'PRIMARY_CONTACT_NUMBER_1', 'PATIENT_STATUS'];
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index f0562c63a1..f28304b376 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -463,5 +463,7 @@
     "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Treatment Start Date",
     "TREATMENT_START_DATE": "Treatment Start Date",
     "CONFIRMED": "Confirmed",
-    "PRIMARY": "Primary"
+    "PRIMARY": "Primary",
+    "DRUG_SUSPEND_WARNING": "Attention: the patient state will be updated to TARV-Suspended",
+    "TARV_TREATMENT_SUSPENDED": "TARV-Treatment Suspensed"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 2654cace25..0dd7e79c4c 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -472,5 +472,7 @@
   "PRESCRIPTION_REPORT_PRINT_PRESCRIPTION_LABEL": "Prescrição",
   "CLINICAL_PATIENT_STATUS": "Activo em",
   "CONFIRMED": "Confirmado",
-  "PRIMARY": "Primário"
+  "PRIMARY": "Primário",
+  "DRUG_SUSPEND_WARNING":"Atenção: o estado de permanência do paciente será actualizado para TARV-Suspenso",
+  "TARV_TREATMENT_SUSPENDED": "TARV-Tratamento Suspenso"
 }

From acaca3e48459e5359d03c003afdc6b92fea77dfa Mon Sep 17 00:00:00 2001
From: krishnanspace <krishnanspace@gmail.com>
Date: Fri, 30 Aug 2019 17:49:37 +0530
Subject: [PATCH 089/131] Krishnan | MPOC-405 Fixed the CSS

---
 .../displaycontrols/conditionsList/views/conditionsList.html    | 2 +-
 ui/app/styles/clinical/_diagnosis.scss                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html b/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html
index 244d7f210d..b262ede04e 100644
--- a/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html
+++ b/ui/app/common/displaycontrols/conditionsList/views/conditionsList.html
@@ -19,7 +19,7 @@
                                 <p class="placeholder-text">{{'CONDITION_LIST_NO_CONDITIONS' | translate}}</p>
                             </li>
                             <li class="table-body" ng-repeat="condition in conditions | filter:{status:status}:true">
-                                <div class="tree-list-item clearfix">
+                                <div>
                                     <span class="testUnderPanel left"><label>{{ condition.displayString() }}</label></span>
                                     <div class="activeSince">
 
diff --git a/ui/app/styles/clinical/_diagnosis.scss b/ui/app/styles/clinical/_diagnosis.scss
index 39d32e5308..d6240e3c92 100644
--- a/ui/app/styles/clinical/_diagnosis.scss
+++ b/ui/app/styles/clinical/_diagnosis.scss
@@ -210,7 +210,7 @@
       }
       .col2 {padding-left: 10px;}
       .col2, .col3 {
-        font-size: 12px;
+        font-size: 14px;
         margin-top: 5px;
         
         .view {margin-bottom: 5px;}

From f3795dad4d9d2fc7807850bbfa669030fee988a2 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Fri, 30 Aug 2019 15:57:57 +0200
Subject: [PATCH 090/131] fixed error message registration form

---
 ui/app/common/util/httpErrorInterceptor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/common/util/httpErrorInterceptor.js b/ui/app/common/util/httpErrorInterceptor.js
index 34295fdb9c..6b61dc0f17 100644
--- a/ui/app/common/util/httpErrorInterceptor.js
+++ b/ui/app/common/util/httpErrorInterceptor.js
@@ -48,7 +48,7 @@ angular.module('httpErrorInterceptor', [])
                 } else if (response.status === 405) {
                     showError(unexpectedError);
                 } else if (response.status === 400) {
-                    if (response.data.error.message.includes('Identifier')) {
+                    if (response.data.error.message.includes('Identifier') || response.data.error.message.includes('Identificador')) {
                         var errorMessage = "REGISTRATION_DUPLICATE_ENTRY_ERROR";
                         showError(errorMessage);
                     }

From d183cb4fcd45a0e54849fa206496375104505f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Fri, 30 Aug 2019 16:06:22 +0200
Subject: [PATCH 091/131] improves order relationship fetch by uuid

---
 .../clinical/consultation/controllers/addTreatmentController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 1e3d314a45..2d110abdce 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -398,7 +398,7 @@ angular.module('bahmni.clinical')
                     $scope.treatment.isUniformFrequency = false;
                 }
                 $scope.treatment.quantity = $scope.treatment.quantity ? $scope.treatment.quantity : null;
-                conceptSetService.getDrugOrderRelationship("7b95f90a-7a78-4be9-9838-247a77b680ce").then(function (response) {
+                conceptSetService.getDrugOrderRelationship($scope.treatment.previousOrderUuid).then(function (response) {
                     $scope.selectedCategory = response.data.category;
                     $scope.selectedTreatmentLine = response.data.treatmentLine;
                 });

From c637514b8d7c68fc20490dbdee04c6c50a781c59 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Fri, 30 Aug 2019 17:05:42 +0200
Subject: [PATCH 092/131] removed extra unnecessary spaces

---
 ui/app/reports/controllers/reportsController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
index a702a37af6..af7af34c8c 100644
--- a/ui/app/reports/controllers/reportsController.js
+++ b/ui/app/reports/controllers/reportsController.js
@@ -104,7 +104,7 @@ angular.module('bahmni.reports')
         var initialization = function () {
             var reportList = appService.getAppDescriptor().getConfigForPage("reports");
             $rootScope.reportsRequiringDateRange = _.isUndefined($rootScope.reportsRequiringDateRange) ? _.values(reportList).filter(function (report) {
-                report.titleKey  = report.titleKey ?  getTranslatedMessage(report.titleKey) : report.name;
+                report.titleKey = report.titleKey ? getTranslatedMessage(report.titleKey) : report.name;
                 return !(report.config && report.config.dateRangeRequired === false);
             }) : $rootScope.reportsRequiringDateRange;
             $rootScope.reportsNotRequiringDateRange = _.isUndefined($rootScope.reportsNotRequiringDateRange) ? _.values(reportList).filter(function (report) {

From 6004d8327a59fbd4f2a94ebce43c92dc30293014 Mon Sep 17 00:00:00 2001
From: Nathan Floor <nathan.floor@jembi.org>
Date: Fri, 30 Aug 2019 17:11:34 +0200
Subject: [PATCH 093/131] Mpoc 567 typo fix (#326)

* Update words from En to Pt

* Fixed typo in English translation for Secondary
---
 ui/app/i18n/clinical/locale_en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 2998fe9ac0..9acae629ff 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -465,5 +465,5 @@
     "CONFIRMED": "Confirmed",
     "PRIMARY": "Primary",
     "PRESUMED": "Presumed",
-    "SECONDARY": "Secundary"
+    "SECONDARY": "Secondary"
 }

From 9cf87b7862b555db2966d0a2375f7b6451dd6933 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Sat, 31 Aug 2019 10:38:23 +0200
Subject: [PATCH 094/131] Clinical Dashboard: Limit Lab Results to last 3
 visits

---
 .../investigationresults/directives/investigationResults.js     | 2 +-
 .../investigationresults/views/investigationTable.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js b/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js
index 3e14870265..0f522d2d54 100644
--- a/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js
+++ b/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js
@@ -12,7 +12,7 @@ angular.module('bahmni.clinical')
 
             var params = {
                 patientUuid: $scope.params.patientUuid,
-                numberOfVisits: $scope.params.numberOfVisits,
+                //numberOfVisits: $scope.params.numberOfVisits,
                 visitUuids: $scope.params.visitUuids,
                 initialAccessionCount: $scope.params.initialAccessionCount,
                 latestAccessionCount: $scope.params.latestAccessionCount
diff --git a/ui/app/clinical/displaycontrols/investigationresults/views/investigationTable.html b/ui/app/clinical/displaycontrols/investigationresults/views/investigationTable.html
index d64ed39dc8..96de223119 100644
--- a/ui/app/clinical/displaycontrols/investigationresults/views/investigationTable.html
+++ b/ui/app/clinical/displaycontrols/investigationresults/views/investigationTable.html
@@ -3,7 +3,7 @@ <h2 ng-if="params.title" class="section-title">{{::params | titleTranslate}} </h
     <div>
         <p class="placeholder-text" ng-if="!hasLabOrders()">{{ ::params.noLabOrdersMessage  | translate }}</p>
         <ul ng-if="hasLabOrders()">
-            <li ng-repeat="labOrderResults in accessions" bindonce="accessions" >
+            <li ng-repeat="labOrderResults in accessions | limitTo: params.numberOfVisits" bindonce="accessions" >
                 <div class="laborder-sub-heading toggle-container" toggle="labOrderResults.isOpen">
                     <i class="fa fa-caret-right"></i>
                     <i class="fa fa-caret-down"></i>

From bc844e0a71a0b665a1865797b3ff6212fac4f0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 12:16:09 +0200
Subject: [PATCH 095/131] Prevents selecting medications automatically

---
 .../consultation/views/treatmentSections/addTreatment.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 2a066522e4..f1c2d10428 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -32,8 +32,8 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                             <select id="line-dropdown" class="fl"
                                     ng-model="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
                                     ng-options="item.display for item in treatmentLines" required>
-                                <option value="" ng-if="selectedCategory === ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
-                                <option value="" ng-if="selectedCategory !== ''">{{selectedCategory.display}}</option>
+                                <option value="" ng-if="selectedTreatmentLine=== ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
+                                <option value="" ng-if="selectedTreatmentLine !== ''">{{selectedTreatmentLine.display}}</option>
                             </select>
                         </div>
                     </article>

From 3b2ffc0278e0858639fd57ec0dbc0af88bd09c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 12:40:26 +0200
Subject: [PATCH 096/131] Fixes code quality (lint) errors

---
 .../controllers/addTreatmentController.js             | 11 ++++-------
 .../common/concept-set/services/conceptSetServices.js |  1 -
 ui/app/common/constants.js                            |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 2d110abdce..1749b2ff36 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -35,7 +35,7 @@ angular.module('bahmni.clinical')
             $scope.suggestedDruglist = [];
             $scope.counter = 0;
             $scope.drugOrderRelationShipList = [];
-            $scope.iBeingRevised= false;
+            $scope.iBeingRevised = false;
             $scope.disableMedication = true;
             $scope.isARV = false;
 
@@ -238,7 +238,6 @@ angular.module('bahmni.clinical')
             };
 
             var clearOtherDrugOrderActions = function (drugOrders) {
-
                 drugOrders.forEach(function (drugOrder) {
                     drugOrder.isDiscontinuedAllowed = true;
                     drugOrder.isBeingEdited = false;
@@ -426,8 +425,6 @@ angular.module('bahmni.clinical')
                 drugOrderRelationShip.drugUuid = $scope.treatment.drug.uuid;
                 drugOrderRelationShip.categoryUuid = $scope.selectedCategory.uuid;
                 drugOrderRelationShip.treatmentLineUuid = $scope.selectedTreatmentLine.uuid;
-
-
                 $scope.drugOrderRelationShipList.push(drugOrderRelationShip);
 
                 newDrugOrder.calculateEffectiveStopDate();
@@ -549,8 +546,8 @@ angular.module('bahmni.clinical')
                 clearHighlights();
                 $scope.isBeingRevised = true;
                 var treatment = drugOrder;
-                if(treatment.category === undefined || treatment.category === ""){
-                }else{
+                if (treatment.category === undefined || treatment.category === "") {
+                } else {
                     $scope.selectedCategory = treatment.category;
                     $scope.selectedTreatmentLine = treatment.treatmentLine;
                 }
@@ -733,7 +730,7 @@ angular.module('bahmni.clinical')
                 var includedOrderSetTreatments = _.filter(orderSetTreatmentsAcrossTabs, function (treatment) {
                     return treatment.orderSetUuid ? treatment.include : true;
                 });
-                $scope.consultation.drugOrderRelationShipList=$scope.drugOrderRelationShipList;
+                $scope.consultation.drugOrderRelationShipList = $scope.drugOrderRelationShipList;
                 $scope.consultation.newlyAddedTreatments = allTreatmentsAcrossTabs.concat(includedOrderSetTreatments);
                 if ($scope.consultation.discontinuedDrugs) {
                     $scope.consultation.discontinuedDrugs.forEach(function (discontinuedDrug) {
diff --git a/ui/app/common/concept-set/services/conceptSetServices.js b/ui/app/common/concept-set/services/conceptSetServices.js
index 6cf6064bc7..389fb4dd70 100644
--- a/ui/app/common/concept-set/services/conceptSetServices.js
+++ b/ui/app/common/concept-set/services/conceptSetServices.js
@@ -38,7 +38,6 @@ angular.module('bahmni.common.conceptSet')
             });
         };
 
-
         return {
             getConcept: getConcept,
             getComputedValue: getComputedValue,
diff --git a/ui/app/common/constants.js b/ui/app/common/constants.js
index 5c01156e75..89edd1d28b 100644
--- a/ui/app/common/constants.js
+++ b/ui/app/common/constants.js
@@ -261,7 +261,7 @@ Bahmni.Common = Bahmni.Common || {};
         localeLangs: "/bahmni_config/openmrs/apps/home/locale_languages.json",
         privilegeRequiredErrorMessage: "PRIVILEGE_REQUIRED",
         defaultPossibleRelativeSearchLimit: 10,
-        drugOrderRelationShipUrl: BAHMNI_CORE+"/drugOrders/drugOrderRelationship"
+        drugOrderRelationShipUrl: BAHMNI_CORE + "/drugOrders/drugOrderRelationship"
     };
 })();
 

From e8c8786522c6188c40f8f430cc46ae825f10d99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 12:49:27 +0200
Subject: [PATCH 097/131] Adds translations for category and line of treatment
 in english

---
 ui/app/i18n/clinical/locale_en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index f0562c63a1..48ced13491 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -462,6 +462,8 @@
     "INACTIVE_DEATH": "Inactive Death",
     "TREATMENT_START_DATE_LIST_DISPLAY_CONTROL_TITLE": "Treatment Start Date",
     "TREATMENT_START_DATE": "Treatment Start Date",
+    "MEDICATION_ADD_DRUG_CATEGORY": "Category",
+    "MEDICATION_ADD_DRUG_LINE": "Line of Treatment",
     "CONFIRMED": "Confirmed",
     "PRIMARY": "Primary"
 }

From 0820be3aef307b7b461e7c678876ce97157bc540 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Sat, 31 Aug 2019 12:51:33 +0200
Subject: [PATCH 098/131] added extra space after comment

---
 .../investigationresults/directives/investigationResults.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js b/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js
index 0f522d2d54..1720ab5456 100644
--- a/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js
+++ b/ui/app/clinical/displaycontrols/investigationresults/directives/investigationResults.js
@@ -12,7 +12,7 @@ angular.module('bahmni.clinical')
 
             var params = {
                 patientUuid: $scope.params.patientUuid,
-                //numberOfVisits: $scope.params.numberOfVisits,
+                // numberOfVisits: $scope.params.numberOfVisits,
                 visitUuids: $scope.params.visitUuids,
                 initialAccessionCount: $scope.params.initialAccessionCount,
                 latestAccessionCount: $scope.params.latestAccessionCount

From 0928becb1bff8dec770d6961b42a522de591f060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 13:24:11 +0200
Subject: [PATCH 099/131] Adds replaceble code to fix errors when using pt
 locale

---
 .../controllers/addTreatmentController.js     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 1749b2ff36..cbb02c3dba 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -97,6 +97,7 @@ angular.module('bahmni.clinical')
                 } else if ($scope.selectedCategory !== undefined && $scope.selectedCategory !== "") {
                     conceptName = $scope.selectedCategory.name;
                 }
+                conceptName = $scope.mapTreatmentLines(conceptName);
                 return conceptSetService.getConcept({
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"
@@ -111,6 +112,26 @@ angular.module('bahmni.clinical')
                 });
             };
 
+            // Code to be improved
+            $scope.mapTreatmentLines = function (conceptName) {
+                if (conceptName === "Primeira Linha") {
+                    conceptName = "1st Line";
+                }
+                if (conceptName === "Segunda Linha") {
+                    conceptName = "2nd Line";
+                }
+                if (conceptName === "Terceira Linha") {
+                    conceptName = "3rd Line";
+                }
+                if (conceptName === "Resistente") {
+                    conceptName = "Resistant";
+                }
+                if (conceptName === "Sensitivo") {
+                    conceptName = "Sensitive";
+                }
+                return conceptName;
+            };
+
             $scope.getFilteredOrderSets = function (searchTerm) {
                 if (searchTerm && searchTerm.length >= 3) {
                     orderSetService.getOrderSetsByQuery(searchTerm).then(function (response) {

From 545a0fdaabaa39d3f9367e0192370e3053284a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 16:04:09 +0200
Subject: [PATCH 100/131] Fixes error when displaying edited Order Line of
 treatment

---
 .../controllers/addTreatmentController.js           |  5 +++--
 .../views/treatmentSections/addTreatment.html       | 13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index cbb02c3dba..b252aedf98 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -28,6 +28,7 @@ angular.module('bahmni.clinical')
             $scope.canOrderSetBeAdded = true;
             $scope.isSearchDisabled = false;
             $scope.categories = [];
+            $scope.treatmentLines = [];
             $scope.selectedCategory = "";
             $scope.selectedTreatmentLine = "";
             $scope.selectedLineDrugs = [];
@@ -35,7 +36,7 @@ angular.module('bahmni.clinical')
             $scope.suggestedDruglist = [];
             $scope.counter = 0;
             $scope.drugOrderRelationShipList = [];
-            $scope.iBeingRevised = false;
+            $scope.isBeingRevised = false;
             $scope.disableMedication = true;
             $scope.isARV = false;
 
@@ -80,7 +81,6 @@ angular.module('bahmni.clinical')
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"
                 }, true).then(function (response) {
-                    $scope.treatmentLines = [];
                     var resp = response.data.results[0].answers;
                     for (var i = 0; i < resp.length; i++) {
                         resp[i].names[0].uuid = resp[i].uuid;
@@ -407,6 +407,7 @@ angular.module('bahmni.clinical')
             $scope.$on("event:reviseDrugOrder", function (event, drugOrder, drugOrders) {
                 clearOtherDrugOrderActions(drugOrders);
                 drugOrder.isBeingEdited = true;
+                $scope.isBeingRevised = true;
                 drugOrder.isDiscontinuedAllowed = false;
                 $scope.treatments.forEach(setIsNotBeingEdited);
                 setDrugOrderBeingEdited(drugOrder);
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index f1c2d10428..f2b97fb395 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -29,16 +29,19 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                                     class="asterick">*</span> </label>
                         </div>
                         <div class="field-value">
-                            <select id="line-dropdown" class="fl"
-                                    ng-model="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
-                                    ng-options="item.display for item in treatmentLines" required>
+                            <select  ng-show="isBeingRevised == false" id="line-dropdown" class="fl"
+                                    ng-model="selectedTreatmentLine" ng-value="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
+                                    ng-options="item.display for item in treatmentLines" ng-change="" ng-click="" required>
                                 <option value="" ng-if="selectedTreatmentLine=== ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
-                                <option value="" ng-if="selectedTreatmentLine !== ''">{{selectedTreatmentLine.display}}</option>
+                                <option value="" ng-if="selectedTreatmentLine != ''" >{{selectedTreatmentLine.display}}</option>
+                            </select>
+                            <select ng-if="isBeingRevised" ng-disabled="true"
+                                    id="line-dropdown1" class="fl">
+                                <option value="">{{selectedTreatmentLine.display}}</option>
                             </select>
                         </div>
                     </article>
 
-
                     <article class="form-field">
                         <div class="field-attribute">
                             <label>{{::treatmentConfig.translate('drugName','MEDICATION_DRUG_NAME_TITLE')}} <span class="asterick">*</span></label>

From 12c45cf805633076eca717b4208c69f53c7e583c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 16:44:43 +0200
Subject: [PATCH 101/131] Allows selecting other categories

---
 .../clinical/consultation/controllers/addTreatmentController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index b252aedf98..c433d22e56 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -628,7 +628,7 @@ angular.module('bahmni.clinical')
                 });
                 $scope.suggestedDruglist = _.flatten(allDrugs);
                 $scope.counter ++;
-                if ($scope.selectedCategory !== "" && $scope.selectedCategory !== undefined) {
+                if ($scope.selectedCategory !== "" && $scope.selectedCategory !== undefined && $scope.selectedCategory.display !== "Other" && $scope.selectedCategory.display !== "Outra Categoria") {
                     $scope.getDrugsFromTreatmentLineOrCategory();
                     var auxiliarDrugsList = [];
                     $scope.drugResultUuid = [];

From 588ef691c0991d6d377acca800d8ac3f30beb5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 16:56:10 +0200
Subject: [PATCH 102/131] Improves allowing selection of other category

---
 .../consultation/controllers/addTreatmentController.js         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index c433d22e56..309a91837c 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -654,13 +654,14 @@ angular.module('bahmni.clinical')
             (function () {
                 var selectedItem;
                 $scope.onSelect = function (item) {
-                    if ($scope.selectedCategory !== "") {
+                    if ($scope.selectedCategory !== "" && $scope.selectedCategory.display !== "Other" && $scope.selectedCategory.display !== "Outra Categoria") {
                         for (let i = 0; i < $scope.suggestedDruglist.length; i++) {
                             if (item.uuid === $scope.suggestedDruglist[i].drug.concept.uuid) {
                                 selectedItem = $scope.suggestedDruglist[i];
                             }
                         }
                     } else {
+                        console.log("entrou aqui");
                         selectedItem = item;
                     }
                     $scope.onChange();

From ee0ce51bdf29af2a44964a5ffa52b0ead0f9349e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sat, 31 Aug 2019 18:30:34 +0200
Subject: [PATCH 103/131] Adds a workaround for listing drugs in pt

---
 .../consultation/controllers/addTreatmentController.js         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 309a91837c..972853cf97 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -77,6 +77,7 @@ angular.module('bahmni.clinical')
             };
 
             $scope.fetchTreatmentLines = function (conceptName) {
+                $scope.treatmentLines = [];
                 return conceptSetService.getConcept({
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"
@@ -97,7 +98,6 @@ angular.module('bahmni.clinical')
                 } else if ($scope.selectedCategory !== undefined && $scope.selectedCategory !== "") {
                     conceptName = $scope.selectedCategory.name;
                 }
-                conceptName = $scope.mapTreatmentLines(conceptName);
                 return conceptSetService.getConcept({
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"
@@ -661,7 +661,6 @@ angular.module('bahmni.clinical')
                             }
                         }
                     } else {
-                        console.log("entrou aqui");
                         selectedItem = item;
                     }
                     $scope.onChange();

From a80efaf4146c44a471a29eba2b73838a1b339d8b Mon Sep 17 00:00:00 2001
From: Sushant Patil <43531186+sushantpatil1214@users.noreply.github.com>
Date: Sun, 1 Sep 2019 13:07:56 +0530
Subject: [PATCH 104/131] Sushant | MPOC-503 added translation (#329)

---
 ui/app/i18n/clinical/locale_en.json | 3 ++-
 ui/app/i18n/clinical/locale_pt.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index d632be6f7e..25c4f32b0a 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -467,5 +467,6 @@
     "DRUG_SUSPEND_WARNING": "Attention: the patient state will be updated to TARV-Suspended",
     "TARV_TREATMENT_SUSPENDED": "TARV-Treatment Suspensed",
     "PRESUMED": "Presumed",
-    "SECONDARY": "Secondary"
+    "SECONDARY": "Secondary",
+    "ABANDONED": "Abandoned"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index fc82bf7fa7..0192f3d685 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -477,5 +477,6 @@
   "TARV_TREATMENT_SUSPENDED": "TARV-Tratamento Suspenso",
   "PRIMARY": "Primária",
   "PRESUMED": "Presumido",
-  "SECONDARY": "Secundária"
+  "SECONDARY": "Secundária",
+  "ABANDONED": "Abandono"
 }

From 155d2f918239cde0a6de4eee5f42e76ea70f6853 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Sun, 1 Sep 2019 11:47:04 +0200
Subject: [PATCH 105/131] added translation for "CONDITION_LIST_ACTIVE_SINCE"

---
 ui/app/i18n/clinical/locale_en.json | 3 ++-
 ui/app/i18n/clinical/locale_pt.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 25c4f32b0a..28b415de51 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -468,5 +468,6 @@
     "TARV_TREATMENT_SUSPENDED": "TARV-Treatment Suspensed",
     "PRESUMED": "Presumed",
     "SECONDARY": "Secondary",
-    "ABANDONED": "Abandoned"
+    "ABANDONED": "Abandoned",
+    "CONDITION_LIST_ACTIVE_SINCE": "Active Condition since:"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 0192f3d685..1e6b0cea2b 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -478,5 +478,6 @@
   "PRIMARY": "Primária",
   "PRESUMED": "Presumido",
   "SECONDARY": "Secundária",
-  "ABANDONED": "Abandono"
+  "ABANDONED": "Abandono",
+  "CONDITION_LIST_ACTIVE_SINCE": "Condição Activa desde:"
 }

From 0ee0b09f71c1738084f51b1ee21694fb82b52822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sun, 1 Sep 2019 13:25:00 +0200
Subject: [PATCH 106/131] Fixes medication search when default locale is set to
 en

---
 .../consultation/controllers/addTreatmentController.js        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 972853cf97..35038455fe 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -55,6 +55,7 @@ angular.module('bahmni.clinical')
             };
 
             $scope.selectCategoryFromDropdown = function () {
+                $scope.selectedTreatmentLine = "";
                 if ($scope.selectedCategory != undefined) {
                     if ($scope.selectedCategory.display === "ARV") {
                         $scope.selectedTreatmentLineCategory = "treatment_line_arv";
@@ -98,6 +99,9 @@ angular.module('bahmni.clinical')
                 } else if ($scope.selectedCategory !== undefined && $scope.selectedCategory !== "") {
                     conceptName = $scope.selectedCategory.name;
                 }
+                if (defaultLocale === "en") {
+                    conceptName = $scope.mapTreatmentLines(conceptName);
+                }
                 return conceptSetService.getConcept({
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"

From 70671c4891a63322786b2079c2730990df009de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sun, 1 Sep 2019 15:13:03 +0200
Subject: [PATCH 107/131] Fixes case sentive issue when searching medication

---
 .../clinical/consultation/controllers/addTreatmentController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 35038455fe..5801fc4dc6 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -640,7 +640,7 @@ angular.module('bahmni.clinical')
                         element.label = element.name;
                         element.value = element.name;
 
-                        if (element.value.includes(searchString)) {
+                        if (element.value.toLowerCase().includes(searchString.toLowerCase())) {
                             auxiliarDrugsList.push(element);
                         }
                     });

From a6c8212a3da3bdcbc417d644fb81e662c70e923d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sun, 1 Sep 2019 17:40:03 +0200
Subject: [PATCH 108/131] adds option to not update the status when patient is
 pre-tarv

---
 .../consultation/controllers/consultationController.js        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 38a6f25c58..4145b6ea41 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -546,8 +546,10 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     params.cachebuster = Math.random();
                     _.map(encounterData.drugOrders, function (currentObj) {
                         if (currentObj.drug.form == 'ARV') {
-                            if (currentObj.action == 'DISCONTINUE') {
+                            if (currentObj.action == 'DISCONTINUE'){
+                               if($scope.patient.toUpperCase() !== "Pre TARV".toUpperCase()){
                                 patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
+                                }
                             }
                         }
                     });

From 2d81a849e0b502cee7995c69de05d4ae60d74d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Sun, 1 Sep 2019 18:34:30 +0200
Subject: [PATCH 109/131] Improves rules validations

---
 .../consultation/controllers/consultationController.js         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 4145b6ea41..255fb8d837 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -545,9 +545,10 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     var params = angular.copy($state.params);
                     params.cachebuster = Math.random();
                     _.map(encounterData.drugOrders, function (currentObj) {
+                        console.log(currentObj);
                         if (currentObj.drug.form == 'ARV') {
                             if (currentObj.action == 'DISCONTINUE'){
-                               if($scope.patient.toUpperCase() !== "Pre TARV".toUpperCase()){
+                               if(!($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && currentObj.orderAttributes !== undefined)){
                                 patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
                                 }
                             }

From 7d6ede46064d0f7737946271363169c704fe9453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Mon, 2 Sep 2019 10:14:52 +0200
Subject: [PATCH 110/131] Remove console log

---
 .../clinical/consultation/controllers/consultationController.js  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 255fb8d837..de99871e05 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -545,7 +545,6 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     var params = angular.copy($state.params);
                     params.cachebuster = Math.random();
                     _.map(encounterData.drugOrders, function (currentObj) {
-                        console.log(currentObj);
                         if (currentObj.drug.form == 'ARV') {
                             if (currentObj.action == 'DISCONTINUE'){
                                if(!($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && currentObj.orderAttributes !== undefined)){

From 045abaed8e4bc82d4ce44775df6fcf01399a731f Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Mon, 2 Sep 2019 10:22:05 +0200
Subject: [PATCH 111/131] Grunt issues fixed

---
 .../consultation/controllers/consultationController.js      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index de99871e05..c00b306974 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -546,9 +546,9 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     params.cachebuster = Math.random();
                     _.map(encounterData.drugOrders, function (currentObj) {
                         if (currentObj.drug.form == 'ARV') {
-                            if (currentObj.action == 'DISCONTINUE'){
-                               if(!($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && currentObj.orderAttributes !== undefined)){
-                                patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
+                            if (currentObj.action == 'DISCONTINUE') {
+                                if (!($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && currentObj.orderAttributes !== undefined)) {
+                                    patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
                                 }
                             }
                         }

From 9abd5c60413b54fcad99620e5b0c5ebb1539c1a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Tue, 3 Sep 2019 12:48:20 +0200
Subject: [PATCH 112/131] Fixes error when selecting Profilaxia and Tratamento
 de ITS categories

---
 .../controllers/addTreatmentController.js     | 28 +++++++++++++++----
 .../views/treatmentSections/addTreatment.html |  5 ++--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 5801fc4dc6..645bb47dc9 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -55,7 +55,7 @@ angular.module('bahmni.clinical')
             };
 
             $scope.selectCategoryFromDropdown = function () {
-                $scope.selectedTreatmentLine = "";
+                $scope.treatmentLines = [];
                 if ($scope.selectedCategory != undefined) {
                     if ($scope.selectedCategory.display === "ARV") {
                         $scope.selectedTreatmentLineCategory = "treatment_line_arv";
@@ -67,12 +67,16 @@ angular.module('bahmni.clinical')
                         $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
                         $scope.disableTreatmentLine = false;
                         $scope.disableMedication = false;
-                    } else if ($scope.selectedCategory.display.toUpperCase() === "Other".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Outra".toUpperCase()) {
+                    } else if ($scope.selectedCategory.display.toUpperCase() === "Other".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Outra Categoria".toUpperCase()) {
+                        $scope.disableMedication = false;
+                        $scope.disableTreatmentLine = true;
+                    } else if ($scope.selectedCategory.display.toUpperCase() === "Tratamento de ITS".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Treatment of ITS".toUpperCase()) {
                         $scope.disableMedication = false;
+                        $scope.disableTreatmentLine = true;
                     } else {
                         $scope.selectedTreatmentLineCategory = "";
                         $scope.disableTreatmentLine = true;
-                        $scope.disableMedication = false;
+                        $scope.disableMedication = true;
                     }
                 }
             };
@@ -94,7 +98,7 @@ angular.module('bahmni.clinical')
 
             $scope.getDrugsFromTreatmentLineOrCategory = function () {
                 var conceptName = "";
-                if ($scope.selectedTreatmentLine !== undefined && $scope.selectedTreatmentLine !== "") {
+                if ($scope.selectedTreatmentLine !== undefined && $scope.selectedTreatmentLine !== null && $scope.selectedTreatmentLine !== "" && $scope.selectedTreatmentLine.display.toUpperCase() !== "Escolha uma resposta".toUpperCase() && $scope.selectedTreatmentLine.display.toUpperCase() !== "Choose an answer".toUpperCase()) {
                     conceptName = $scope.selectedTreatmentLine.name;
                 } else if ($scope.selectedCategory !== undefined && $scope.selectedCategory !== "") {
                     conceptName = $scope.selectedCategory.name;
@@ -102,6 +106,7 @@ angular.module('bahmni.clinical')
                 if (defaultLocale === "en") {
                     conceptName = $scope.mapTreatmentLines(conceptName);
                 }
+                console.log(conceptName);
                 return conceptSetService.getConcept({
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"
@@ -133,6 +138,15 @@ angular.module('bahmni.clinical')
                 if (conceptName === "Sensitivo") {
                     conceptName = "Sensitive";
                 }
+                if (conceptName === "Tratamento de ITS") {
+                    conceptName = "Treatment of ITS";
+                }
+                if (conceptName === "Profilaxia") {
+                    conceptName = "Prophylaxis";
+                }
+                if (conceptName === "Drogas Anti-Tuberculose") {
+                    conceptName = "Anti-Tuberculosis Drugs";
+                }
                 return conceptName;
             };
 
@@ -450,7 +464,11 @@ angular.module('bahmni.clinical')
                 var drugOrderRelationShip = {};
                 drugOrderRelationShip.drugUuid = $scope.treatment.drug.uuid;
                 drugOrderRelationShip.categoryUuid = $scope.selectedCategory.uuid;
-                drugOrderRelationShip.treatmentLineUuid = $scope.selectedTreatmentLine.uuid;
+                if ($scope.selectedTreatmentLine == null || $scope.selectedTreatmentLine == "" || $scope.selectedTreatmentLine === undefined) {
+                    drugOrderRelationShip.treatmentLineUuid = "2c7f29f9-fab3-4f72-9681-61cbda3131d4";
+                } else {
+                    drugOrderRelationShip.treatmentLineUuid = $scope.selectedTreatmentLine.uuid;
+                }
                 $scope.drugOrderRelationShipList.push(drugOrderRelationShip);
 
                 newDrugOrder.calculateEffectiveStopDate();
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index f2b97fb395..1a31138b05 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -31,9 +31,8 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                         <div class="field-value">
                             <select  ng-show="isBeingRevised == false" id="line-dropdown" class="fl"
                                     ng-model="selectedTreatmentLine" ng-value="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
-                                    ng-options="item.display for item in treatmentLines" ng-change="" ng-click="" required>
-                                <option value="" ng-if="selectedTreatmentLine=== ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
-                                <option value="" ng-if="selectedTreatmentLine != ''" >{{selectedTreatmentLine.display}}</option>
+                                    ng-options="item.display for item in treatmentLines" ng-change="" ng-click="" >
+                                <option value="" ng-if="selectedCategory=== ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
                             </select>
                             <select ng-if="isBeingRevised" ng-disabled="true"
                                     id="line-dropdown1" class="fl">

From 1d479ce19579900a9188575974d7d74dd796c780 Mon Sep 17 00:00:00 2001
From: krishnanspace <34261449+krishnanspace@users.noreply.github.com>
Date: Tue, 3 Sep 2019 17:27:46 +0530
Subject: [PATCH 113/131] Mpoc 403 fix (#328)

* Krishnan | MPOC-403 Fixed the Appointments Issue

* Added the ability to disable all form fields

* Krishnan | Hide the Consultation button

* Fixed the Codacy issue

* disable save button depending on state

* Krishnan | Added a condition to avoid NULL as Patient State
---
 .../manage/allAppointmentsController.js       | 10 +++++
 .../list/appointmentsListViewController.js    |  2 +
 .../appointments/directives/patientSearch.js  | 12 ++++--
 .../views/manage/allAppointments.html         |  2 +-
 .../views/clinicalDashboardHeader.html        |  1 +
 ui/app/clinical/patientInitialization.js      |  6 +++
 .../views/attributeInformation.html           |  8 ++--
 .../controllers/editPatientController.js      | 15 +++++--
 .../controllers/patientCommonController.js    | 13 ++++++
 .../directives/healthFacilityAddressFields.js | 12 ++++++
 .../registration/directives/patientAction.js  | 11 +++++
 .../directives/topDownAddressFields.js        | 16 ++++++--
 .../directives/transferOutAddressFields.js    | 12 ++++++
 ui/app/registration/views/age.html            |  8 ++--
 ui/app/registration/views/dob.html            |  2 +-
 ui/app/registration/views/editpatient.html    |  2 +-
 .../views/healthFacilityAddressFields.html    |  3 ++
 ui/app/registration/views/patientAction.html  |  4 +-
 ui/app/registration/views/patientcommon.html  | 40 +++++++++----------
 .../views/topDownAddressFields.html           |  1 +
 .../views/transferOutAddressFields.html       |  3 ++
 21 files changed, 140 insertions(+), 43 deletions(-)

diff --git a/ui/app/appointments/controllers/manage/allAppointmentsController.js b/ui/app/appointments/controllers/manage/allAppointmentsController.js
index bacada2943..db384934f1 100644
--- a/ui/app/appointments/controllers/manage/allAppointmentsController.js
+++ b/ui/app/appointments/controllers/manage/allAppointmentsController.js
@@ -14,6 +14,16 @@ angular.module('bahmni.appointments')
                 $state.go(path, $state.params, {reload: false});
             };
 
+            $scope.hideAppointmentButton = false;
+
+            $scope.$on("HideAppointmentButton", function (evt, data) {
+                if (data === true) {
+                    $scope.hideAppointmentButton = true;
+                } else {
+                    $scope.hideAppointmentButton = false;
+                }
+            });
+
             $scope.getCurrentAppointmentTabName = function () {
                 return $state.current.tabName;
             };
diff --git a/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js b/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js
index 9748908c67..2853adafa7 100644
--- a/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js
+++ b/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js
@@ -86,6 +86,8 @@ angular.module('bahmni.appointments')
             };
 
             $scope.goBackToPreviousView = function () {
+                $scope.$emit("HideAppointmentButton", false);
+                $state.params.patient = null;
                 $scope.searchedPatient = false;
                 $scope.tableInfo[2].enable = false;
                 $scope.filteredAppointments = oldPatientData;
diff --git a/ui/app/appointments/directives/patientSearch.js b/ui/app/appointments/directives/patientSearch.js
index 356a3a81ab..a1735464ff 100644
--- a/ui/app/appointments/directives/patientSearch.js
+++ b/ui/app/appointments/directives/patientSearch.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('bahmni.appointments')
-    .directive('patientSearch', ['patientService', 'appointmentsService', 'spinner', '$state', function (patientService, appointmentsService, spinner, $state) {
+    .directive('patientSearch', ['patientService', 'appointmentsService', 'spinner', '$state', '$q', function (patientService, appointmentsService, spinner, $state, $q) {
         return {
             restrict: "E",
             scope: {
@@ -25,8 +25,14 @@ angular.module('bahmni.appointments')
 
                     $scope.onSelectPatient = function (data) {
                         $state.params.patient = data;
-                        spinner.forPromise(appointmentsService.search({patientUuid: data.uuid}).then(function (oldAppointments) {
-                            var appointmentInDESCOrderBasedOnStartDateTime = _.sortBy(oldAppointments.data, "startDateTime").reverse();
+                        spinner.forPromise($q.all([appointmentsService.search({patientUuid: data.uuid}), patientService.getPatientStatusState(data.uuid)]).then(function (oldAppointments) {
+                            var patientState = oldAppointments[1].data[0].patient_state;
+                            if (patientState == 'INACTIVE_TRANSFERRED_OUT' || patientState == 'INACTIVE_SUSPENDED' || patientState == 'INACTIVE_DEATH') {
+                                $scope.$emit("HideAppointmentButton", true);
+                            } else {
+                                $scope.$emit("HideAppointmentButton", false);
+                            }
+                            var appointmentInDESCOrderBasedOnStartDateTime = _.sortBy(oldAppointments[0].data, "startDateTime").reverse();
                             $scope.onSearch(appointmentInDESCOrderBasedOnStartDateTime);
                         }));
                     };
diff --git a/ui/app/appointments/views/manage/allAppointments.html b/ui/app/appointments/views/manage/allAppointments.html
index 23f4e9b3f7..8ac6f3b366 100644
--- a/ui/app/appointments/views/manage/allAppointments.html
+++ b/ui/app/appointments/views/manage/allAppointments.html
@@ -8,7 +8,7 @@
             <a ng-class="{'active': getCurrentTabName() === 'calendar'}" ng-if="enableCalendarView && !isSearchEnabled" ng-click="navigateTo('calendar')">
                 {{::'CALENDAR_VIEW' | translate}}
             </a>
-            <a show-if-privilege="{{manageAppointmentPrivilege}}" class="add-app-btn" ng-click="navigateTo(getCurrentTabName() + '.new')">
+            <a show-if-privilege="{{manageAppointmentPrivilege}}" ng-if="!hideAppointmentButton" class="add-app-btn" ng-click="navigateTo(getCurrentTabName() + '.new')">
                 {{::'ADD_NEW_APPOINTMENT' | translate }}
             </a>
         </p>
diff --git a/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html b/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html
index 78f911452d..22b8467555 100644
--- a/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html
+++ b/ui/app/clinical/dashboard/views/clinicalDashboardHeader.html
@@ -119,6 +119,7 @@
                 </div>
             <span class="grouped-buttons">
                  <a class=" btn--left btn--success "
+                    ng-hide="patient.isReadOnly"
                     ng-if="visitHistory.activeVisit || retrospectiveEntry || allowConsultation()"
                     ng-click="openConsultation()"
                     accesskey="{{'CONSULTATION_SHORTCUT_KEY' | translate}}"
diff --git a/ui/app/clinical/patientInitialization.js b/ui/app/clinical/patientInitialization.js
index a088ddf86f..9fb91767bd 100644
--- a/ui/app/clinical/patientInitialization.js
+++ b/ui/app/clinical/patientInitialization.js
@@ -10,6 +10,12 @@ angular.module('bahmni.clinical').factory('patientInitialization',
                         var patient = patientMapper.map(openMRSPatientResponse[0].data);
                         patient.patientStatus = openMRSPatientResponse[1].data[0].patient_status;
                         patient.patientState = openMRSPatientResponse[1].data[0].patient_state;
+
+                        if (patient.patientState == 'INACTIVE_TRANSFERRED_OUT' || patient.patientState == 'INACTIVE_SUSPENDED' || patient.patientState == 'INACTIVE_DEATH') {
+                            patient.isReadOnly = true;
+                        } else {
+                            patient.isReadOnly = false;
+                        }
                         return {"patient": patient};
                     });
                 };
diff --git a/ui/app/common/attributeTypes/views/attributeInformation.html b/ui/app/common/attributeTypes/views/attributeInformation.html
index 7718ded4dc..5d2acb9690 100644
--- a/ui/app/common/attributeTypes/views/attributeInformation.html
+++ b/ui/app/common/attributeTypes/views/attributeInformation.html
@@ -51,7 +51,7 @@
                ng-keyup="suggest(targetModel[attribute.name])"
                ng-blur="validateField(false,attribute.name)"
                ng-mouseleave="validateField(true,attribute.name)"
-               ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}">
+               ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}" ng-disabled="::isReadOnly(attribute.name)">
         <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterSuggestions.length > 0" ng-hide="hideList"
             style="position:absolute; top:31px;  width:192px">
             <li class="ui-menu-item" role="presentation" ng-repeat="info in filterSuggestions"
@@ -70,7 +70,7 @@
                ng-keyup="suggest(targetModel[attribute.name])"
                ng-blur="validateField(false,attribute.name)"
                ng-mouseleave="validateField(true,attribute.name)"
-               ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}">
+               ng-required="{{::attribute.required}}" ng-style="{'border': borderColor, 'background': backgroundColor}" ng-disabled="::isReadOnly(attribute.name)">
         <ul class="ui-front ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all" ng-if="showTag && filterSuggestions.length > 0" ng-hide="hideList"
             style="position:absolute; top:31px;  width:192px">
             <li class="ui-menu-item" role="presentation" ng-repeat="info in filterSuggestions"
@@ -104,7 +104,7 @@
     <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name == 'PATIENT_STATE_CHANGE'">
         <select id="{{::attribute.name}}" ng-model="targetModel[attribute.name].conceptUuid"
                 ng-options="a.conceptId as a.description | translate for a in ::attribute.answers"
-                ng-required="{{::attribute.required}}" ng-change="appendConceptNameToModel(attribute);handleUpdate(attribute.name);updatePatientState(targetModel[attribute.name])">
+                ng-required="{{::attribute.required}}" ng-change="appendConceptNameToModel(attribute);handleUpdate(attribute.name);updatePatientState(targetModel[attribute.name])" ng-disabled="::isReadOnly(attribute.name)">
             <option disabled value="">{{::'REGISTRATION_CHOOSE_AN_OPTION' | translate}}</option>
         </select>
     </div>
@@ -137,7 +137,7 @@
     <div class="left" data-ng-switch-when="org.openmrs.Concept" ng-if="attribute.name == 'SECTOR_SELECT'">
         <select id="{{::attribute.name}}" ng-model="targetModel[attribute.name].conceptUuid"
                 ng-options="a.conceptId as a.description | translate for a in ::attribute.answers"
-                ng-required="{{::attribute.required}}" ng-change="appendConceptNameToModel(attribute); handleUpdate(attribute.name);handleSectorChange()">
+                ng-required="{{::attribute.required}}" ng-disabled="::isReadOnly(attribute.name)" ng-change="appendConceptNameToModel(attribute); handleUpdate(attribute.name);handleSectorChange()">
             <option disabled value="">{{::'REGISTRATION_CHOOSE_AN_OPTION' | translate}}</option>
         </select>
     </div>
diff --git a/ui/app/registration/controllers/editPatientController.js b/ui/app/registration/controllers/editPatientController.js
index 33232ec850..1de935592c 100644
--- a/ui/app/registration/controllers/editPatientController.js
+++ b/ui/app/registration/controllers/editPatientController.js
@@ -38,6 +38,8 @@ angular.module('bahmni.registration')
 
                     if ($scope.patient.patientState == "INACTIVE_SUSPENDED" || $scope.patient.patientState === "INACTIVE_TRANSFERRED_OUT" || $scope.patient.patientState === "INACTIVE_DEATH") {
                         $rootScope.isEligibleForVisit = false;
+                        $scope.$broadcast("DisableRegistrationFields", true);
+                        $scope.$emit("DisableRegistrationFields", true);
                     }
 
                     if ($scope.patient.patientState == "INACTIVE_TRANSFERRED_OUT") {
@@ -184,7 +186,6 @@ angular.module('bahmni.registration')
 
             (function () {
                 var getPatientPromise = patientService.get(uuid).then(successCallBack);
-
                 var isDigitized = encounterService.getDigitized(uuid);
                 isDigitized.then(function (data) {
                     var encountersWithObservations = data.data.results.filter(function (encounter) {
@@ -197,14 +198,14 @@ angular.module('bahmni.registration')
             })();
 
             $scope.$on("PTO", function (evt, data) {
-                $scope.patient.patientState = data;
+                $scope.patient.patientStateChange = data;
             });
 
             $scope.update = function () {
                 var patientStatus = $scope.patient.patientStatus;
                 var patientUuid = $scope.patient.uuid;
                 var creatorUuid = $rootScope.currentUser.uuid;
-                var patientState = $scope.patient.patientState;
+                var patientState = $scope.patient.patientStateChange || $scope.patient.patientState;
 
                 if ($scope.patient.patientState == 'INACTIVE_TRANSFERRED_OUT') {
                     if ($scope.patient['TRANSFERENCE_HF_NAME']) {
@@ -250,7 +251,13 @@ angular.module('bahmni.registration')
             };
 
             $scope.isReadOnly = function (field) {
-                return $scope.readOnlyFields ? ($scope.readOnlyFields[field] ? true : false) : undefined;
+                if ($scope.patient.patientState) {
+                    if ($scope.patient.patientState === "INACTIVE_SUSPENDED" || $scope.patient.patientState === "INACTIVE_TRANSFERRED_OUT" || $scope.patient.patientState === "INACTIVE_DEATH") {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
             };
 
             $scope.afterSave = function () {
diff --git a/ui/app/registration/controllers/patientCommonController.js b/ui/app/registration/controllers/patientCommonController.js
index adb3bbe5ab..1e531c9554 100644
--- a/ui/app/registration/controllers/patientCommonController.js
+++ b/ui/app/registration/controllers/patientCommonController.js
@@ -26,6 +26,19 @@ angular.module('bahmni.registration')
             $scope.showTransferredOutSection = false;
             $scope.showSuspensionSection = false;
             $scope.showDeathSection = false;
+            $scope.formFieldsDisabled = false;
+
+            $scope.$on('DisableRegistrationFields', function (ent, data) {
+                if (data) {
+                    $scope.formFieldsDisabled = data;
+                } else {
+                    $scope.formFieldsDisabled = false;
+                }
+            });
+
+            $scope.$on("DisableFields", function (evt, data) {
+                $scope.formFieldsDisabled = data;
+            });
 
             $scope.$on("IN_TF", function (evt, data) {
                 $scope.showTransferredOutSection = data;
diff --git a/ui/app/registration/directives/healthFacilityAddressFields.js b/ui/app/registration/directives/healthFacilityAddressFields.js
index 7a36c3b982..c87c6b5785 100644
--- a/ui/app/registration/directives/healthFacilityAddressFields.js
+++ b/ui/app/registration/directives/healthFacilityAddressFields.js
@@ -9,6 +9,7 @@ angular.module('bahmni.registration')
                 address: '=',
                 addressLevels: '=',
                 fieldValidation: '=',
+                patient: '=',
                 strictAutocompleteFromLevel: '='
             }
         };
@@ -198,6 +199,17 @@ angular.module('bahmni.registration')
                     deregisterAddressWatch();
                 }
             });
+
+            var deregisterAddressWatchForPatientState = $scope.$watch('patient', function (newValue) {
+                if (newValue !== undefined) {
+                    if (newValue == "INACTIVE_SUSPENDED" || newValue === "INACTIVE_TRANSFERRED_OUT" || newValue === "INACTIVE_DEATH") {
+                        $scope.isAddressDisabled = true;
+                    } else {
+                        $scope.isAddressDisabled = false;
+                    }
+                    deregisterAddressWatchForPatientState();
+                }
+            });
         };
         init();
     }]);
diff --git a/ui/app/registration/directives/patientAction.js b/ui/app/registration/directives/patientAction.js
index 21f6cae8d6..e9e16e799f 100644
--- a/ui/app/registration/directives/patientAction.js
+++ b/ui/app/registration/directives/patientAction.js
@@ -80,6 +80,7 @@ angular.module('bahmni.registration')
                             self.activeVisit = activeVisitForCurrentLoginLocation[0];
                         }
                         setForwardActionKey();
+                        patientState();
                     }));
                 };
 
@@ -147,6 +148,16 @@ angular.module('bahmni.registration')
                     return true;
                 };
 
+                var patientState = function () {
+                    if ($scope.patient.PATIENT_STATE_CHANGE == undefined || $scope.patient.PATIENT_STATE_CHANGE.value == 'Patient_Transferred_Out') {
+                        $scope.canSave = true;
+                    } else {
+                        $scope.canSave = false;
+                    }
+                };
+
+                patientState();
+
                 $scope.setSubmitSource = function (source) {
                     if (!validFields()) {
                         $rootScope.isValidFields = false;
diff --git a/ui/app/registration/directives/topDownAddressFields.js b/ui/app/registration/directives/topDownAddressFields.js
index 5cc75f13fd..02bef3a236 100644
--- a/ui/app/registration/directives/topDownAddressFields.js
+++ b/ui/app/registration/directives/topDownAddressFields.js
@@ -10,15 +10,15 @@ angular.module('bahmni.registration')
                 address: '=',
                 addressLevels: '=',
                 fieldValidation: '=',
+                patient: '=',
                 strictAutocompleteFromLevel: '='
             }
         };
     })
-    .controller('TopDownAddressFieldsDirectiveController', ['$scope', '$rootScope', 'addressHierarchyService', function ($scope, $rootScope, addressHierarchyService) {
+    .controller('TopDownAddressFieldsDirectiveController', ['$scope', '$rootScope', 'addressHierarchyService', 'patientService', '$q', function ($scope, $rootScope, addressHierarchyService, patientService, $q) {
         $scope.addressFieldInvalid = false;
         var selectedAddressUuids = {};
         var selectedUserGeneratedIds = {};
-
         var addressLevelsCloneInDescendingOrder = $scope.addressLevels.slice(0).reverse();
         var addressLevelUIOrderBasedOnConfig = $scope.addressLevels;
         $scope.addressLevelsChunks = Bahmni.Common.Util.ArrayUtil.chunk(addressLevelUIOrderBasedOnConfig, 2);
@@ -120,7 +120,6 @@ angular.module('bahmni.registration')
         };
 
         $scope.getAddressDataResults = addressHierarchyService.getAddressDataResults;
-
         var addressHierarchEmptyFieldsValidations = function (fieldName) {
             if (fieldName === "country" || fieldName === "stateProvince" || fieldName === "cityVillage") {
                 $rootScope.fieldValue = angular.element("#" + fieldName)[0].value;
@@ -179,6 +178,17 @@ angular.module('bahmni.registration')
                     deregisterAddressWatch();
                 }
             });
+
+            var deregisterAddressWatchForPatientState = $scope.$watch('patient', function (newValue) {
+                if (newValue !== undefined) {
+                    if (newValue == "INACTIVE_SUSPENDED" || newValue === "INACTIVE_TRANSFERRED_OUT" || newValue === "INACTIVE_DEATH") {
+                        $scope.isAddressDisabled = true;
+                    } else {
+                        $scope.isAddressDisabled = false;
+                    }
+                    deregisterAddressWatchForPatientState();
+                }
+            });
         };
         init();
     }]);
diff --git a/ui/app/registration/directives/transferOutAddressFields.js b/ui/app/registration/directives/transferOutAddressFields.js
index 817b9e566d..ae5078b16a 100644
--- a/ui/app/registration/directives/transferOutAddressFields.js
+++ b/ui/app/registration/directives/transferOutAddressFields.js
@@ -9,6 +9,7 @@ angular.module('bahmni.registration')
                 address: '=',
                 addressLevels: '=',
                 fieldValidation: '=',
+                patient: '=',
                 strictAutocompleteFromLevel: '='
             }
         };
@@ -200,6 +201,17 @@ angular.module('bahmni.registration')
                     deregisterAddressWatch();
                 }
             });
+
+            var deregisterAddressWatchForPatientState = $scope.$watch('patient', function (newValue) {
+                if (newValue !== undefined) {
+                    if (newValue == "INACTIVE_SUSPENDED" || newValue === "INACTIVE_TRANSFERRED_OUT" || newValue === "INACTIVE_DEATH") {
+                        $scope.isAddressDisabled = true;
+                    } else {
+                        $scope.isAddressDisabled = false;
+                    }
+                    deregisterAddressWatchForPatientState();
+                }
+            });
         };
         init();
     }]);
diff --git a/ui/app/registration/views/age.html b/ui/app/registration/views/age.html
index f826700195..c2d5ea12bd 100644
--- a/ui/app/registration/views/age.html
+++ b/ui/app/registration/views/age.html
@@ -9,21 +9,21 @@
             <input  type="number" id="ageYears" name="ageYear" max="120" ng-model="patient.age.years" min="0"
                     ng-required="::!dobMandatory"
                     ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()" ng-blur="handleUpdate('age')"
-                    ng-disabled="isAgeDisabled" ng-class="{ 'illegalValue': submitted && this.myForms.myForm.ageYear.$invalid || this.myForms.myForm.ageYear.$invalid && !this.myForms.myForm.ageYear.$pristine}"
+                    ng-disabled="isAgeDisabled || formFieldsDisabled" ng-class="{ 'illegalValue': submitted && this.myForms.myForm.ageYear.$invalid || this.myForms.myForm.ageYear.$invalid && !this.myForms.myForm.ageYear.$pristine}"
             >
         </div>
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_MONTHS' | translate}}</span>
             <input type="number" id="ageMonths" name="ageMonths" max="12" ng-model="patient.age.months" min="0"
                    ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()"
-                   ng-disabled="isAgeDisabled" required
+                   ng-disabled="isAgeDisabled || formFieldsDisabled" required
             >
         </div>
         <div class="input-prepend">
             <span class="add-on">{{ ::'REGISTRATION_LABEL_DAYS' | translate}}</span>
             <input type="number" id="ageDays" name="ageDays" max="31" ng-model="patient.age.days" min="0"
                    ng-change="patient.calculateBirthDate();checkDuplicatePatients();checkValidationForm()"
-                   ng-disabled="isAgeDisabled" required
+                   ng-disabled="isAgeDisabled || formFieldsDisabled" required
             >
         </div>
 
@@ -31,7 +31,7 @@
 
     <div class="input-prepend estimate_box">
         <input type="checkbox" ng-model="patient.birthdateEstimated" ng-blur="handleUpdate('birthdateEstimated')"
-               class="estimate-check" ng-disabled="isBirthDateEstimatedDisabled" ng-change="updateDOB()">
+               class="estimate-check" ng-disabled="isBirthDateEstimatedDisabled || formFieldsDisabled" ng-change="updateDOB()">
         <span class="estimate-label" for="birthdate">{{ ::'REGISTRATION_LABEL_ESTIMATE' | translate}}</span>
     </div>
 
diff --git a/ui/app/registration/views/dob.html b/ui/app/registration/views/dob.html
index 5204afe085..ee2d5ab89d 100644
--- a/ui/app/registration/views/dob.html
+++ b/ui/app/registration/views/dob.html
@@ -3,7 +3,7 @@
         <label for="birthdate">{{ ::'REGISTRATION_LABEL_DOB' | translate}}<span class="asterick" ng-show="::dobMandatory">*</span></label>
     </div>
     <div class="field-value">
-        <input id="birthdate" type="date" name="birthdate" ng-model="patient.birthdate"  max="{{::today}}" ng-disabled="patient.birthdateEstimated"
+        <input id="birthdate" type="date" name="birthdate" ng-model="patient.birthdate"  max="{{::today}}" ng-disabled="patient.birthdateEstimated || formFieldsDisabled" 
                ng-change="patient.calculateAge();updateBirthDateEstimated();checkDuplicatePatients();onBirthDateChange()" ng-blur="handleUpdate('birthdate')" ng-required="::dobMandatory">
     </div>
 
diff --git a/ui/app/registration/views/editpatient.html b/ui/app/registration/views/editpatient.html
index aa5b78d078..4ab447c372 100644
--- a/ui/app/registration/views/editpatient.html
+++ b/ui/app/registration/views/editpatient.html
@@ -39,7 +39,7 @@
                         <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation" 
                             is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList" 
                             on-change="checkDuplicatePatients()"
-                            get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
+                            get-data-results="getDataResults" is-read-only="isReadOnly"  handle-update="handleUpdate"></attribute-types>
                 </article>
         </span>
             <!--<article class="form-field">
diff --git a/ui/app/registration/views/healthFacilityAddressFields.html b/ui/app/registration/views/healthFacilityAddressFields.html
index 31033be573..d0481644f5 100644
--- a/ui/app/registration/views/healthFacilityAddressFields.html
+++ b/ui/app/registration/views/healthFacilityAddressFields.html
@@ -22,6 +22,7 @@
                is-invalid="addressFieldInvalid"
                ng-class="{'illegalValue': addressFieldInvalid}"
                ng-keydown="removeSelection($event, addressLevel.addressField)"
+               ng-disabled="isAddressDisabled"
                required/>
     </div>
 
@@ -43,6 +44,7 @@
                is-invalid="addressFieldInvalid"
                ng-class="{'illegalValue': addressFieldInvalid}"
                ng-keydown="removeSelection($event, addressLevel.addressField)"
+               ng-disabled="isAddressDisabled"
                required/>
     </div>
 
@@ -63,6 +65,7 @@
                is-invalid="addressFieldInvalid"
                ng-class="{'illegalValue': addressFieldInvalid}"
                ng-keydown="removeSelection($event, addressLevel.addressField)"
+               ng-disabled="isAddressDisabled"
                required/>
     </div>
 
diff --git a/ui/app/registration/views/patientAction.html b/ui/app/registration/views/patientAction.html
index 20fdfee9e6..59d39a0fd5 100644
--- a/ui/app/registration/views/patientAction.html
+++ b/ui/app/registration/views/patientAction.html
@@ -30,9 +30,9 @@
         </span>
     </span>
 
-    <button type="submit" class="right submit-btn" ng-click="setSubmitSource('save')" disabled ng-if="!canSave"
+    <button ng-hide="patient.PATIENT_STATE_CHANGE.value !== 'Patient_Transferred_Out'" type="submit" class="right submit-btn" ng-click="setSubmitSource('save')" disabled ng-if="!canSave"
             accesskey="{{ ::'REGISTRATION_SAVE_ACCESS_KEY' | translate}}" ng-bind-html="::'REGISTRATION_LABEL_SAVE' | translate"></button>
 
-    <button type="submit" class="right submit-btn" ng-click="setSubmitSource('save')" ng-if="canSave"
+    <button type="submit" class="right submit-btn" ng-click="setSubmitSource('save');patientState();" ng-if="canSave"
             accesskey="{{ ::'REGISTRATION_SAVE_ACCESS_KEY' | translate}}" ng-bind-html="::'REGISTRATION_LABEL_SAVE' | translate"></button>
 </div>
diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index e11e0a95cc..8ef2351249 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -29,10 +29,10 @@
                         <input data-ng-switch-when="true" type="text" name="givenName" id="givenName" field-validation="::fieldValidation"
                                ng-model="$parent.patient.givenName" non-blank pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
-                               placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}">
+                               placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}" ng-disabled="formFieldsDisabled">
 
                         <input data-ng-switch-default type="text" name="givenName" field-validation="::fieldValidation" id="givenName" ng-model="patient.givenName" non-blank
-                               pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}">
+                               pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}" ng-disabled="formFieldsDisabled">
                     </span>
 
                     <span data-ng-switch="::isAutoComplete('givenName')"
@@ -41,13 +41,13 @@
                                ng-model="$parent.patient.givenName" non-blank pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}" field-validation="::fieldValidation"
-                               focus-me="true" ng-pattern="regexCharacters">
+                               focus-me="true" ng-pattern="regexCharacters" ng-disabled="formFieldsDisabled">
 
                         <input data-ng-switch-default type="text" name="givenName" id="givenName" ng-model="patient.givenName" non-blank
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_FIRSTNAME' | translate}}"
                                ng-pattern="regexCharacters"
                                ng-change="checkDuplicatePatients()" required field-validation="::fieldValidation"
-                               ng-class="{'illegalValue' : submitted && this.myForms.myForm.givenName.$invalid || this.myForms.myForm.givenName.$error.pattern || (this.myForms.myForm.givenName.$error.required && !this.myForms.myForm.givenName.$pristine)}">
+                               ng-class="{'illegalValue' : submitted && this.myForms.myForm.givenName.$invalid || this.myForms.myForm.givenName.$error.pattern || (this.myForms.myForm.givenName.$error.required && !this.myForms.myForm.givenName.$pristine)}" ng-disabled="formFieldsDisabled">
                         <p class="help-block" ng-show="this.myForms.myForm.givenName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
                     </span>
 
@@ -56,11 +56,11 @@
                                ng-model="$parent.patient.middleName" pattern-validate my-autocomplete
                                source="getAutoCompleteList" response-map="getDataResults" data-item-type="personName"
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}" field-validation="::fieldValidation"
-                               ng-pattern="regexCharacters">
+                               ng-pattern="regexCharacters" ng-disabled="formFieldsDisabled">
 
                         <input data-ng-switch-default type="text" name="middleName" id="middleName" ng-model="patient.middleName"
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_MIDDLE_NAME' | translate}}" field-validation="::fieldValidation"
-                               ng-pattern="regexCharacters">
+                               ng-pattern="regexCharacters" ng-disabled="formFieldsDisabled">
                         <p class="help-block" ng-show="this.myForms.myForm.middleName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
                     </span>
 
@@ -71,13 +71,13 @@
                                placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}"
                                field-validation="::fieldValidation"
                                ng-required="::isLastNameMandatory" ng-change="checkDuplicatePatients()" ng-pattern="regexCharacters"
-                               ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}">
+                               ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}" ng-disabled="formFieldsDisabled">
 
                         <input data-ng-switch-default type="text" name="familyName" id="familyName" ng-model="patient.familyName"
                                pattern-validate placeholder="{{ ::'REGISTRATION_LABEL_PATIENT_LAST_NAME' | translate}}"
                                field-validation="::fieldValidation"
                                ng-required="::isLastNameMandatory" ng-pattern="regexCharacters"
-                               ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}">
+                               ng-class="{'illegalValue' : submitted && this.myForms.myForm.familyName.$invalid || this.myForms.myForm.familyName.$error.pattern || (this.myForm.familyName.$error.required && !this.myForm.familyName.$pristine)}" ng-disabled="formFieldsDisabled">
                         <p class="help-block" ng-show="this.myForms.myForm.familyName.$error.pattern">{{::'PATTERN_REGISTRATION_CHARACTERS_ONLY' | translate}}</p>
                     </span>
 
@@ -102,7 +102,7 @@
                 </div>
                 <div class="field-value showOn-desktop" ng-show="::showCasteSameAsLastName()">
                     <input type="checkbox" id="casteSameAsLastNameCheck" ng-model="patient.sameAsLastName"
-                           ng-change="setCasteAsLastName()">
+                           ng-change="setCasteAsLastName()" ng-disabled="formFieldsDisabled">
                 </div>
                 <div class="field-attribute" ng-show="::showCasteSameAsLastName()">
                     <label id="casteSameAsLastNameCheckLabel" for="casteSameAsLastNameCheck">{{::'REGISTRATION_LABEL_CASTE_SAME_LAST_NAME'
@@ -110,7 +110,7 @@
                 </div>
                 <div class="field-value showOn-small-screen" ng-show="::showCasteSameAsLastName()">
                     <input type="checkbox" id="casteSameAsLastNameCheck" ng-model="patient.sameAsLastName"
-                           ng-change="setCasteAsLastName()">
+                           ng-change="setCasteAsLastName()" ng-disabled="formFieldsDisabled">
                 </div>
             </article>
 
@@ -125,7 +125,7 @@
                 <div class="field-value">
                     <select id="gender" name="gender" ng-model="patient.gender" required="required" ng-class="{'illegalValue' : submitted && this.myForms.myForm.gender.$invalid || this.myForms.myForm.gender.$invalid && !this.myForms.myForm.gender.$pristine}"
                             ng-options="genderMap[genderCode] | translate for genderCode in genderCodes track by genderCode"
-                            ng-change="handleUpdate('gender');checkDuplicatePatients()">
+                            ng-change="handleUpdate('gender');checkDuplicatePatients()" ng-disabled="formFieldsDisabled">
                         <option disabled value="">{{::'REGISTRATION_CHOOSE_AN_OPTION' | translate}}</option>
                     </select>
                     <!--<div class="selectGender">
@@ -138,7 +138,7 @@
                 </div>
             </article>
         </section>
-        <section class="age-wrapper">
+        <section class="age-wrapper" >
             <div ng-if="::!dobMandatory">
                 <ng-include src="'views/dob.html'"></ng-include>
                 <ng-include src="'views/age.html'"></ng-include>
@@ -243,7 +243,7 @@
                     <div class="form-field">
                         <div class="left ng-scope">
                             <select id="attributeChoice" ng-model="attributeChoice" ng-hide="existDocs.length==0"
-                                    ng-Click="nationalityEditAttribute(attributeChoice)">
+                                    ng-Click="nationalityEditAttribute(attributeChoice)" ng-disabled="formFieldsDisabled">
                                 <option value="">{{::'REGISTRATION_CHOOSE_AN_OPTION' | translate}}</option>
                                 <option ng-show="existDocs.includes('REGISTRATION_OPTION_NONE') && existDocs.includes('BI') &&
                                                      existDocs.includes('CARTAO_DE_ELEITOR') && existDocs.includes('CEDULA_DE_NASCIMENTO') &&
@@ -259,7 +259,7 @@
 
                             <button type="button" class="comment-toggle fr ng-scope ng-isolate-scope" tabindex="-1"
                                     ng-hide="existDocs.length==0" style="margin-left: 30px; height:27px"
-                                    ng-click="addEditDocRow(attributeChoice)">
+                                    ng-click="addEditDocRow(attributeChoice)" ng-disabled="formFieldsDisabled">
                                 <i class="fa-plus fa fa-green small"></i>
                             </button>
                         </div>
@@ -363,7 +363,7 @@
                  ng-if="::!addressHierarchyConfigs.showAddressFieldsTopDown"></section>
         <section top-down-address-fields data-address-levels="::addressLevels" data-address="patient.address"
                  field-validation="::fieldValidation" ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"
-                 strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel"></section>
+                 strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel" data-patient="patient.patientState"></section>
 
         <legend class="registraion_legend">
             <span class="mylegend"> {{ ::'REGISTRATION_CONTACT_INFORMATION' | translate}}</span>
@@ -536,7 +536,7 @@
 
                         <section transfer-Out-Address-Fields data-address-levels="::addressLevels" data-address="patient.address"
                                  field-validation="::fieldValidation" ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"
-                                 strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel"></section>
+                                 strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel" data-patient="patient.patientState"></section>
 
                         <section ng-repeat="attributeRow in ::patientConfiguration.customAttributeRows()">
                             <article class="form-field" ng-repeat="attribute in ::attributeRow" 
@@ -554,13 +554,13 @@
                                      ng-class="::{'right-form-field' : $index%2 != 0}">
                                      <!-- {{attribute.name}} -->
                                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                                 handle-update="handleUpdate" ng-if="attribute.name == 'DATE_OF_DEATH'"></attribute-types>
+                                                 handle-update="handleUpdate" ng-if="attribute.name == 'DATE_OF_DEATH'" is-read-only="isReadOnly"></attribute-types>
                             
                                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                                 handle-update="handleUpdate" ng-if="attribute.name == 'CAUSE_OF_DEATH'"></attribute-types>
+                                                 handle-update="handleUpdate" ng-if="attribute.name == 'CAUSE_OF_DEATH'" is-read-only="isReadOnly"></attribute-types>
 
                                 <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                                 handle-update="handleUpdate" ng-if="attribute.name == 'DEATH_OBSERVATIONS'"></attribute-types>
+                                                 handle-update="handleUpdate" ng-if="attribute.name == 'DEATH_OBSERVATIONS'" is-read-only="isReadOnly"></attribute-types>
                             </article>                     
                         </section>
                     </div>
@@ -616,7 +616,7 @@
                     <section health-facility-address-fields data-address-levels="::addressLevels"
                              data-address="patient.address" field-validation="::fieldValidation"
                              ng-if="::addressHierarchyConfigs.showAddressFieldsTopDown"
-                             strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel">
+                             strict-autocomplete-from-level="::addressHierarchyConfigs.strictAutocompleteFromLevel" data-patient="patient.patientState">
                     </section>
 
 
diff --git a/ui/app/registration/views/topDownAddressFields.html b/ui/app/registration/views/topDownAddressFields.html
index 7de54cf499..aab96f3e1c 100644
--- a/ui/app/registration/views/topDownAddressFields.html
+++ b/ui/app/registration/views/topDownAddressFields.html
@@ -24,6 +24,7 @@
                    is-invalid="addressFieldInvalid"
                    ng-class="{'illegalValue': addressFieldInvalid}"
                    on-edit="removeAutoCompleteEntry(addressLevel.addressField)"
+                   ng-disabled="::isAddressDisabled"
                    required/>
         </div>
     </article>
diff --git a/ui/app/registration/views/transferOutAddressFields.html b/ui/app/registration/views/transferOutAddressFields.html
index a773ddbbc2..c8bb82c57c 100644
--- a/ui/app/registration/views/transferOutAddressFields.html
+++ b/ui/app/registration/views/transferOutAddressFields.html
@@ -22,6 +22,7 @@
                initial-value="selectedValue[addressLevel.addressField]"
                is-invalid="addressFieldInvalid"
                ng-keydown="removeSelection($event, addressLevel.addressField)"
+               ng-disabled="isAddressDisabled"
                required/>
     </div>
 
@@ -43,6 +44,7 @@
                initial-value="selectedValue[addressLevel.addressField]"
                is-invalid="addressFieldInvalid"
                ng-keydown="removeSelection($event, addressLevel.addressField)"
+               ng-disabled="isAddressDisabled"
                required/>
     </div>
 
@@ -63,6 +65,7 @@
                initial-value="selectedValue[addressLevel.addressField]"
                is-invalid="addressFieldInvalid"
                ng-keydown="removeSelection($event, addressLevel.addressField)"
+               ng-disabled="isAddressDisabled"
                ng-required="isRequired"/>
     </div>
 

From 4e5d4d8a9a89dac72799bcf365d3c589874ff31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Tue, 3 Sep 2019 16:32:09 +0200
Subject: [PATCH 114/131] Fixes translation issues

---
 .../controllers/addTreatmentController.js     | 42 ++++++++++++++++++-
 .../views/treatmentSections/addTreatment.html |  2 +-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 645bb47dc9..2e217b0ca2 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -81,6 +81,10 @@ angular.module('bahmni.clinical')
                 }
             };
 
+            $scope.selectTreatmentLineFromDropDown = function () {
+                $scope.selectedLineDrugs = [];
+            };
+
             $scope.fetchTreatmentLines = function (conceptName) {
                 $scope.treatmentLines = [];
                 return conceptSetService.getConcept({
@@ -150,6 +154,40 @@ angular.module('bahmni.clinical')
                 return conceptName;
             };
 
+            $scope.mapConceptNames = function (conceptName) {
+                if (conceptName === "1st Line") {
+                    conceptName = "Primeira Linha";
+                }
+                if (conceptName === "2nd Line") {
+                    conceptName = "Segunda Linha";
+                }
+                if (conceptName === "3rd Line") {
+                    conceptName = "Terceira Linha";
+                }
+                if (conceptName === "Resistant") {
+                    conceptName = "Resistente";
+                }
+                if (conceptName === "Sensitive") {
+                    conceptName = "Sensitivo";
+                }
+                if (conceptName === "Tratament of ITS") {
+                    conceptName = "Treatmento de ITS";
+                }
+                if (conceptName === "Prophylaxis") {
+                    conceptName = "Profilaxia";
+                }
+                if (conceptName === "Anti-Tuberculosis Drugs") {
+                    conceptName = "Drogas Anti-Tuberculose";
+                }
+                if (conceptName === "Other category") {
+                    conceptName = "Outra Categoria";
+                }
+                if (conceptName === "Choose an answer") {
+                    conceptName = "Escolha uma resposta";
+                }
+                return conceptName;
+            };
+
             $scope.getFilteredOrderSets = function (searchTerm) {
                 if (searchTerm && searchTerm.length >= 3) {
                     orderSetService.getOrderSetsByQuery(searchTerm).then(function (response) {
@@ -439,7 +477,9 @@ angular.module('bahmni.clinical')
                 $scope.treatment.quantity = $scope.treatment.quantity ? $scope.treatment.quantity : null;
                 conceptSetService.getDrugOrderRelationship($scope.treatment.previousOrderUuid).then(function (response) {
                     $scope.selectedCategory = response.data.category;
+                    $scope.selectedCategory.display = $scope.mapConceptNames($scope.selectedCategory.display);
                     $scope.selectedTreatmentLine = response.data.treatmentLine;
+                    $scope.selectedTreatmentLine.display = $scope.mapConceptNames($scope.selectedTreatmentLine.display);
                 });
             });
 
@@ -465,7 +505,7 @@ angular.module('bahmni.clinical')
                 drugOrderRelationShip.drugUuid = $scope.treatment.drug.uuid;
                 drugOrderRelationShip.categoryUuid = $scope.selectedCategory.uuid;
                 if ($scope.selectedTreatmentLine == null || $scope.selectedTreatmentLine == "" || $scope.selectedTreatmentLine === undefined) {
-                    drugOrderRelationShip.treatmentLineUuid = "2c7f29f9-fab3-4f72-9681-61cbda3131d4";
+                    drugOrderRelationShip.treatmentLineUuid = "e53fd4bf-b89c-4f97-9c82-120038ea435c";
                 } else {
                     drugOrderRelationShip.treatmentLineUuid = $scope.selectedTreatmentLine.uuid;
                 }
diff --git a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
index 1a31138b05..aa2d4e38c7 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/addTreatment.html
@@ -31,7 +31,7 @@ <h2 class="section-title has-toggle" toggle="addTreatment">
                         <div class="field-value">
                             <select  ng-show="isBeingRevised == false" id="line-dropdown" class="fl"
                                     ng-model="selectedTreatmentLine" ng-value="selectedTreatmentLine" ng-disabled="disableTreatmentLine || isBeingRevised"
-                                    ng-options="item.display for item in treatmentLines" ng-change="" ng-click="" >
+                                    ng-options="item.display for item in treatmentLines" ng-change="selectTreatmentLineFromDropDown()" ng-click="" >
                                 <option value="" ng-if="selectedCategory=== ''">{{ 'CHOOSE_ANSWER_FROM_DROPDOWN_LABEL'|translate }}</option>
                             </select>
                             <select ng-if="isBeingRevised" ng-disabled="true"

From 56f6ac57efc7c2558270487d942f5fe8104b211a Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Wed, 4 Sep 2019 12:34:08 +0530
Subject: [PATCH 115/131] Amol | Solved MPOC-584 BUG (#332)

---
 ui/app/registration/controllers/createPatientController.js | 2 +-
 ui/app/registration/directives/patientAction.js            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/app/registration/controllers/createPatientController.js b/ui/app/registration/controllers/createPatientController.js
index ae1c306a20..e122e0ebfb 100644
--- a/ui/app/registration/controllers/createPatientController.js
+++ b/ui/app/registration/controllers/createPatientController.js
@@ -40,7 +40,7 @@ angular.module('bahmni.registration')
                 }
             };
 
-            $scope.buildFinalNID = function () {
+            $rootScope.buildFinalNID = function () {
                 $scope.patient.primaryIdentifier.registrationNumber = $scope.NID.healthFacilityCode + '/' + $scope.NID.serviceCode + '/' + $scope.NID.year + '/' + $scope.NID.sequentialCode;
             };
             $scope.$watch('patient.primaryIdentifier.registrationNumber', function () {
diff --git a/ui/app/registration/directives/patientAction.js b/ui/app/registration/directives/patientAction.js
index e9e16e799f..291b503643 100644
--- a/ui/app/registration/directives/patientAction.js
+++ b/ui/app/registration/directives/patientAction.js
@@ -159,6 +159,7 @@ angular.module('bahmni.registration')
                 patientState();
 
                 $scope.setSubmitSource = function (source) {
+                    $rootScope.buildFinalNID();
                     if (!validFields()) {
                         $rootScope.isValidFields = false;
                     } else {

From 9b85ad157f0a31aca5565557ad8d52d6453e55e2 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Wed, 4 Sep 2019 09:42:57 +0200
Subject: [PATCH 116/131] Changes patient's state if the prescription being
 suspend is dispensed

---
 .../controllers/consultationController.js           | 13 +++++++++++++
 .../controllers/drugOrderHistoryController.js       |  8 ++++++++
 .../views/treatmentSections/drugOrderHistory.html   |  5 +++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index c00b306974..3f8f8fbf32 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -545,14 +545,27 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     var params = angular.copy($state.params);
                     params.cachebuster = Math.random();
                     _.map(encounterData.drugOrders, function (currentObj) {
+                        var isPrescriptionDispensed = false;
+                        
+                        if(currentObj.orderAttributes && currentObj.orderAttributes.length) {
+                            currentObj.orderAttributes.forEach(attribute => {
+                                if(attribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && attribute.value){
+                                    isPrescriptionDispensed = true;
+                                }
+                            });
+                        }
+
                         if (currentObj.drug.form == 'ARV') {
                             if (currentObj.action == 'DISCONTINUE') {
                                 if (!($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && currentObj.orderAttributes !== undefined)) {
                                     patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
+                                } else if ($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && isPrescriptionDispensed === true) {
+                                    patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
                                 }
                             }
                         }
                     });
+
                     return encounterService.create(encounterData)
                         .then(function (saveResponse) {
                             var messageParams = {
diff --git a/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js b/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
index 9a782efc9c..e318ee17a7 100644
--- a/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
+++ b/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
@@ -156,11 +156,13 @@ angular.module('bahmni.clinical')
                 if (drugOrder.isDiscontinuedAllowed) {
                     $rootScope.$broadcast("event:discontinueDrugOrder", drugOrder);
                     $scope.updateFormConditions(drugOrder);
+                    angular.element('#dispense-drug-btn')[0].disabled = true;
                 }
             };
 
             $scope.undoDiscontinue = function (drugOrder) {
                 $rootScope.$broadcast("event:undoDiscontinueDrugOrder", drugOrder);
+                angular.element('#dispense-drug-btn')[0].disabled = false;
             };
 
             $scope.shouldBeDisabled = function (drugOrder, orderAttribute) {
@@ -175,6 +177,12 @@ angular.module('bahmni.clinical')
                     $scope.toggleDrugOrderAttribute(orderAttribute, valueToSet);
                     $scope.consultation.drugOrdersWithUpdatedOrderAttributes[drugOrder.uuid] = drugOrder;
                 }
+
+                if (orderAttribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && orderAttribute.value === true && valueToSet == undefined) {
+                    angular.element('#stop-drug-btn')[0].disabled = true;
+                }else if (orderAttribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && orderAttribute.value === false && valueToSet == undefined) {
+                    angular.element('#stop-drug-btn')[0].disabled = false;
+                }
             };
 
             $scope.toggleDrugOrderAttribute = function (orderAttribute, valueToSet) {
diff --git a/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html b/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
index 8f5f78ee87..9f7c54f1bb 100644
--- a/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
+++ b/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
@@ -28,7 +28,8 @@
                                     <div class="button-group">
                                         <button ng-repeat="orderAttribute in drugOrder.orderAttributes" show-if-privilege="{{dispensePrivilege}}"
                                                 class="dispense-btn" ng-disabled="shouldBeDisabled(drugOrder,orderAttribute)"
-                                                ng-click="updateOrderAttribute(drugOrder,orderAttribute)">
+                                                ng-click="updateOrderAttribute(drugOrder,orderAttribute)"
+                                                id="dispense-drug-btn">
                                             <i class="fa fa-check" ng-show="orderAttribute.value"></i>
                                             {{orderAttribute.name.substring(0,1)}}
                                         </button>
@@ -38,7 +39,7 @@
                                         <button class="undo-btn" ng-if="drugOrder.isMarkedForDiscontinue" ng-disabled="!drugOrder.isActive() || !drugOrder.isDiscontinuedAllowed" ng-click="undoDiscontinue(drugOrder)">
                                             <i class="fa fa-undo"></i>
                                         </button>
-                                        <button class="stop-drug-btn" ng-if="!drugOrder.isMarkedForDiscontinue" ng-disabled="!drugOrder.isActive() || !drugOrder.isDiscontinuedAllowed" ng-click="discontinue(drugOrder)">
+                                        <button class="stop-drug-btn" ng-if="!drugOrder.isMarkedForDiscontinue" ng-disabled="!drugOrder.isActive() || !drugOrder.isDiscontinuedAllowed" ng-click="discontinue(drugOrder)" id="stop-drug-btn">
                                             {{ ::'MEDICATION_STOP' | translate }}
                                         </button>
                                         <button class="refill-btn" ng-disabled="!drugOrder.effectiveStopDate || drugOrder.isDrugRetired" ng-click="refill(drugOrder)">

From 43e53bb82a0847f800da5fac16231a618429aa69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?It=C3=A9lio=20Lucas?= <itelyu@gmail.com>
Date: Wed, 4 Sep 2019 11:20:43 +0200
Subject: [PATCH 117/131] Fix Pre TARV patient behavior

---
 .../controllers/consultationController.js           | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
index 3f8f8fbf32..c00b306974 100644
--- a/ui/app/clinical/consultation/controllers/consultationController.js
+++ b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -545,27 +545,14 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                     var params = angular.copy($state.params);
                     params.cachebuster = Math.random();
                     _.map(encounterData.drugOrders, function (currentObj) {
-                        var isPrescriptionDispensed = false;
-                        
-                        if(currentObj.orderAttributes && currentObj.orderAttributes.length) {
-                            currentObj.orderAttributes.forEach(attribute => {
-                                if(attribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && attribute.value){
-                                    isPrescriptionDispensed = true;
-                                }
-                            });
-                        }
-
                         if (currentObj.drug.form == 'ARV') {
                             if (currentObj.action == 'DISCONTINUE') {
                                 if (!($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && currentObj.orderAttributes !== undefined)) {
                                     patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
-                                } else if ($scope.patient.patientStatus.toUpperCase() === "Pre TARV".toUpperCase() && isPrescriptionDispensed === true) {
-                                    patientService.savePatientStatusState('TARV_TREATMENT_SUSPENDED', $scope.patient.uuid, $rootScope.currentUser.uuid, $scope.patient.patientState);
                                 }
                             }
                         }
                     });
-
                     return encounterService.create(encounterData)
                         .then(function (saveResponse) {
                             var messageParams = {

From 9087e9e4dd84ebae97363b5c523767dae8628a3d Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Wed, 4 Sep 2019 11:28:15 +0200
Subject: [PATCH 118/131] fixed grunt issue with missing space before "else"
 instruction

---
 .../consultation/controllers/drugOrderHistoryController.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js b/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
index e318ee17a7..d26d00c4e6 100644
--- a/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
+++ b/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
@@ -180,7 +180,7 @@ angular.module('bahmni.clinical')
 
                 if (orderAttribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && orderAttribute.value === true && valueToSet == undefined) {
                     angular.element('#stop-drug-btn')[0].disabled = true;
-                }else if (orderAttribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && orderAttribute.value === false && valueToSet == undefined) {
+                } else if (orderAttribute.name.toUpperCase() == 'Dispensed'.toUpperCase() && orderAttribute.value === false && valueToSet == undefined) {
                     angular.element('#stop-drug-btn')[0].disabled = false;
                 }
             };

From ee4b22ac9b6046104de417ddfafdd5b7c3717e6c Mon Sep 17 00:00:00 2001
From: Simao Mazive <simao.mazive@jembi.org>
Date: Wed, 4 Sep 2019 12:09:50 +0200
Subject: [PATCH 119/131] Error message fix

---
 ui/app/i18n/registration/locale_pt.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/i18n/registration/locale_pt.json b/ui/app/i18n/registration/locale_pt.json
index c107432164..a0964ac12c 100644
--- a/ui/app/i18n/registration/locale_pt.json
+++ b/ui/app/i18n/registration/locale_pt.json
@@ -166,8 +166,8 @@
     "INVALID_AGE_YEAR": "Anos inválidos",
     "INVALID_AGE_MONTH": "Meses inválidos",
     "INVALID_AGE_DAY": "Dias inválidos",
-    "REGISTRATION_REQUIRED_FIELD": "Preencha correctamente os campos.",
-    "REGISTRATION_DUPLICATE_ENTRY_ERROR": "O NID introduzido está sendo usando por um outro paciente.",
+    "REGISTRATION_REQUIRED_FIELD": "Corrija os dados do campo NID.",
+    "REGISTRATION_DUPLICATE_ENTRY_ERROR": "O NID introduzido está sendo usado por um outro paciente.",
     "BMI STATUS": "Estado Nutricional",
     "BMI": "IMC",
     "REGISTRATION_STATE_INFO_KEY": "Estado de Permanência",

From df5435c62a1e63e84504a2146b9f03d30014e362 Mon Sep 17 00:00:00 2001
From: krishnanspace <krishnanspace@gmail.com>
Date: Wed, 4 Sep 2019 17:54:11 +0530
Subject: [PATCH 120/131] Krishnan | MPOC-583 Changing the description of the
 Patient State and Status

---
 .../directives/patientContext.js               | 18 ++++++++++++++++++
 .../patientContext/views/patientContext.html   |  3 ++-
 ui/app/i18n/clinical/locale_en.json            | 13 +++++++++++--
 ui/app/i18n/clinical/locale_pt.json            | 12 +++++++++++-
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js b/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
index d968af6941..3515c99880 100644
--- a/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
+++ b/ui/app/clinical/displaycontrols/patientContext/directives/patientContext.js
@@ -8,6 +8,24 @@ angular.module('bahmni.clinical')
             $scope.patientStatus = $scope.patient.patientStatus;
             $scope.patientState = $scope.patient.patientState;
 
+            if ($scope.patientState.includes('DEATH')) {
+                $scope.patientAction = 'PA_DEATH';
+            }
+
+            if ($scope.patientState.includes('SUSPENDED')) {
+                $scope.patientAction = 'PA_SUSPENDED';
+            }
+
+            if ($scope.patientState.includes('TRANSFERRED')) {
+                $scope.patientAction = 'PA_TRANSFERRED';
+            }
+
+            if ($scope.patientStatus.includes('Pre')) {
+                $scope.patientActualStatus = 'PAS_PRE_TARV';
+            } else {
+                $scope.patientActualStatus = 'PAS_TARV';
+            }
+
             $scope.initPromise.then(function (response) {
                 $scope.patientContext = response.data;
                 var programAttributes = $scope.patientContext.programAttributes;
diff --git a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
index f98c8b7d06..dceb8bb813 100644
--- a/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
+++ b/ui/app/clinical/displaycontrols/patientContext/views/patientContext.html
@@ -12,7 +12,8 @@
             </li>
             <li>{{patientContext.gender | translate}}</li>
             <li>{{patientContext.birthdate | birthDateToAgeText}}</li>
-            <li>{{patientStatus | translate}} - {{patientState | translate}}</li>
+            <li ng-if="patientState=='ACTIVE'">{{patientState | translate}} {{patientStatus | translate}}</li>
+            <li ng-if="patientState!='ACTIVE'">{{'INACTIVE' | translate}} - {{patientAction | translate}}({{patientActualStatus | translate}})</li>
             <li ng-repeat="(key, value) in patientContext.additionalPatientIdentifiers">
                 {{key}}: {{value}}
             </li>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index 21c17f5ffd..d706646243 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -467,9 +467,18 @@
     "CONFIRMED": "Confirmed",
     "PRIMARY": "Primary",
     "DRUG_SUSPEND_WARNING": "Attention: the patient state will be updated to TARV-Suspended",
-    "TARV_TREATMENT_SUSPENDED": "TARV-Treatment Suspensed",
+    "TARV_TREATMENT_SUSPENDED": "TARV - Suspensed",
     "PRESUMED": "Presumed",
     "SECONDARY": "Secondary",
     "ABANDONED": "Abandoned",
-    "CONDITION_LIST_ACTIVE_SINCE": "Active Condition since:"
+    "CONDITION_LIST_ACTIVE_SINCE": "Active Condition since:",
+    "PA_DEATH": "Death",
+    "PA_SUSPENDED": "Suspended",
+    "PA_TRANSFERRED": "Transferred Out",
+    "PAS_PRE_TARV": "Pre-TARV",
+    "PAS_TARV": "TARV",
+    "ACTIVE": "Active in",
+    "TARV_ABANDONED": "TARV - Abandoned",
+    "TARV_RESTART": "TARV - Restart",
+    "Pre TARV":"Pre-TARV"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 293f89e999..3d3cfd1d21 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -482,5 +482,15 @@
   "PRESUMED": "Presumido",
   "SECONDARY": "Secundária",
   "ABANDONED": "Abandono",
-  "CONDITION_LIST_ACTIVE_SINCE": "Condição Activa desde:"
+  "CONDITION_LIST_ACTIVE_SINCE": "Condição Activa desde:",
+  "PA_DEATH": "Óbito",
+  "PA_SUSPENDED": "Suspenso",
+  "PA_TRANSFERRED": "Transferido Para",
+  "PAS_PRE_TARV": "Pré-TARV",
+  "PAS_TARV": "TARV",
+  "ACTIVE": "Activo em",
+  "TARV_ABANDONED": "TARV - Abandono",
+  "TARV_RESTART": "TARV - Reinício",
+  "Pre TARV":"Pré-TARV"
+
 }

From 455ed6dc329effd3939dff48ecbbd6e976f1c6a4 Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Thu, 5 Sep 2019 10:58:54 +0530
Subject: [PATCH 121/131] Amol | Revert back changes for working functionality
 on QA (#337)

---
 ui/app/registration/controllers/createPatientController.js | 2 +-
 ui/app/registration/directives/patientAction.js            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/app/registration/controllers/createPatientController.js b/ui/app/registration/controllers/createPatientController.js
index e122e0ebfb..ae1c306a20 100644
--- a/ui/app/registration/controllers/createPatientController.js
+++ b/ui/app/registration/controllers/createPatientController.js
@@ -40,7 +40,7 @@ angular.module('bahmni.registration')
                 }
             };
 
-            $rootScope.buildFinalNID = function () {
+            $scope.buildFinalNID = function () {
                 $scope.patient.primaryIdentifier.registrationNumber = $scope.NID.healthFacilityCode + '/' + $scope.NID.serviceCode + '/' + $scope.NID.year + '/' + $scope.NID.sequentialCode;
             };
             $scope.$watch('patient.primaryIdentifier.registrationNumber', function () {
diff --git a/ui/app/registration/directives/patientAction.js b/ui/app/registration/directives/patientAction.js
index 291b503643..e9e16e799f 100644
--- a/ui/app/registration/directives/patientAction.js
+++ b/ui/app/registration/directives/patientAction.js
@@ -159,7 +159,6 @@ angular.module('bahmni.registration')
                 patientState();
 
                 $scope.setSubmitSource = function (source) {
-                    $rootScope.buildFinalNID();
                     if (!validFields()) {
                         $rootScope.isValidFields = false;
                     } else {

From 0d25a43cb01a238453030f38410090266f65220d Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Thu, 5 Sep 2019 08:40:38 +0200
Subject: [PATCH 122/131] Added highlight to the field with "fake" data

---
 .../consultation/controllers/diagnosisController.js        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/diagnosisController.js b/ui/app/clinical/consultation/controllers/diagnosisController.js
index a641fe7d36..2ba032b74e 100644
--- a/ui/app/clinical/consultation/controllers/diagnosisController.js
+++ b/ui/app/clinical/consultation/controllers/diagnosisController.js
@@ -58,7 +58,12 @@ angular.module('bahmni.clinical')
             };
 
             $scope.getDiagnosis = function (params) {
-                return diagnosisService.getAllFor(params.term).then(mapConcept);
+                var diagnose = diagnosisService.getAllFor(params.term).then(mapConcept);
+
+                if(!diagnose.$$state.value){
+                    angular.element("#name-0").addClass('illegalValue');
+                }
+                return diagnose;
             };
 
             $scope.getConditions = function (params) {

From 225e583237deed1ea1aaa43e8ee97ae56f0d6a8d Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Thu, 5 Sep 2019 08:41:00 +0200
Subject: [PATCH 123/131] Added highlight to the field with "fake" data

---
 .../controllers/diagnosisController.js         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/diagnosisController.js b/ui/app/clinical/consultation/controllers/diagnosisController.js
index 2ba032b74e..b55d3edc07 100644
--- a/ui/app/clinical/consultation/controllers/diagnosisController.js
+++ b/ui/app/clinical/consultation/controllers/diagnosisController.js
@@ -58,12 +58,7 @@ angular.module('bahmni.clinical')
             };
 
             $scope.getDiagnosis = function (params) {
-                var diagnose = diagnosisService.getAllFor(params.term).then(mapConcept);
-
-                if(!diagnose.$$state.value){
-                    angular.element("#name-0").addClass('illegalValue');
-                }
-                return diagnose;
+                return diagnosisService.getAllFor(params.term).then(mapConcept);
             };
 
             $scope.getConditions = function (params) {
@@ -435,6 +430,17 @@ angular.module('bahmni.clinical')
             };
 
             $scope.cleanOutDiagnosisList = function (allDiagnoses) {
+                angular.element("#name-0").addClass('illegalValue');
+
+                if(allDiagnoses.length === 1){
+                    var codedAnswers = _.map(_.remove(_.map($scope.consultation.newlyAddedDiagnoses, 'codedAnswer'), undefined), function (answer) {
+                        return answer.name.toLowerCase();
+                    });
+                    if(codedAnswers[0].toUpperCase() === allDiagnoses[0].value.toUpperCase()){
+                        angular.element("#name-0").removeClass('illegalValue');
+                    }
+                }
+                
                 return allDiagnoses.filter(function (diagnosis) {
                     return !alreadyAddedToDiagnosis(diagnosis);
                 });

From ca03b0a605716ce6680f21d7e4f3812864eeeb78 Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Thu, 5 Sep 2019 09:59:16 +0200
Subject: [PATCH 124/131] fixed grunt errors

---
 .../clinical/consultation/controllers/diagnosisController.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/diagnosisController.js b/ui/app/clinical/consultation/controllers/diagnosisController.js
index b55d3edc07..a17bf0dabe 100644
--- a/ui/app/clinical/consultation/controllers/diagnosisController.js
+++ b/ui/app/clinical/consultation/controllers/diagnosisController.js
@@ -432,15 +432,14 @@ angular.module('bahmni.clinical')
             $scope.cleanOutDiagnosisList = function (allDiagnoses) {
                 angular.element("#name-0").addClass('illegalValue');
 
-                if(allDiagnoses.length === 1){
+                if (allDiagnoses.length === 1) {
                     var codedAnswers = _.map(_.remove(_.map($scope.consultation.newlyAddedDiagnoses, 'codedAnswer'), undefined), function (answer) {
                         return answer.name.toLowerCase();
                     });
-                    if(codedAnswers[0].toUpperCase() === allDiagnoses[0].value.toUpperCase()){
+                    if (codedAnswers[0].toUpperCase() === allDiagnoses[0].value.toUpperCase()) {
                         angular.element("#name-0").removeClass('illegalValue');
                     }
                 }
-                
                 return allDiagnoses.filter(function (diagnosis) {
                     return !alreadyAddedToDiagnosis(diagnosis);
                 });

From 81208257345448dd4961364eecab486e4e382424 Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Thu, 5 Sep 2019 11:00:52 +0300
Subject: [PATCH 125/131] MPOC-571 limit hic test section to clinical privilege

---
 .../controllers/patientCommonController.js             | 10 ++++++++++
 ui/app/registration/views/patientcommon.html           |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/app/registration/controllers/patientCommonController.js b/ui/app/registration/controllers/patientCommonController.js
index 1e531c9554..4479410163 100644
--- a/ui/app/registration/controllers/patientCommonController.js
+++ b/ui/app/registration/controllers/patientCommonController.js
@@ -27,6 +27,16 @@ angular.module('bahmni.registration')
             $scope.showSuspensionSection = false;
             $scope.showDeathSection = false;
             $scope.formFieldsDisabled = false;
+            $scope.hasClinical = "false";
+
+            var findPrivilege = function (privilegeName) {
+                return _.find($rootScope.currentUser.privileges, function (privilege) {
+                    $scope.hasCLinical = privilegeName === privilege.name;
+                    return privilegeName === privilege.name;
+                });
+            };
+
+            findPrivilege("app:clinical");
 
             $scope.$on('DisableRegistrationFields', function (ent, data) {
                 if (data) {
diff --git a/ui/app/registration/views/patientcommon.html b/ui/app/registration/views/patientcommon.html
index 8ef2351249..45aab4175b 100644
--- a/ui/app/registration/views/patientcommon.html
+++ b/ui/app/registration/views/patientcommon.html
@@ -584,7 +584,7 @@
         </div>
     </div>
 
-    <div ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
+    <div ng-show="hasCLinical"  ng-repeat="section in ::patientConfiguration.getOrderedPatientAttributesSections()"
          class="additional-info-wrapper" ng-if="section.title=='patientHIVTestInformation'">
         <div ng-if="section.canShow">
             <div class="box-container form" ng-if="::(section.attributes.length > 0 && section.title)">
@@ -665,4 +665,4 @@
             <ng-include src="'views/patientDeathInformation.html'"></ng-include>
         </section>
     </div>
-</div>
\ No newline at end of file
+</div>

From 2915cb9416c004a9a97b65cf03cb9fc6d2adb406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A3o=20Mazive?=
 <47382637+simaomazive@users.noreply.github.com>
Date: Thu, 5 Sep 2019 13:19:27 +0200
Subject: [PATCH 126/131] Simao Mazive | MPOC-545 Change: Family Situation: Add
 Confidante Details to Dashboard (#334)

* Work in progress

* Family Situation: Add Confidante Details to Dashboard

* Bold labels
---
 .../views/confidentDetailsDialog.html         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 ui/app/common/displaycontrols/observation/views/confidentDetailsDialog.html

diff --git a/ui/app/common/displaycontrols/observation/views/confidentDetailsDialog.html b/ui/app/common/displaycontrols/observation/views/confidentDetailsDialog.html
new file mode 100644
index 0000000000..da696f8cd3
--- /dev/null
+++ b/ui/app/common/displaycontrols/observation/views/confidentDetailsDialog.html
@@ -0,0 +1,19 @@
+<section class="template-container" style="overflow-y: scroll;">
+    <h2 ng-class="::{'section-title': !isFulfilmentDisplayControl, 'form-field': isFulfilmentDisplayControl}">{{::title | titleTranslate}}</h2>
+    <p ng-if="section.visitDateTime.length === 0" style="background-color:#ffffff;color:#444444;padding:5px">{{::'NO_CONFIDENT_DETAILS' | translate}} </p>
+    <ul style="font-size: 14px;color: #000000">
+        <li ng-repeat="dateTime in visitsList track by $index" style="background-color:#ddd;">
+            <span class="tree-list-item row-click toggle-container ng-scope ng-isolate-scope active" id="visit{{section.visitDomId[$index]}}" toggle="isOpen[$index]">
+                <i ng-class="isOpen[$index] ? 'fa fa-caret-down' : 'fa fa-caret-right'"></i>
+                <span class="obs-date">
+                    {{dateTime | bahmniDateTime}}
+                </span>
+            </span>
+            <div ng-if="isOpen[$index] == true">
+                <div ng-repeat="concept in confidentDetailsData[$index] track by $index" class="print-observations hidden-print" style="background-color:#fff;margin-bottom:1px;padding-left:20px;padding-top:4px;padding-bottom:4px">
+                    <strong><span>{{concept.conceptNameToDisplay}}:</span></strong> <span>{{concept.valueAsString}}</span>
+                </div>
+            </div>
+        </li>
+    </ul>
+</section>
\ No newline at end of file

From 163799aa48fb892e3a357a38a3bd17bb21395a9e Mon Sep 17 00:00:00 2001
From: Amol Chavan <c.amolsoft@gmail.com>
Date: Fri, 6 Sep 2019 12:23:22 +0530
Subject: [PATCH 127/131] Amol | MPOC-584 Resolved the new issue (#340)

---
 .../controllers/createPatientController.js    |   2 +-
 ui/app/registration/views/newpatient.html     | 104 +++++++++++-------
 2 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/ui/app/registration/controllers/createPatientController.js b/ui/app/registration/controllers/createPatientController.js
index ae1c306a20..914513951d 100644
--- a/ui/app/registration/controllers/createPatientController.js
+++ b/ui/app/registration/controllers/createPatientController.js
@@ -21,7 +21,7 @@ angular.module('bahmni.registration')
             $rootScope.regexCharacters = '^[a-záàãâéèêẽíìóòõôúùçA-ZÁÀÃÂÉÈÊẼÍÌÓÒÔÕÚÙÇ ]+$';
             $scope.myForms = {};
             $rootScope.isEligibleForVisit = true;
-
+            $rootScope.typeOfRegistrationSelected = undefined;
             var getPersonAttributeTypes = function () {
                 return $rootScope.patientConfiguration.attributeTypes;
             };
diff --git a/ui/app/registration/views/newpatient.html b/ui/app/registration/views/newpatient.html
index 834f198760..16168ef686 100644
--- a/ui/app/registration/views/newpatient.html
+++ b/ui/app/registration/views/newpatient.html
@@ -9,32 +9,34 @@
                     <span class="mylegend"><strong>{{::'REGISTRATION_PATIENT_DETAILS' | translate}}</strong></span>
                 </legend>
                 <span class="form-field-inline clearfix" ng-repeat="attribute in ::patientConfiguration.attributeTypes"
-                      ng-class="{'has-error' : submitted && typeOfRegistrationSelected === undefined}">
+                    ng-class="{'has-error' : submitted && typeOfRegistrationSelected === undefined}">
                     <article class="form-field" ng-if="attribute.name == 'TYPE_OF_REGISTRATION'"
-                             ng-class="::{'right-form-field' : $index%2 != 0}">
+                        ng-class="::{'right-form-field' : $index%2 != 0}">
                         <attribute-types target-model="patient" attribute="::attribute"
-                                         field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
-                                         get-auto-complete-list="getAutoCompleteList" on-change="checkDuplicatePatients();"
-                                         get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
+                            field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
+                            get-auto-complete-list="getAutoCompleteList" on-change="checkDuplicatePatients();"
+                            get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate">
+                        </attribute-types>
                     </article>
                 </span>
                 <span class="form-field-inline clearfix" ng-repeat="attribute in ::patientConfiguration.attributeTypes"
-                      ng-class="{'has-error' : submitted && patientStatus === undefined}">
-                     <article class="form-field" ng-if="attribute.name == 'PATIENT_STATUS'"
-                              ng-class="::{'right-form-field' : $index%2 != 0}" >
-                            <attribute-types target-model="patient" attribute="::attribute" field-validation="::fieldValidation"
-                                             is-auto-complete="isAutoComplete" get-auto-complete-list="getAutoCompleteList"
-                                             on-change="checkDuplicatePatients()"
-                                             get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate"></attribute-types>
+                    ng-class="{'has-error' : submitted && patientStatus === undefined}">
+                    <article class="form-field" ng-if="attribute.name == 'PATIENT_STATUS'"
+                        ng-class="::{'right-form-field' : $index%2 != 0}">
+                        <attribute-types target-model="patient" attribute="::attribute"
+                            field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
+                            get-auto-complete-list="getAutoCompleteList" on-change="checkDuplicatePatients()"
+                            get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate">
+                        </attribute-types>
                     </article>
                 </span>
                 <span class="form-field-inline clearfix" ng-repeat="attribute in ::patientConfiguration.attributeTypes">
                     <article class="form-field" ng-if="attribute.name == 'US_REG_DATE'"
-                             ng-class="::{'right-form-field' : $index%2 != 0}" style="margin-bottom: 5px">
+                        ng-class="::{'right-form-field' : $index%2 != 0}" style="margin-bottom: 5px">
                         <attribute-types target-model="patient" attribute="::attribute"
-                                         field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
-                                         get-auto-complete-list="getAutoCompleteList" on-change="checkDuplicatePatients()"
-                                         get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate">
+                            field-validation="::fieldValidation" is-auto-complete="isAutoComplete"
+                            get-auto-complete-list="getAutoCompleteList" on-change="checkDuplicatePatients()"
+                            get-data-results="getDataResults" is-read-only="isReadOnly" handle-update="handleUpdate">
                         </attribute-types>
                     </article>
                 </span>
@@ -43,7 +45,7 @@
                     <div class="photo-container-wrapper" ng-if="!disablePhotoCapture">
                         <span class="pull-right photo-container">
                             <img class="patient-image" ng-src="{{patient.image}}"
-                                 fallback-src="../images/blank-user.gif">
+                                fallback-src="../images/blank-user.gif">
                             <div ng-model="patient.image" capture-photo="" class="capture-photo-btn"></div>
                         </span>
                     </div>
@@ -52,56 +54,74 @@
                     <article class="form-field existing-patient">
                         <div class="field-attribute">
                             <label class="control-label"
-                                   for="patientID">{{'REGISTRATION_LABEL_PATIENT_ENTER_ID' | translate}}
+                                for="patientID">{{'REGISTRATION_LABEL_PATIENT_ENTER_ID' | translate}}
                                 <span
-                                        ng-show="::patient.primaryIdentifier.identifierType.required && !patient.primaryIdentifier.hasIdentifierSources()"
-                                        class="asterick">*</span>
+                                    ng-show="::patient.primaryIdentifier.identifierType.required && !patient.primaryIdentifier.hasIdentifierSources()"
+                                    class="asterick">*</span>
                             </label>
                         </div>
                         <div class="input-prepend" ng-if="typeOfRegistrationSelected == 'TRANSFERRED_PATIENT'">
                             <span class="add-on">{{ ::'REGISTRATION_HEALTH_FACILITY_CODE' | translate}}</span>
-                            <input type="text" name="healthFacilityCode" id="healthFacilityCode" ng-model="NID.healthFacilityCode"
-                                   pattern-validate onfocus="this.value=''" focus-me="true" placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE' | translate}}"
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier"
-                                   ng-blur="buildFinalNID()" minlength="8" ng-pattern="regexDigits" maxlength="8" size=8 required
-                                   ng-class="{'illegalValue' : submitted && this.myForms.myForm.healthFacilityCode.$invalid || this.myForms.myForm.healthFacilityCode.$invalid && !this.myForms.myForm.healthFacilityCode.$pristine || this.myForms.myForm.healthFacilityCode.$error.pattern}" >
-                            <p class="help-block" ng-show="this.myForms.myForm.healthFacilityCode.$error.minlength && !this.myForms.myForm.healthFacilityCode.$error.pattern">{{::'MINLENGTH_HEALTH_FACILITY_CODE' | translate}}</p>
+                            <input type="text" name="healthFacilityCode" id="healthFacilityCode"
+                                ng-init="NID.healthFacilityCode=''" ng-model="NID.healthFacilityCode" pattern-validate
+                                onfocus="this.value=''" focus-me="true"
+                                placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE' | translate}}"
+                                focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()"
+                                minlength="8" ng-pattern="regexDigits" maxlength="8" size=8 required
+                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.healthFacilityCode.$invalid || this.myForms.myForm.healthFacilityCode.$invalid && !this.myForms.myForm.healthFacilityCode.$pristine || this.myForms.myForm.healthFacilityCode.$error.pattern}">
+                            <p class="help-block"
+                                ng-show="this.myForms.myForm.healthFacilityCode.$error.minlength && !this.myForms.myForm.healthFacilityCode.$error.pattern">
+                                {{::'MINLENGTH_HEALTH_FACILITY_CODE' | translate}}</p>
                         </div>
 
                         <div class="input-prepend" ng-if="typeOfRegistrationSelected == undefined">
                             <span class="add-on">{{ ::'REGISTRATION_HEALTH_FACILITY_CODE' | translate}}</span>
-                            <input type="text" required ng-value="NID.healthFacilityCode = ''" name="healthFacilityCode" id="healthFacilityCode" ng-model="NID.healthFacilityCode" size="8" ng-disabled="true">
+                            <input type="text" required ng-value="NID.healthFacilityCode = ''" name="healthFacilityCode"
+                                id="healthFacilityCode" ng-model="NID.healthFacilityCode" size="8" ng-disabled="true">
                         </div>
+
                         <div class="input-prepend" ng-if="typeOfRegistrationSelected == 'NEW_PATIENT'">
                             <span class="add-on">{{ ::'REGISTRATION_HEALTH_FACILITY_CODE' | translate}}</span>
-                            <input name="healthFacilityCode" type="text" id="healthFacilityCode" ng-model="NID.healthFacilityCode"
-                                   pattern-validate ng-value="NID.healthFacilityCode = healthFacility.code" ng-disabled="true"
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier"
-                                   ng-blur="buildFinalNID()" minlength="8" maxlength="8" size=8 required>
+                            <input type="text" name="healthFacilityCode" id="healthFacilityCode"
+                                ng-model="NID.healthFacilityCode" pattern-validate onfocus="this.value=''"
+                                focus-me="true"
+                                placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_HEALTHFACILITY_CODE' | translate}}"
+                                focus-on="patient.primaryIdentifier.hasOldIdentifier"
+                                ng-focus="NID.healthFacilityCode = healthFacility.code" ng-blur="buildFinalNID()"
+                                minlength="8" ng-pattern="regexDigits" maxlength="8" size=8 required readonly
+                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.healthFacilityCode.$invalid || this.myForms.myForm.healthFacilityCode.$invalid && !this.myForms.myForm.healthFacilityCode.$pristine || this.myForms.myForm.healthFacilityCode.$error.pattern}">
+                            <p class="help-block"
+                                ng-show="this.myForms.myForm.healthFacilityCode.$error.minlength && !this.myForms.myForm.healthFacilityCode.$error.pattern">
+                            </p>
                         </div>
 
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_SERVICE_CODE' | translate}}</span>
-                            <input type="text" name="serviceCode" id="serviceCode" ng-model="NID.serviceCode" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" disabled size="2"
-                                   ng-init="NID.serviceCode='01'">
+                            <input type="text" name="serviceCode" id="serviceCode" ng-model="NID.serviceCode"
+                                pattern-validate focus-on="patient.primaryIdentifier.hasOldIdentifier" disabled size="2"
+                                ng-init="NID.serviceCode='01'">
                         </div>
 
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_NID_YEAR' | translate}}</span>
                             <input type="number" id="nidYear" name="nidYear" ng-model="NID.year" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()" min="1900" size="4"
-                                   max="{{currentYear}}" minlength="1" maxlength="4" required placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_YEAR' | translate}}"
-                                   ng-class="{'illegalValue' : submitted && this.myForms.myForm.nidYear.$invalid || this.myForms.myForm.nidYear.$invalid && !this.myForms.myForm.nidYear.$pristine}">
+                                focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()"
+                                min="1900" size="4" max="{{currentYear}}" minlength="1" maxlength="4" required
+                                placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_YEAR' | translate}}"
+                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.nidYear.$invalid || this.myForms.myForm.nidYear.$invalid && !this.myForms.myForm.nidYear.$pristine}">
                         </div>
 
                         <div class="input-prepend">
                             <span class="add-on">{{ ::'REGISTRATION_SEQUENTIAL_CODE' | translate}}</span>
-                            <input type="text" name="sequentialCode" id="sequentialCode" ng-model="NID.sequentialCode" pattern-validate
-                                   focus-on="patient.primaryIdentifier.hasOldIdentifier" ng-blur="buildFinalNID()"
-                                   minlength="5" ng-pattern="regexDigits" maxlength="5" size="8" required placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE' | translate}}"
-                                   ng-class="{'illegalValue' : submitted && this.myForms.myForm.sequentialCode.$invalid || !this.myForms.myForm.sequentialCode.$pristine && this.myForms.myForm.sequentialCode.$invalid || this.myForms.myForm.sequentialCode.$error.pattern || this.myForms.myForm.sequentialCode.$error.minlength}">
-                            <p class="help-block" ng-show="this.myForms.myForm.sequentialCode.$error.minlength && !this.myForms.myForm.sequentialCode.$error.pattern">{{::'MINLENGTH_REGISTRATION_SEQUENTIAL_CODE' | translate}}</p>
+                            <input type="text" name="sequentialCode" id="sequentialCode" ng-model="NID.sequentialCode"
+                                pattern-validate focus-on="patient.primaryIdentifier.hasOldIdentifier"
+                                ng-blur="buildFinalNID()" minlength="5" ng-pattern="regexDigits" maxlength="5" size="8"
+                                required
+                                placeholder="{{::'REGISTRATION_PLACEHOLDER_FOR_NID_SEQUENCIAL_CODE' | translate}}"
+                                ng-class="{'illegalValue' : submitted && this.myForms.myForm.sequentialCode.$invalid || !this.myForms.myForm.sequentialCode.$pristine && this.myForms.myForm.sequentialCode.$invalid || this.myForms.myForm.sequentialCode.$error.pattern || this.myForms.myForm.sequentialCode.$error.minlength}">
+                            <p class="help-block"
+                                ng-show="this.myForms.myForm.sequentialCode.$error.minlength && !this.myForms.myForm.sequentialCode.$error.pattern">
+                                {{::'MINLENGTH_REGISTRATION_SEQUENTIAL_CODE' | translate}}</p>
                         </div>
 
                     </article>

From 3783f122bc79689cf08182dc56db2d1ab3aade36 Mon Sep 17 00:00:00 2001
From: Itelio Lucas <itelyu@gmail.com>
Date: Fri, 6 Sep 2019 11:22:44 +0200
Subject: [PATCH 128/131] Highlight fields with invalid data

---
 .../consultation/controllers/diagnosisController.js  | 12 ++++++++++++
 ui/app/clinical/consultation/views/allergies.html    |  4 ++--
 ui/app/clinical/consultation/views/conditions.html   |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/diagnosisController.js b/ui/app/clinical/consultation/controllers/diagnosisController.js
index a17bf0dabe..65d9d3fd73 100644
--- a/ui/app/clinical/consultation/controllers/diagnosisController.js
+++ b/ui/app/clinical/consultation/controllers/diagnosisController.js
@@ -132,6 +132,16 @@ angular.module('bahmni.clinical')
                 });
             };
 
+            $scope.checkInvalidConditions = function () {
+                // Should check first, before adding class but as the system only accepts on-select values then check is skipped
+                angular.element("#condition").addClass('illegalValue');
+            };
+
+            $scope.checkInvalidAllergies = function (consultation) {
+                // Should check first, before adding class but as the system only accepts on-select values then check is skipped
+                angular.element("#allergy").addClass('illegalValue');
+            };
+
             var isInvalidDiagnosis = function (diagnosis) {
                 var codedAnswers = _.map(_.remove(_.map($scope.consultation.newlyAddedDiagnoses, 'codedAnswer'), undefined), function (answer) {
                     return answer.name.toLowerCase();
@@ -189,6 +199,7 @@ angular.module('bahmni.clinical')
                 return function (item) {
                     $scope.consultation.condition.concept.uuid = item.lookup.uuid;
                     item.value = $scope.consultation.condition.concept.name = item.lookup.name;
+                    angular.element("#condition").removeClass('illegalValue');
                 };
             };
 
@@ -196,6 +207,7 @@ angular.module('bahmni.clinical')
                 return function (item) {
                     $scope.consultation.allergy.concept.uuid = item.lookup.uuid;
                     item.value = $scope.consultation.allergy.concept.name = item.lookup.name;
+                    angular.element("#allergy").removeClass('illegalValue');
                 };
             };
 
diff --git a/ui/app/clinical/consultation/views/allergies.html b/ui/app/clinical/consultation/views/allergies.html
index 7bd8f8d32e..980d1ad6d3 100644
--- a/ui/app/clinical/consultation/views/allergies.html
+++ b/ui/app/clinical/consultation/views/allergies.html
@@ -13,10 +13,10 @@
         </div>
         <div class="row">
             <div class="col col1">
-                <input ng-model="consultation.allergy.concept.name" type="text" name="name" id="name"
+                <input ng-model="consultation.allergy.concept.name" type="text" name="name" id="allergy"
                        bahmni-autocomplete source="getAllergyDiagnosis"
                        on-select="getAddAllergyMethod()"
-                       ng-change="consultation.allergy.clearConcept()"
+                       ng-change="consultation.allergy.clearConcept(); checkInvalidAllergies()"
                        ng-class="{illegalValue: !(consultation.allergy.concept.name || consultation.allergy.isEmpty())}">
             </div>
             <div class="col col2">
diff --git a/ui/app/clinical/consultation/views/conditions.html b/ui/app/clinical/consultation/views/conditions.html
index 2d06bb1350..9ac7afd06e 100644
--- a/ui/app/clinical/consultation/views/conditions.html
+++ b/ui/app/clinical/consultation/views/conditions.html
@@ -13,10 +13,10 @@
         </div>
         <div class="row">
             <div class="col col1">
-                <input ng-model="consultation.condition.concept.name" type="text" name="name" id="name"
+                <input ng-model="consultation.condition.concept.name" type="text" name="name" id="condition"
                        bahmni-autocomplete source="getConditions"
                        on-select="getAddConditionMethod()"
-                       ng-change="consultation.condition.clearConcept()"
+                       ng-change="consultation.condition.clearConcept(); checkInvalidConditions()"
                        ng-class="{illegalValue: !(consultation.condition.concept.name || consultation.condition.isEmpty())}">
             </div>
             <div class="col col2">

From 7b8a1ee26a94b621be781ca17477789774c11dcf Mon Sep 17 00:00:00 2001
From: = <ekirapapaul@gmail.com>
Date: Fri, 6 Sep 2019 14:21:12 +0300
Subject: [PATCH 129/131] MPOC-316 Changed medications categories translations

---
 .../controllers/addTreatmentController.js           | 13 ++++++++-----
 ui/app/i18n/clinical/locale_en.json                 |  7 ++++++-
 ui/app/i18n/clinical/locale_pt.json                 |  8 ++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index 2e217b0ca2..fc163430b4 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -54,23 +54,27 @@ angular.module('bahmni.clinical')
                 });
             };
 
+            var getTranslatedMessage = function (key) {
+                return $translate.instant(key);
+            };
+
             $scope.selectCategoryFromDropdown = function () {
                 $scope.treatmentLines = [];
                 if ($scope.selectedCategory != undefined) {
-                    if ($scope.selectedCategory.display === "ARV") {
+                    if ($scope.selectedCategory.display === getTranslatedMessage("ARV_KEY")) {
                         $scope.selectedTreatmentLineCategory = "treatment_line_arv";
                         $scope.disableTreatmentLine = false;
                         $scope.disableMedication = false;
                         $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
-                    } else if ($scope.selectedCategory.display.toUpperCase() === "Anti-Tuberculosis Drugs".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Drogas Anti-Tuberculose".toUpperCase()) {
+                    } else if ($scope.selectedCategory.display === getTranslatedMessage("ANTI_TB_KEY")) {
                         $scope.selectedTreatmentLineCategory = "treatment_line_tb";
                         $scope.fetchTreatmentLines($scope.selectedTreatmentLineCategory);
                         $scope.disableTreatmentLine = false;
                         $scope.disableMedication = false;
-                    } else if ($scope.selectedCategory.display.toUpperCase() === "Other".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Outra Categoria".toUpperCase()) {
+                    } else if ($scope.selectedCategory.display === getTranslatedMessage("OTHER_CATEGORY")) {
                         $scope.disableMedication = false;
                         $scope.disableTreatmentLine = true;
-                    } else if ($scope.selectedCategory.display.toUpperCase() === "Tratamento de ITS".toUpperCase() || $scope.selectedCategory.display.toUpperCase() === "Treatment of ITS".toUpperCase()) {
+                    } else if ($scope.selectedCategory.display === getTranslatedMessage("ITS_KEY")) {
                         $scope.disableMedication = false;
                         $scope.disableTreatmentLine = true;
                     } else {
@@ -110,7 +114,6 @@ angular.module('bahmni.clinical')
                 if (defaultLocale === "en") {
                     conceptName = $scope.mapTreatmentLines(conceptName);
                 }
-                console.log(conceptName);
                 return conceptSetService.getConcept({
                     name: conceptName,
                     v: "custom:(answers:(uuid,name,names))"
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index d706646243..ceb5f82f5b 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -480,5 +480,10 @@
     "ACTIVE": "Active in",
     "TARV_ABANDONED": "TARV - Abandoned",
     "TARV_RESTART": "TARV - Restart",
-    "Pre TARV":"Pre-TARV"
+    "Pre TARV":"Pre-TARV",
+    "ARV_KEY" : "ARV",
+    "PROPHYLAXIS_KEY" : " Prophylaxis",
+    "ITS_KEY" : "Treatment of ITS",
+    "ANTI_TB_KEY" : "Anti-Tuberculosis Drugs",
+    "OTHER_CATEGORY" : "Other"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index 3d3cfd1d21..6bcb8f95c1 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -491,6 +491,10 @@
   "ACTIVE": "Activo em",
   "TARV_ABANDONED": "TARV - Abandono",
   "TARV_RESTART": "TARV - Reinício",
-  "Pre TARV":"Pré-TARV"
-
+  "Pre TARV":"Pré-TARV",
+  "ARV_KEY" : "Antirretrovirais",
+  "PROPHYLAXIS_KEY" : "Profilaxias",
+  "ITS_KEY" : "Tratamento de ITS",
+  "ANTI_TB_KEY" : "Medicamentos Anti-Tuberculose",
+  "OTHER_CATEGORY" : "Outros Medicamentos"
 }

From 3b7c7517e7ff1a57d40e751cc45e3d466f8db3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Mon, 9 Sep 2019 10:24:24 +0200
Subject: [PATCH 130/131] Adds small improvements on ARV translations

---
 ui/app/i18n/clinical/locale_en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index ceb5f82f5b..850d426410 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -481,7 +481,7 @@
     "TARV_ABANDONED": "TARV - Abandoned",
     "TARV_RESTART": "TARV - Restart",
     "Pre TARV":"Pre-TARV",
-    "ARV_KEY" : "ARV",
+    "ARV_KEY" : "Antirretrovirals",
     "PROPHYLAXIS_KEY" : " Prophylaxis",
     "ITS_KEY" : "Treatment of ITS",
     "ANTI_TB_KEY" : "Anti-Tuberculosis Drugs",

From 6512af258d3f33a86db835efc19b47603d63f838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edg=C3=AAncio=20da=20Calista?= <edgencio@gmail.com>
Date: Mon, 9 Sep 2019 11:40:27 +0200
Subject: [PATCH 131/131] Fixes "Dispensation type not showing"

---
 .../clinical/consultation/controllers/addTreatmentController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
index fc163430b4..c7b07866f9 100644
--- a/ui/app/clinical/consultation/controllers/addTreatmentController.js
+++ b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -737,7 +737,7 @@ angular.module('bahmni.clinical')
 
                 $scope.onChange = function () {
                     if (selectedItem) {
-                        $scope.isARV = selectedItem.drug.dosageForm && selectedItem.drug.dosageForm.display === "ARV";
+                        $scope.isARV = selectedItem.drug.dosageForm && (selectedItem.drug.dosageForm.display === "ARV" || selectedItem.drug.dosageForm.display === getTranslatedMessage("ARV_KEY"));
                         $scope.treatment.isNonCodedDrug = false;
                         delete $scope.treatment.drugNonCoded;
                         $scope.treatment.changeDrug({