[Parvathy, Rahul] | BAH-3334 | Fix. Add CSS Stylesheet Import

Co-authored-by: Parvathy Babu <[email protected]>
Bahmni · Jul 16, 2024 · 4383960 · 4383960
1 parent 0904852
commit 4383960
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
@@ -22,7 +22,7 @@
         <link rel="stylesheet" href="../micro-frontends-dist/ipd.min.css"/>
         <link rel="stylesheet" href="../micro-frontends-dist/next-ui.min.css"/>
         <!-- build:css clinical.min.css -->
-        <link rel="stylesheet" href="../styles/clinicalPrint.css"/>
+        <link rel="stylesheet" href="../styles/clinical.css"/>
         <!-- endbuild -->
 
     </head>

diff --git a/ui/app/common/displaycontrols/forms/views/formsTable.html b/ui/app/common/displaycontrols/forms/views/formsTable.html
@@ -19,17 +19,15 @@
                         <li ng-repeat="data in formData" class="clearfix">
                             <span>{{getDisplayName(data)}}</span>
                        <span class="fr formDataTime" ng-class="{'formDataDate': showFormsDate }">
-                            <span ng-hide="::showFormsDate">{{data.obsDatetime || data.encounterDateTime | bahmniDateTime}}</span>
-                            <span ng-show="::showFormsDate">{{
+                            <span class="fr" ng-hide="::showFormsDate">{{data.obsDatetime || data.encounterDateTime | bahmniDateTime}}</span>
+                            <span class="fr" ng-show="::showFormsDate">{{
                                 data.obsDatetime || data.encounterDateTime | bahmniDate}}</span>
-                            <span ng-show="doesUserHaveAccessToTheForm(data, 'view')" class="has-link fl formDataEdit"
-                                  ng-dialog="../common/displaycontrols/forms/views/showObservationFormData.html"
-                                  ng-dialog-class="ngdialog-theme-default ng-dialog-all-details-page ng-dialog-view"
-                                  ng-dialog-data="{{getConfigToFetchDataAndShow(data)}}"
-                                  ng-dialog-scope="this">
+                                <span ng-if="data.providerList.length > 0">{{data.providerList[0].name}}</span>
+                                <span ng-show="doesUserHaveAccessToTheForm(data, 'view')" class="has-link fl formDataEdit"
+                                      ng-click="openDialog(data)">
                                 <i class="fa fa-eye"></i>
                             </span>
-                            <span ng-show="doesUserHaveAccessToTheForm(data, 'edit')" class="has-link fl formDataEdit"
+                            <span ng-show="doesUserHaveAccessToTheForm(data ,'edit') && showEditForActiveEncounter(data.encounterUuid)"class="has-link fl formDataEdit"
                                   ng-dialog="dashboard/views/dashboardSections/editObservationForm.html"
                                   ng-dialog-class="ngdialog-theme-default ng-dialog-all-details-page ng-dialog-edit"
                                   ng-dialog-data="{{getEditObsData(data)}}"