362 Commits

Author SHA1 Message Date
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
71dd35adc2 Changes in Services Dropdown. 2025-09-22 12:40:00 +05:30
42a80bbd68 removed unused code 2025-09-22 10:30:57 +05:30
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
4afe43d116 handle one tenant have , directly move to dashboard once logged 2025-09-22 00:09:34 +05:30
afcd1934f9 Integrate the API for Work Area and fetch data filtered by serviceId. 2025-09-21 15:10:31 +05:30
70acf57266 Remove message from Services dropdwon. 2025-09-20 20:05:25 +05:30
b2d7349fc9 Adding search funcionality in Teams for Organization and Services. 2025-09-20 19:37:47 +05:30
fa7dc2860c Changes in the Teams Services dropdown will reflect the Services data. 2025-09-20 19:30:47 +05:30
9711144236 Adding a new Grid in Teams Grid. 2025-09-20 15:40:17 +05:30
1a88f5fec5 chenages msg 2025-09-20 14:02:57 +05:30
7dafd4a45f fetched assigned organozation to project 2025-09-20 13:59:20 +05:30
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
f6d864d42e assign to project and Tenant flow is integrated with api 2025-09-20 12:14:34 +05:30
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
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
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
994f22e8c0 Changes in Infrastructure service dropdown. 2025-09-20 11:29:29 +05:30
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
b39df5f665 Changes in Teams dropdown. 2025-09-20 11:21:56 +05:30
005fdb3490 added assigned org to project 2025-09-19 23:46:06 +05:30
9223f7a176 Adding Card in Daily Progress Report. 2025-09-19 20:03:36 +05:30
00d6774e06 Change the position of Services in Create Task popup in Infrastructure. 2025-09-19 19:26:46 +05:30
1ef82ad0b2 Only 1 project or no project is assigned then dropdown will be hide. 2025-09-19 19:20:01 +05:30
1da587d010 Adding condition if single or no project assigned then dropdown is not shown 2025-09-19 19:13:02 +05:30
54e609883d Adding Dropdown in Create Task Popup. 2025-09-19 16:13:09 +05:30
7d17422681 Calling Api for Services dropdown. 2025-09-19 16:02:36 +05:30
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
e154bac64a Calling api for services dropdwon. 2025-09-19 15:54:29 +05:30
ea350db98b Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1229 2025-09-19 15:27:16 +05:30
133024bc5c setup assigned org to project and integrated projectservice 2025-09-19 15:25:58 +05:30
ea219b7176 Adding Services Dropdown in Infrastructure. 2025-09-19 15:03:25 +05:30
af5519fd60 Adding Dropdown and Organization Column in Teams 2025-09-19 14:53:40 +05:30
1452e77bc5 initially setup service provider form 2025-09-18 19:23:24 +05:30
b2c68824dd fixed refresh existen permission 2025-09-18 12:57:37 +05:30
889b477dd0 removed subMenu of Project setting 2025-09-17 14:24:45 +05:30
cc7ef47055 fixed validation msg set bottom of select box 2025-09-17 12:54:40 +05:30
95fbac4760 fixed prevent removed existen permission whenever add new one 2025-09-17 12:41:00 +05:30
0a489be675 added proper global and project level permission 2025-09-16 16:08:47 +05:30
42086d7f3a Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Sep_1W_V2 2025-09-16 10:40:27 +05:30
e6e90c7d4e Filter dropdown in Assign Task popup does not close on outside click 2025-09-15 11:52:15 +00:00
94eb283b2d added permission for managr task 2025-09-13 19:01:08 +05:30
0e3a634205 fixed permission add and remove updation 2025-09-13 18:16:56 +05:30
755eb94ae3 added padding and marging at project feature permission card 2025-09-09 15:41:27 +05:30
0194c4427a Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:57:30 +05:30
ea022d37c8 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:50:58 +05:30
768f810465 All symbols will be same in all components. 2025-09-05 17:17:15 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
f9fe987a94 changed useproject hook name 2025-09-05 11:58:36 +05:30