Skip to content

Shravan fix conflicts 4351#4954

Open
Shravan-neelamsetty wants to merge 40 commits into
developmentfrom
shravan-fix-conflicts-4351
Open

Shravan fix conflicts 4351#4954
Shravan-neelamsetty wants to merge 40 commits into
developmentfrom
shravan-fix-conflicts-4351

Conversation

@Shravan-neelamsetty
Copy link
Copy Markdown
Contributor

Description

Resolved all merge conflicts for PR #4351 (Carlos's dark mode implementation for the Total Construction Summary page). This branch merges carlos-optimize-dark-mode-total-construction-summary into development with all 16 conflicting files resolved, reviewer feedback addressed, and lint/prettier fixes applied.

Fixes merge conflicts blocking PR #4351

Related PRs (if any):

This PR resolves merge conflicts for #4351 by carlos

Main changes explained:

  • Resolved 16 file conflicts across BMDashboard components, LeaderBoard, and ExperienceDonutChart
  • Handled 2 rename/delete conflicts (ToolStatusDonutChart.css and Leaderboard.css → .module.css migrations)
  • Maintained CSS modules approach from development while preserving Carlos's dark mode additions
  • Kept camelCase CSS module class naming convention consistent across all resolved files
  • Added dark mode styling for select dropdowns, calendars, tooltips, and chart components
  • Applied prettier and eslint auto-fixes on all resolved files

How to test:

  1. Check into branch shravan-fix-conflicts-4351
  2. Run yarn install and yarn start:local
  3. Clear site data/cache
  4. Log in as admin user
  5. Go to bmdashboard/totalconstructionsummary
  6. Toggle dark mode ON — verify all sections render correctly (Risk Profile, Issue Tracking, Tools & Equipment, Labor Hours, Financials, etc.)
  7. Toggle dark mode OFF — verify light mode still works properly
  8. Check dropdowns, date pickers, chart tooltips, and calendar popups in both modes
  9. Navigate to Leaderboard page — verify two-row layout, trophy icons, and dark mode toggle work

Screenshots or videos of changes:

1)issue tracking calender issue solved

issue tracking calender issue solved

2)tools and equipement tracking issue solved

tools and equipement tracking issue solved

3)lessons learned dark mode issue solved

lessons learned dark mode issue solved

4)global distribution dark mode issue solved

global distribution dark mode issue solved

Note:

@netlify
Copy link
Copy Markdown

netlify Bot commented Mar 7, 2026

Deploy Preview for highestgoodnetwork-dev ready!

Name Link
🔨 Latest commit 9b15db0
🔍 Latest deploy log https://app.netlify.com/projects/highestgoodnetwork-dev/deploys/6a185ac78ff4890008119d5b
😎 Deploy Preview https://deploy-preview-4954--highestgoodnetwork-dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Mar 7, 2026

@Shravan-neelamsetty Shravan-neelamsetty force-pushed the shravan-fix-conflicts-4351 branch from 901060b to 6fa3e3b Compare April 8, 2026 03:44
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Apr 8, 2026

@one-community one-community added the High Priority - Please Review First This is an important PR we'd like to get merged as soon as possible label Apr 9, 2026
Copy link
Copy Markdown

@HemanthNidamanuru HemanthNidamanuru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Shravan,

I tested this PR locally and everything looks good! One small thing to fix: the selected projects field background does not adapt properly in dark mode.

Image Image Image Image Image

Copy link
Copy Markdown

@Anusha-Gali Anusha-Gali left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Shravan,

I have reviewed your PR locally and in "Total Construction Summary" i found the below issues:

  • In Longest Open issues, the chart background when compare to the other charts on the page
  • The Supplier Performance dropdown's in Tools and Equipment tracking are not adapted to the same color as other dropdown's.
  • The options in the Injury Severity chart in Lessons Learned are not clearly visible when selected
  • The options in the Planned vs Actual Cost in Financials are not clearly visible when selected
  • The hover text in Global Distribution map is not visible, and a lot of dropdown's and other features are missing when compared to Dev
  • The calendar in the Planned vs Actual Cost in Financials is in light mode

The rest of the charts are well adapted to dark mode. The Leaderboard page is also as per requirement.

Issues
Image
Image
Image
Image
Image
Image

No issues
Image
Image

@Shravan-neelamsetty Shravan-neelamsetty force-pushed the shravan-fix-conflicts-4351 branch from d7258f1 to 4e075f3 Compare May 28, 2026 01:22
@sonarqubecloud
Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
3.8% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

High Priority - Please Review First This is an important PR we'd like to get merged as soon as possible

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants