diff --git a/src/components/TabMenu/TabMenu.scss b/src/components/TabMenu/TabMenu.scss index b1b49b4..9f3e61e 100644 --- a/src/components/TabMenu/TabMenu.scss +++ b/src/components/TabMenu/TabMenu.scss @@ -25,7 +25,7 @@ .MuiTypography-body1 { font-family: "lexend" !important; color: #241f319b !important; - font-size: 15px !important; + font-size: 14px !important; } .MuiSwitch-thumb { diff --git a/src/components/TabMenu/TabMenu.tsx b/src/components/TabMenu/TabMenu.tsx index 92c6573..ddbd069 100644 --- a/src/components/TabMenu/TabMenu.tsx +++ b/src/components/TabMenu/TabMenu.tsx @@ -3,10 +3,9 @@ import * as React from 'react'; import { Stack, styled, Box, Tab, Tabs, TableContainer, Table, TableHead, TableRow, TableCell, TableBody, - InputLabel, Select, FormControl, MenuItem, FormControlLabel, Switch, alpha, CircularProgress + FormControlLabel, Switch, alpha, CircularProgress } from '@mui/material'; import colors from '../../colors/colors'; -import { MONTHS } from '../../utility/utility'; import { CiCircleInfo } from "react-icons/ci"; import "./TabMenu.scss"; @@ -16,9 +15,7 @@ interface TabPanelProps { index: number; value: number; data?: any; - valueInput?: string; valueSwitch?: boolean; - changeMois?: Function; changeOnlyPaid?: Function; isLoading?: boolean } @@ -29,7 +26,7 @@ const StyledTab = styled(Tab)({ } }); -const PinkSwitch = styled(Switch)(({ theme }) => ({ +const CustomSwitch = styled(Switch)(({ theme }) => ({ '& .MuiSwitch-switchBase.Mui-checked': { color: `${colors.blue} !important`, '&:hover': { @@ -46,7 +43,7 @@ const columns = [ ]; const TabPanel = (props: TabPanelProps) => { - const { value, index, data, valueInput, valueSwitch, changeMois, changeOnlyPaid, isLoading } = props; + const { value, index, data, valueSwitch, changeOnlyPaid, isLoading } = props; const cols = columns[index]; const getColorPaiement = (mode: string) => { @@ -68,24 +65,10 @@ const TabPanel = (props: TabPanelProps) => { if (index === 0) { return ( - - - Mois - - - } label="Payée seulement" /> + + } label={"Payées"} /> - + @@ -166,7 +149,7 @@ const a11yProps = (index: number) => { export default function TabMenu(props: any) { const { cotisations } = props; - const { data, valueInput, valueSwitch, changeMois, changeOnlyPaid, isLoading } = cotisations; + const { data, valueSwitch, changeOnlyPaid, isLoading } = cotisations; const [value, setValue] = React.useState(0); @@ -176,7 +159,7 @@ export default function TabMenu(props: any) { return ( - + - + diff --git a/src/pages/Dashboard/Dashboard.scss b/src/pages/Dashboard/Dashboard.scss index a92d037..8b0114c 100644 --- a/src/pages/Dashboard/Dashboard.scss +++ b/src/pages/Dashboard/Dashboard.scss @@ -22,7 +22,7 @@ } .Mui-selected { - background-color: #1976d20b !important; + background-color: #1976d208 !important; } .MuiMenuItem-root { diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx index 47a401c..0854e54 100644 --- a/src/pages/Dashboard/Dashboard.tsx +++ b/src/pages/Dashboard/Dashboard.tsx @@ -380,10 +380,26 @@ export default function Dashboard() { } -

Suivi financier

+ +

Suivi financier

+ + Mois + + +
diff --git a/src/services/services.ts b/src/services/services.ts index 1103e44..ab40b26 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -88,4 +88,16 @@ export default class Service { }); return res; } + + static async getRevenus(annee: number, mois: string) { + let res; + await axios.get(`${this.baseUrl}cotisations?annee=${annee}&mois=${mois}`, { + ...this.getBearerToken(), + }).then((response) => { + res = response.data; + }).catch((error) => { + throw error; + }); + return res; + } } \ No newline at end of file