Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

src/modules/14_KPI/components/Tab/01_Assessment.vue

@@ -207,15 +207,13 @@ watch(
 
 onMounted(async () => {
   showLoader();
-  await Promise.all([
+  Promise.all([
     getCriteria(),
-    fetchListPlanned(),
-    fetchListRole(),
-    fetchAssigned(),
+    await fetchListPlanned(),
+    await fetchListRole(),
+    await fetchAssigned(),
   ]).finally(() => {
-    setTimeout(() => {
-      hideLoader();
-    }, 1000);
+    hideLoader();
   });
 });
 </script>

src/modules/14_KPI/views/detailView.vue

@@ -178,6 +178,7 @@ function onSubmit() {
 }
 
 async function getOrgOp() {
+  showLoader()
   await http
     .get(config.API.Kpiorg + `/${store.dataProfile.profileId}`)
     .then((res) => {
@@ -213,6 +214,7 @@ async function getOrgOp() {
           name: `${i.prefix}${i.firstName} ${i.lastName}`,
         }))
         .find((i: any) => i.id == store.dataEvaluation.commanderHighId);
+        hideLoader()
     })
     .catch((e) => {
       messageError($q, e);