3120 Commits

Author SHA1 Message Date
ae9ef7938d fixed : Project created permission for service 2025-12-11 10:37:39 +05:30
e755faecdc fixed: added array guards in mergedServices to stop iterable error 2025-12-11 10:25:45 +05:30
23660379c9 fixed 'ProjectwiseTeamCount' path inside dashboard 2025-12-11 09:51:01 +05:30
2bf5e9a13f Merge branch 'Encrypted_Reponse' into Purchase_Invoice_Management 2025-12-11 09:40:09 +05:30
3413806670 Merge branch 'Encrypted_Reponse' into Purchase_Invoice_Management 2025-12-11 09:39:51 +05:30
8033fdb7e7 selected default current selected service - create task 2025-12-10 16:52:52 +05:30
b62fc82a9c Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-10 16:33:04 +05:30
4253ed71eb modified ui base on suggestion 2025-12-10 16:32:59 +05:30
01fc302011 Merge pull request 'Adding_Chips_DailyTask :- Adding Chips in Daily task report.' (#538) from Adding_Chips_DailyTask into Purchase_Invoice_Management
Reviewed-on: #538
merged
2025-12-10 11:01:16 +00:00
d56aefde02 Adding sizing in manageemployee. 2025-12-10 11:01:16 +00:00
c71fe3a45e Adding dates chips in document. 2025-12-10 11:01:16 +00:00
0f43c877c4 Adding Date picker chips in Expense and 2025-12-10 11:01:16 +00:00
153ffcdc3e Adding w-100 at doument filter panel. 2025-12-10 11:01:16 +00:00
e31e4cfc31 Adding Filter chips at Tenant. 2025-12-10 11:01:16 +00:00
8216bf1f2d Correction in Infra Project Card view. 2025-12-10 11:01:16 +00:00
6b9d7c56bc Adding filter chips in daily Progress Report. 2025-12-10 11:01:16 +00:00
07ba95e533 removed console warning 2025-12-10 12:40:30 +05:30
c1ae9ee55e changed footer 2025-12-10 12:26:43 +05:30
117d82769a Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into dpr-report 2025-12-10 12:16:11 +05:30
35f1aa8c13 hide attendance project wise overview project having selected 2025-12-10 12:12:12 +05:30
cd1ae64753 added attandace poject wise overview 2025-12-10 12:09:53 +05:30
363a9c5feb Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-10 10:32:00 +05:30
69148331f5 added partially proejctwise attendace 2025-12-10 10:31:54 +05:30
1bbc338b9b Merge pull request 'Adding Dashboard a Jobs Weidget.' (#537) from Jobs_Weidget into Purchase_Invoice_Management
Reviewed-on: #537
merged
2025-12-10 05:00:21 +00:00
bc0540a0b7 Adding Dashboard a Jobs Weidget. 2025-12-10 10:27:07 +05:30
65158b9368 added encryption 2025-12-09 16:37:13 +05:30
4a47b1d0fa removed console and added none option for groupping for Expense list 2025-12-09 14:26:18 +05:30
0643d3d0e1 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Purchase_Invoice_Management 2025-12-09 12:40:03 +05:30
3a1aac8834 Updation at Projects Completion Status when nothing is zero nothing is show. 2025-12-08 18:13:17 +05:30
8e49d4dc8b added new class for pageView heigt 2025-12-08 16:24:03 +05:30
e10bb10c20 display properly each document 2025-12-08 14:10:00 +05:30
cd9c6d2365 removed color for collection action butttons 2025-12-08 11:43:58 +05:30
0a82297396 fixed updated or archived - service jobs msg 2025-12-08 11:37:14 +05:30
07ab3314f3 Removing Console.log at ViewBranchdetails. 2025-12-08 10:31:54 +05:30
e6a6c8c9e8 Updation in ViewBranchdetails. 2025-12-08 10:03:09 +05:30
3d90eebd44 Increasing the size of plannedwork. 2025-12-06 17:14:07 +05:30
d5582400b0 Changes in EditActivity Modal. 2025-12-06 17:10:36 +05:30
8b3ca8d57a Merge pull request 'Adding_dropdown :- Adding custome dropdown across all the modal.' (#533) from Adding_dropdown into Purchase_Invoice_Management
Reviewed-on: #533
merged
2025-12-06 11:30:46 +00:00
7eb2274584 Resolving Error in EditActivitymodal. 2025-12-06 16:57:14 +05:30
5a8a8c4676 Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_dropdown 2025-12-06 16:54:54 +05:30
d9c3964983 Merge pull request 'Add Pending Actions toggle near search box in Expense.' (#530) from Adding_Toggle_Button into Purchase_Invoice_Management
Reviewed-on: #530
merged
2025-12-06 11:18:15 +00:00
50e33b7b39 Add Pending Actions toggle near search box in Expense. 2025-12-06 11:18:15 +00:00
d6a8040977 Merge pull request 'Attendance in Employee Profile Should Display Project-Wise' (#531) from Kartik_Enhancement_918 into Purchase_Invoice_Management
Reviewed-on: #531
Merged
2025-12-06 11:14:50 +00:00
95813c5869 Planned Work now accepts values with up to 2 decimal places. 2025-12-06 11:14:50 +00:00
88dc11793c Attendance in Employee Profile Should Display Project-Wise 2025-12-06 11:14:50 +00:00
ca3cc590d2 Merge pull request 'Branch_Detail_View :- Adding details view in jobs.' (#532) from Branch_Detail_View into Purchase_Invoice_Management
Reviewed-on: #532
merged
2025-12-06 11:13:10 +00:00
1e151a8b10 Adding Cursor pointer for view branch in jobs. 2025-12-06 11:13:10 +00:00
946e0b2883 Showing details view in Branches. 2025-12-06 11:13:10 +00:00
baa17ab0cf fixed visile dropdown issue inside master page 2025-12-06 16:42:10 +05:30
7de27cc335 Correction in Master Page. 2025-12-06 16:35:02 +05:30