Skip to content

Fix buttons and add nurse UI#384

Merged
biswajeetdash01 merged 12 commits into
Gopher-Industries:masterfrom
biswajeetdash01:master
May 28, 2026
Merged

Fix buttons and add nurse UI#384
biswajeetdash01 merged 12 commits into
Gopher-Industries:masterfrom
biswajeetdash01:master

Conversation

@biswajeetdash01
Copy link
Copy Markdown
Collaborator

Description

This PR improves the mobile app task and nurse workflows while also adding the new nurse-facing/admin UI in the guardian-admin-dashboard.

The main changes include:

  • fixed button-related UI and interaction issues across key app screens
  • refreshed the nurse roster experience and supporting layouts/resources
  • updated task list, task detail, and related patient/general views for better usability
  • added shared navigation/supporting UI pieces in the Android app
  • introduced the nurse/admin dashboard UI flow in guardian-admin-dashboard, including login, OTP, sidebar layout, dashboard pages, roster, staff management, reports, settings, and supporting auth/service utilities

Todos

  • Tested and working locally
  • Code follows the style guidelines of this project
  • I have performed a self-review of my code
  • Code changes documented
  • Requested review from >= 2 devs on the team (one frontend and one backend recommended)

How to test

  1. Pull this branch and install dependencies if needed.
  2. Run the Android app and verify the updated button behavior in the affected patient, caretaker, and general/task screens.
  3. Open the nurse roster flow in the Android app and confirm the updated layout, navigation, and UI elements render correctly.
  4. Check task-related screens such as task list, task add, and task detail to confirm buttons, styling, and interactions work as expected.
  5. Run the admin dashboard frontend from guardian-admin-dashboard.
  6. Verify the new auth flow pages load correctly:
    • login page
    • OTP page
  7. Verify the dashboard shell and navigation work correctly across:
    • dashboard home
    • nurse roster
    • staff management
    • patients
    • reports
    • settings
    • organisation assignment
  8. Confirm styling/assets load correctly and there are no obvious routing or rendering issues.

Screenshots and/or Gifs

Add screenshots/gifs for:

  • updated Android nurse roster UI
  • updated task/button screens in the Android app
  • admin dashboard login page
  • OTP page
  • dashboard home
  • nurse roster/admin pages

Associated MS Planner Tasks

  • Review actions shown to each role
  • Review buttons shown to each role
  • Add or refine hide/show logic
  • Test current role access expectations

Known Issues

  • Some pages currently focus on UI structure and navigation, so deeper end-to-end workflow validation may still be needed.

Copy link
Copy Markdown
Collaborator

@s225031317 s225031317 left a comment

Choose a reason for hiding this comment

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

I reviewed the changes and overall the PR aligns well with what was described. The updates across the Android app and the guardian-admin-dashboard improve the UI and usability quite nicely. The fixes to button behaviour across different screens make interactions feel more smooth and consistent, and the updated nurse roster layout is clearer and easier to follow.

I also noticed good improvements in navigation and shared UI components, which helps keep things consistent across the app. The task-related screens (like task list and task detail) now feel more structured and easier to use. On the admin side, the new dashboard flow with login, OTP, sidebar and pages like roster, staff management, reports, and settings looks well organised and gives a solid base for future features.

It’s also good to see that the changes were tested locally and follow the general coding style of the project. The PR stays focused on improving the frontend experience without adding unnecessary complexity, which is good.

Overall, this looks like a solid improvement PR and seems ready to merge. As a small suggestion for future, it might be useful to do more end-to-end workflow testing and double check role-based visibility in some areas, and maybe refine UI responsiveness a bit more, but these are not blocking for this PR.

Copy link
Copy Markdown
Collaborator

@s225031317 s225031317 left a comment

Choose a reason for hiding this comment

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

I reviewed the changes and overall the PR aligns well with what was described. The updates across the Android app and the guardian-admin-dashboard improve the UI and usability quite nicely. The fixes to button behaviour across different screens make interactions feel more smooth and consistent, and the updated nurse roster layout is clearer and easier to follow.

I also noticed good improvements in navigation and shared UI components, which helps keep things consistent across the app. The task-related screens (like task list and task detail) now feel more structured and easier to use. On the admin side, the new dashboard flow with login, OTP, sidebar and pages like roster, staff management, reports, and settings looks well organised and gives a solid base for future features.

It’s also good to see that the changes were tested locally and follow the general coding style of the project. The PR stays focused on improving the frontend experience without adding unnecessary complexity, which is good.

Overall, this looks like a solid improvement PR and seems ready to merge. As a small suggestion for future, it might be useful to do more end-to-end workflow testing and double check role-based visibility in some areas, and maybe refine UI responsiveness a bit more, but these are not blocking for this PR.

@biswajeetdash01
Copy link
Copy Markdown
Collaborator Author

biswajeetdash01 commented May 16, 2026

Screenshot 2026-05-16 at 10 58 17 PM Screenshot 2026-05-16 at 11 18 05 PM Screenshot 2026-05-16 at 11 18 13 PM Screenshot 2026-05-16 at 11 18 21 PM Screenshot 2026-05-16 at 11 20 10 PM ** Sprint 2 PR Description** This PR hardens the Android patient reassignment flow so the app does not crash when opening or submitting the reassignment screen.

Changes

  • Updated reassignment staff API calls to use the required backend endpoints:
    • GET /api/v1/caretaker
    • GET /api/v1/nurse/all
    • GET /api/v1/doctors
    • PUT /api/v1/admin/patients/{id}/reassign
  • Made reassignment staff parsing resilient to different backend response shapes:
    • plain arrays
    • wrapped responses like { nurses: [...] }
    • wrapped responses like { doctors: [...] }
  • Added safer handling for missing/null staff fields.
  • Added session/error handling so the dialog shows an error instead of crashing.
  • Preserved loading, validation, and success/error states in the reassignment dialog.

Testing

  • Verified admin login returns a JWT using admin@guardian.com.
  • Tested live backend endpoints:
    • GET /caretaker returned 200, count 5
    • GET /nurse/all returned 200, count 7
    • GET /doctors returned 200, count 3
    • PUT /admin/patients/{fake}/reassign returned 404 Patient not found, confirming the endpoint is authenticated and reachable without modifying shared data
  • Ran Android checks:
    • ./gradlew :app:compileDebugKotlin passed
    • ./gradlew :app:testDebugUnitTest passed
    • ./gradlew :app:assembleDebug passed

Notes

  • No non-Android app folders were changed.
  • Real reassignment was not executed to avoid modifying shared backend deployment data.

@biswajeetdash01 biswajeetdash01 merged commit 2a18f9b into Gopher-Industries:master May 28, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants