diff --git a/src/pages/LecturerPage/LecturerDashboardPage.tsx b/src/pages/LecturerPage/LecturerDashboardPage.tsx index 87c1646..7709553 100644 --- a/src/pages/LecturerPage/LecturerDashboardPage.tsx +++ b/src/pages/LecturerPage/LecturerDashboardPage.tsx @@ -318,7 +318,7 @@ const LecturerDashboardPage = () => { ) : ( { tickPadding: 5, tickRotation: -45, tickValues: 10, + format: (value) => { + return value.replace(/^(\d{2})(\d{2})-/, "$2-"); + }, }} axisLeft={{ tickSize: 5, @@ -384,7 +387,7 @@ const LecturerDashboardPage = () => { keys={completeProgressData.keyList} indexBy={completeProgressData.index} enableLabel={false} - margin={{ top: 50, right: 130, bottom: 50, left: 60 }} + margin={{ top: 50, right: 50, bottom: 50, left: 100 }} padding={0.3} valueScale={{ type: "linear" }} indexScale={{ type: "band", round: true }} @@ -412,22 +415,6 @@ const LecturerDashboardPage = () => { modifiers: [["darker", 1.6]], }} layout="horizontal" - legends={[ - { - dataFrom: "keys", - anchor: "bottom-right", - direction: "column", - justify: false, - translateX: 120, - translateY: 0, - itemsSpacing: 2, - itemWidth: 100, - itemHeight: 20, - itemDirection: "left-to-right", - itemOpacity: 0.85, - symbolSize: 20, - }, - ]} /> )} @@ -496,7 +483,7 @@ const LecturerDashboardPage = () => { keys={progressGroupData.keyList} indexBy={progressGroupData.index} enableLabel={false} - margin={{ top: 50, right: 130, bottom: 50, left: 60 }} + margin={{ top: 50, right: 50, bottom: 50, left: 60 }} padding={0.3} valueScale={{ type: "linear" }} indexScale={{ type: "band", round: true }} @@ -523,22 +510,6 @@ const LecturerDashboardPage = () => { from: "color", modifiers: [["darker", 1.6]], }} - legends={[ - { - dataFrom: "keys", - anchor: "bottom-right", - direction: "column", - justify: false, - translateX: 120, - translateY: 0, - itemsSpacing: 2, - itemWidth: 100, - itemHeight: 20, - itemDirection: "left-to-right", - itemOpacity: 0.85, - symbolSize: 20, - }, - ]} /> )}