From 2b23bb519203ed982b030121b380f4ef8da864cc Mon Sep 17 00:00:00 2001
From: Joao machiana <joaomachiana@gmail.com>
Date: Thu, 31 Oct 2019 14:13:38 +0200
Subject: [PATCH] Revert "Merge pull request #384 from esaude/MPOC-650"

This reverts commit f259b0d6be7d57baea5f9f39cd79ef56fd683cc6, reversing
changes made to 6feb26d8f494becc8a5c032f9a43d7b4230474ea.
---
 .../clinical/common/views/visitSummary.html   |  6 --
 ui/app/clinical/config/visitMandatoryTab.json | 32 ++++++-
 .../directives/appointmentResume.js           | 85 -------------------
 .../consultation/views/appointmentResume.html | 61 -------------
 .../consultation/views/consultation.html      |  5 --
 .../views/investigationResults.html           |  2 +
 ui/app/clinical/index.html                    |  1 -
 .../pivottable/views/pivotTable.html          |  4 +-
 ui/app/i18n/clinical/locale_en.json           |  4 +-
 ui/app/i18n/clinical/locale_pt.json           |  4 +-
 10 files changed, 34 insertions(+), 170 deletions(-)
 delete mode 100644 ui/app/clinical/consultation/directives/appointmentResume.js
 delete mode 100644 ui/app/clinical/consultation/views/appointmentResume.html

diff --git a/ui/app/clinical/common/views/visitSummary.html b/ui/app/clinical/common/views/visitSummary.html
index 882facab3a..74f09fbb2a 100644
--- a/ui/app/clinical/common/views/visitSummary.html
+++ b/ui/app/clinical/common/views/visitSummary.html
@@ -66,12 +66,6 @@
                                     visit-summary="visitSummary"></treatment-data>
                 </div>
             </div>
-            <div data-ng-switch-when="appointment">
-                <section class="block observation section-grid">
-                    <appointment-resume></appointment-resume>
-                </section>
-            </div>
-
             <div data-ng-switch-when="disposition">
                 <div ng-if="::section.config">
                     <disposition id="disposition" params="::section.config"
diff --git a/ui/app/clinical/config/visitMandatoryTab.json b/ui/app/clinical/config/visitMandatoryTab.json
index 5a27812fea..b29c6fc2ce 100644
--- a/ui/app/clinical/config/visitMandatoryTab.json
+++ b/ui/app/clinical/config/visitMandatoryTab.json
@@ -42,6 +42,24 @@
                 "showDetailsButton": true
             }
         },
+        "Disposition": {
+            "type": "disposition",
+            "translationKey": "VISIT_TITLE_DISPOSITIONS_KEY",
+            "displayOrder": 3,
+            "config": {
+                "translationKey":"VISIT_TITLE_DISPOSITION_KEY",
+                "numberOfVisits": 1,
+                "showDetailsButton": true
+            }
+        },
+        "Admission Details": {
+            "type": "admissionDetails",
+            "displayOrder": 4,
+            "config": {
+                "translationKey": "VISIT_TITLE_ADMISSION_DETAILS_KEY",
+                "showDetailsButton": true
+            }
+        },
         "Investigation Result": {
             "type": "investigationResult",
             "title": "Investigation Result",
@@ -71,12 +89,18 @@
                 "showProvider" : true
             }
         },
-        "Appointments": {
-            "type": "appointment",
-            "title": "Appointments",
+        "Radiology": {
+            "type": "radiology",
             "displayOrder": 7,
             "config": {
-                "translationKey": "CONSULTATION_TAB_APPOINTMENT_HEADER_LABEL"
+                "translationKey": "VISIT_TITLE_RADIOLOGY_KEY"
+            }
+        },
+        "Patient Files": {
+            "type": "patientFiles",
+            "displayOrder": 8,
+            "config": {
+                "translationKey": "VISIT_TITLE_PATIENT_FILES_KEY"
             }
         }
     }
diff --git a/ui/app/clinical/consultation/directives/appointmentResume.js b/ui/app/clinical/consultation/directives/appointmentResume.js
deleted file mode 100644
index a14ea76124..0000000000
--- a/ui/app/clinical/consultation/directives/appointmentResume.js
+++ /dev/null
@@ -1,85 +0,0 @@
-'use strict';
-
-angular.module('bahmni.clinical').directive('appointmentResume', ['$http', '$q', '$window', function ($http, $q, $window) {
-    var link = function ($scope) {
-        var getUpcomingAppointments = function () {
-            var params = {
-                q: "bahmni.sqlGet.upComingAppointments",
-                v: "full",
-                patientUuid: $scope.patient.uuid
-            };
-            return $http.get('/openmrs/ws/rest/v1/bahmnicore/sql', {
-                method: "GET",
-                params: params,
-                withCredentials: true
-            });
-        };
-        var getPastAppointments = function () {
-            var params = {
-                q: "bahmni.sqlGet.pastAppointments",
-                v: "full",
-                patientUuid: $scope.patient.uuid
-            };
-            return $http.get('/openmrs/ws/rest/v1/bahmnicore/sql', {
-                method: "GET",
-                params: params,
-                withCredentials: true
-            });
-        };
-        $q.all([getUpcomingAppointments(), getPastAppointments()]).then(function (response) {
-            var upcomingAppointments = response[0].data;
-            $scope.upcomingApss_ClinicalAppointment = [];
-
-            for (let i = 0; i < upcomingAppointments.length; i++) {
-                if (upcomingAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_KEY === 'APSS&PP' || upcomingAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_KEY === 'Consulta Clínica' || upcomingAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_KEY === 'Farmácia') {
-                    $scope.upcomingApss_ClinicalAppointment.push(upcomingAppointments[i]);
-                }
-            }
-
-            for (let i = 0; i < $scope.upcomingApss_ClinicalAppointment.length; i++) {
-                delete $scope.upcomingApss_ClinicalAppointment[i].DASHBOARD_APPOINTMENTS_PROVIDER_KEY;
-                delete $scope.upcomingApss_ClinicalAppointment[i].DASHBOARD_APPOINTMENTS_STATUS_KEY;
-                delete $scope.upcomingApss_ClinicalAppointment[i].DASHBOARD_APPOINTMENTS_SERVICE_TYPE_KEY;
-                $scope.upcomingApss_ClinicalAppointment[i].DASHBOARD_APPOINTMENTS_SLOT_KEY = $scope.setBlock($scope.upcomingApss_ClinicalAppointment[i].DASHBOARD_APPOINTMENTS_SLOT_KEY);
-            }
-            $scope.upcomingApss_ClinicalAppointmentsHeadings = _.keys($scope.upcomingApss_ClinicalAppointment[0]);
-
-            var pastAppointments = response[1].data;
-            $scope.pastApss_ClinicalAppointments = [];
-
-            for (let i = 0; i < pastAppointments.length; i++) {
-                if (pastAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_KEY === 'APSS&PP' || pastAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_KEY === 'Consulta Clínica' || pastAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_KEY === 'Farmácia') {
-                    $scope.pastApss_ClinicalAppointments.push(pastAppointments[i]);
-                }
-            }
-
-            for (let i = 0; i < $scope.pastApss_ClinicalAppointments.length; i++) {
-                delete $scope.pastApss_ClinicalAppointments[i].DASHBOARD_APPOINTMENTS_PROVIDER_KEY;
-                delete $scope.pastApss_ClinicalAppointments[i].DASHBOARD_APPOINTMENTS_STATUS_KEY;
-                delete $scope.pastApss_ClinicalAppointments[i].DASHBOARD_APPOINTMENTS_SERVICE_TYPE_KEY;
-                $scope.pastApss_ClinicalAppointments[i].DASHBOARD_APPOINTMENTS_SLOT_KEY = $scope.setBlock($scope.pastApss_ClinicalAppointments[i].DASHBOARD_APPOINTMENTS_SLOT_KEY);
-            }
-            $scope.pastApss_ClinicalAppointmentsHeadings = _.keys($scope.pastApss_ClinicalAppointments[0]);
-        });
-
-        $scope.setBlock = function (timeInterval) {
-            if (timeInterval === "12:00 AM - 8:59 AM") {
-                return "APP_BLOCK_1";
-            } else
-            if (timeInterval === "9:00 AM - 11:59 AM") {
-                return "APP_BLOCK_2";
-            } else
-            if (timeInterval === "12:00 PM - 3:29 PM") {
-                return "APP_BLOCK_3";
-            } else {
-                return "APP_BLOCK_4";
-            }
-        };
-    };
-    return {
-        restrict: 'E',
-        link: link,
-        templateUrl: './consultation/views/appointmentResume.html'
-    };
-}]);
-
diff --git a/ui/app/clinical/consultation/views/appointmentResume.html b/ui/app/clinical/consultation/views/appointmentResume.html
deleted file mode 100644
index 9bcf32db8e..0000000000
--- a/ui/app/clinical/consultation/views/appointmentResume.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<section class="app-dashboard-integration">
-    <h2 class="section-title">{{ 'CONSULTATION_TAB_APPOINTMENT_HEADER_LABEL'|translate }}</h2>
-
-    <ul style="font-size: 14px;color: #333;background: #eee; font-weight: bold;">
-        <li style="background-color:#ddd;padding-top:3px;padding-bottom:3px">
-            <span style="padding-left: 10px"> {{::"DASHBOARD_UPCOMING_APPOINTMENTS_KEY" | translate}} </span>
-        </li>
-
-        <ul style="background-color: #eee;margin-left: 10px;font-weight: normal;margin-top: 4px;margin-bottom: 3px;" ng-if="upcomingApss_ClinicalAppointment.length === 0" class="form-field">
-            <li>{{::"DASHBOARD_NO_UPCOMING_APPOINTMENTS_KEY" | translate}}</li>
-        </ul>
-
-        <ul ng-if="upcomingApss_ClinicalAppointment.length !== 0">
-            <table class="table-header">
-                <thead>
-                <tr>
-                    <th ng-repeat="heading in upcomingApss_ClinicalAppointmentsHeadings">
-                        {{heading | translate}}
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-repeat="appointment in upcomingApss_ClinicalAppointment">
-                    <td ng-repeat="detail in appointment">
-                        {{detail | translate}}
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </ul>
-    </ul>
-
-    <ul style="font-size: 14px;color: #333;background: #eee; font-weight: bold;">
-        <li style="background-color:#ddd;padding-top:3px;padding-bottom:3px">
-            <span style="padding-left: 10px"> {{::"DASHBOARD_PAST_APPOINTMENTS_KEY" | translate}} </span>
-        </li>
-
-        <ul style="background-color: #eee;margin-left: 10px;font-weight: normal;margin-top: 4px;margin-bottom: 3px;" ng-if="pastApss_ClinicalAppointments.length === 0">
-            <li>{{::"DASHBOARD_NO_PAST_APPOINTMENTS_KEY" | translate}}</li>
-        </ul>
-
-        <ul ng-if="pastApss_ClinicalAppointments.length !== 0">
-            <table class="table-header">
-                <thead>
-                <tr>
-                    <th ng-repeat="heading in pastApss_ClinicalAppointmentsHeadings">
-                        {{heading | translate}}
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-repeat="appointment in pastApss_ClinicalAppointments">
-                    <td ng-repeat="detail in appointment">
-                        {{detail | translate}}
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </ul>
-    </ul>
-</section>
diff --git a/ui/app/clinical/consultation/views/consultation.html b/ui/app/clinical/consultation/views/consultation.html
index 65d6ec051f..3cb9a7fb58 100644
--- a/ui/app/clinical/consultation/views/consultation.html
+++ b/ui/app/clinical/consultation/views/consultation.html
@@ -226,11 +226,6 @@ <h2 class="section-title">{{ 'CONSULTATION_TAB_OBSERVATIONS_HEADER_LABEL'|transl
                 </table>
             </div>
         </section>
-
-        <section class="block observation section-grid">
-            <appointment-resume></appointment-resume>
-        </section>
-
         <section class="block investigation" style="display:none;"> <!--Hiding the section for release 4-->
             <h2>{{ 'CONSULTATION_TAB_INVESTIGATION_HEADER_LABEL'|translate }}</h2>
             <ul>
diff --git a/ui/app/clinical/displaycontrols/investigationresults/views/investigationResults.html b/ui/app/clinical/displaycontrols/investigationresults/views/investigationResults.html
index 35d70d0182..7bc87a7353 100644
--- a/ui/app/clinical/displaycontrols/investigationresults/views/investigationResults.html
+++ b/ui/app/clinical/displaycontrols/investigationresults/views/investigationResults.html
@@ -1,4 +1,6 @@
 <div>
+    <investigation-chart ng-if="params.showChart" accessions="investigationResults.tabular"
+                     params="params"></investigation-chart>
     <investigation-table ng-if="params.showTable" accessions="investigationResults.labAccessions"
                      params="params"></investigation-table>
 </div>
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
index 3a02a816dd..3bfc9ec247 100644
--- a/ui/app/clinical/index.html
+++ b/ui/app/clinical/index.html
@@ -399,7 +399,6 @@
         <script src="consultation/services/treatmentConfig.js"></script>
         <script src="consultation/filters/observationValue.js"></script>
         <script src="consultation/directives/buttonsRadio.js"></script>
-        <script src="consultation/directives/appointmentResume.js"></script>
         <script src="consultation/directives/orderSelector.js"></script>
         <script src="consultation/directives/diagnosisAutoComplete.js"></script>
         <script src="consultation/directives/newDrugOrders.js"></script>
diff --git a/ui/app/common/displaycontrols/pivottable/views/pivotTable.html b/ui/app/common/displaycontrols/pivottable/views/pivotTable.html
index c7b6eda6bf..59dcf87898 100644
--- a/ui/app/common/displaycontrols/pivottable/views/pivotTable.html
+++ b/ui/app/common/displaycontrols/pivottable/views/pivotTable.html
@@ -1,6 +1,6 @@
 <section class="dashboard-section" ng-if="::hasData">
-    <h2 ng-if="::(displayName)" class="section-title section-title-pivot">
-        {{::displayName | translate}}
+    <h2 ng-if="::(displayName || diseaseName)" class="section-title section-title-pivot">
+        {{::displayName || diseaseName}}
         <div class="fr btn-scrolling">
             <button ng-click="scrollLeft()" class="fl btn-small btn-scroll-left" title="{{::'SCROLL_LEFT' | translate }}"><i class="fa fa-arrow-left"></i> </button>
             <button ng-click="scrollRight()" class="fl btn-small btn-scroll-right" title="{{::'SCROLL_RIGHT' | translate }}"><i class="fa fa fa-arrow-right"></i></button>
diff --git a/ui/app/i18n/clinical/locale_en.json b/ui/app/i18n/clinical/locale_en.json
index b8778f19af..e11cc4333a 100644
--- a/ui/app/i18n/clinical/locale_en.json
+++ b/ui/app/i18n/clinical/locale_en.json
@@ -540,7 +540,5 @@
     "CONFIRMED":"CONFIRMED",
     "PRESUMED":"PRESUMED",
     "INACTIVE":"Inactive",
-    "Assintomático" : "Asymptomatic",
-    "CONSULTATION_TAB_APPOINTMENT_HEADER_LABEL": "Appointments",
-    "Vitals Flowsheet": "Nutritional Values"
+    "Assintomático" : "Asymptomatic"
 }
diff --git a/ui/app/i18n/clinical/locale_pt.json b/ui/app/i18n/clinical/locale_pt.json
index cefb0d8177..9767154a5a 100644
--- a/ui/app/i18n/clinical/locale_pt.json
+++ b/ui/app/i18n/clinical/locale_pt.json
@@ -553,7 +553,5 @@
   "CONSULTATION_TAB_REVISED_DIAGNOSES_LABEL_DIAGNOSES_LABEL":"Detalhes",
   "CONFIRMED":"CONFIRMADO",
   "PRESUMED":"PRESUMIDO",
-  "INACTIVE":"Inactivo",
-  "CONSULTATION_TAB_APPOINTMENT_HEADER_LABEL": "Outras Marcações",
-  "Vitals Flowsheet": "Dados Antropométricos"
+  "INACTIVE":"Inactivo"
 }