1321 Commits

Author SHA1 Message Date
ae66cb3705 Change the label in Assign Organization. 2025-09-27 09:31:52 +00:00
ca8a41bb63 added style classes for footer 2025-09-27 09:29:59 +00:00
265c74f079 added filter and sorted employee list - Team 2025-09-27 09:29:59 +00:00
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
3233043cf2 initial setup for assign emp to project 2025-09-27 09:29:59 +00:00
3fddb686d3 change get employee at assign task to employee 2025-09-27 14:58:39 +05:30
4fd6e5cc1a Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-27 10:33:40 +05:30
1fb8eb9ef1 Create Task popup will open at all the time while submitting. 2025-09-26 16:21:37 +05:30
1a3890e837 Removing Create and Activity from MasterModal.jsx file. 2025-09-26 15:34:08 +05:30
2dbf08e330 Removing create and Edit activity component. 2025-09-26 15:02:03 +05:30
b044b88c49 Adding border in Group and Activities popup and Removing mandatory field in Tenant. 2025-09-26 14:56:19 +05:30
53fa013c39 split projectList component 2025-09-26 11:47:03 +05:30
22a1ad45e7 Change the name of Switch Tenant to Workspace 2025-09-26 11:37:31 +05:30
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +05:30
69c225ac72 Adding Services dropdown in Organization Creation dropdown. 2025-09-25 16:09:36 +05:30
38bd8d36c0 Correction of Delete Employee Popup Texts 2025-09-25 09:21:54 +00:00
0e6dd93260 Verify mandatory indicator (*) for Reference field while creating a Tenant 2025-09-25 09:20:48 +00:00
84f9cb2e29 Change all create button UI. 2025-09-25 09:17:56 +00:00
1d218056ac Incorrect button sequence in Tenant Edit form 2025-09-25 09:17:16 +00:00
d2b10495bd Added Services Column in Edit activity modal 2025-09-25 09:00:46 +00:00
ae9c4833b3 Added Activity Group, and implemented sorting for Service, Activity Group, and Activities. 2025-09-25 09:00:46 +00:00
e69efe61cb Adding Activity-Group in Create Task popup. 2025-09-25 09:00:46 +00:00
92b1531b75 daily task planning filtering according to service 2025-09-25 14:11:04 +05:30
57edd92dce fixed blocking of dailyprogress by using pagination 2025-09-25 12:36:55 +05:30
49eaf857ad In Choose Orgainzation popup Find Organization and Search box show in one line. 2025-09-25 11:46:12 +05:30
ccdfc193c6 Change the position of setting and Organization in Project nav. 2025-09-25 09:52:13 +05:30
817b31379e Switch Tenant button move to top in User Profile. 2025-09-24 17:33:55 +05:30
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
e2ae2e5fbd change labels as per guidance 2025-09-24 16:43:36 +05:30
1f4a7e5e9c forgot uncomment important stuff- tenant 2025-09-24 15:08:42 +05:30
1286184e1f Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default 2025-09-24 07:20:45 +00:00
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
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
d87dae4799 In ExpensePanel add new Toggle button. 2025-09-23 16:35:48 +05:30
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
ca7b0cda13 initially setup of service management 2025-09-22 18:44:05 +05:30
a380a7ab29 Changes in Choose Organization1 popup increase the space. 2025-09-22 16:25:02 +05:30
c609387924 Changes in Organization popup 2025-09-22 16:00:24 +05:30
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
6ebbc853bc optimized logout fun and intergrated inside Tenant selection page 2025-09-22 13:13:13 +05:30
71dd35adc2 Changes in Services Dropdown. 2025-09-22 12:40:00 +05:30
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
42a80bbd68 removed unused code 2025-09-22 10:30:57 +05:30
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
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
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
4afe43d116 handle one tenant have , directly move to dashboard once logged 2025-09-22 00:09:34 +05:30
b9b3788dda configured tenant level login 2025-09-21 18:59:34 +05:30
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +05:30
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