Skip to content

Sanjaya grg/fix/pr new fixed checkin checkout functionality and date time readable format#402

Merged
TeddyScript101 merged 4 commits into
mainfrom
SanjayaGrg/fix/PR-New-Fixed-checkin-checkout-functionality-and-date-time-readable-format
May 23, 2026
Merged

Sanjaya grg/fix/pr new fixed checkin checkout functionality and date time readable format#402
TeddyScript101 merged 4 commits into
mainfrom
SanjayaGrg/fix/PR-New-Fixed-checkin-checkout-functionality-and-date-time-readable-format

Conversation

@SanjayaGrg
Copy link
Copy Markdown
Collaborator

Fixing PR #365 and #303 ,

Summary

This PR recreates the previous check-in/check-out changes as a frontend-only PR.

What was done

  • fixed check-in and check-out flow in the guard app
  • fixed duplicate check-in/check-out handling
  • improved attendance history display in shift details
  • added readable date/time formatting for attendance records
  • updated shift-related frontend screens to show attendance data correctly

Important note

This PR includes frontend changes only.
Backend files from the previous PR were excluded from PR #365.

Screenshots

image image

@TeddyScript101
Copy link
Copy Markdown
Collaborator

I haven’t checked the check-in logic, but I’ve assigned Krisha to review it.

image

However, you have overridden the 'Incident Reports' and 'Payroll' navigation buttons in HomeScreen.tsx, which are available at the main branch for a couple of weeks.

@Krisha190235
Copy link
Copy Markdown
Collaborator

I've reviewed the check-in/check-out functionality and it's working as expected. But you still need to have a look for navigation buttons for Incident Report and payroll.

@SanjayaGrg
Copy link
Copy Markdown
Collaborator Author

Thanks @Krisha190235 , I have fixed this in the current PR branch.

I restored HomeScreen.tsx to match main and removed the unintended override of the Incident Reports and Payroll navigation buttons.

I pushed the update to this same PR for review.

@TeddyScript101 TeddyScript101 merged commit 8af91d1 into main May 23, 2026
2 checks passed
@TeddyScript101 TeddyScript101 deleted the SanjayaGrg/fix/PR-New-Fixed-checkin-checkout-functionality-and-date-time-readable-format branch May 23, 2026 15:26
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.

3 participants