Merge pull request #172 from IT-Cotato/fix/COT-82-resolve-attendance-…

…design-value-issue Fix/cot 82 resolve attendance design value issue
IT-Cotato · Nov 26, 2024 · a02cdee · a02cdee
2 parents e23e5fe + 08ccba2
commit a02cdee
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/components/attendance/attendance-fab/AttendanceFab.tsx b/src/components/attendance/attendance-fab/AttendanceFab.tsx
@@ -57,7 +57,13 @@ const AttendanceFab = () => {
   //
   return (
     <CotatoFloatingActionButton
-      icon={<CotatoIcon icon="expand-solid" size="100%" />}
+      icon={
+        <CotatoIcon
+          icon="expand-solid"
+          size="100%"
+          color={(theme) => theme.colors.common.white_const}
+        />
+      }
       name="레이아웃"
     >
       {Object.entries(fabList).map(([key, value]) => (

diff --git a/src/pages/Attendance/Report/AttendanceReport.tsx b/src/pages/Attendance/Report/AttendanceReport.tsx
@@ -18,6 +18,7 @@ const AttendanceReport = () => {
     <Container
       sx={{
         height: '100%',
+        padding: '2rem',
       }}
     >
       <AttendanceReportHeader />

diff --git a/src/pages/Attendance/Report/AttendanceReportAll.tsx b/src/pages/Attendance/Report/AttendanceReportAll.tsx
@@ -1,5 +1,5 @@
-import { Container, Stack } from '@mui/material';
 import React from 'react';
+import { Container, Stack } from '@mui/material';
 import AttendanceReportSubFilters from './AttendanceReportSubFilters';
 import AttendanceReportAllTable from './AttendanceReportAllTable';
 import AttendanceReportHeader from './AttendanceReportHeader';
@@ -13,6 +13,7 @@ const AttendanceReportAll = () => {
     <Container
       sx={{
         height: '100%',
+        padding: '2rem',
       }}
     >
       <AttendanceReportHeader />

diff --git a/src/pages/Attendance/Report/AttendanceReportAllTable.tsx b/src/pages/Attendance/Report/AttendanceReportAllTable.tsx
@@ -71,11 +71,11 @@ const AttendanceReportAllTable = () => {
             </AttedanceTableLayout.TableCell>
 
             <AttedanceTableLayout.TableCell>
-              {record.statistic?.online}
+              {record.statistic?.offline}
             </AttedanceTableLayout.TableCell>
 
             <AttedanceTableLayout.TableCell>
-              {record.statistic?.offline}
+              {record.statistic?.online}
             </AttedanceTableLayout.TableCell>
 
             <AttedanceTableLayout.TableCell>