Skip to content

Shreya P taking over for Vamsidhar create grouped bar graph showing injury severity #4479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vamsidharpanithi wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Shreya P taking over for Vamsidhar create grouped bar graph showing injury severity #4479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec7b858
Fix dark mode styling for filter categories on Injury Severity by Cat…
vamsidharpanithi Nov 30, 2025
7aa2c1b
Merge development into vamsidhar-create-grouped-bar-graph-showing-inj…
vamsidharpanithi Nov 30, 2025
a31a982
Fix duplicate isAckLoading declaration in Header.jsx
vamsidharpanithi Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function InjuryCategoryBarChart() {
</div>
</div>

{loading && <p>Loading…</p>}
{loading && <p className={darkMode ? styles.darkMode : ''}>Loading…</p>}
{!loading && error && <p className={styles.error}>Error: {String(error)}</p>}

{!loading && !error && (
Expand Down Expand Up @@ -251,7 +251,7 @@ function InjuryCategoryBarChart() {
contentStyle={{
backgroundColor: darkMode ? '#2b3e59' : '#fff',
color: darkMode ? '#fff' : '#000',
border: 'none',
border: darkMode ? '1px solid #555' : '1px solid #ccc',
}}
labelStyle={{
color: darkMode ? '#fff' : '#000',
Expand Down
157 changes: 138 additions & 19 deletions ...oard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
.filter {
display: flex;
flex-direction: column;
gap: 0.5rem;
}

.injury-chart-label {
color: #444;
font-size: 0.9rem;
margin-bottom: 0.25rem;
font-weight: 500;
}

.error {
Expand All @@ -52,11 +54,11 @@
}

.darkMode .injury-chart-title {
color: white;
color: #ffffff;
}

.darkMode .injury-chart-label {
color: white;
color: #e0e0e0 !important;
}

.darkMode .injury-chart-filters {
Expand All @@ -66,39 +68,156 @@
padding: 1rem;
}

.darkMode .injury-select__control {
/* React-Select dark mode styles */
.darkMode :global(.injury-select__control) {
background-color: #2b3e59 !important;
color: white !important;
border-color: #555 !important;
color: #ffffff !important;
}

.darkMode :global(.injury-select__control:hover) {
border-color: #777 !important;
}

.darkMode .injury-select__single-value,
.darkMode .injury-select__multi-value__label,
.darkMode .injury-select__input-container {
color: white !important;
.darkMode :global(.injury-select__control--is-focused) {
border-color: #0d55b3 !important;
box-shadow: 0 0 0 1px #0d55b3 !important;
}

.darkMode :global(.injury-select__single-value),
.darkMode :global(.injury-select__multi-value__label),
.darkMode :global(.injury-select__input-container) {
color: #ffffff !important;
}

.darkMode :global(.injury-select__input-container input) {
color: #ffffff !important;
}

.darkMode :global(.injury-select__placeholder) {
color: #a0a0a0 !important;
}

.darkMode :global(.injury-select__menu) {
background-color: #2b3e59 !important;
border-color: #555 !important;
}

.darkMode .injury-select__menu {
.darkMode :global(.injury-select__option) {
background-color: #2b3e59 !important;
color: white !important;
color: #ffffff !important;
}

.darkMode :global(.injury-select__option:hover),
.darkMode :global(.injury-select__option--is-focused) {
background-color: #0d55b3 !important;
color: #ffffff !important;
}

.darkMode :global(.injury-select__option--is-selected) {
background-color: #375071 !important;
color: #ffffff !important;
}

.darkMode :global(.injury-select__multi-value) {
background-color: #375071 !important;
}

.darkMode :global(.injury-select__multi-value__remove) {
color: #ffffff !important;
}

.darkMode :global(.injury-select__multi-value__remove:hover) {
background-color: #0d55b3 !important;
color: #ffffff !important;
}

.darkMode :global(.injury-select__indicator-separator) {
background-color: #555 !important;
}

.darkMode .injury-select__option:hover {
color: black !important;
.darkMode :global(.injury-select__dropdown-indicator),
.darkMode :global(.injury-select__clear-indicator) {
color: #ffffff !important;
}

.darkMode .react-datepicker__input-container input {
.darkMode :global(.injury-select__dropdown-indicator:hover),
.darkMode :global(.injury-select__clear-indicator:hover) {
color: #0d55b3 !important;
}

/* React-DatePicker dark mode styles */
.darkMode :global(.react-datepicker__input-container input) {
background-color: #2b3e59 !important;
color: white !important;
border: 1px solid #555;
padding: 0.5rem;
border-radius: 4px;
color: #ffffff !important;
border: 1px solid #555 !important;
padding: 0.5rem !important;
border-radius: 4px !important;
}

.darkMode :global(.react-datepicker__input-container input::placeholder) {
color: #a0a0a0 !important;
}

.darkMode :global(.react-datepicker__input-container input:focus) {
border-color: #0d55b3 !important;
outline: none !important;
box-shadow: 0 0 0 1px #0d55b3 !important;
}

.darkMode :global(.react-datepicker) {
background-color: #3A506B !important;
border-color: #555 !important;
color: #ffffff !important;
}

.darkMode :global(.react-datepicker__header) {
background-color: #1C2541 !important;
border-bottom-color: #555 !important;
}

.darkMode :global(.react-datepicker__current-month),
.darkMode :global(.react-datepicker__day-name),
.darkMode :global(.react-datepicker__day),
.darkMode :global(.react-datepicker__time-name) {
color: #ffffff !important;
}

.darkMode :global(.react-datepicker__day:hover),
.darkMode :global(.react-datepicker__day--keyboard-selected) {
background-color: #0d55b3 !important;
color: #ffffff !important;
}

.darkMode :global(.react-datepicker__day--selected),
.darkMode :global(.react-datepicker__day--in-selecting-range),
.darkMode :global(.react-datepicker__day--in-range) {
background-color: #0d55b3 !important;
color: #ffffff !important;
}

.darkMode :global(.react-datepicker__navigation-icon::before) {
border-color: #ffffff !important;
}

/* Chart elements dark mode */
.darkMode :global(.recharts-cartesian-axis-tick-value) {
fill: #ffffff !important;
}

.darkMode :global(.recharts-legend-item-text) {
color: #ffffff !important;
}

/* Loading and error text in dark mode */
.darkMode :global(p) {
color: #ffffff !important;
}

.darkMode .error {
color: #ff6b6b;
color: #ff6b6b !important;
}

.darkMode .empty {
color: #ccc;
color: #a0a0a0 !important;
}
1 change: 0 additions & 1 deletion src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ export function Header(props) {
const [hasProfileLoaded, setHasProfileLoaded] = useState(false);
const dismissalKey = `lastDismissed_${userId}`;
const [lastDismissed, setLastDismissed] = useState(localStorage.getItem(dismissalKey));
const [isAckLoading, setIsAckLoading] = useState(false);
const unreadNotifications = props.notification?.unreadNotifications; // List of unread notifications
const dispatch = useDispatch();
const history = useHistory();
Expand Down
Loading