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

2345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kartik Sharma
c3835a3856 Some changes in Header and aboutproject component. 2025-07-30 15:34:04 +05:30
pramod.mahajan
811392448d Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313) from Kartik_Task_#832_ProjectSelection into Issues_July_4W 
Reviewed-on: #313
merged
 2025-07-30 09:26:35 +00:00
Kartik Sharma
5399fa1f17 When a project is selected, the last selected project will be displayed. 2025-07-30 14:39:43 +05:30
pramod.mahajan
4512c11a60 Merge pull request 'Modify Application role popup to look better' (#309) from Kartik_Bug#793 into Issues_July_4W 
Reviewed-on: #309
Merged
 2025-07-30 09:04:05 +00:00
Kartik Sharma
14be5aadda UI Changes in Aboutproject.jsx. 2025-07-30 09:04:05 +00:00
Kartik Sharma
fa3ccd28fa Responsive grid changes in Create Role and EditRole. 2025-07-30 09:04:05 +00:00
Kartik Sharma
4d4037ed71 Changes in Application Role popup. 2025-07-30 09:04:05 +00:00
Kartik Sharma
91fabf929c Modify Application role popup to look better 2025-07-30 09:04:05 +00:00
pramod.mahajan
95bfacf5f1 Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306) from Kartik_Bug#797 into Issues_July_4W 
Reviewed-on: #306
Merged
 2025-07-30 07:54:06 +00:00
Kartik Sharma
76e290fe79 Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. 2025-07-30 07:54:06 +00:00
pramod.mahajan
a1682c8a62 Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307) from Kartik_Enhancement#807 into Issues_July_4W 
Reviewed-on: #307
Merged
 2025-07-29 13:44:47 +00:00
Kartik Sharma
ac8815d674 In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids. 2025-07-29 13:44:47 +00:00
pramod.mahajan
697c9acfa6 Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308) from Kartik_Bug#717 into Issues_July_4W 
Reviewed-on: #308
Merged
 2025-07-29 13:33:08 +00:00
Kartik Sharma
a763ec4412 Date Format Not Consistent – Should Always Display DD‑MM‑YYYY 2025-07-29 13:33:08 +00:00
Kartik Sharma
cc05dbad20 In Contact profile popup Include Delete functionality add. 2025-07-29 16:23:19 +05:30
Kartik Sharma
528d02a703 Changes in Directory card view design. 2025-07-28 13:21:20 +05:30
Kartik Sharma
66f2d4bff6 In Project List page change Filter icon. 2025-07-28 13:10:55 +05:30
pramod.mahajan
ffb1bd742a Merge pull request 'Project List Dropdown will be remove in Projects.' (#302) from Kartik_ProjectList#628 into Issues_July_4W 
Reviewed-on: #302
Merged
 2025-07-28 06:02:02 +00:00
Kartik Sharma
f28a1a9d4e Project List Dropdown will be remove in Projects. 2025-07-28 06:02:02 +00:00
Kartik Sharma
8b2aef8a52 All the changes of Search functionality in Attendance page. 2025-07-28 11:21:37 +05:30
pramod mahajan
254aaf1977 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 16:55:11 +05:30
Kartik Sharma
bb224ea3e7 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 16:50:24 +05:30
Kartik Sharma
536f4d4e3a Directory Implementation in Contact profile popup. 2025-07-26 16:50:24 +05:30
Kartik Sharma
d7986e4af4 Changes in during a merge 2025-07-26 16:50:24 +05:30
Kartik Sharma
527e052786 changes 2025-07-26 16:43:51 +05:30
Kartik Sharma
52ef65cce0 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-26 16:43:28 +05:30
Kartik Sharma
32434da93f Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:42:26 +05:30
Kartik Sharma
276a2ca9f4 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:39:42 +05:30
Kartik Sharma
aa43dd4540 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 16:39:16 +05:30
Kartik Sharma
a001875a56 UI changes in Employee Profile and Project Profile. 2025-07-26 16:39:16 +05:30
Kartik Sharma
f565e83413 Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 16:38:38 +05:30
Kartik Sharma
55625246ce Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 16:38:38 +05:30
kartik.sharma
9f1b8f7090 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 
revert When user is Assign to single project then dropdown and All Projects is not seen.
 2025-07-26 16:38:38 +05:30
Kartik Sharma
c35b7954fc When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-26 16:38:38 +05:30
Kartik Sharma
3848130cde Chnages in Header.js wihile user is assigned to single project. 2025-07-26 16:38:38 +05:30
Kartik Sharma
74c2906527 Removing Console.log. 2025-07-26 16:38:38 +05:30
Kartik Sharma
7535028b44 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-26 16:38:37 +05:30
Kartik Sharma
3925926084 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 16:37:52 +05:30
Kartik Sharma
3709346d42 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 16:35:43 +05:30
pramod.mahajan
eec208db89 Merge pull request 'Change all filter icon in Directory ,imageGallery and Project List.' (#301) from Kartik_Filter_Changes#800 into Issues_July_4W 
Reviewed-on: #301
merged
 2025-07-26 09:37:03 +00:00
Kartik Sharma
0357596ea3 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 09:37:03 +00:00
pramod.mahajan
53628f0bf0 Merge pull request 'Directory Implementation in Contact profile popup.' (#300) from Kartik_Directory_Changes#805 into Issues_July_4W 
Reviewed-on: #300
Merged
 2025-07-26 09:24:29 +00:00
Kartik Sharma
3be282d99d Directory Implementation in Contact profile popup. 2025-07-26 14:50:55 +05:30
Kartik Sharma
699c349ba5 Changes in during a merge 2025-07-26 13:28:47 +05:30
Kartik Sharma
aa5998bc11 changes 2025-07-26 12:59:12 +05:30
Kartik Sharma
7e5f5807f6 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 12:56:54 +05:30
Kartik Sharma
75d4ca176d 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-26 12:56:09 +05:30
Kartik Sharma
1f3438e3a9 Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:55:14 +05:30
Kartik Sharma
30b567d020 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:54:09 +05:30
Kartik Sharma
1df2d50aba Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 12:51:44 +05:30