[Rahul] | BAH-4064 | Add. IPD Dashboard Link For All IPD Visits

Bahmni · Aug 13, 2024 · 24762ea · 24762ea
1 parent d2ad40b
commit 24762ea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/ui/app/clinical/consultation/models/visitHistoryEntry.js b/ui/app/clinical/consultation/models/visitHistoryEntry.js
@@ -10,8 +10,8 @@ Bahmni.Clinical.VisitHistoryEntry = (function () {
  return this.stopDatetime === null;
  },
 
- isActiveIPDVisit: function () {
- return this.stopDatetime === null && (this.visitType.name || this.visitType.display) === "IPD";
+ isIPDVisit: function () {
+ return (this.visitType.name || this.visitType.display) === "IPD";
  },
 
  isFromCurrentLocation: function (currentVisitLocation) {

diff --git a/ui/app/clinical/displaycontrols/allvisits/views/visitsTable.html b/ui/app/clinical/displaycontrols/allvisits/views/visitsTable.html
@@ -11,22 +11,21 @@ <h2 class="section-title" ng-show="::params.translationKey" >
  <table class="visits dashboard-table" id="visitDisplayTable" ng-if="::hasVisits()">
  <tbody>
  <tr id="eachVisit" ng-repeat="visit in ::visits | limitTo: params.maximumNoOfVisits">
- <td class="name" width="50%">
+ <td class="name" width="40%">
  <a class="visit" ng-click="openVisit(visit)">
  <span>{{::visit.startDatetime | bahmniDate}}</span>
  <span ng-if="::!visit.isOneDayVisit()">- {{::visit.stopDatetime | bahmniDate }}</span>
  <i class="fa fa-star current-visit-icon" id="currentVisitIcon" ng-if="::visit.isActive()"
  title="Current Visit"></i>
  </a>
  </td>
- <td class="value" id="visitType" ng-if="::visit.isActiveIPDVisit()">
+ <td class="value" id="visitType">{{::translateVisitTypes(visit.getVisitType())}}</td>
+ <td class="value" id="visitType" ng-if="::visit.isIPDVisit()">
  <a class="visit" ng-click="openIPDDashboard(visit)">
- {{::translateVisitTypes(visit.getVisitType())}}
+ {{::'VIEW_IPD_DASHBOARD'|translate}}
+ <i class="fa fa-external-link"></i>
  </a>
  </td>
- <td class="value" id="visitType" ng-if="::!visit.isActiveIPDVisit()">
- {{::translateVisitTypes(visit.getVisitType())}}
- </td>
  </tr>
  </tbody>
  </table>

diff --git a/ui/app/common/displaycontrols/navigationlinks/directives/navigationLinks.js b/ui/app/common/displaycontrols/navigationlinks/directives/navigationLinks.js
@@ -45,12 +45,6 @@ angular.module('bahmni.common.displaycontrol.navigationlinks')
  "translationKey": "PATIENT_REGISTRATION_PAGE_KEY",
  "url": "../registration/#/patient/{{patientUuid}}",
  "title": "Registration"
- },
- {
- "name": "labEntry",
- "translationKey": "LAB_ENTRY_KEY",
- "url": "/lab/patient/{{patientUuid}}",
- "title": "Lab Entry"
  }
  ];
 

diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
@@ -201,7 +201,7 @@
  "MESSAGE_DIALOG_OPTION_OKAY": "OK",
  "MESSAGE_DIALOG_OPTION_REVIEW": "Review",
  "MESSAGE_DIALOG_OPTION_DISCARD": "Discard",
- "LAB_ENTRY_KEY": "Lab Entry",
+ "VIEW_IPD_DASHBOARD": "View IPD Dashboard",
  "OBS_BOOLEAN_YES_KEY": "Yes",
  "OBS_BOOLEAN_NO_KEY": "No",
  "CLINICAL_DUPLICATE_DIAGNOSIS_ERROR_MESSAGE": "Please correct the duplicate diagnosis entered.",