Skip to content

Commit cb34056

Browse files
Merge pull request #4484 from OneCommunityGlobal/kristin-add-dark-mode-support-for-log-attendance-page
Sai Sandeep taking over for Kristin - Add Dark Mode Support for Log Attendance Page
2 parents 67c95ec + 07d2f5c commit cb34056

5 files changed

Lines changed: 554 additions & 702 deletions

File tree

src/components/AttendanceSystem/AttendanceNoShowCharts.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ENDPOINTS } from '~/utils/URL';
1010
import { events as mockEvents } from './mockData';
1111
import styles from './AttendanceNoShowCharts.module.css';
1212

13-
const attendanceColors = ['#0088FE', '#FF8042'];
13+
const attendanceColors = ['#0088FE', '#FF8042', '#FFBB28'];
1414
const noShowColors = ['#00C49F', '#FF0000'];
1515

1616
// Status color mapping
@@ -133,12 +133,13 @@ const renderCustomizedLabel = ({ cx, cy, midAngle, innerRadius, outerRadius, per
133133
<text
134134
x={x}
135135
y={y}
136-
fill="black"
137-
textAnchor={x > cx ? 'start' : 'end'}
136+
fill="white"
137+
textAnchor="middle"
138138
dominantBaseline="central"
139139
fontSize="12"
140+
fontWeight="bold"
140141
>
141-
{`${(percent * 100).toFixed(1)}%`}
142+
{percent > 0 ? `${(percent * 100).toFixed(0)}%` : ''}
142143
</text>
143144
);
144145
};

src/components/Header/Header.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ export function Header(props) {
406406
const viewingUser = JSON.parse(window.sessionStorage.getItem('viewingUser'));
407407
return (
408408
<div className={`${styles.headerWrapper}`} data-testid="header">
409-
<Navbar className={`py-3 ${styles.navbar}`} color="dark" dark expand="xl">
409+
<Navbar className={`py-3 ${styles.navbar}`} color="dark" dark expand={true}>
410410
{logoutPopup && <Logout open={logoutPopup} setLogoutPopup={setLogoutPopup} />}
411411
{showPromotionsPopup && <DisplayBox onClose={() => setShowPromotionsPopup(false)} />}
412412

src/components/Header/Header.module.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
}
188188
}
189189

190+
190191
@media screen and (max-width: 1151px) and (min-width: 992px) {
191192
.dropdownMenu {
192193
width: auto !important;
@@ -302,6 +303,7 @@
302303
}
303304

304305
/* Responsive behavior - prevent icon overlap on smaller screens */
306+
305307
@media (max-width: 1200px) {
306308
.left-section,
307309
.center-section,
@@ -351,4 +353,5 @@
351353
width: 100% !important;
352354
justify-content: center !important;
353355
}
354-
}
356+
}
357+

src/components/UserManagement/ActiveInactiveConfirmationPopup.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
ModalFooter,
1010
} from 'reactstrap';
1111
import '../Header/index.css';
12-
import { InactiveReason } from '../../utils/enums';
12+
import { InactiveReason } from '../../utils/enums.js';
1313

1414
const ActiveInactiveConfirmationPopup = React.memo((props) => {
1515
const darkMode = useSelector(state => state.theme.darkMode);

0 commit comments

Comments
 (0)