admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
1,918 Commits 240 Branches 0 Tags
Commit Graph

1918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kartik Sharma
2d1cddb2e0 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". 2025-07-26 12:03:38 +05:30
Kartik Sharma
a02c72859f Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. 2025-07-26 12:02:32 +05:30
pramod mahajan
d3f21f33b6 added background color property for table row - 'tr-group'- that grouping entities 2025-07-25 18:17:18 +05:30
Vikas Nale
f209b7cb86 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 
Reviewed-on: #291
 2025-07-25 09:45:43 +00:00
Vikas Nale
c2fe727bec 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 
Reviewed-on: #288
 2025-07-25 09:39:48 +00:00
Kartik Sharma
0cb661687a 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. 2025-07-25 11:52:30 +05:30
Kartik Sharma
85bdc270ac Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:40:03 +05:30
Kartik Sharma
678e6bccf6 Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757 2025-07-24 17:10:25 +05:30
Kartik Sharma
4f64a23089 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:10:22 +05:30
Vikas Nale
da434ff649 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 
Reviewed-on: #287
 2025-07-24 10:41:55 +00:00
Vikas Nale
3de7ce30c4 Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285) from Kartik_Bug#787 into Issues_July_4W 
Reviewed-on: #285
 2025-07-24 10:38:48 +00:00
Vikas Nale
1e509501da Merge branch 'Kartik_Bug#799' into Issues_July_4W 
# Conflicts:
#	src/components/Project/AssignTask.jsx
 2025-07-24 16:04:30 +05:30
Vikas Nale
ba1864a9ff 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 
Reviewed-on: #281
 2025-07-24 10:29:29 +00:00
Vikas Nale
95dde88d7a Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278) from Kartik_Bug795 into Issues_July_4W 
Reviewed-on: #278
 2025-07-24 10:14:09 +00:00
Vikas Nale
2c3c4087c8 Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277) from Kartik_Enhancement#759 into Issues_July_4W 
Reviewed-on: #277
 2025-07-24 10:10:56 +00:00
Vikas Nale
bc18cf9cc3 Merge pull request 'Added new field in contact create and update form' (#263) from Ashutosh_Enhancement_#632 into Issues_July_4W 
Reviewed-on: #263
 2025-07-24 10:05:41 +00:00
Vikas Nale
d42bb413e8 Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' (#270) from react-query-v2 into main 
Reviewed-on: #270
 2025-07-24 09:41:19 +00:00
Kartik Sharma
a6f5c131a3 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 12:03:38 +05:30
Kartik Sharma
0a890bf88a In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. 2025-07-24 10:59:13 +05:30
Kartik Sharma
89674dd771 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-23 18:22:13 +05:30
Kartik Sharma
d4c4454eb1 UI changes in Employee Profile and Project Profile. 2025-07-23 17:08:50 +05:30
Kartik Sharma
8fd8f395c9 Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-23 15:47:41 +05:30
Kartik Sharma
e485066bd1 Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-23 15:45:02 +05:30
kartik.sharma
d3822c3590 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 
revert When user is Assign to single project then dropdown and All Projects is not seen.
 2025-07-23 06:21:27 +00:00
Kartik Sharma
f6d3c6b2ab When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-23 11:47:11 +05:30
Kartik Sharma
df15367397 Chnages in Header.js wihile user is assigned to single project. 2025-07-23 11:10:34 +05:30
Kartik Sharma
2f2acb7df3 Removing Console.log. 2025-07-23 10:55:30 +05:30
Kartik Sharma
9dbec1e137 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-23 10:52:30 +05:30
Kartik Sharma
a021a7b7b2 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-22 17:13:45 +05:30
Kartik Sharma
e96187cfa1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-22 16:47:26 +05:30
pramod.mahajan
820f80562f Merge pull request 'Kartik_Bug#785' (#274) from Kartik_Bug#785 into Issues_July_4W 
Reviewed-on: #274
Merged
 2025-07-22 09:29:12 +00:00
Kartik Sharma
b5cf52ba49 Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 2025-07-22 09:29:12 +00:00
Kartik Sharma
633e60d141 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". 2025-07-22 09:29:12 +00:00
pramod.mahajan
59c36d099b Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' (#275) from Kartik_Bug#789 into Issues_July_4W 
Reviewed-on: #275
Merged
 2025-07-22 09:27:01 +00:00
Kartik Sharma
e207310f0e Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. 2025-07-22 12:53:54 +05:30
pramod mahajan
43e173d0ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-21 09:47:09 +05:30
pramod.mahajan
c58d4d684b Merge pull request 'FixedInfra Planning issue' (#266) from taskPlanningIssue into main 
Reviewed-on: #266
Merged
 2025-07-19 05:49:31 +00:00
pramod mahajan
f0e007fe89 FixedInfra Planning issue 2025-07-19 11:18:21 +05:30
pramod mahajan
56540f7521 changed project selection routing 2025-07-18 19:20:31 +05:30
pramod mahajan
632119cfb9 removed unused code 2025-07-18 18:38:35 +05:30
pramod mahajan
b84275a7a3 fixed: employee fetching inside assign task 2025-07-18 17:09:49 +05:30
pramod.mahajan
07373f6180 Merge pull request 'Integrated React-query in Gallery for handling api calling' (#264) from query-Gallary into react-query-v2 
Reviewed-on: #264
merged
 2025-07-18 09:58:51 +00:00
pramod mahajan
89085d5069 prevent IntersectionObserver error on unobserve with null ref 2025-07-18 15:01:44 +05:30
pramod mahajan
425c32750c integrated query in gallary 2025-07-18 14:56:40 +05:30
pramod mahajan
cd23e43a82 removed unused code 2025-07-18 11:57:07 +05:30
pramod mahajan
0ad8c72aa9 fixed singlar 2025-07-18 11:32:32 +05:30
pramod mahajan
d176221c13 Corrected regex to accurately detect / and dashboard 2025-07-18 11:19:29 +05:30
pramod mahajan
1c68e3a3d5 fixed signalr issue due to occured integrated query 2025-07-18 10:54:44 +05:30
pramod mahajan
0c95882e7f changed employeeAttendance record modal 2025-07-18 00:09:45 +05:30
pramod mahajan
92568039eb sync data within regularize request and appove or reject between 2025-07-18 00:01:16 +05:30