51 Commits

Author SHA1 Message Date
1c48ab80aa Added checklist and taskallocation relation table and logic to map taskallocation and checklist in that table in report task API 2025-04-15 17:11:29 +05:30
cac50a3f06 Added checklist to report api 2025-04-15 15:47:57 +05:30
dbc1b721c1 Changed the Task list View model 2025-04-14 17:26:35 +05:30
9b1a1d1fe7 Fixed the error of empty checkList in get activities 2025-04-14 17:03:56 +05:30
be0c37588e In dashboard project Progress show from first task assigned if give date is older than first assign date 2025-04-14 15:58:14 +05:30
829a421ab0 Fixed Confilts 2025-04-14 13:37:27 +05:30
498ea6e4e7 Added the Check list in Activity Master APIs 2025-04-14 12:56:49 +05:30
3ec3618b7e Fixed code error 2025-04-14 12:55:47 +05:30
c6f3216150 Added CheckList to Update and Create API 2025-04-14 12:55:09 +05:30
ed449fdf47 Created new Api for creating and editing activities 2025-04-14 12:55:05 +05:30
17994bff08 Added CheckList to Update and Create API 2025-04-14 12:52:58 +05:30
16a4234f75 Created new Api for creating and editing activities 2025-04-14 12:52:54 +05:30
d1be217740 Fixed code error 2025-04-14 12:52:01 +05:30
f391806a57 Added CheckList to Update and Create API 2025-04-14 12:51:52 +05:30
c3079258d9 Created new Api for creating and editing activities 2025-04-14 12:51:08 +05:30
dc9b696265 Fixed Confilt 2025-04-14 12:48:42 +05:30
52d0474d45 Added a filter of only date while fetching data from database 2025-04-11 16:42:51 +05:30
40420d19c4 Added api to send data to apis 2025-04-10 19:38:54 +05:30
c44deb439e Removed all warning 2025-04-09 16:29:38 +05:30
5d4b1ad282 Fixed the typo of PermanentAddress 2025-04-09 13:09:50 +05:30
db879495cb Created new view model for get projet list API 2025-04-09 12:16:41 +05:30
15e83346e2 Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management 2025-04-09 10:41:14 +05:30
e41faf4045 Passing role name in record attendance api 2025-04-09 10:41:00 +05:30
2117b81c48 Remove custom CORS settings to all allow all requests 2025-04-09 10:36:58 +05:30
52a67ba15b Removed null refreance warning from MOdel project 2025-04-09 10:25:44 +05:30
58bb684c4b Removed all Warnings from Services project 2025-04-09 09:18:15 +05:30
56448cb8a2 Created new Api fro getting Attendance of emplyee who requested regularization 2025-04-08 16:47:24 +05:30
7ddb1e2f8e Fixed the bug of Attendance Regularization 2025-04-08 16:09:50 +05:30
727e4794da Fixed some miner bugs 2025-04-07 18:07:37 +05:30
41edbef9d1 Chenaged response of manage task in project API 2025-04-07 11:34:40 +05:30
0b81a6ea62 Make changes in report api to check if user reporting second time. 2025-04-07 09:42:38 +05:30
745b4d2e1c Created new view models for showing taskAllication list and comment 2025-04-05 17:16:32 +05:30
64c4772595 fixed missing http method 2025-04-04 16:09:47 +05:30
7ddb37852e Added Apis for task allocations 2025-04-04 15:42:42 +05:30
352b4fb40e Changed Response format of all APIs 2025-04-03 15:50:54 +05:30
1b16983092 #40 - Add models and database migration for Task Allocation 2025-04-02 18:37:15 +05:30
e50eedc7e6 Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee 2025-04-02 17:54:38 +05:30
eba230723b Fixed bug about UpdatedBy 2025-04-02 16:08:02 +05:30
69a4ad7286 Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inc=active employees 2025-04-02 16:08:02 +05:30
212fe250c1 Solved time discrepancies in attendance/record 2025-04-02 16:08:01 +05:30
a42a924884 Added new validation in user login to verify if user is active or not and if user's email is confirmed or not 2025-04-02 16:06:53 +05:30
bec60cd24e Fixed bug about UpdatedBy 2025-04-02 16:06:53 +05:30
c17b5df8d0 Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inc=active employees 2025-04-02 16:06:53 +05:30
a9124e1a93 Fixed project duplicate bug appered due to absence of projectId 2025-04-02 16:06:53 +05:30
f0ed430f37 Solved time discrepancies in attendance/record 2025-04-02 16:06:53 +05:30
c071b7ecaf Added the condition to check if received token for reset password is encoded or not 2025-04-02 16:06:53 +05:30
c4952825fe user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response 2025-04-02 15:58:48 +05:30
c701187223 resolve merge coflict 2025-03-31 12:30:41 +05:30
PramodMahajan14
7a1a4d6bdb added condition for unique role name 2025-03-29 11:27:28 +05:30
0ea14ff112 Push user rights branh 2025-03-25 13:01:56 +05:30