230 Commits

Author SHA1 Message Date
Pramod Mahajan
280fc922ff created two end pointe for assigne and unassign project for perticular employee 2025-06-09 09:48:35 +05:30
Pramod Mahajan
681cdd690c created new dto for projectAllocation for employee 2025-06-09 09:46:30 +05:30
75183d1397 Fixed the issue where the application user ID was not being stored in the Employees table. 2025-06-03 18:49:17 +05:30
2e9459444f Merge branch 'Ashutosh_Enhancement#276_TodaysPlanned' into Issue_Jun_1W
# Conflicts:
#	Marco.Pms.Services/Controllers/ProjectController.cs
2025-06-03 17:28:33 +05:30
0dabb2d7bd Merge pull request 'Task#448 : add 'assigned-projects' endpoint to retrieve all projects by employee ID' (#79) from pramod_Task#448 into Issue_Jun_1W
Reviewed-on: #79
2025-06-03 11:56:41 +00:00
Pramod Mahajan
038e585253 add 'assigned-projects' endpoint to retrieve all projects by employee ID 2025-06-03 15:57:01 +05:30
91d7c3b508 When sending project infrastructure sending today's Planned task numbers 2025-06-03 15:54:13 +05:30
d049be9e49 in dashboard project attendance api made intime and out time nullable 2025-06-02 11:01:19 +05:30
ba92a3b3ed Fixed the Internal error of swagger 2025-05-31 15:11:35 +05:30
2f3203c524 Added pending report and todays assigned conut in activity report view model 2025-05-31 09:46:29 +05:30
b479c7cf19 Merge pull request 'Implement an API to store employee information with a captured image and update employee information.' (#78) from Ashutosh_Enhancement#413_Manage_Employee into Issue_May_5W
Reviewed-on: #78
2025-05-30 12:29:50 +00:00
e73d3e0744 Taking emailids and email body from database rather than local or hardcoded as well logging every mail to database 2025-05-30 17:46:51 +05:30
98409f5b87 Implement an API to store employee information with a captured image and update employee information. 2025-05-30 16:57:10 +05:30
235ca073ce Merge pull request 'Ashutosh_Task#316_Daily_Project_Report' (#74) from Ashutosh_Task#316_Daily_Project_Report into Issue_May_4W
Reviewed-on: #74
2025-05-26 06:12:16 +00:00
276b253e2d Added fixed height to table elements 2025-05-26 06:12:16 +00:00
7e70297e7c Added an Email service and API to send an Email of daily project progress report 2025-05-26 06:12:16 +00:00
56aeceb1f9 Merge pull request 'Implemented an API endpoint that retrieves the number of planned tasks and completed tasks for a specific project on a given date' (#72) from Ashutosh_Task#348_Activities_Report into Issue_May_4W
Reviewed-on: #72
2025-05-24 06:35:33 +00:00
40134d1f14 Implemented an API endpoint that retrieves the number of planned tasks and completed tasks for a specific project on a given date 2025-05-24 10:49:46 +05:30
52ee06d47e Merge pull request 'Implemented an API endpoint that retrieves the attendance records for a specific project on a given date' (#71) from Ashutosh_Task#347_Project_Attendance_Report into Issue_May_4W
Reviewed-on: #71
2025-05-24 04:58:05 +00:00
7ddcc8cf13 Implemented an API endpoint that retrieves the attendance records for a specific project on a given date 2025-05-24 10:12:56 +05:30
6b33c4baf4 Merge pull request 'Implemented an API to retrieve a pending checkout and pending regularization request for logged in employee' (#70) from Ashutosh_Task#346_Pending_Attendance into Issue_May_4W
Reviewed-on: #70
2025-05-24 04:34:01 +00:00
0414c2366e Implemented an API to retrieve a pending checkout and pending regularization request for logged in employee 2025-05-23 17:42:55 +05:30
68c393c05d Add template for project status report 2025-05-19 16:49:26 +05:30
4e3d981beb Merge pull request 'Moved variable configuration to development and production appsettings' (#62) from Ashutosh_AppSettings_Changes into Issue_May_3W
Reviewed-on: #62
2025-05-19 09:47:43 +00:00
7833d79541 MOved variable configuration to development and production appsettings 2025-05-19 12:44:48 +05:30
a0f1777316 Merge pull request 'Changed the feature permission grouping' (#46) from Ashutosh_Feature_Permission into Issue_May_3W
Reviewed-on: #46
2025-05-14 08:05:03 +00:00
7bd784bdd5 changed attendance to check-in date 2025-05-14 13:16:38 +05:30
3ff030d28f Filtering has been changed from the updated date to the attendance date. 2025-05-14 13:03:55 +05:30
23a81e835e Changed the feature permission grouping 2025-05-14 12:33:02 +05:30
d4ba3d5341 Merge pull request 'Add a foreign key for WorkCategory table to the WorkItem model' (#45) from Ashutosh_Enhancement#206_Added_WorkCategory_In_WorkItem into Issues_May_2W
Reviewed-on: #45
2025-05-12 09:02:14 +00:00
7c9cd4697f Add a foreign key for WorkCategory table to the WorkItem model 2025-05-12 13:18:19 +05:30
4287bf7b2e Merge pull request 'Included the reported date when sending the list of allocated tasks to provide more detailed tracking information.' (#44) from Ashutosh_Enhancement_#214_Report_Task_At_Zero into Issues_May_2W
Reviewed-on: #44
2025-05-10 13:37:45 +00:00
8c5164d83a Included the reported date when sending the list of allocated tasks to provide more detailed tracking information. 2025-05-10 13:37:45 +00:00
27e02c10aa Merge pull request 'Ashutosh_Feature#208_WorkCategory_Master_Table' (#43) from Ashutosh_Feature#208_WorkCategory_Master_Table into Issues_May_2W
Reviewed-on: #43
2025-05-10 13:37:10 +00:00
8fae161095 Added "id" in updating endpiont url 2025-05-10 18:14:25 +05:30
ec7e754f59 Added an API endpoint to delete a Work Category, allowing deletion only if IsSystem = false. 2025-05-10 15:23:29 +05:30
5953f37e57 Added an API endpoint to update an existing Work Category, with update allowed only if IsSystem = false. 2025-05-10 15:22:10 +05:30
6f378fe0bd Added an API endpoint to create a new Work Category entry. 2025-05-10 15:17:02 +05:30
20ea1389dd Added an API endpoint to retrieve the Work Category by ID 2025-05-10 15:15:30 +05:30
648d8e691a Added an API endpoint to retrieve the list of all Work Categories. 2025-05-10 15:13:57 +05:30
7a3d0c8c60 created model, DTO,(Data Transfer Object) VM(View Model) for Work Category master table and added migration for adding table to database and seeding system-defined categoryies in table for first tenant 2025-05-10 15:04:39 +05:30
d95f61cba9 Fixed error happeds when Changing file strucutre in model project 2025-05-10 13:39:33 +05:30
0c49d8d05c Changed file structure in model project 2025-05-10 13:16:20 +05:30
2b7a7190c7 Merge pull request 'deleted duplicate manage employee api' (#42) from Ashutosh_Enhancement#199_Manage_Employee_FromBody into Issues_May_2W
Reviewed-on: #42
2025-05-09 06:36:36 +00:00
551ab5ffef deleted duplicate manage employee api 2025-05-09 06:36:36 +00:00
76b4bc88d5 Merge pull request 'Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.' (#41) from Ashtuosh_Bug#191_Incorrect_Success_Message into Issues_May_2W
Reviewed-on: #41
2025-05-09 06:35:43 +00:00
041d32d8ea Added proper success messages upon creation and update of building, floor, and work area for improved user feedback. 2025-05-09 09:41:30 +05:30
ece25ecd9d Merge pull request 'Employee data is received as JSON, instead of multipart/form-data, during creation and update operations' (#40) from Ashutosh_Enhancement#199_Manage_Employee_FromBody into Issues_May_2W
Reviewed-on: #40
2025-05-08 11:03:43 +00:00
87bcdf223a Employee data is received as JSON, instead of multipart/form-data, during creation and update operations 2025-05-08 16:30:26 +05:30
141d001673 Merge pull request 'Ashutosh_Enhancement#198_Added_IsSystem' (#39) from Ashutosh_Enhancement#198_Added_IsSystem into Issues_May_2W
Reviewed-on: #39
2025-05-08 10:22:14 +00:00