Update tanggal claim report
This commit is contained in:
@@ -21,6 +21,7 @@ class MemberResources extends JsonResource
|
|||||||
'fullName' => $this->full_name,
|
'fullName' => $this->full_name,
|
||||||
'division' => $this->division_name ?? '',
|
'division' => $this->division_name ?? '',
|
||||||
'status' => $this->status,
|
'status' => $this->status,
|
||||||
|
'submissionDate' => $this->submission_date,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ class CorporateMemberService
|
|||||||
$query->getQuery()->orderBy('corporate_divisions.name', $request->order);
|
$query->getQuery()->orderBy('corporate_divisions.name', $request->order);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code'])
|
->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code','claim_requests.submission_date'])
|
||||||
->paginate($limit);
|
->paginate($limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import palette from '../../theme/palette';
|
|||||||
import { UserCurrentCorporateContext } from '../../contexts/UserCurrentCorporate';
|
import { UserCurrentCorporateContext } from '../../contexts/UserCurrentCorporate';
|
||||||
import { HeadCell, Order, PaginationTableProps } from '../../@types/table';
|
import { HeadCell, Order, PaginationTableProps } from '../../@types/table';
|
||||||
import { useSearchParams, useNavigate } from 'react-router-dom';
|
import { useSearchParams, useNavigate } from 'react-router-dom';
|
||||||
|
import { fDate } from '../../utils/formatTime';
|
||||||
|
|
||||||
export default function List() {
|
export default function List() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@@ -118,6 +119,12 @@ export default function List() {
|
|||||||
label: 'Code Request',
|
label: 'Code Request',
|
||||||
isSort: true,
|
isSort: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: 'submissionDate',
|
||||||
|
align: 'left',
|
||||||
|
label: 'Submission Date',
|
||||||
|
isSort: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: 'fullName',
|
id: 'fullName',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
@@ -212,6 +219,8 @@ export default function List() {
|
|||||||
Ongoing
|
Ongoing
|
||||||
</Button>
|
</Button>
|
||||||
),
|
),
|
||||||
|
submissionDate:
|
||||||
|
obj.submissionDate ? fDate(obj.submissionDate) : ''
|
||||||
}))
|
}))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user