Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php

@@ -35,15 +35,12 @@ class DailyMonitoringController extends Controller
         ];
     }
 
-    /**
-     * Member List
-     */
     public function GetMemberList(Request $request)
     {
         $memberList = DB::table('request_logs')
             ->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
             ->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id')
-            ->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
+            ->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider', 'request_logs.organization_id' )
             ->where('request_logs.service_code', 'IP')
             ->where('request_logs.deleted_at', null)
             ->when($request->search, function ($q, $search) {
@@ -80,6 +77,7 @@ class DailyMonitoringController extends Controller
             ->where('request_logs.deleted_at', null)
             // ->where('request_logs.status_final_log', 'approved')
             ->where("request_logs.member_id", "=", $memberDetail->id)
+            ->where("request_logs.organization_id", "=", $request->organization_id)
             ->when($request->search, function ($q, $search) {
                 $q->where('request_logs.code', 'LIKE', "%".$search."%");
             })

Modules/Internal/Transformers/DailyMonitoringResource.php

@@ -22,6 +22,7 @@ class DailyMonitoringResource extends JsonResource
             'end_date' => $this->enddate,
             'addmision_date' => $this->addmision_date,
             'provider' => $this->provider,
+            'organization_id' => $this->organization_id,
         ];
 
         return $data;

frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/ClaimList.tsx

@@ -32,6 +32,7 @@ type Props = {
 export default function ClaimList({ ...props }: Props) {
     const [searchParams, setSearchParams] = useSearchParams();
     const { member_id } = useParams();
+    const { organization_id } = useParams();
     // State
     // --------------------
     const [dataTableIsLoading, setDataTableLoading] = useState<boolean>(true);
@@ -48,8 +49,11 @@ export default function ClaimList({ ...props }: Props) {
     // -------------------
     const loadDataTableData = async (appliedFilter: any | null = null) => {
         setDataTableLoading(true);
-        const filter = appliedFilter ? appliedFilter : Object.fromEntries([...searchParams.entries()]);
+        const defaultFilter = {
-       
+          'organization_id' : organization_id
+        }
+        const filter = appliedFilter ? defaultFilter : Object.fromEntries([...searchParams.entries(), ['organization_id', organization_id]]);
+        console.log(filter)
         const response = await axios.get('/case_management/claimlist/'+member_id, {params: filter})
         setDataTableLoading(false);
         setDataTableData(response.data);

frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DailyMonitoringListRow.tsx

@@ -66,7 +66,7 @@ export default function DailyMonitoringListRow ({ ...props }: Props) {
                     <Stack direction="row" justifyContent="flex-end" spacing={1}>
                         <TableMoreMenu actions={
                             <>
-                                <MenuItem onClick={() => navigate(`/case_management/daily_monitoring/${props.row.member_id}/claims`)}>
+                                <MenuItem onClick={() => navigate(`/case_management/daily_monitoring/${props.row.member_id}/${props.row.organization_id}/claims`)}>
                                     <Visibility />
                                     View
                                 </MenuItem>

frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts

@@ -7,7 +7,8 @@ export type DailyMonitoringListType = {
     start_date   : string,
     end_date     : string,
     addmision_date : string,
-    provider : string
+    provider : string,
+    organization_id : number,
 }
 
 /**

frontend/dashboard/src/routes/index.tsx

@@ -225,7 +225,7 @@ export default function Router() {
                     element: <DailyMonitoring />
                 },
                 {
-                    path: 'daily_monitoring/:member_id/claims',
+                    path: 'daily_monitoring/:member_id/:organization_id/claims',
                     element: <DailyMonitoringClaims />
                 },
                 {