Skip to content

Add Project Tag Sidebar, Tag AND Filter Support & Processing Timesheet Status#703

Merged
niraj2477 merged 31 commits intomainfrom
develop
Jul 29, 2025
Merged

Add Project Tag Sidebar, Tag AND Filter Support & Processing Timesheet Status#703
niraj2477 merged 31 commits intomainfrom
develop

Conversation

@Siddhantsingh1230
Copy link
Copy Markdown
Collaborator

@Siddhantsingh1230 Siddhantsingh1230 commented Jul 29, 2025

Description

This PR adds:

  • Introduces a Sidebar component to control project Tags on the Project Detail Page
  • Adds support for filtering by multiple tags using AND logic
  • Updates Save Changes to persist tag filters along with other filters to the ERP backend
  • Adds a new Processing Timesheet status to custom_weekly_approval_status and custom_approval_status to clarify queue state and reduce confusion with approved entries

Relevant Technical Choices

  • Add Sidebar component.
  • Update Project detail header component to incorporate above changes.
  • Refactor createFilter to store tags.
  • Modify getFilter utility to add AND based tag filtering
  • Update approve_rejection utility to set new status before queuing background job
  • Update update_weekly_status_of_timesheet utility to add new status priority
  • Update FE components to incorporate above changes.

Testing Instructions

  • Go to NPMS
  • Open Project Page
  • Apply multiple Tag Filters
  • Click on any project
  • Sidebar should be visible
  • Try Adding and deleting tags to the project

To test for Processing Timesheet status

  • Open any submitted Timesheets
  • Approve or Reject Timesheet
  • A new status Processing Timesheet should be shown until all timesheets are processed.

Additional Information:

None

Screenshot/Screencast

Tag Sidebar:

Sidebar.For.Tags.webm

Tag Filter:

Tag.Filter.webm

Processing Timesheet

2025-07-28.11-17-12.webm

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)

Addresses: https://github.com/rtCamp/erp-rtcamp/issues/2422, https://github.com/rtCamp/erp-rtcamp/issues/2423,https://github.com/rtCamp/erp-rtcamp/issues/2430

maharrshi and others added 30 commits July 21, 2025 12:45
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Playwright script for TC29, 105 and 113
Fix empty values in textEditor component in renderField
Fix row creation in empty child table & add min-width to childtable ui
Add Support for "AND" Filter in Tag Filter
Add Sidebar to control project tags in Project detail page
Publish Processing timsheet status
@niraj2477 niraj2477 merged commit 781d2b5 into main Jul 29, 2025
6 checks 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.

3 participants