-[x] Send oldest dates in organization listing page

-[x] Change text in organization listing page for date range type picker
younginnovations · Jul 10, 2023 · c58e902 · c58e902
1 parent db3a7b4
commit c58e902
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/app/Http/Controllers/SuperAdmin/SuperAdminController.php b/app/Http/Controllers/SuperAdmin/SuperAdminController.php
@@ -6,6 +6,7 @@
 
 use App\Constants\Enums;
 use App\Http\Controllers\Controller;
+use App\IATI\Services\Dashboard\DashboardService;
 use App\IATI\Services\Organization\OrganizationService;
 use App\IATI\Services\User\UserService;
 use App\IATI\Traits\DateRangeResolverTrait;
@@ -30,8 +31,9 @@ class SuperAdminController extends Controller
      *
      * @param OrganizationService $organizationService
      * @param UserService $userService
+     * @param DashboardService $dashboardService
      */
-    public function __construct(public OrganizationService $organizationService, public UserService $userService)
+    public function __construct(public OrganizationService $organizationService, public UserService $userService, public DashboardService $dashboardService)
     {
         //
     }
@@ -54,8 +56,9 @@ public function listOrganizations(): View|Factory|JsonResponse|Application
             $registrationType = Enums::ORGANIZATION_REGISTRATION_METHOD;
             $publisherType = getCodeList('OrganizationType', 'Organization');
             $dataLicense = getCodeList('DataLicense', 'Activity', false);
+            $oldestDates = $this->dashboardService->getOldestDate();
 
-            return view('superadmin.organisationsList', compact('country', 'setupCompleteness', 'registrationType', 'publisherType', 'dataLicense'));
+            return view('superadmin.organisationsList', compact('country', 'setupCompleteness', 'registrationType', 'publisherType', 'dataLicense', 'oldestDates'));
         } catch (Exception $e) {
             logger()->error($e->getMessage());
 

diff --git a/app/IATI/Services/Dashboard/DashboardService.php b/app/IATI/Services/Dashboard/DashboardService.php
@@ -419,6 +419,11 @@ public function resolveStartDateAndEndDate($request, array $params, string $tabl
         return $params;
     }
 
+    /**
+     * Returns oldest created_at date.
+     *
+     * @return array
+     */
     public function getOldestDate(): array
     {
         return [

diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=d61e6b288145cef77e210bf8a5a415cd",
+    "/js/app.js": "/js/app.js?id=767b05429c814c2589733ac24f9f6f13",
     "/js/script.js": "/js/script.js?id=4920eb85d84da1e87cb71769c04a12a2",
     "/js/webportal-script.js": "/js/webportal-script.js?id=f9c23d4bccd261db9414465886315f45",
     "/js/formbuilder.js": "/js/formbuilder.js?id=96f1b9dd5890b8ff09e613117dd94592",

diff --git a/resources/assets/js/views/superadmin/components/TableList.vue b/resources/assets/js/views/superadmin/components/TableList.vue
@@ -682,8 +682,8 @@ export default defineComponent({
     let defaultValueStatus: boolean[] = reactive([]);
     const showMultiSelectWithSearch = ref(false);
     let dropdownRange = {
-      created_at: 'User registered date',
-      last_logged_in: 'Last logged in',
+      created_at: 'Registered date range',
+      last_logged_in: 'Last login date range',
     };
     const sortParams = ref({ orderBy: '', direction: '' });
 

diff --git a/resources/views/superadmin/organisationsList.blade.php b/resources/views/superadmin/organisationsList.blade.php
@@ -7,6 +7,7 @@
             :registration-types='{{json_encode($registrationType)}}'
             :publisher-types='{{json_encode($publisherType)}}'
             :data-licenses='{{json_encode($dataLicense)}}'
+            :oldest-dates='{{json_encode($oldestDates)}}'
     >
     </organisation-list>
 @endsection