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

2652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kartik Sharma
0e6dd93260 Verify mandatory indicator (*) for Reference field while creating a Tenant 2025-09-25 09:20:48 +00:00
pramod.mahajan
245219ad71 Merge pull request 'Inconsistent search bar height in Tenant module' (#429) from Kartik_Bug#1300 into Organization_Management 
Reviewed-on: #429
Merged
 2025-09-25 09:19:07 +00:00
Kartik Sharma
978a497f28 Inconsistent search bar height in Tenant module 2025-09-25 09:19:07 +00:00
pramod.mahajan
451d0a785f Merge pull request 'Change all create button UI.' (#430) from Kartik_Task#1345 into Organization_Management 
Reviewed-on: #430
Merged
 2025-09-25 09:17:56 +00:00
Kartik Sharma
84f9cb2e29 Change all create button UI. 2025-09-25 09:17:56 +00:00
pramod.mahajan
9d9ca28bad Merge pull request 'Incorrect button sequence in Tenant Edit form' (#428) from Kartik_Bug#1301 into Organization_Management 
Reviewed-on: #428
Merged
 2025-09-25 09:17:16 +00:00
Kartik Sharma
1d218056ac Incorrect button sequence in Tenant Edit form 2025-09-25 09:17:16 +00:00
pramod.mahajan
58837cef0c Merge pull request 'Adding Activity-Group in Create Task popup.' (#431) from Kartik_Task_InfraMask#1266 into Organization_Management 
Reviewed-on: #431
merged
 2025-09-25 09:00:46 +00:00
pramod.mahajan
1cd3bf6c7f updated assigned services poject whenver assigned new service 2025-09-25 09:00:46 +00:00
Kartik Sharma
d2b10495bd Added Services Column in Edit activity modal 2025-09-25 09:00:46 +00:00
Kartik Sharma
ae9c4833b3 Added Activity Group, and implemented sorting for Service, Activity Group, and Activities. 2025-09-25 09:00:46 +00:00
Kartik Sharma
e69efe61cb Adding Activity-Group in Create Task popup. 2025-09-25 09:00:46 +00:00
pramod.mahajan
92b1531b75 daily task planning filtering according to service 2025-09-25 14:11:04 +05:30
pramod.mahajan
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
Kartik Sharma
49eaf857ad In Choose Orgainzation popup Find Organization and Search box show in one line. 2025-09-25 11:46:12 +05:30
Kartik Sharma
ccdfc193c6 Change the position of setting and Organization in Project nav. 2025-09-25 09:52:13 +05:30
Kartik Sharma
817b31379e Switch Tenant button move to top in User Profile. 2025-09-24 17:33:55 +05:30
Vikas Nale
b36120f73d Merge pull request 'In ExpensePanel add new Toggle button.' (#421) from Kartik_Task#1303 into Organization_Management 
Reviewed-on: #421
 2025-09-24 11:14:01 +00:00
Vikas Nale
e2ae2e5fbd change labels as per guidance 2025-09-24 16:43:36 +05:30
pramod.mahajan
521e6690cb uncommit important stuff 2025-09-24 15:09:34 +05:30
pramod.mahajan
1f4a7e5e9c forgot uncomment important stuff- tenant 2025-09-24 15:08:42 +05:30
pramod.mahajan
1d3fcff859 Merge pull request 'Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default' (#423) from Kartik_Bug#1292 into Organization_Management 
Reviewed-on: #423
Merged
 2025-09-24 07:20:45 +00:00
Kartik Sharma
1286184e1f Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default 2025-09-24 07:20:45 +00:00
pramod.mahajan
4e315aafcf added small ui changed like table b-padding, button size and fixd delete activity and group 2025-09-24 12:49:00 +05:30
pramod.mahajan
52e12426af Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-23 17:49:01 +05:30
pramod.mahajan
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
Kartik Sharma
d87dae4799 In ExpensePanel add new Toggle button. 2025-09-23 16:35:48 +05:30
Kartik Sharma
4683eff749 In the ProjectList view, when we select 'View Details', the project is automatically set to 'marcosecure' instead of the selected project. 2025-09-23 11:06:16 +05:30
ashutosh.nehete
772a3e2829 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-22 18:44:13 +05:30
ashutosh.nehete
ca7b0cda13 initially setup of service management 2025-09-22 18:44:05 +05:30
Kartik Sharma
a380a7ab29 Changes in Choose Organization1 popup increase the space. 2025-09-22 16:25:02 +05:30
Kartik Sharma
c609387924 Changes in Organization popup 2025-09-22 16:00:24 +05:30
ashutosh.nehete
69cc3b9383 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-22 13:13:22 +05:30
ashutosh.nehete
6ebbc853bc optimized logout fun and intergrated inside Tenant selection page 2025-09-22 13:13:13 +05:30
Kartik Sharma
71dd35adc2 Changes in Services Dropdown. 2025-09-22 12:40:00 +05:30
ashutosh.nehete
533b40d1bf Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-22 10:31:06 +05:30
ashutosh.nehete
42a80bbd68 removed unused code 2025-09-22 10:30:57 +05:30
Vikas Nale
397020ccb4 Merge pull request 'Creating a Services in Master Compoenents.' (#408) from Master_Services into Organization_Management 
Reviewed-on: #408
 2025-09-22 05:00:06 +00:00
Vikas Nale
71932ea6dc Merge pull request 'Integrate the API for Work Area and fetch data filtered by serviceId.' (#419) from Kartik_Task_Infra#1265 into Organization_Management 
Reviewed-on: #419
 2025-09-22 04:07:58 +00:00
Vikas Nale
693cabf63d Merge pull request 'Calling api for Attendance component for Organization.' (#420) from Kartik_Task_Att#1236 into Organization_Management 
Reviewed-on: #420
 2025-09-22 04:07:09 +00:00
Kartik Sharma
4afe43d116 handle one tenant have , directly move to dashboard once logged 2025-09-22 00:09:34 +05:30
Kartik Sharma
b9b3788dda configured tenant level login 2025-09-21 18:59:34 +05:30
Kartik Sharma
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +05:30
Kartik Sharma
aee510f527 revert pramod changed - (tenant login mistake 2025-09-21 16:58:29 +05:30
Kartik Sharma
7e6020e3db Merge branch 'organization_management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-21 16:42:26 +05:30
Vikas Nale
cf78d17cf5 Merge pull request 'Add an Organization column in the Attendance grid across all tabs.' (#414) from Kartik_Task_OrgCol_att#1238 into Organization_Management 
Reviewed-on: #414
 2025-09-21 11:11:21 +00:00
Kartik Sharma
72dbdb0fe0 Changes in Attendance 2025-09-21 16:40:23 +05:30
Kartik Sharma
afcd1934f9 Integrate the API for Work Area and fetch data filtered by serviceId. 2025-09-21 15:10:31 +05:30
Pramod
3e5afe0bc6 revertlogin initial steup in organization_management brnach 2025-09-21 10:13:12 +05:30
Pramod
070fa93fca initially setup login 2025-09-21 10:06:38 +05:30