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

2514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pramod.mahajan
cfd3986479 fixed small changed like heading, font change 2025-09-30 11:59:16 +05:30
pramod.mahajan
764b145ad9 empty select activity, planne work fields after successfully created task 2025-09-29 18:31:56 +05:30
pramod.mahajan
20c7cf7f37 added right path for organization info show 2025-09-29 18:00:48 +05:30
pramod.mahajan
6d74940c0c added optional chain at view org details 2025-09-29 17:55:56 +05:30
pramod.mahajan
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
pramod.mahajan
02600308e8 rmoved unused and console 2025-09-29 16:53:24 +05:30
pramod.mahajan
d1c72291a3 update date utility for localtoUtc fn 2025-09-29 15:20:54 +05:30
pramod.mahajan
fdbd81c5e7 removed console 2025-09-29 15:13:36 +05:30
pramod.mahajan
28d5ef653d added optional chain for manage project to prevent run time error 2025-09-29 15:10:49 +05:30
pramod.mahajan
550b142d74 fixed run time date error 2025-09-29 15:03:52 +05:30
pramod.mahajan
68335f0695 added temp. placeholder for image gallary 2025-09-29 14:38:23 +05:30
pramod.mahajan
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
Kartik Sharma
965e1e4808 Correction in Edit Bucket in Directory. 2025-09-29 09:00:27 +00:00
Kartik Sharma
1c376fe91f Changes in Directory edit 2025-09-29 09:00:27 +00:00
pramod.mahajan
61835cb189 added clear filter 2025-09-29 12:55:31 +05:30
pramod.mahajan
375c482b61 renamed Inactive to Includes Inactive 2025-09-29 12:04:33 +05:30
pramod.mahajan
72424eee53 added updation for fllter 2025-09-29 11:52:11 +05:30
pramod.mahajan
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
pramod.mahajan
61b209a082 addded remember me functionality 2025-09-29 00:13:52 +05:30
pramod.mahajan
198e31290c updated project files 2025-09-28 22:15:07 +05:30
pramod.mahajan
482f8a9bcb added organization api in repo. and removed unuse files 2025-09-27 23:54:44 +05:30
pramod.mahajan
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
Kartik Sharma
eb8d269662 Date picker in Document Filter shows pre-filled date instead of blank 2025-09-27 09:41:15 +00:00
pramod.mahajan
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
Kartik Sharma
1e7b4ba21e Date field not cleared in Tenant filter after clicking Clear button 2025-09-27 09:40:05 +00:00
pramod.mahajan
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
Kartik Sharma
7455d8a221 Add extra spacing in Infra Work details. 2025-09-27 09:38:34 +00:00
pramod.mahajan
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
Kartik Sharma
7ac3268514 Add an info (ℹ️) icon to the Daily Progress Report’s Total Pending Task 2025-09-27 09:37:36 +00:00
pramod.mahajan
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
Kartik Sharma
be72ca9a58 Scrollbar Behavior in "Choose Organization" (Projects → Organization Tab) 2025-09-27 09:36:27 +00:00
pramod.mahajan
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
Kartik Sharma
112e0ff798 Selected Building and Floor Should Persist While Creating Work Area and Activity (Project Infrastructure) 2025-09-27 09:35:27 +00:00
pramod.mahajan
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
Kartik Sharma
a873ace109 Tenant Creation – Error banner for plan selection/currency should not be shown 2025-09-27 09:34:48 +00:00
pramod.mahajan
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
Kartik Sharma
0d6708619f Switch Tenant & Goto workspace option label should be “Switch Workspace 2025-09-27 09:34:07 +00:00
pramod.mahajan
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
Kartik Sharma
ddfe09b570 Tenant Creation – Logo removed when navigating back from second page 2025-09-27 09:33:46 +00:00
pramod.mahajan
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
Kartik Sharma
ae66cb3705 Change the label in Assign Organization. 2025-09-27 09:31:52 +00:00
pramod.mahajan
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
pramod.mahajan
ca8a41bb63 added style classes for footer 2025-09-27 09:29:59 +00:00
pramod.mahajan
265c74f079 added filter and sorted employee list - Team 2025-09-27 09:29:59 +00:00
pramod.mahajan
2ef1fcfd1d successfullly assigned employe to project 2025-09-27 09:29:59 +00:00
pramod.mahajan
3233043cf2 initial setup for assign emp to project 2025-09-27 09:29:59 +00:00
pramod.mahajan
3fddb686d3 change get employee at assign task to employee 2025-09-27 14:58:39 +05:30
pramod.mahajan
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
Kartik Sharma
1fb8eb9ef1 Create Task popup will open at all the time while submitting. 2025-09-26 16:21:37 +05:30
Kartik Sharma
1a3890e837 Removing Create and Activity from MasterModal.jsx file. 2025-09-26 15:34:08 +05:30