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

2464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vikas Nale
53a9cbc30b Merge pull request 'Changes in the Teams Services dropdown will reflect the Services data.' (#418) from Kartik_Task_TeamGrid#1259 into Organization_Management 
Reviewed-on: #418
 2025-09-20 15:01:16 +00:00
Kartik Sharma
70acf57266 Remove message from Services dropdwon. 2025-09-20 20:05:25 +05:30
Kartik Sharma
b2d7349fc9 Adding search funcionality in Teams for Organization and Services. 2025-09-20 19:37:47 +05:30
Kartik Sharma
a0f7e5c57b Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task_TeamGrid#1259 2025-09-20 19:32:41 +05:30
Kartik Sharma
fa7dc2860c Changes in the Teams Services dropdown will reflect the Services data. 2025-09-20 19:30:47 +05:30
pramod.mahajan
a1a935b0d5 Merge pull request 'changed Uii for org. or project assigned' (#417) from organization_level_login into Organization_Management 
Reviewed-on: #417
 2025-09-20 13:27:30 +00:00
Pramod
e610cc08c1 changed Uii for org. or project assigned 2025-09-20 18:47:09 +05:30
Kartik Sharma
9711144236 Adding a new Grid in Teams Grid. 2025-09-20 15:40:17 +05:30
pramod mahajan
1a88f5fec5 chenages msg 2025-09-20 14:02:57 +05:30
pramod mahajan
ce73cfad21 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-20 13:59:24 +05:30
pramod mahajan
7dafd4a45f fetched assigned organozation to project 2025-09-20 13:59:20 +05:30
Vikas Nale
2e3e3aa6ca Merge pull request 'Adding Filter Icon in Attendance tab and add functionality in all Attendance component.' (#416) from Kartik_Task_AttFilter#1235 into Organization_Management 
Reviewed-on: #416
 2025-09-20 06:45:11 +00:00
pramod mahajan
158c934a9f Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-20 12:14:40 +05:30
pramod mahajan
f6d864d42e assign to project and Tenant flow is integrated with api 2025-09-20 12:14:34 +05:30
Kartik Sharma
90b96864be Changes in Attendance filter 2025-09-20 12:13:49 +05:30
Vikas Nale
5a048f7066 Merge pull request 'Adding Dropdown and API call in Daily Progress Report.' (#413) from Kartik_Task_DailyProgress#1232 into Organization_Management 
Reviewed-on: #413
 2025-09-20 06:22:43 +00:00
Kartik Sharma
731d2dbed7 Changes in Infrastructure. 2025-09-20 11:51:32 +05:30
Vikas Nale
25de45b31b Merge pull request 'Adding Dropdown in Daily Task Planning and call api.' (#412) from Kartik_Task_DailyTask#1231 into Organization_Management 
Reviewed-on: #412
 2025-09-20 06:09:58 +00:00
Kartik Sharma
58b5da1793 Changes in Daily Task planning 2025-09-20 11:39:14 +05:30
Vikas Nale
0746e5c349 Merge pull request 'Adding Dropdown in Create Task Popup.' (#411) from Kartik_Task#1230 into Organization_Management 
Reviewed-on: #411
 2025-09-20 06:03:55 +00:00
Vikas Nale
83143dff0a Merge pull request 'Adding Services Dropdown in Infrastructure.' (#410) from Kartik_Task#1229 into Organization_Management 
Reviewed-on: #410
 2025-09-20 06:00:05 +00:00
Kartik Sharma
994f22e8c0 Changes in Infrastructure service dropdown. 2025-09-20 11:29:29 +05:30
Vikas Nale
84a5be52f8 Merge pull request 'Adding Dropdown and Organization Column in Teams' (#409) from Kartik_Task#1227 into Organization_Management 
Reviewed-on: #409
 2025-09-20 05:52:30 +00:00
Kartik Sharma
b39df5f665 Changes in Teams dropdown. 2025-09-20 11:21:56 +05:30
Kartik Sharma
9bdcc74486 Adding Filter Icon in Attendance tab and add functionality in all Attendance component. 2025-09-20 10:28:18 +05:30
pramod mahajan
005fdb3490 added assigned org to project 2025-09-19 23:46:06 +05:30
Kartik Sharma
9223f7a176 Adding Card in Daily Progress Report. 2025-09-19 20:03:36 +05:30
Kartik Sharma
27b62c858d Change the position of Datepicker and Dropdown box. 2025-09-19 19:50:50 +05:30
Kartik Sharma
00d6774e06 Change the position of Services in Create Task popup in Infrastructure. 2025-09-19 19:26:46 +05:30
Kartik Sharma
1ef82ad0b2 Only 1 project or no project is assigned then dropdown will be hide. 2025-09-19 19:20:01 +05:30
Kartik Sharma
1da587d010 Adding condition if single or no project assigned then dropdown is not shown 2025-09-19 19:13:02 +05:30
Kartik Sharma
164b82e1c7 Add an Organization column in the Attendance grid across all tabs. 2025-09-19 17:00:02 +05:30
Kartik Sharma
e9d8b6daea Adding Dropdown and API call in Daily Progress Report. 2025-09-19 16:43:44 +05:30
Kartik Sharma
9b37288901 Adding Dropdown in Daily Task Planning and call api. 2025-09-19 16:32:34 +05:30
Kartik Sharma
54e609883d Adding Dropdown in Create Task Popup. 2025-09-19 16:13:09 +05:30
Kartik Sharma
7d17422681 Calling Api for Services dropdown. 2025-09-19 16:02:36 +05:30
Kartik Sharma
d67121c150 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1227 2025-09-19 15:55:25 +05:30
Kartik Sharma
e154bac64a Calling api for services dropdwon. 2025-09-19 15:54:29 +05:30