Organization Manage #426

pramod.mahajan · 2025-09-24T09:27:21Z

pramod.mahajan commented

2025-09-24 09:27:21 +00:00

added organzation creation, assign org to project . and tenant.

added services. (work Acivity differentated in groups. group

Services ----> Groups ----> activities

added organzation creation, assign org to project . and tenant. added services. (work Acivity differentated in groups. group Services ----> Groups ----> activities

pramod.mahajan added 95 commits 2025-09-24 09:27:22 +00:00

initially setup 6baa2896c2

removed unused files e0c7eee1fd

setup organization modal, it seprated form another becuase this modal can open anywhere at one hook d944d3a389

refactore SelectMult Tag for label display is required or optional 970c195ca5

resolved conflict during came rebase 19f8189fc3

Merge branch 'Refactor_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 834ce62e67

fixed Modal provider component and setup organization creation 0348f6da8e

organization created successfully 01a5766074

initially setup 701d1adc0b

removed unused files 18698a67e3

setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 012a89b3ea

refactore SelectMult Tag for label display is required or optional 8eb8e27f89

resolved conflict during came rebase 78a0ecebf1

fixed Modal provider component and setup organization creation a48fc1d989

organization created successfully 28b0541894

initially setup 99eaf92e3f

setup organization modal, it seprated form another becuase this modal can open anywhere at one hook 979293ad90

refactore SelectMult Tag for label display is required or optional 3c4c25b449

fixed Modal provider component and setup organization creation 2e65007f26

organization created successfully 1b144aab8a

convert inline style css class into class name 9a3488c92b

integrated fetch organization list api and display with search filter 0d9ef7f248

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 7fa2ca9227

initially setup service provider form 1452e77bc5

Creating a Services in Master Compoenents. 08194dd8ef

Adding Dropdown and Organization Column in Teams af5519fd60

Adding Services Dropdown in Infrastructure. ea219b7176

setup assigned org to project and integrated projectservice 133024bc5c

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1229 ea350db98b

Calling api for services dropdwon. e154bac64a

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1227 d67121c150

Calling Api for Services dropdown. 7d17422681

Adding Dropdown in Create Task Popup. 54e609883d

Adding Dropdown in Daily Task Planning and call api. 9b37288901

Adding Dropdown and API call in Daily Progress Report. e9d8b6daea

Add an Organization column in the Attendance grid across all tabs. 164b82e1c7

Adding condition if single or no project assigned then dropdown is not shown 1da587d010

Only 1 project or no project is assigned then dropdown will be hide. 1ef82ad0b2

Change the position of Services in Create Task popup in Infrastructure. 00d6774e06

Change the position of Datepicker and Dropdown box. 27b62c858d

Adding Card in Daily Progress Report. 9223f7a176

added assigned org to project 005fdb3490

Adding Filter Icon in Attendance tab and add functionality in all Attendance component. 9bdcc74486

Changes in Teams dropdown. b39df5f665

Merge pull request 'Adding Dropdown and Organization Column in Teams' (#409 ) from Kartik_Task#1227 into Organization_Management 84a5be52f8

Reviewed-on: #409

Changes in Infrastructure service dropdown. 994f22e8c0

Merge pull request 'Adding Services Dropdown in Infrastructure.' (#410 ) from Kartik_Task#1229 into Organization_Management 83143dff0a

Reviewed-on: #410

Merge pull request 'Adding Dropdown in Create Task Popup.' (#411 ) from Kartik_Task#1230 into Organization_Management 0746e5c349

Reviewed-on: #411

Changes in Daily Task planning 58b5da1793

Merge pull request 'Adding Dropdown in Daily Task Planning and call api.' (#412 ) from Kartik_Task_DailyTask#1231 into Organization_Management 25de45b31b

Reviewed-on: #412

Changes in Infrastructure. 731d2dbed7

Merge pull request 'Adding Dropdown and API call in Daily Progress Report.' (#413 ) from Kartik_Task_DailyProgress#1232 into Organization_Management 5a048f7066

Reviewed-on: #413

Changes in Attendance filter 90b96864be

assign to project and Tenant flow is integrated with api f6d864d42e

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 158c934a9f

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 2e3e3aa6ca

Reviewed-on: #416

fetched assigned organozation to project 7dafd4a45f

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management ce73cfad21

chenages msg 1a88f5fec5

Adding a new Grid in Teams Grid. 9711144236

changed Uii for org. or project assigned e610cc08c1

Merge pull request 'changed Uii for org. or project assigned' (#417 ) from organization_level_login into Organization_Management a1a935b0d5

Reviewed-on: #417

Changes in the Teams Services dropdown will reflect the Services data. fa7dc2860c

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task_TeamGrid#1259 a0f7e5c57b

Adding search funcionality in Teams for Organization and Services. b2d7349fc9

Remove message from Services dropdwon. 70acf57266

Merge pull request 'Changes in the Teams Services dropdown will reflect the Services data.' (#418 ) from Kartik_Task_TeamGrid#1259 into Organization_Management 53a9cbc30b

Reviewed-on: #418

initially setup login 070fa93fca

revertlogin initial steup in organization_management brnach 3e5afe0bc6

Integrate the API for Work Area and fetch data filtered by serviceId. afcd1934f9

Changes in Attendance 72dbdb0fe0

Merge pull request 'Add an Organization column in the Attendance grid across all tabs.' (#414 ) from Kartik_Task_OrgCol_att#1238 into Organization_Management cf78d17cf5

Reviewed-on: #414

Merge branch 'organization_management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 7e6020e3db

revert pramod changed - (tenant login mistake aee510f527

Calling api for Attendance component for Organization. 5e1ccc9b05

configured tenant level login b9b3788dda

handle one tenant have , directly move to dashboard once logged 4afe43d116

Merge pull request 'Calling api for Attendance component for Organization.' (#420 ) from Kartik_Task_Att#1236 into Organization_Management 693cabf63d

Reviewed-on: #420

Merge pull request 'Integrate the API for Work Area and fetch data filtered by serviceId.' (#419 ) from Kartik_Task_Infra#1265 into Organization_Management 71932ea6dc

Reviewed-on: #419

Merge pull request 'Creating a Services in Master Compoenents.' (#408 ) from Master_Services into Organization_Management 397020ccb4

Reviewed-on: #408

removed unused code 42a80bbd68

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 533b40d1bf

Changes in Services Dropdown. 71dd35adc2

optimized logout fun and intergrated inside Tenant selection page 6ebbc853bc

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 69cc3b9383

Changes in Organization popup c609387924

Changes in Choose Organization1 popup increase the space. a380a7ab29

initially setup of service management ca7b0cda13

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 772a3e2829

In the ProjectList view, when we select 'View Details', the project is automatically set to 'marcosecure' instead of the selected project. 4683eff749

integrated service group wise activity operation delete,edit and create d975664023

Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management 52e12426af

added small ui changed like table b-padding, button size and fixd delete activity and group 4e315aafcf

Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default 1286184e1f

Merge pull request 'Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default' (#423 ) from Kartik_Bug#1292 into Organization_Management 1d3fcff859

Reviewed-on: #423
Merged

pramod.mahajan added 2 commits 2025-09-24 09:40:02 +00:00

forgot uncomment important stuff- tenant 1f4a7e5e9c

uncommit important stuff 521e6690cb

vikas.nale added 3 commits 2025-09-24 11:14:04 +00:00

In ExpensePanel add new Toggle button. d87dae4799

change labels as per guidance e2ae2e5fbd

Merge pull request 'In ExpensePanel add new Toggle button.' (#421 ) from Kartik_Task#1303 into Organization_Management b36120f73d

Reviewed-on: #421

pramod.mahajan closed this pull request

2025-09-24 11:55:11 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/marco.pms.web#426