Configured some columns for staff and client lists.

app/Http/Controllers/Facility/ClientTqueryController.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers\Facility;
+
+use App\Http\Controllers\ApiController;
+use App\Http\Permissions\Permission;
+use App\Http\Permissions\PermissionDescribe;
+use App\Tquery\Engine\TqService;
+use App\Tquery\OpenApi\OpenApiGet;
+use App\Tquery\OpenApi\OpenApiPost;
+use App\Tquery\Tables\ClientTquery;
+use App\Utils\OpenApi\FacilityParameter;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class ClientTqueryController extends ApiController
+{
+    protected function initPermissions(): void
+    {
+        $this->permissionOneOf(Permission::facilityAdmin);
+    }
+
+    private function getTqService(): TqService
+    {
+        return App::make(ClientTquery::class, ['facility' => $this->getFacilityOrFail()]);
+    }
+
+    #[OpenApiGet(
+        path: '/api/v1/facility/{facility}/user/client/tquery',
+        permissions: new PermissionDescribe(Permission::facilityAdmin),
+        summary: 'Facility clients tquery',
+        tag: 'Facility client',
+        parameters: [new FacilityParameter()],
+    )]
+    public function get(): JsonResponse
+    {
+        return new JsonResponse($this->getTqService()->getConfigArray());
+    }
+
+    #[OpenApiPost(
+        path: '/api/v1/facility/{facility}/user/client/tquery',
+        permissions: new PermissionDescribe(Permission::facilityAdmin),
+        summary: 'Facility clients tquery',
+        tag: 'Facility client',
+        parameters: [new FacilityParameter()],
+    )]
+    public function post(
+        Request $request,
+    ): JsonResponse {
+        return new JsonResponse($this->getTqService()->query($request));
+    }
+}

app/Http/Controllers/Facility/MeetingTqueryController.php

@@ -18,7 +18,7 @@ class MeetingTqueryController extends ApiController
 {
     protected function initPermissions(): void
     {
-        $this->permissionOneOf(Permission::globalAdmin);
+        $this->permissionOneOf(Permission::facilityAdmin);
     }
 
     private function getTqService(): TqService

app/Http/Controllers/Facility/StaffTqueryController.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers\Facility;
+
+use App\Http\Controllers\ApiController;
+use App\Http\Permissions\Permission;
+use App\Http\Permissions\PermissionDescribe;
+use App\Tquery\Engine\TqService;
+use App\Tquery\OpenApi\OpenApiGet;
+use App\Tquery\OpenApi\OpenApiPost;
+use App\Tquery\Tables\StaffTquery;
+use App\Utils\OpenApi\FacilityParameter;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class StaffTqueryController extends ApiController
+{
+    protected function initPermissions(): void
+    {
+        $this->permissionOneOf(Permission::facilityAdmin);
+    }
+
+    private function getTqService(): TqService
+    {
+        return App::make(StaffTquery::class, ['facility' => $this->getFacilityOrFail()]);
+    }
+
+    #[OpenApiGet(
+        path: '/api/v1/facility/{facility}/user/staff/tquery',
+        permissions: new PermissionDescribe(Permission::facilityAdmin),
+        summary: 'Facility staff tquery',
+        tag: 'Facility staff',
+        parameters: [new FacilityParameter()],
+    )]
+    public function get(): JsonResponse
+    {
+        return new JsonResponse($this->getTqService()->getConfigArray());
+    }
+
+    #[OpenApiPost(
+        path: '/api/v1/facility/{facility}/user/staff/tquery',
+        permissions: new PermissionDescribe(Permission::facilityAdmin),
+        summary: 'Facility staff tquery',
+        tag: 'Facility staff',
+        parameters: [new FacilityParameter()],
+    )]
+    public function post(
+        Request $request,
+    ): JsonResponse {
+        return new JsonResponse($this->getTqService()->query($request));
+    }
+}

app/Tquery/Config/TqDataTypeEnum.php

@@ -6,7 +6,6 @@
 use App\Rules\Valid;
 use App\Rules\RegexpIsValidRule;
 use App\Tquery\Filter\TqFilterOperator;
-use App\Utils\Date\DateHelper;
 
 enum TqDataTypeEnum
 {

app/Tquery/Config/TqTableAliasEnum.php

@@ -8,21 +8,23 @@ enum TqTableAliasEnum
 {
     case created_by;
     case last_login_facility;
+    case members;
 
     public function baseTable(): TqTableEnum
     {
         return match ($this) {
             self::created_by => TqTableEnum::users,
             self::last_login_facility => TqTableEnum::facilities,
+            self::members => TqTableEnum::members,
         };
     }
 
     public function applyJoin(TqBuilder $builder, TqTableEnum $joinBase, bool $left): void
     {
         $joinColumn = match ($this) {
             self::created_by => $this->name,
-            self::last_login_facility => $this->name . '_id',
+            default => $this->name . '_id',
         };
-        $builder->join($joinBase, $this, $joinColumn, $left);
+        $builder->join($joinBase, $this, $joinColumn, $left, false);
     }
 }

app/Tquery/Engine/TqBuilder.php

@@ -36,17 +36,19 @@ public function join(
         TqTableAliasEnum $table,
         string $joinColumn,
         bool $left,
+        bool $inv,
     ): bool {
         if (in_array($table, $this->joins, strict: true)) {
             return false;
         }
+        [$tableColumn, $baseColumn] = $inv ? [$joinColumn, 'id'] : ['id', $joinColumn];
         $this->joins[] = $table;
         $tableBase = $table->baseTable();
         $this->builder->join(
             "{$tableBase->name} as {$table->name}",
-            "{$table->name}.id",
+            "{$table->name}.$tableColumn",
             '=',
-            "{$joinBase->name}.$joinColumn",
+            "{$joinBase->name}.$baseColumn",
             $left ? 'left' : 'inner',
         );
         return true;

app/Tquery/Tables/ClientTquery.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Tquery\Tables;
+
+use App\Models\Facility;
+use App\Tquery\Config\TqTableAliasEnum;
+use App\Tquery\Config\TqTableEnum;
+use App\Tquery\Engine\TqBuilder;
+
+readonly class ClientTquery extends AdminUserTquery
+{
+    public function __construct(private Facility $facility)
+    {
+        parent::__construct();
+    }
+
+    protected function getBuilder(): TqBuilder
+    {
+        $builder = TqBuilder::fromTable(TqTableEnum::users);
+        $builder->join(TqTableEnum::users, TqTableAliasEnum::members, 'user_id', left: false, inv: true);
+        $builder->where(fn(string $bind) => "members.facility_id = $bind", false, $this->facility->id, false, false);
+        $builder->where(fn(null $bind) => 'members.client_id is not null', false, null, false, false);
+        return $builder;
+    }
+}

app/Tquery/Tables/StaffTquery.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Tquery\Tables;
+
+use App\Models\Facility;
+use App\Tquery\Config\TqTableAliasEnum;
+use App\Tquery\Config\TqTableEnum;
+use App\Tquery\Engine\TqBuilder;
+
+readonly class StaffTquery extends AdminUserTquery
+{
+    public function __construct(private Facility $facility)
+    {
+        parent::__construct();
+    }
+
+    protected function getBuilder(): TqBuilder
+    {
+        $builder = TqBuilder::fromTable(TqTableEnum::users);
+        $builder->join(TqTableEnum::users, TqTableAliasEnum::members, 'user_id', left: false, inv: true);
+        $builder->where(fn(string $bind) => "members.facility_id = $bind", false, $this->facility->id, false, false);
+        $builder->where(fn(null $bind) => 'members.staff_member_id is not null', false, null, false, false);
+        return $builder;
+    }
+}

resources/js/App.tsx

@@ -14,8 +14,10 @@ const AdminFacilitiesListPage = lazy(() => import("features/root/pages/AdminFaci
 const AdminUsersListPage = lazy(() => import("features/root/pages/AdminUsersList.page"));
 const CalendarPage = lazy(() => import("features/root/pages/Calendar.page"));
 const CalendarTablePage = lazy(() => import("features/root/pages/CalendarTable.page"));
+const ClientsTablePage = lazy(() => import("features/root/pages/ClientsTable.page"));
 const LoginPage = lazy(() => import("features/authentication/pages/Login.page"));
 const RootPage = lazy(() => import("features/root/pages/Root.page"));
+const StaffTablePage = lazy(() => import("features/root/pages/StaffTable.page"));
 
 const App: VoidComponent = () => {
   const facilitiesQuery = createQuery(System.facilitiesQueryOptions);
@@ -53,8 +55,8 @@ const App: VoidComponent = () => {
           <UnknownNotFound />
           <LeafRoute routeKey="facility.admin.calendar" path="/calendar" component={CalendarPage} />
           <LeafRoute routeKey="facility.admin.calendar_table" path="/calendar-table" component={CalendarTablePage} />
-          <LeafRoute routeKey="facility.admin.clients" path="/clients" component={NotYetImplemented} />
-          <LeafRoute routeKey="facility.admin.staff" path="/staff" component={NotYetImplemented} />
+          <LeafRoute routeKey="facility.admin.staff" path="/staff" component={StaffTablePage} />
+          <LeafRoute routeKey="facility.admin.clients" path="/clients" component={ClientsTablePage} />
           <LeafRoute routeKey="facility.admin.reports" path="/reports" component={NotYetImplemented} />
         </Route>
       </Route>

resources/js/data-access/memo-api/groups/FacilityClient.ts

@@ -0,0 +1,9 @@
+/**
+ * @see {@link https://test-memo.fdds.pl/api/documentation#/Facility%20client production docs}
+ * @see {@link http://localhost:9081/api/documentation#/Facility%20client local docs}
+ */
+export namespace FacilityClient {
+  export const keys = {
+    client: () => ["client"] as const,
+  };
+}

resources/js/data-access/memo-api/groups/FacilityStaff.ts

@@ -0,0 +1,9 @@
+/**
+ * @see {@link https://test-memo.fdds.pl/api/documentation#/Facility%20staff production docs}
+ * @see {@link http://localhost:9081/api/documentation#/Facility%20staff local docs}
+ */
+export namespace FacilityStaff {
+  export const keys = {
+    staff: () => ["staff"] as const,
+  };
+}

resources/js/features/root/layout/Navbar.tsx

@@ -91,16 +91,16 @@ function getSectionItems(
             href: `/${facilityUrl}/admin/calendar`,
             routeKey: "facility.admin.calendar",
           },
-          {
-            icon: CLIENT_ICONS.menu,
-            href: `/${facilityUrl}/admin/clients`,
-            routeKey: "facility.admin.clients",
-          },
           {
             icon: STAFF_ICONS.menu,
             href: `/${facilityUrl}/admin/staff`,
             routeKey: "facility.admin.staff",
           },
+          {
+            icon: CLIENT_ICONS.menu,
+            href: `/${facilityUrl}/admin/clients`,
+            routeKey: "facility.admin.clients",
+          },
           {
             icon: HiOutlineClipboardDocumentList,
             href: `/${facilityUrl}/admin/reports`,

resources/js/features/root/pages/ClientsTable.page.tsx

@@ -0,0 +1,28 @@
+import {createTableTranslations} from "components/ui/Table";
+import {TQueryTable} from "components/ui/Table/TQueryTable";
+import {FacilityClient} from "data-access/memo-api/groups/FacilityClient";
+import {VoidComponent} from "solid-js";
+import {activeFacilityId} from "state/activeFacilityId.state";
+
+export default (() => {
+  return (
+    <>
+      <TQueryTable
+        mode="standalone"
+        staticPrefixQueryKey={FacilityClient.keys.client()}
+        staticEntityURL={`facility/${activeFacilityId()}/user/client`}
+        staticTranslations={createTableTranslations("clients")}
+        staticPersistenceKey="facilityClients"
+        columns={[
+          {name: "id", initialVisible: false},
+          {name: "name", columnDef: {enableHiding: false}},
+          // {name: "genderDictId"},
+          {name: "createdAt", columnDef: {sortDescFirst: true}, initialVisible: false},
+          {name: "createdBy.name", initialVisible: false},
+          {name: "updatedAt", columnDef: {sortDescFirst: true}, initialVisible: false},
+        ]}
+        initialSort={[{id: "name", desc: false}]}
+      />
+    </>
+  );
+}) satisfies VoidComponent;

resources/js/features/root/pages/StaffTable.page.tsx

@@ -0,0 +1,40 @@
+import {cellFunc, createTableTranslations} from "components/ui/Table";
+import {TQueryTable} from "components/ui/Table/TQueryTable";
+import {FacilityStaff} from "data-access/memo-api/groups/FacilityStaff";
+import {VoidComponent} from "solid-js";
+import {activeFacilityId} from "state/activeFacilityId.state";
+import {Email} from "components/ui/Email";
+
+export default (() => {
+  return (
+    <>
+      <TQueryTable
+        mode="standalone"
+        staticPrefixQueryKey={FacilityStaff.keys.staff()}
+        staticEntityURL={`facility/${activeFacilityId()}/user/staff`}
+        staticTranslations={createTableTranslations("staff")}
+        staticPersistenceKey="facilityStaff"
+        columns={[
+          {name: "id", initialVisible: false},
+          {name: "name", columnDef: {enableHiding: false}},
+          {name: "email", columnDef: {cell: cellFunc<string>((v) => <Email class="w-full" email={v} />)}},
+          {name: "hasEmailVerified", initialVisible: false},
+          {name: "hasPassword"},
+          {name: "passwordExpireAt", initialVisible: false},
+          {
+            name: "hasGlobalAdmin",
+            columnDef: {
+              cell: cellFunc<boolean>((adm) => <span class="w-full text-center">{adm ? "💪🏽" : ""}</span>),
+              size: 130,
+            },
+            initialVisible: false,
+          },
+          {name: "createdAt", columnDef: {sortDescFirst: true}, initialVisible: false},
+          {name: "createdBy.name", initialVisible: false},
+          {name: "updatedAt", columnDef: {sortDescFirst: true}, initialVisible: false},
+        ]}
+        initialSort={[{id: "name", desc: false}]}
+      />
+    </>
+  );
+}) satisfies VoidComponent;