828 Commits

Author SHA1 Message Date
c793e9178d Implemented Skeleton for CRUD APIs for Services and Activity Groups 2025-07-01 15:59:18 +05:30
512dcd5396 Added Models for Service and Activity Group and Updated Activity Master Model Also added DTOs and VMs for Service and Activity Group and Updated DTOs and VMs for Activity Master 2025-07-01 15:59:18 +05:30
65da812a97 Merge pull request 'Issues_June_3W' (#99) from Issues_June_3W into main
Reviewed-on: #99
2025-07-01 10:25:44 +00:00
a3de905159 Chnaged the name of view employee feature permission to view team members 2025-06-30 16:58:28 +05:30
5f9ca98284 Implemented the view employee and view all employee permission to employee list API 2025-06-30 16:33:50 +05:30
00c30eb2cc Merge pull request 'Ashutosh_Enhancement_#622' (#98) from Ashutosh_Enhancement_#622 into Issues_June_3W
Reviewed-on: #98
2025-06-30 10:13:46 +00:00
2a507bf7b0 Implemented View all employee permission in employee list API 2025-06-30 15:29:29 +05:30
5a3dd42630 Added migration for new feature permissio and chnaged features for view infra and manage infra to project management 2025-06-30 13:13:12 +05:30
ea80176eec Merge pull request 'Added a return statement after saving the contact tag.' (#97) from Ashutosh_Task_#237 into Issues_June_3W
Reviewed-on: #97
2025-06-30 05:04:10 +00:00
d817170d0f Added a return statement after saving the contact tag. 2025-06-30 10:31:01 +05:30
b7386d0c98 Merge pull request 'Ashutosh_Task#513' (#96) from Ashutosh_Task#513 into Issues_June_3W
Reviewed-on: #96
2025-06-28 04:27:28 +00:00
8c691c5d3e Merge branch 'Ashutosh_Task#513' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_Task#513 2025-06-28 09:51:30 +05:30
8d35063ced Merge pull request 'Ashutosh_Task#513' (#95) from Ashutosh_Task#513 into Issues_June_3W
Reviewed-on: #95
2025-06-27 11:45:54 +00:00
2128e630d5 Added conatct name nd organization name in all contact note VMs 2025-06-27 17:14:20 +05:30
9149c4e546 Filtered conatct notes by projects and added contact name and organization name in list VM 2025-06-27 17:14:20 +05:30
d12f8ed0fb Added conatct name nd organization name in all contact note VMs 2025-06-27 11:50:51 +05:30
90c5308d76 Filtered conatct notes by projects and added contact name and organization name in list VM 2025-06-27 10:58:29 +05:30
70c1c6da9d Merge branch 'Issues_June_3W' of https://git.marcoaiot.com/admin/marco.pms.api into Issues_June_3W 2025-06-24 16:33:05 +05:30
e3ddcee8b3 Implemented An API to get list of all notes 2025-06-24 16:32:54 +05:30
0d49163d7b Merge pull request 'When task is approved stored approved tasks in reported task field not in completed task' (#93) from Ashutosh_Bug#529 into Approve_Task_Feature
Reviewed-on: #93
2025-06-24 06:06:37 +00:00
b94f4bdb63 When task is approved stored approved tasks in reported task field not in completed task 2025-06-24 11:30:50 +05:30
2ed0e6e5b6 Merge branch 'Issues_June_3W' of https://git.marcoaiot.com/admin/marco.pms.api into Issues_June_3W 2025-06-23 17:10:10 +05:30
72a92417b5 Implemented An API to get list of all notes 2025-06-23 17:10:05 +05:30
cb2856b2df Merge pull request 'Implemented An API to get list of all notes' (#92) from Ashutosh_Task#513 into Issues_June_3W
Reviewed-on: #92
2025-06-23 11:38:16 +00:00
b56478056e Implemented An API to get list of all notes 2025-06-23 14:50:50 +05:30
82ebd07d61 Added project validation in attendance Overview API 2025-06-20 13:09:13 +05:30
b78c5c07c5 Added a new API in dashbased ot check attendance overview of specifec project for give number of days 2025-06-20 12:45:35 +05:30
64a7cde69c Implemented signalR in record-mobile API 2025-06-19 18:28:57 +05:30
a6a842bf10 Fixed rebase issues 2025-06-19 07:30:55 -04:00
c3f5fe8e34 Fixing rebase issues 2025-06-19 07:07:54 -04:00
c9bb18d8e5 Optimized the task management API 2025-06-19 07:05:32 -04:00
2e925efcf7 Added code to validate the id received by path parameter with id received by payload 2025-06-19 06:53:02 -04:00
5bc13e215d Added CRUD operation APIs for work Status master table 2025-06-19 06:53:02 -04:00
Pramod Mahajan
f20b4a42a1 added new fields inside workItem- parentTaskId and Description 2025-06-19 06:53:02 -04:00
99818c42b0 Added new API to get list of work status 2025-06-19 06:53:02 -04:00
5d5579882f Added Functionality for approving the reported task 2025-06-19 06:53:01 -04:00
3dfde6d9a5 Added new entry in status master table 2025-06-19 11:43:10 +05:30
aa2bc674eb Optimized the task management API 2025-06-18 19:08:06 +05:30
4164c7d761 Cheange the message sending when manageing project infrastructure 2025-06-18 18:12:28 +05:30
Pramod Mahajan
692b1bfef3 Merge branch 'Approve_Task_Feature' of https://git.marcoaiot.com/admin/marco.pms.api into Approve_Task_Feature 2025-06-18 17:35:12 +05:30
Pramod Mahajan
1c58265a9f added new fields inside workItem- parentTaskId and Description 2025-06-18 17:34:33 +05:30
303f326773 Implemented signalR in Employee module 2025-06-18 12:00:35 +05:30
e2956c0c8c Added signalR functionality in Project Infrastructure 2025-06-17 17:05:52 +05:30
39378f3a88 Resolved rebase issues 2025-06-16 18:09:00 +05:30
caacb43aa8 Merge branch 'SingalR_Integration' of https://git.marcoaiot.com/admin/marco.pms.api into SingalR_Integration 2025-06-16 17:57:49 +05:30
29ea1698bc Implemented signalR in manage Task API 2025-06-16 17:57:44 +05:30
793877b8f8 Implemented signalR in project infrastructure APIs 2025-06-16 17:57:37 +05:30
f47586710b Add basic implementation and add in record attendance API for testing 2025-06-16 17:55:59 +05:30
b21d30c18e Changed the keyword for updating and creating project 2025-06-16 17:54:52 +05:30
d78a2fe3b2 Implemented signalR in project infrastructure APIs 2025-06-16 17:54:52 +05:30