Skip to content

Fe statistic dashboard by arsh - #309

Open
arshghanchi wants to merge 7 commits into
Hardhat-Enterprises:devfrom
arshghanchi:fe-statistic-dashboard-by-arsh
Open

Fe statistic dashboard by arsh#309
arshghanchi wants to merge 7 commits into
Hardhat-Enterprises:devfrom
arshghanchi:fe-statistic-dashboard-by-arsh

Conversation

@arshghanchi

Copy link
Copy Markdown
Contributor

This PR adds a fully functional, JSON-driven statistics dashboard to the app: a custom-styled month selector spinner lets users pick any month (Jan–Dec) and immediately updates five MPAndroidChart visualizations (day-wise bar, category pie, weekly trend line, success vs. failed stacked bar, and severity radar) along with key stat panels, all backed by demo data in assets/analytics_data.json and consistent theming for a seamless user experience.

@Jasi-with-noe Jasi-with-noe added the bug Something isn't working label May 16, 2025
@Jasi-with-noe

Copy link
Copy Markdown
Contributor

Hey Arsh — thanks for the submission! The statistics dashboard looks great. However, there are a few merge conflicts and integration concerns that need your attention before we can proceed:


Key Merge Conflicts

1. MainActivity.java

  • You're adding a nav_dashboard route while dev currently uses nav_report.
  • Your BottomNavigationView listener overrides existing logic for CommunityReportActivity.
  • Suggestion: Instead of replacing one, merge both nav_dashboard and nav_report and make sure to resolve conflicts from your side.

2. NewsActivity.java

  • Similar conflict with the BottomNavigationView: nav_dashboard logic is clashing with the nav_report flow.
  • ✅ Ensure both dashboard and report screens are retained and the menu is updated accordingly.

3. SettingsActivity.java

  • Conflict in navigation again — your version drops nav_report.

✅ Next Steps

  • Resolve conflicts locally:

    • Pull the latest dev branch.
    • Merge it into your feature branch (fe-statistic-dashboard-by-arsh).
    • Carefully resolve each conflict, combining both versions where necessary.
  • Retest impacted screens:

    • MainActivity, NewsActivity, and SettingsActivity to ensure navigation is functional.
  • Push the updated branch:

    • Once conflicts are resolved and verified, push the changes for re-review.

— Thanks, Jasmin

@Jasi-with-noe Jasi-with-noe self-assigned this May 16, 2025
@arshghanchi

Copy link
Copy Markdown
Contributor Author

done the changes and i have updated my branch with latest features. thanks

@Jasi-with-noe

Copy link
Copy Markdown
Contributor

Hi Arsh, Could you please attach any visuals (screenshots/videos) for your implementation, as it would make it easier for myself when testing. Thanks

@arshghanchi

Copy link
Copy Markdown
Contributor Author

Screenshot (319)
Screenshot (320)

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

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants