tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-02-15 14:57:44 +07:00
parent baa45b9ea7 e64b243fd6
commit 40ad1ecc82
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -42,7 +42,6 @@ class DailyMonitoringController extends Controller
{ {
$memberList = DB::table('request_logs') $memberList = DB::table('request_logs')
->leftJoin('members', 'request_logs.member_id', '=', 'members.id') ->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
->leftJoin('member_plans', 'request_logs.member_id', '=', 'member_plans.member_id')
->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_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' )
->where('request_logs.service_code', 'IP') ->where('request_logs.service_code', 'IP')

31
frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Components/DailyMonitoringList.tsx
View File

@@ -186,33 +186,26 @@ export default function DailyMonitoringList() {
</TableHead> </TableHead>
{/* Body Table */} {/* Body Table */}
{dataTableIsLoading ? {dataTableIsLoading ? (
(
<TableBody> <TableBody>
<TableRow> <TableRow>
<TableCell colSpan={7} align="center">Loading</TableCell> <TableCell colSpan={7} align="center">Loading</TableCell>
</TableRow> </TableRow>
</TableBody> </TableBody>
) ) : dataTableData.data.length == 0 ? (
: <TableBody>
( <TableRow>
dataTableData.data.length == 0 ? <TableCell colSpan={7} align="center">No Data</TableCell>
( </TableRow>
<TableBody> </TableBody>
<TableRow> ) : dataTableData.data && dataTableData.data.length > 0 ? (
<TableCell colSpan={7} align="center">No Data</TableCell> <TableBody>
</TableRow>
</TableBody>
)
:
(
<TableBody>
{dataTableData.data.map((row: DailyMonitoringListType, index) => ( {dataTableData.data.map((row: DailyMonitoringListType, index) => (
<DailyMonitoringListRow key={index} number={index+1} row={row} /> <DailyMonitoringListRow key={index} number={index+1} row={row} />
))} ))}
</TableBody> </TableBody>
) ) : null}
)}
</Table> </Table>
) )
} }