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

[WIP] Change Api to currentCorporate

Browse Source
This commit is contained in:
R
2022-12-07 11:13:07 +07:00
parent 3c18ae2852
commit 8d6b6e41d7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Client/Http/Controllers/Api/DashboardController.php
View File

@@ -19,7 +19,7 @@ class DashboardController extends Controller
$user = Auth::user(); $user = Auth::user();
$currentCorporate = $user->managedCorporates() $currentCorporate = $user->managedCorporates()
->with(['currentPolicy', 'employees']) ->with(['currentPolicy', 'employees'])
->findOrFail($corporate_id); ->find($corporate_id);
$data = DashboardResources::make($currentCorporate); $data = DashboardResources::make($currentCorporate);

5
frontend/client-portal/src/pages/Dashboard/Dashboard.tsx
View File

@@ -57,6 +57,7 @@ type CardBalanceProps = {
export default function Dashboard() { export default function Dashboard() {
const { themeStretch } = useSettings(); const { themeStretch } = useSettings();
const { user } = useAuth(); const { user } = useAuth();
const [currentCorporate, setCurrentCorporate] = useState({id: 1});
// @ts-ignore // @ts-ignore
const [corporateValue, setCorporateValue] = useState(`1`); const [corporateValue, setCorporateValue] = useState(`1`);
@@ -79,8 +80,8 @@ export default function Dashboard() {
useEffect(() => { useEffect(() => {
(async () => { (async () => {
const corporates = await axios.get('corporate'); const corporates = await axios.get(`${currentCorporate.id}/dashboard`);
const dashboard = await axios.get('dashboard'); const dashboard = await axios.get(`${currentCorporate.id}/dashboard`);
setCorporateData(corporates.data); setCorporateData(corporates.data);
setPolicyData(dashboard.data.policy); setPolicyData(dashboard.data.policy);