Skip to content

Add Approval pending Status and fix get_timesheet_detail API#664

Merged
niraj2477 merged 1 commit intodevelopfrom
fix/update_week_status
Jun 30, 2025
Merged

Add Approval pending Status and fix get_timesheet_detail API#664
niraj2477 merged 1 commit intodevelopfrom
fix/update_week_status

Conversation

@Siddhantsingh1230
Copy link
Copy Markdown
Collaborator

Description

This PR adds a check for the "Approval Pending" weekly status. If the total hours marked as "Approval Pending" exceed the employee's working hours, editing the timesheets will no longer update the weekly status. Additionally, an issue where cancelled documents were visible in the "Edit Timesheet" dialog has been fixed.

Relevant Technical Choices

  • Add Approval Pending Status Count

Testing Instructions

  • Add Timesheets for the entire week
  • Sent it for approval
  • Edit any timesheet
  • The Status should not change

Additional Information:

N/A

Screenshot/Screencast

N/A

Checklist

  • I have carefully reviewed the code before submitting it for review.
  • This code is adequately covered by unit tests to validate its functionality.
  • I have conducted thorough testing to ensure it functions as intended.
  • A member of the QA team has reviewed and tested this PR (To be checked by QA or code reviewer)

@Siddhantsingh1230 Siddhantsingh1230 changed the base branch from main to develop June 30, 2025 11:10
@Siddhantsingh1230 Siddhantsingh1230 changed the title Add Approval pending Status and fix get_timeshet_detail API Add Approval pending Status and fix get_timesheet_detail API Jun 30, 2025
@niraj2477 niraj2477 merged commit 36587ed into develop Jun 30, 2025
6 of 7 checks passed
@Siddhantsingh1230 Siddhantsingh1230 deleted the fix/update_week_status branch August 7, 2025 12:35
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