Merge branch '1185-dashboard-visualization-api' into develop

younginnovations · Jul 11, 2023 · 4ca28ea · 4ca28ea
2 parents 1e75e37 + 7c51f23
commit 4ca28ea
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 29 deletions.
diff --git a/app/IATI/Repositories/Organization/OrganizationRepository.php b/app/IATI/Repositories/Organization/OrganizationRepository.php
@@ -499,24 +499,21 @@ public function publisherWithoutActivity(): int
      */
     public function getOrganizationDashboardDownload($queryParams): array
     {
+    //    case when publishing_info::text=json_strip_nulls(publishing_info)::text and (publishing_info->'publisher_verification')::text='true'::text and (publishing_info->'token_verification')::text='true'::text then 'complete' else 'incomplete' end as publisher_info,
+    //    case when default_values::text=json_strip_nulls(default_values)::text and activity_default_values::text=json_strip_nulls(activity_default_values)::text then 'complete' else 'incomplete' end as default_values,
+
+        $completenessMap = $this->getCompletenessMap();
+        $statementForPublisher_info = 'case when ' . $completenessMap['Publishers_settings_not_completed'] . " then 'incomplete' else 'complete' end as publisher_info";
+        $statementForDefault_values = 'case when ' . $completenessMap['Default_values_not_completed'] . " then 'incomplete' else 'complete' end as default_values";
+
         $query = $this->model->select(DB::raw("name->0->>'narrative' as organization,
         identifier,
         publisher_type,
         country,
         registration_type,
         data_license,
-        case when publishing_info::text=json_strip_nulls(publishing_info)::text
-            and (publishing_info->'publisher_verification')::text='true'::text
-            and (publishing_info->'token_verification')::text='true'::text
-        then 'complete'
-        else 'incomplete'
-        end as publisher_info,
-          case
-            when default_values::text=json_strip_nulls(default_values)::text
-            and activity_default_values::text=json_strip_nulls(activity_default_values)::text
-          then 'complete'
-          else 'incomplete'
-        end as default_values,
+        $statementForPublisher_info,
+        $statementForDefault_values,
         organizations.created_at,
         organizations.updated_at
          "))->leftJoin('settings', 'organizations.id', 'settings.organization_id');

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/webportal-app.css b/public/css/webportal-app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -4,7 +4,7 @@
     "/js/webportal-script.js": "/js/webportal-script.js?id=f9c23d4bccd261db9414465886315f45",
     "/js/formbuilder.js": "/js/formbuilder.js?id=96f1b9dd5890b8ff09e613117dd94592",
     "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
-    "/css/webportal-app.css": "/css/webportal-app.css?id=0ef21eaa5bc48f61370721b46827ead4",
-    "/css/app.css": "/css/app.css?id=693d30b46b1cb39d8e16438ebf00e8a4",
-    "/js/vendor.js": "/js/vendor.js?id=f9ea589d654a205711a655b5c2811269"
+    "/css/webportal-app.css": "/css/webportal-app.css?id=b169e00c49d729adc0fa2a6f1bc28f56",
+    "/css/app.css": "/css/app.css?id=55e7a64f689f45cf577416aef3b22231",
+    "/js/vendor.js": "/js/vendor.js?id=90af54c401fa265e59e0abc5d778df2b"
 }