Merge pull request #390 from esaude/develop

Develop
esaude · Oct 31, 2019 · 9b9c9f9 · 9b9c9f9
2 parents 5236d2a + 5ff858e
commit 9b9c9f9
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 170 deletions.
diff --git 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
@@ -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
diff --git a/ui/app/clinical/consultation/views/appointmentResume.html b/ui/app/clinical/consultation/views/appointmentResume.html
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }