230 Commits

Author SHA1 Message Date
8bdf4b75a4 Added an API to delete job role if that job role is not asigned to any employee 2025-05-08 15:23:35 +05:30
3da4a09a6d Added an API to delete application role if isSystem=false and application role is not asigned to any employee 2025-05-08 15:04:08 +05:30
261938fbad Added isSystem flage in Employee and ApplicationRole table and added functionality not to suspend employee if isSystem=true and not to update or delete application role if isSystem=true 2025-05-08 15:02:24 +05:30
d807ac1998 Merge pull request 'Added a flag in the Employee List API to retrieve active and inactive employees separately.' (#38) from Ashutosh_Enhancement#172_Show_InactiveEmployees into Issues_May_2W
Reviewed-on: #38
2025-05-08 05:38:16 +00:00
c5a9777898 Added a flag in the Employee List API to retrieve active and inactive employees separately. 2025-05-08 05:38:16 +00:00
4ff1168566 Merge branch 'Issues_May_2W' of https://git.marcoaiot.com/admin/marco.pms.api into Issues_May_2W 2025-05-07 16:07:28 +05:30
167da8146c In the Attendance Log table, the UpdatedBy field was incorrectly recording the employee whose attendance was marked, rather than the actual user who performed the update, fixed this issue in this commit 2025-05-07 16:07:18 +05:30
bbddc236b1 In the Attendance Log table, the UpdatedBy field was incorrectly recording the employee whose attendance was marked, rather than the actual user who performed the update, fixed this issue in this commit 2025-05-07 12:23:44 +05:30
0dc39e36d9 Merge pull request 'Implemented an API endpoint that allows the system to record attendance entries (e.g., check-in and check-out) for a specific employee. This helps track employee working hours, presence, and status.' (#37) from Ashutosh_Feature#183_Get_AttendanceLogs_By_EmployeeId into main
Reviewed-on: #37
2025-05-06 12:12:25 +00:00
68c5021085 Added condition to only fetch attendance record between dateFrom and dateTo 2025-05-06 17:38:51 +05:30
b059a733bb Send "role name" property in project/log api 2025-05-06 12:42:29 +05:30
6d6a2b6015 Implemented an API endpoint that allows the system to record attendance entries (e.g., check-in and check-out) for a specific employee. This helps track employee working hours, presence, and status. 2025-05-06 10:08:57 +05:30
7e3f0815a0 Fixed issue of returing email already existed even if entered new email 2025-05-05 19:05:16 +05:30
e22db781a1 Merge pull request 'Changed the data-type of ApprovedBy in attendes table' (#36) from Ashutosh_ApprovedBy_In_Attendes into main
Reviewed-on: #36
2025-05-05 12:51:31 +00:00
70a8fc0089 Changed the data-type of ApprovedBy in attendes table 2025-05-05 12:51:31 +00:00
b46d7bd2c4 Merge pull request 'Implement an API endpoint to delete a task' (#34) from Ashutosh_Feature#170_Task_Deletion into main
Reviewed-on: #34
2025-05-05 12:05:05 +00:00
523b1eb9d0 Implement an API endpoint to delete a task 2025-05-05 12:05:05 +00:00
64a178931c Merge pull request 'Implement an API endpoint that allows for to suspension of an employee.' (#35) from Ashutosh_Feature#174_Suspend_Employee into main
Reviewed-on: #35
2025-05-05 12:03:30 +00:00
c1228e9a22 Implement an API endpoint that allows for to suspension of an employee. 2025-05-05 17:22:35 +05:30
a318f69883 Do not populate activity master during migration 2025-05-04 13:33:56 +05:30
c60bc8a9e5 Improved the DataSeeder logic in the startup process to ensure consistent and accurate seeding of initial data. 2025-05-03 21:55:47 +05:30
7c3b777c77 Merge pull request 'Converte all Ids from Integer to Guid' (#33) from Ashutosh_Enhancement#132_Int_To_Guid into Feature_Forum
Reviewed-on: #33
2025-05-03 09:44:35 +00:00
4c478d28f8 Fixed remaining int to Guid conversions 2025-05-03 09:44:35 +00:00
3ec1ff1b5f Converte all Ids from Integer to Guid 2025-05-03 09:44:35 +00:00
f6c135180f fixed bug of not sending the presignedUrl even if document exists 2025-05-03 10:13:49 +05:30
89a3b1e414 Merge pull request 'When requesting regularization, ensure that the check-out time is later than the check-in time.' (#32) from Ashutosh_Bug#127_Regularization_Time_Validation into Feature_Forum
Reviewed-on: #32
2025-04-30 11:24:52 +00:00
0bfac5ca4f When requesting regularization, ensure that the check-out time is later than the check-in time. 2025-04-30 11:24:52 +00:00
e369ccffbb Merge pull request 'Fixed a bug where unable to cheklist item while updating activity' (#31) from Ashutosh_Bug#125_Unable_To_Add_Checklist_Item into Feature_Forum
Reviewed-on: #31
2025-04-29 11:16:14 +00:00
40bb028edc Fixed a bug where unable to cheklist item while updating activity 2025-04-29 13:20:29 +05:30
24b9c8a450 Merge pull request 'Implement null validation in attendance log API' (#29) from Ashutosh_Bug#117_Null_Validation_In_Attendance_Log into Feature_Forum
Reviewed-on: #29
2025-04-29 05:45:15 +00:00
d0c80a18d6 Added proper check-in time for second time check-in 2025-04-29 05:45:15 +00:00
885e370668 Implement null validation in attendance log API 2025-04-29 05:45:15 +00:00
4256dca197 Merge pull request 'Removed Possible null refreance warnings' (#30) from Ashutosh_Enhancement_#123_Possible_Null_Reference into Feature_Forum
Reviewed-on: #30
2025-04-29 05:44:32 +00:00
e6d0dbcdca Removed Possible null refreance warnings 2025-04-29 05:44:32 +00:00
a7553d8461 Merge pull request 'If a checklist item is removed while updating an activity, it must also be deleted from the database.' (#28) from Ashutosh_Bug#119_Remove_CheckList_Item into Feature_Forum
Reviewed-on: #28
2025-04-29 05:44:15 +00:00
8634af5f45 If a checklist item is removed while updating an activity, it must also be deleted from the database. 2025-04-28 12:20:16 +05:30
54b43b742a revert 37534e9b31afa317865665c805b83a4fa8edd3ab
revert If a checklist item is removed while updating an activity, it must also be deleted from the database.
2025-04-28 06:47:49 +00:00
37534e9b31 If a checklist item is removed while updating an activity, it must also be deleted from the database. 2025-04-28 12:15:00 +05:30
32ad77cace Merge pull request 'Fixed the bug of email template not found in production environment' (#27) from Ashutosh_Bug#114_Email_Template_Not_Found into Feature_Forum
Reviewed-on: #27
2025-04-28 05:12:56 +00:00
e6ecbc2f78 Fixed the bug of email template not found in production environment 2025-04-27 11:48:56 +05:30
512a899310 Added functionality to remove entries from the employee-role mapping when IsEnabled is set to false. 2025-04-26 19:06:45 +05:30
4ec27709c9 Merge pull request 'Implemented functionality to whitelist file extensions during upload to S3' (#26) from Ashutosh_Task#106_Upload_Whitelist_Only into Feature_Forum
Reviewed-on: #26
2025-04-26 10:52:30 +00:00
882dc50671 Change the to first letter of file name lowercase 2025-04-26 16:07:17 +05:30
fc050631e7 Implemented functionality to whitelist file extensions during upload to S3 2025-04-26 16:01:35 +05:30
eee07fa409 Created CRUD operation APIs for Forum Master Tables. 2025-04-26 12:19:28 +05:30
c1a55fa17b Removed tenantid filed from Dtos 2025-04-26 12:05:44 +05:30
c338140210 Added an additional column to the ticket forum table to store the linked project ID, and updated both the view models and data transfer models accordingly. 2025-04-25 21:47:06 +05:30
ace2fe7d54 Implemented core forum features including ticket creation, ticket updates, adding and updating comments, managing attachments, retrieving ticket details by ID, and fetching the ticket list 2025-04-25 17:41:44 +05:30
fce124ac8b Merge pull request 'Ashutosh_Bug#108_Attendance_log' (#25) from Ashutosh_Bug#108_Attendance_log into Feature_Forum
Reviewed-on: #25
2025-04-25 11:03:29 +00:00
5ca7d721fc The attendance logs are displaying inaccurate data during retrieval 2025-04-24 18:31:21 +05:30