2946 Commits

Author SHA1 Message Date
0eb3cc61a3 removed unused code 2025-11-26 18:56:36 +05:30
ea0e38f100 removed console 2025-11-26 18:41:23 +05:30
d27546073f Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 18:37:08 +05:30
a1a8dd4447 added zoom in and size bar collaspeing 2025-11-26 18:37:05 +05:30
80717f0458 Showing message on the center of the page in Branches. 2025-11-26 18:02:26 +05:30
4dbfe2bd48 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 17:53:21 +05:30
c2c8dabdd4 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-26 17:52:34 +05:30
54ca807436 removed double class name 2025-11-26 17:52:22 +05:30
6e57108f8e Merge pull request 'UI alignment in Finance forms.' (#515) from Finance_Form_Layout into Project_Branch_Management
Reviewed-on: #515
merged
2025-11-26 12:21:31 +00:00
219161f15e UI alignment in Finance forms. 2025-11-26 12:21:31 +00:00
86039552c8 Merge pull request 'Weidget_Dashoard_Jobs :- Creating Weiget for Jobs.' (#521) from Weidget_Dashoard_Jobs into Project_Branch_Management
Reviewed-on: #521
merged
2025-11-26 12:19:44 +00:00
e8ebbe4d76 Hide the Weidget. 2025-11-26 12:19:44 +00:00
3d7a404d1f Changing Name of tabs. 2025-11-26 12:19:44 +00:00
e041e0fe8a Adding Permission in Attendance Weiget at dasboard and Project Profile. 2025-11-26 12:19:44 +00:00
082df5fad3 Changes in Daily progress report filter panel and Daily task list view. 2025-11-26 12:19:44 +00:00
cfcf80b6c2 Changes in ServiceJobs. 2025-11-26 12:19:44 +00:00
7617146512 Adding Min Height in Attendance Weiget. 2025-11-26 12:19:44 +00:00
711dfb8f00 Correction in Project Statistics. 2025-11-26 12:19:44 +00:00
cf430881dc Creating new weidget for dashboard for Service jobs. 2025-11-26 12:19:44 +00:00
d4582c101a Merge pull request 'Project_Branch_Management : New Feature Service Project - Branch Management' (#519) from Project_Branch_Management into main
Reviewed-on: #519
merged
2025-11-25 09:42:47 +00:00
c6af020c85 changed fs-6 and body-font-size 2025-11-25 15:09:25 +05:30
822ff1a7e4 UI Alignment in Service Card view. 2025-11-25 11:20:19 +05:30
92d17167b1 added zoom in-out 2025-11-25 10:11:43 +05:30
8ec62827d5 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-24 17:58:26 +05:30
965fce1587 Merge pull request 'Service_Project_ListView :- Creating List view for service Project.' (#518) from Service_Project_ListView into Project_Branch_Management
Reviewed-on: #518
Merged
2025-11-24 11:16:57 +00:00
bb37fd7044 set align for Service Project List card 2025-11-24 11:16:57 +00:00
03d60bf66d Adding search functionality in Projectpage. 2025-11-24 11:16:57 +00:00
071e5956a7 Changes. 2025-11-24 11:16:57 +00:00
c669eb90c3 Correction in List view alignment. 2025-11-24 11:16:57 +00:00
4d2e37f52e Adding Message for Card and list view in Services and Infra 2025-11-24 11:16:57 +00:00
6dde240926 Creating a list view for Services. 2025-11-24 11:16:57 +00:00
482b5a1680 Adding lIst view. 2025-11-24 11:16:57 +00:00
098090cf69 Merge pull request 'Status Dropdown Should Auto-Close After Job Status Update' (#516) from Kartik_Bug#1773 into Project_Branch_Management
Reviewed-on: #516
mergd
2025-11-24 11:05:51 +00:00
5747d4ec71 Status Dropdown Should Auto-Close After Job Status Update 2025-11-24 10:35:03 +05:30
48f314eac4 added signalR for project Branch 2025-11-21 15:28:31 +05:30
18e739f3ab fixed collection header ui 2025-11-21 14:51:31 +05:30
a5329f1a2a added new selectproject field inside ManageRecurring 2025-11-21 14:25:32 +05:30
8b4a9d2d1c added new project filed inside ManagePaymentRequest 2025-11-21 14:08:52 +05:30
4506f740eb Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 13:13:50 +05:30
f001dff5b0 Creating new icon for Un-archive 2025-11-21 13:09:14 +05:30
33d94f6f06 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 12:58:52 +05:30
0ac1141579 changed filed for project and employee now not need project for select employee 2025-11-21 12:58:47 +05:30
4d8af5da91 added pre-fill updating 2025-11-21 12:57:54 +05:30
fead3a37a6 Adding Pending in Loading in Job list. 2025-11-21 12:31:10 +05:30
98e9a8b625 When we in Archive tab then canvas will be open now it work correctly. 2025-11-21 12:21:22 +05:30
2781da8906 Change the logic according to archieve show by status. 2025-11-21 12:04:36 +05:30
d13c48dd39 Change the Ui for Archieve jobs. 2025-11-21 11:47:55 +05:30
ee4ef18594 Implementing Restore Functionality in Jobs. 2025-11-21 11:39:36 +05:30
742337a3d0 Merge branch 'Project_Branch_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Project_Branch_Management 2025-11-21 11:12:03 +05:30
5abab06b0c removed console error 2025-11-21 11:11:44 +05:30