Merge branch 'master' of https://bitbucket.org/jubilian/fcsc_ipi_frontend
This commit is contained in:
commit
f60934d3c9
@ -126,7 +126,7 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => {
|
|||||||
item,
|
item,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const columnWidths = [240, 120, 100, 100, 130, 150, 180, 150, 150, 180, 120];
|
const columnWidths = [220, 150, 100, 100, 130, 150, 180, 150, 150, 180, 120];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
|
|||||||
@ -30,14 +30,14 @@ const AdminDashboard = () => {
|
|||||||
setLoading(true);
|
setLoading(true);
|
||||||
const response = await apiClient.get('/admin_dashboard');
|
const response = await apiClient.get('/admin_dashboard');
|
||||||
const data = response?.data?.summary || {};
|
const data = response?.data?.summary || {};
|
||||||
const notStartedCombined = (data.not_started || 0) + (data.overdue || 0);
|
// const notStartedCombined = (data.not_started || 0) + (data.overdue || 0);
|
||||||
|
|
||||||
setSummary({
|
setSummary({
|
||||||
total_establishments: data.total_establishments || 0,
|
total_establishments: data.total_establishments || 0,
|
||||||
submitted: data.submitted || 0,
|
submitted: data.submitted || 0,
|
||||||
approved: data.approved || 0,
|
approved: data.approved || 0,
|
||||||
rejected: data.rejected || 0,
|
rejected: data.rejected || 0,
|
||||||
not_started: notStartedCombined,
|
not_started: data.not_started || 0,
|
||||||
pending: data.pending || 0,
|
pending: data.pending || 0,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user