|
|
e4f8e507d5
|
Merge branch 'Ashutosh_ActivityMaster_managenment' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_ActivityMaster_managenment
|
2025-04-11 17:26:25 +05:30 |
|
|
|
23322fdeb2
|
Fixed code error
|
2025-04-11 17:22:38 +05:30 |
|
|
|
0fe811d78c
|
Added CheckList to Update and Create API
|
2025-04-11 17:21:04 +05:30 |
|
|
|
689d5c28bb
|
Created new Api for creating and editing activities
|
2025-04-11 17:21:04 +05:30 |
|
|
|
b8e2c265be
|
Fixed code error
|
2025-04-11 17:19:32 +05:30 |
|
|
|
52d0474d45
|
Added a filter of only date while fetching data from database
|
2025-04-11 16:42:51 +05:30 |
|
|
|
3fabadc380
|
Added the date filter while fetching data from database
|
2025-04-11 16:40:57 +05:30 |
|
|
|
b624e9ec62
|
Merge branch 'Ashutosh_ActivityMaster_managenment' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_ActivityMaster_managenment
|
2025-04-11 16:17:22 +05:30 |
|
|
|
3702dae1ac
|
Added CheckList to Update and Create API
|
2025-04-11 16:16:53 +05:30 |
|
|
|
e53d45ed77
|
Created new Api for creating and editing activities
|
2025-04-11 16:16:53 +05:30 |
|
|
|
38262074c4
|
Merge pull request 'Added Api to send data to front-end dashboard' (#14) from Ashutosh_Dashboard into Feature_Task_management
Reviewed-on: #14
|
2025-04-11 10:38:54 +00:00 |
|
|
|
90b5152bb2
|
Added CheckList to Update and Create API
|
2025-04-10 19:56:30 +05:30 |
|
|
|
40420d19c4
|
Added api to send data to apis
|
2025-04-10 19:38:54 +05:30 |
|
|
|
81d487f9f2
|
Created new Api for creating and editing activities
|
2025-04-10 19:16:21 +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 |
|
|
|
ec5fba0637
|
Fixed null refrenance warning
|
2025-04-09 08:46:29 +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 |
|
|
|
9c4b1639fe
|
Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management
|
2025-04-02 18:37:29 +05:30 |
|
|
|
1b16983092
|
#40 - Add models and database migration for Task Allocation
|
2025-04-02 18:37:15 +05:30 |
|
|
|
e6fb6a23b5
|
#40 - Add models and database migration for Task Allocation
|
2025-04-02 18:35:58 +05:30 |
|
|
|
04d6c03b05
|
Merge pull request 'Ashutosh_Employee_Update_Validation' (#13) from Ashutosh_Employee_Update_Validation into Issuses
Reviewed-on: #13
|
2025-04-02 13:04:43 +00:00 |
|
|
|
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 |
|
Pramod Mahajan
|
5034da19cd
|
added condition for unique role name.
|
2025-04-02 16:53:35 +05:30 |
|
Pramod Mahajan
|
3fce6ef499
|
Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
|
2025-04-02 16:53:08 +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 |
|
Pramod Mahajan
|
fce9832ea2
|
Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
|
2025-04-02 16:04:24 +05:30 |
|
|
|
5e9dd55a07
|
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:04:12 +05:30 |
|
