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

2464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod mahajan
f00e3a1a24 initial setup sidebar menus from backend 2025-08-23 17:06:38 +05:30
pramod.mahajan
18390e9368 Merge pull request 'Issues_Aug_1W' (#355) from Issues_Aug_1W into main 
Reviewed-on: #355
merged
 2025-08-23 11:09:24 +00:00
pramod mahajan
380effd2f0 changed project source 2025-08-23 14:58:22 +05:30
Kartik Sharma
a01e2deee7 Changes in Regularizationaction. 2025-08-23 13:19:41 +05:30
Kartik Sharma
57eb2ab405 Changes in projectId for attendance, employee. 
Dropdown of project has been hide in expense.
 2025-08-23 12:55:35 +05:30
pramod mahajan
a76cbe8615 handle error msg 2025-08-23 11:21:02 +05:30
pramod mahajan
006a68f2fe added new loader 2025-08-23 10:33:26 +05:30
pramod mahajan
49cf94546a changed position of autorenew input field 2025-08-23 10:23:05 +05:30
pramod.mahajan
0cc65fdcfa Merge pull request 'Display Only "Re-activate" Button for Inactive Employees in Action Column' (#348) from Kartik_Bug#944 into Issues_Aug_1W 
Reviewed-on: #348
Merged
 2025-08-23 04:37:20 +00:00
Kartik Sharma
f1bc6bd57d Updation in Employee Suspend and Reactivate employee. 2025-08-23 04:37:20 +00:00
Kartik Sharma
00b73b3d34 Display Only "Re-activate" Button for Inactive Employees in Action Column 2025-08-23 04:37:20 +00:00
pramod.mahajan
d542c26a17 Merge pull request 'Filter Popup from Expense Module Persists When Switching to Attendance Module' (#349) from Kartik_Bug#906 into Issues_Aug_1W 
Reviewed-on: #349
Merged
 2025-08-23 04:36:58 +00:00
Kartik Sharma
6cbab5949c Filter Popup from Expense Module Persists When Switching to Attendance Module 2025-08-23 04:36:58 +00:00
pramod.mahajan
6fe6d0ea40 Merge pull request 'Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning' (#350) from Kartik_Bug#920 into Issues_Aug_1W 
Reviewed-on: #350
Merged
 2025-08-23 04:36:31 +00:00
Kartik Sharma
9f9bfbe922 Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning 2025-08-23 04:36:31 +00:00
pramod.mahajan
52b0b9b2da Merge pull request 'Implementing a search functionality within the Attendance component to enable search across all tabs.' (#351) from Kartik_Enhancement#948 into Issues_Aug_1W 
Reviewed-on: #351
Merged
 2025-08-23 04:35:39 +00:00
Kartik Sharma
9272783388 Implementing a search functionality within the Attendance component to enable search across all tabs. 2025-08-23 04:35:39 +00:00
pramod.mahajan
fd5bd1966d Merge pull request 'Missing Employee Search Box in Assign Task Popup' (#352) from Kartik_Bug#915 into Issues_Aug_1W 
Reviewed-on: #352
merged
 2025-08-23 04:35:07 +00:00
pramod mahajan
b2f5213f7d restric to enter aph, symbol character 2025-08-22 15:48:43 +05:30
pramod mahajan
4ab33fd5fd added self Tenant Profile 2025-08-22 15:16:51 +05:30
pramod mahajan
735e766215 removed max user label from subscription card 2025-08-22 11:56:53 +05:30
Kartik Sharma
1bf7ccbaad Missing Employee Search Box in Assign Task Popup 2025-08-20 16:28:15 +05:30
pramod mahajan
4a98c3d5e8 se default freq. 3 2025-08-19 13:39:03 +05:30
pramod mahajan
7808a39aa0 prevent to view list of tenant if haven't permission. 2025-08-19 12:06:52 +05:30
pramod mahajan
b645aec55f sorting plans history using date 2025-08-19 11:50:05 +05:30
pramod mahajan
56e4c86c7f handle empty field showing 2025-08-19 11:19:12 +05:30
pramod mahajan
5a90088a28 added tenant releated permission id's 2025-08-19 10:48:46 +05:30
pramod mahajan
e7a0d41278 restrict firstName and lastName fields to accept only alphabets 2025-08-19 10:11:47 +05:30
pramod mahajan
00904ffa86 update contact number field to support valid and also international format 2025-08-19 09:54:58 +05:30
pramod mahajan
19d7e35d8a corrected spelling mistake in "Quarterly" plan type (Bills & Plan History 2025-08-18 23:38:07 +05:30
pramod mahajan
0a82e0af42 handle run time error 2025-08-18 23:27:52 +05:30
pramod mahajan
0df19cb78e initial setup sidebar menus from backend 2025-08-18 18:21:16 +05:30
Vikas Nale
4349f19c30 Merge pull request 'Border line missing in multiple fields on Add New Employee form' (#344) from Kartik_Bug#932 into Issues_Aug_1W 
Reviewed-on: #344
 2025-08-18 11:08:37 +00:00
Vikas Nale
3bdd7218bb Merge pull request 'IN Create New Expense popup change the label TransactionId to Transaction ID.' (#343) from Kartik_Bug#895 into Issues_Aug_1W 
Reviewed-on: #343
 2025-08-18 11:07:29 +00:00
Vikas Nale
4a7fb67cd4 Merge pull request 'Inconsistent Filter Icon in Daily Progress Report section.' (#342) from Kartik_Bug#919 into Issues_Aug_1W 
Reviewed-on: #342
 2025-08-18 11:06:43 +00:00
Vikas Nale
30092e51bf Merge pull request 'Username & Password field should auto-trim spaces in Login page.' (#341) from Kartik_Bug#929 into Issues_Aug_1W 
Reviewed-on: #341
 2025-08-18 11:05:29 +00:00
Vikas Nale
db5c8fbe48 Merge pull request 'In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up' (#340) from Kartik_Bug#886 into Issues_Aug_1W 
Reviewed-on: #340
 2025-08-18 11:03:53 +00:00
Vikas Nale
8c5c802f72 Merge pull request 'In AttendanceLog When we select a date range picker then api is not call after updation now its working properly.' (#346) from Kartik_Bug#907 into Issues_Aug_1W 
Reviewed-on: #346
 2025-08-18 11:02:25 +00:00
Kartik Sharma
b45a4eb553 In AttendanceLog When we select a date range picker then api is not call after updation now its working properly. 2025-08-18 16:11:02 +05:30
Kartik Sharma
2208cc66b1 Border line missing in multiple fields on Add New Employee form 2025-08-18 13:27:14 +05:30
Kartik Sharma
6d504bf16b IN Create New Expense popup change the label TransactionId to Transaction ID. 2025-08-18 12:38:24 +05:30
pramod mahajan
f25289f7fa adde permission keys 2025-08-18 12:15:08 +05:30
Kartik Sharma
9720206150 Inconsistent Filter Icon in Daily Progress Report section. 2025-08-18 12:07:05 +05:30
Kartik Sharma
438ee4417f Username & Password field should auto-trim spaces in Login page. 2025-08-18 11:46:38 +05:30
Kartik Sharma
2b5df10137 In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up 2025-08-18 11:29:38 +05:30
Kartik Sharma
7283140a3a Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W 2025-08-18 10:23:03 +05:30
Vikas Nale
d8f5485bec missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324 
#324
 2025-08-18 10:22:32 +05:30
Vikas Nale
967d176a09 change table header Official Designation to Designation 2025-08-18 10:22:32 +05:30
Kartik Sharma
b97ac8e680 Special Characters Shoulsd not Allowed in Name Fields 2025-08-18 10:22:32 +05:30
Kartik Sharma
745938a11f Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-18 10:22:32 +05:30