Organization_Management : Organization Hierarchy #443

Merged
pramod.mahajan merged 180 commits from Organization_Management into main 2025-09-30 09:07:31 +00:00

180 Commits

Author SHA1 Message Date
9c6450496e added closed fun after create project and changed label name 2025-09-30 14:22:01 +05:30
cfd3986479 fixed small changed like heading, font change 2025-09-30 11:59:16 +05:30
764b145ad9 empty select activity, planne work fields after successfully created task 2025-09-29 18:31:56 +05:30
20c7cf7f37 added right path for organization info show 2025-09-29 18:00:48 +05:30
6d74940c0c added optional chain at view org details 2025-09-29 17:55:56 +05:30
02dcd8611f user could not create subtask completed equal to approve task and fixd error imported subTask component 2025-09-29 17:29:11 +05:30
02600308e8 rmoved unused and console 2025-09-29 16:53:24 +05:30
d1c72291a3 update date utility for localtoUtc fn 2025-09-29 15:20:54 +05:30
fdbd81c5e7 removed console 2025-09-29 15:13:36 +05:30
28d5ef653d added optional chain for manage project to prevent run time error 2025-09-29 15:10:49 +05:30
550b142d74 fixed run time date error 2025-09-29 15:03:52 +05:30
68335f0695 added temp. placeholder for image gallary 2025-09-29 14:38:23 +05:30
4ea20981fc Merge pull request 'Changes in Directory edit' (#407) from Kartik_Bug#1180 into Organization_Management
Reviewed-on: #407
Merged
2025-09-29 09:00:27 +00:00
965e1e4808 Correction in Edit Bucket in Directory. 2025-09-29 09:00:27 +00:00
1c376fe91f Changes in Directory edit 2025-09-29 09:00:27 +00:00
61835cb189 added clear filter 2025-09-29 12:55:31 +05:30
375c482b61 renamed Inactive to Includes Inactive 2025-09-29 12:04:33 +05:30
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
22514b1fa0 Merge pull request 'ProjectUpdationForOrganizaion : added Two fields inside Project create and update form - Promoter and PMC and added Remember me' (#442) from ProjectUpdationForOrganizaion into Organization_Management
Reviewed-on: #442
Merged
2025-09-28 18:44:30 +00:00
61b209a082 addded remember me functionality 2025-09-29 00:13:52 +05:30
198e31290c updated project files 2025-09-28 22:15:07 +05:30
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
2489095b0b Merge pull request 'Date picker in Document Filter shows pre-filled date instead of blank' (#422) from Kartik_Bug#1250 into Organization_Management
Reviewed-on: #422
Merged
2025-09-27 09:41:15 +00:00
eb8d269662 Date picker in Document Filter shows pre-filled date instead of blank 2025-09-27 09:41:15 +00:00
bbd8ed12f6 Merge pull request 'Date field not cleared in Tenant filter after clicking Clear button' (#432) from Kartik_Bug#1306 into Organization_Management
Reviewed-on: #432
Merged
2025-09-27 09:40:05 +00:00
1e7b4ba21e Date field not cleared in Tenant filter after clicking Clear button 2025-09-27 09:40:05 +00:00
4de3987a37 Merge pull request 'Add extra spacing in Infra Work details.' (#434) from Kartik_Bug#1359 into Organization_Management
Reviewed-on: #434
Merged
2025-09-27 09:38:34 +00:00
7455d8a221 Add extra spacing in Infra Work details. 2025-09-27 09:38:34 +00:00
3f4b7d08d4 Merge pull request 'Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task' (#435) from Kartik_Task#1361 into Organization_Management
Reviewed-on: #435
Merged
2025-09-27 09:37:36 +00:00
7ac3268514 Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task 2025-09-27 09:37:36 +00:00
f8740472de Merge pull request 'Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab)' (#436) from Kartik_Task#1374 into Organization_Management
Reviewed-on: #436
Merged
2025-09-27 09:36:27 +00:00
be72ca9a58 Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab) 2025-09-27 09:36:27 +00:00
c71c00c0f7 Merge pull request 'Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure)' (#438) from Kartik_Bug#1372 into Organization_Management
Reviewed-on: #438
Merged
2025-09-27 09:35:27 +00:00
112e0ff798 Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure) 2025-09-27 09:35:27 +00:00
96eb030457 Merge pull request 'Tenant Creation – Error banner for plan selection/currency should not be shown' (#439) from Kartik_Bug#1370 into Organization_Management
Reviewed-on: #439
Merged
2025-09-27 09:34:48 +00:00
a873ace109 Tenant Creation – Error banner for plan selection/currency should not be shown 2025-09-27 09:34:48 +00:00
fb164bd2f2 Merge pull request 'Switch Tenant & Goto workspace option label should be “Switch Workspace' (#440) from Kartik_Bug#1366 into Organization_Management
Reviewed-on: #440
Merged
2025-09-27 09:34:07 +00:00
0d6708619f Switch Tenant & Goto workspace option label should be “Switch Workspace 2025-09-27 09:34:07 +00:00
edba191a2e Merge pull request 'Tenant Creation – Logo removed when navigating back from second page' (#441) from Kartik_Bug#1369 into Organization_Management
Reviewed-on: #441
Merged
2025-09-27 09:33:46 +00:00
ddfe09b570 Tenant Creation – Logo removed when navigating back from second page 2025-09-27 09:33:46 +00:00
acb899dd2e Merge pull request 'Change the label in Assign Organization.' (#433) from Kartik_Bug#1353 into Organization_Management
Reviewed-on: #433
Merged
2025-09-27 09:31:52 +00:00
ae66cb3705 Change the label in Assign Organization. 2025-09-27 09:31:52 +00:00
d52fa00de0 Merge pull request 'Team Assign ToProject : With other Organization employees' (#437) from TeamAssignToProject into Organization_Management
Reviewed-on: #437
Merged
2025-09-27 09:29:59 +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
db815ba038 Rmoving Refresh icon and Label in Tenant. 2025-09-26 11:51:55 +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
91dcd7c132 The images on the Forgot page and Request Demo page should be centered after the update. 2025-09-26 10:53:31 +05:30
7d18edfa9b added tenant selection path within otp sign in way 2025-09-26 10:01:09 +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
182280e91d Merge pull request 'Correction of Delete Employee Popup Texts' (#424) from Kartik_Bug#1261 into Organization_Management
Reviewed-on: #424
Mereged
2025-09-25 09:21:54 +00:00
38bd8d36c0 Correction of Delete Employee Popup Texts 2025-09-25 09:21:54 +00:00
a4bccc9bf6 Merge pull request 'Verify mandatory indicator (*) for Reference field while creating a Tenant' (#427) from Kartik_Bug#1295 into Organization_Management
Reviewed-on: #427
Merged
2025-09-25 09:20:48 +00:00
0e6dd93260 Verify mandatory indicator (*) for Reference field while creating a Tenant 2025-09-25 09:20:48 +00:00
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
978a497f28 Inconsistent search bar height in Tenant module 2025-09-25 09:19:07 +00:00
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
84f9cb2e29 Change all create button UI. 2025-09-25 09:17:56 +00:00
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
1d218056ac Incorrect button sequence in Tenant Edit form 2025-09-25 09:17:16 +00:00
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
1cd3bf6c7f updated assigned services poject whenver assigned new service 2025-09-25 09:00:46 +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
521e6690cb uncommit important stuff 2025-09-24 15:09:34 +05:30
1f4a7e5e9c forgot uncomment important stuff- tenant 2025-09-24 15:08:42 +05:30
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
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
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
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
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
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
aee510f527 revert pramod changed - (tenant login mistake 2025-09-21 16:58:29 +05:30
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
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
72dbdb0fe0 Changes in Attendance 2025-09-21 16:40:23 +05:30
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
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
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
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
fa7dc2860c Changes in the Teams Services dropdown will reflect the Services data. 2025-09-20 19:30:47 +05:30
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
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
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
7dafd4a45f fetched assigned organozation to project 2025-09-20 13:59:20 +05:30
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
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
90b96864be Changes in Attendance filter 2025-09-20 12:13:49 +05:30
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
731d2dbed7 Changes in Infrastructure. 2025-09-20 11:51:32 +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
58b5da1793 Changes in Daily Task planning 2025-09-20 11:39:14 +05:30
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
9bdcc74486 Adding Filter Icon in Attendance tab and add functionality in all Attendance component. 2025-09-20 10:28:18 +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
27b62c858d Change the position of Datepicker and Dropdown box. 2025-09-19 19:50:50 +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
164b82e1c7 Add an Organization column in the Attendance grid across all tabs. 2025-09-19 17:00:02 +05:30
e9d8b6daea Adding Dropdown and API call in Daily Progress Report. 2025-09-19 16:43:44 +05:30
9b37288901 Adding Dropdown in Daily Task Planning and call api. 2025-09-19 16:32:34 +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
08194dd8ef Creating a Services in Master Compoenents. 2025-09-19 14:18:56 +05:30
1452e77bc5 initially setup service provider form 2025-09-18 19:23:24 +05:30
7fa2ca9227 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-18 15:25:02 +05:30
0d9ef7f248 integrated fetch organization list api and display with search filter 2025-09-18 15:23:48 +05:30
9a3488c92b convert inline style css class into class name 2025-09-18 15:23:48 +05:30
1b144aab8a organization created successfully 2025-09-18 15:23:48 +05:30
2e65007f26 fixed Modal provider component and setup organization creation 2025-09-18 15:23:48 +05:30
3c4c25b449 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:23:23 +05:30
979293ad90 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:21:23 +05:30
99eaf92e3f initially setup 2025-09-18 15:18:51 +05:30
28b0541894 organization created successfully 2025-09-18 15:18:04 +05:30
a48fc1d989 fixed Modal provider component and setup organization creation 2025-09-18 15:18:04 +05:30
78a0ecebf1 resolved conflict during came rebase 2025-09-18 15:18:04 +05:30
8eb8e27f89 refactore SelectMult Tag for label display is required or optional 2025-09-18 15:18:04 +05:30
012a89b3ea setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-18 15:18:04 +05:30
18698a67e3 removed unused files 2025-09-18 15:18:04 +05:30
701d1adc0b initially setup 2025-09-18 15:18:03 +05:30
01a5766074 organization created successfully 2025-09-18 10:01:39 +05:30
0348f6da8e fixed Modal provider component and setup organization creation 2025-09-17 19:45:42 +05:30
834ce62e67 Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 2025-09-17 14:26:35 +05:30
19f8189fc3 resolved conflict during came rebase 2025-09-17 14:19:02 +05:30
970c195ca5 refactore SelectMult Tag for label display is required or optional 2025-09-17 14:15:29 +05:30
d944d3a389 setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 2025-09-17 14:15:29 +05:30
e0c7eee1fd removed unused files 2025-09-17 14:14:56 +05:30
6baa2896c2 initially setup 2025-09-17 14:14:56 +05:30