|
|
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 |
|
|
|
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 |
|
