Issues_July_4W #304

kartik.sharma · 2025-07-28T06:21:24Z

kartik.sharma commented

2025-07-28 06:21:24 +00:00

All the changes in UI and Adding search funtionality in Attendance and Assign Task popup.

kartik.sharma added 94 commits 2025-07-28 06:21:25 +00:00

Added new field in contact create and update form fb1dec6c93

Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. e207310f0e

Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' (#275 ) from Kartik_Bug#789 into Issues_July_4W 59c36d099b

Reviewed-on: #275
Merged

At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 633e60d141

Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". b5cf52ba49

Merge pull request 'Kartik_Bug#785' (#274 ) from Kartik_Bug#785 into Issues_July_4W 820f80562f

Reviewed-on: #274
Merged

Enhancement implemented in the Attendance component to include search functionality. e96187cfa1

Adding In-built scrollbar in Select Teams dropdown and Employees. a021a7b7b2

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 9dbec1e137

Removing Console.log. 2f2acb7df3

Chnages in Header.js wihile user is assigned to single project. df15367397

When user is Assign to single project then dropdown and All Projects is not seen. f6d3c6b2ab

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 d3822c3590

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. e485066bd1

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 8fd8f395c9

UI changes in Employee Profile and Project Profile. d4c4454eb1

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 89674dd771

In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. 0a890bf88a

Attendance Log Page Resets to First Page After Performing Action on Other Pages. a6f5c131a3

Merge pull request 'Added new field in contact create and update form' (#263 ) from Ashutosh_Enhancement_#632 into Issues_July_4W bc18cf9cc3

Reviewed-on: #263

Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277 ) from Kartik_Enhancement#759 into Issues_July_4W 2c3c4087c8

Reviewed-on: #277

Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278 ) from Kartik_Bug795 into Issues_July_4W 95dde88d7a

Reviewed-on: #278

Merge pull request 'Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.' (#281 ) from Kartik_Bug#792 into Issues_July_4W ba1864a9ff

Reviewed-on: #281

Merge branch 'Kartik_Bug#799' into Issues_July_4W 1e509501da

# Conflicts:
#	src/components/Project/AssignTask.jsx

Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285 ) from Kartik_Bug#787 into Issues_July_4W 3de7ce30c4

Reviewed-on: #285

Merge pull request 'In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.' (#287 ) from Kartik_Bug#542 into Issues_July_4W da434ff649

Reviewed-on: #287

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 4f64a23089

Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757 678e6bccf6

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 85bdc270ac

Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 0cb661687a

Merge pull request 'Attendance Log Page Resets to First Page After Performing Action on Other Pages.' (#288 ) from Kartik_Bug#757 into Issues_July_4W c2fe727bec

Reviewed-on: #288

Merge pull request 'Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.' (#291 ) from Kartik_Task#808 into Issues_July_4W f209b7cb86

Reviewed-on: #291

Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. a02c72859f

At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2d1cddb2e0

Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 587029a766

Added new field in contact create and update form d8f892e9f4

Enhancement implemented in the Attendance component to include search functionality. cdcc9b90e4

Adding In-built scrollbar in Select Teams dropdown and Employees. 3bd2a17c97

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 6ce2860457

Removing Console.log. a23220fb66

Chnages in Header.js wihile user is assigned to single project. 2bc0939d64

When user is Assign to single project then dropdown and All Projects is not seen. 18fb3a0f09

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 464c32c3ba

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 7b0cc6cdbe

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. bccd8a7bdd

UI changes in Employee Profile and Project Profile. 1d9de3dbca

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 774f287615

In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. aa550ed030

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 9afee2934a

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 1e8c836e4d

Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. f68f589a5e

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 5956e64492

Enhancement implemented in the Attendance component to include search functionality. ae973bf1a1

Adding In-built scrollbar in Select Teams dropdown and Employees. 23e484774d

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 9b7d808f58

Chnages in Header.js wihile user is assigned to single project. 248f14b8d2

When user is Assign to single project then dropdown and All Projects is not seen. 72c9472643

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 f040528821

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. ac101e1e81

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. ad6937b02e

UI changes in Employee Profile and Project Profile. 92d3f91950

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 1df2d50aba

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 30b567d020

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 1f3438e3a9

Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 75d4ca176d

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 7e5f5807f6

changes aa5998bc11

Changes in during a merge 699c349ba5

Directory Implementation in Contact profile popup. 3be282d99d

Merge pull request 'Directory Implementation in Contact profile popup.' (#300 ) from Kartik_Directory_Changes#805 into Issues_July_4W 53628f0bf0

Reviewed-on: #300
Merged

Change all filter icon in Directory ,imageGallery and Project List. 0357596ea3

Merge pull request 'Change all filter icon in Directory ,imageGallery and Project List.' (#301 ) from Kartik_Filter_Changes#800 into Issues_July_4W eec208db89

Reviewed-on: #301
merged

Enhancement implemented in the Attendance component to include search functionality. 3709346d42

Adding In-built scrollbar in Select Teams dropdown and Employees. 3925926084

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 7535028b44

Removing Console.log. 74c2906527

Chnages in Header.js wihile user is assigned to single project. 3848130cde

When user is Assign to single project then dropdown and All Projects is not seen. c35b7954fc

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 9f1b8f7090

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 55625246ce

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. f565e83413

UI changes in Employee Profile and Project Profile. a001875a56

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" aa43dd4540

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 276a2ca9f4

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 32434da93f

Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 52ef65cce0

changes 527e052786

Changes in during a merge d7986e4af4

Directory Implementation in Contact profile popup. 536f4d4e3a

Change all filter icon in Directory ,imageGallery and Project List. bb224ea3e7

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 254aaf1977

All the changes of Search functionality in Attendance page. 8b2aef8a52

Project List Dropdown will be remove in Projects. f28a1a9d4e

Merge pull request 'Project List Dropdown will be remove in Projects.' (#302 ) from Kartik_ProjectList#628 into Issues_July_4W ffb1bd742a

Reviewed-on: #302
Merged

kartik.sharma added 1 commit 2025-07-28 07:41:15 +00:00

In Project List page change Filter icon. 66f2d4bff6

kartik.sharma added 1 commit 2025-07-28 07:51:28 +00:00

Changes in Directory card view design. 528d02a703

kartik.sharma added 1 commit 2025-07-29 10:53:39 +00:00

In Contact profile popup Include Delete functionality add. cc05dbad20

vikas.nale commented

2025-07-29 12:48:14 +00:00

How can we merge with the main, where changes are yet to be released?

vikas.nale closed this pull request

2025-07-29 12:48:14 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/marco.pms.web#304