Mobn 2522 (#100)

* SreeLekha, Sri Laxmi | MOBN-2522 | Update. Address fields in visit tab patient ribbon. * SreeLekha, Sri Laxmi | MOBN-2522 | Update. Visit tab patient ribbon CSS. --------- Co-authored-by: rsrilaxmiragini <[email protected]>
bahmni-msf · Nov 6, 2024 · 76b9908 · 76b9908
1 parent 3c82bfc
commit 76b9908
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ui/app/clinical/common/controllers/visitController.js b/ui/app/clinical/common/controllers/visitController.js
@@ -118,6 +118,8 @@ angular.module('bahmni.clinical')
 
             var init = function () {
                 $scope.hideDoctorName = appService.getAppDescriptor().getConfigValue("hideDoctorName");
+                $scope.hidePOAddress = appService.getAppDescriptor().getConfigValue("hidePOAddress");
+                $scope.hideVillageAddress = appService.getAppDescriptor().getConfigValue("hideVillageAddress");
                 $scope.visitTabConfig.setVisitUuidsAndPatientUuidToTheSections([$scope.visitUuid], $scope.patientUuid);
                 var tabToOpen = getTab();
                 $scope.visitTabConfig.switchTab(tabToOpen);

diff --git a/ui/app/clinical/common/views/patientInfoPrint.html b/ui/app/clinical/common/views/patientInfoPrint.html
@@ -9,15 +9,16 @@
             <td>Registration No: <span class="value">{{patient.identifier}}</span></td>
         </tr>
         <tr>
-            <td>Village / Town: <span class="value">{{patient.address.cityVillage}}</span></td>
-            <td>P.O: <span class="value">{{patient.address.address2}}</span></td>
-            <td>District: <span class="value">{{patient.address.countyDistrict}}</span></td>
+            <td ng-hide="hideVillageAddress">Village / Town: <span class="value">{{patient.address.cityVillage}}</span></td>
+            <td ng-hide="hidePOAddress">P.O: <span class="value">{{patient.address.address2}}</span></td>
+            <td>Traditional Authority: <span class="value">{{patient.address.address4}}</span></td>
+            <td colspan="2">District: <span class="value">{{patient.address.address3}}</span></td>
         </tr>
         <tr ng-switch-when="true">
             <td colspan="3">Visit Date: <span class="value">{{(visitDate | bahmniDate) || (visitSummary.startDateTime | bahmniDate)}}</span></td>
         </tr>
         <tr ng-switch-default>
-            <td colspan="2">Visit Date: <span class="value">{{(visitDate | bahmniDate) || (visitSummary.startDateTime | bahmniDate)}}</span></td>
+            <td colspan="3">Visit Date: <span class="value">{{(visitDate | bahmniDate) || (visitSummary.startDateTime | bahmniDate)}}</span></td>
             <td ng-hide="hideDoctorName">Doctor Name:
                 <span ng-show="providerNames || drugOrders[drugOrders.length-1].provider.name" class="ng-binding">
                     {{providerNames ? providerNames : drugOrders[drugOrders.length-1].provider.name }}

diff --git a/ui/app/common/patient/mappers/patientMapper.js b/ui/app/common/patient/mappers/patientMapper.js
@@ -81,6 +81,7 @@ Bahmni.PatientMapper = function (patientConfig, $rootScope, $translate) {
             "address1": preferredAddress.address1,
             "address2": preferredAddress.address2,
             "address3": preferredAddress.address3,
+            "address4": preferredAddress.address4,
             "cityVillage": preferredAddress.cityVillage,
             "countyDistrict": preferredAddress.countyDistrict === null ? '' : preferredAddress.countyDistrict,
             "stateProvince": preferredAddress.stateProvince,