From 7538ba54fb4640882a1ecedde7a8d27e9f2d45f3 Mon Sep 17 00:00:00 2001 From: Arjun-Go Date: Wed, 25 Sep 2024 11:28:27 +0530 Subject: [PATCH] add. functionality to close accordions by config --- .../Containers/formDisplayControl/FormDisplayControl.jsx | 2 +- .../Containers/formDisplayControl/formDisplayControl.scss | 2 ++ .../common/displaycontrols/dashboard/directives/dashboard.js | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/micro-frontends/src/next-ui/Containers/formDisplayControl/FormDisplayControl.jsx b/micro-frontends/src/next-ui/Containers/formDisplayControl/FormDisplayControl.jsx index 7e077a471f..74a5bc99a4 100644 --- a/micro-frontends/src/next-ui/Containers/formDisplayControl/FormDisplayControl.jsx +++ b/micro-frontends/src/next-ui/Containers/formDisplayControl/FormDisplayControl.jsx @@ -216,7 +216,7 @@ export function FormDisplayControl(props) { {value.map((entry, index) => { return ( diff --git a/micro-frontends/src/next-ui/Containers/formDisplayControl/formDisplayControl.scss b/micro-frontends/src/next-ui/Containers/formDisplayControl/formDisplayControl.scss index 66714b8a67..1009248312 100644 --- a/micro-frontends/src/next-ui/Containers/formDisplayControl/formDisplayControl.scss +++ b/micro-frontends/src/next-ui/Containers/formDisplayControl/formDisplayControl.scss @@ -15,6 +15,8 @@ background: #fff; padding: 5px; color: #444 !important; + max-height: 20rem; + overflow-y: scroll; .form-name { width: 42%; diff --git a/ui/app/common/displaycontrols/dashboard/directives/dashboard.js b/ui/app/common/displaycontrols/dashboard/directives/dashboard.js index 81d8848e4a..18ef8481f0 100644 --- a/ui/app/common/displaycontrols/dashboard/directives/dashboard.js +++ b/ui/app/common/displaycontrols/dashboard/directives/dashboard.js @@ -21,7 +21,8 @@ angular.module('bahmni.common.displaycontrol.dashboard') consultationMapper: new Bahmni.ConsultationMapper(configurations.dosageFrequencyConfig(), configurations.dosageInstructionConfig(), configurations.consultationNoteConcept(), configurations.labOrderNotesConcept()), editErrorMessage: $translate.instant('CLINICAL_FORM_ERRORS_MESSAGE_KEY'), - showPrintOption: (dashboardConfig && dashboardConfig.printing) ? true : false + showPrintOption: !!(dashboardConfig && dashboardConfig.printing), + closeAccordionsByDefault: !!(dashboardConfig && dashboardConfig.closeAccordionsByDefault) }; $scope.formApi = { handleEditSave: function (encounter) {