8955bf1e6a
Merge pull request 'Implemented functionality to upload captured attendance images to Amazon S3 and record associated data in the database.' ( #24 ) from Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3 into Feature_Forum
...
Reviewed-on: #24
2025-04-23 10:37:09 +00:00
1141971aa1
Added authorization to Attendance Controller
2025-04-23 15:50:28 +05:30
cd1f06a99d
Deleted the unwanted images
2025-04-23 15:46:26 +05:30
1eab6669e1
Modified BatchId column in Document table to accept null values.
2025-04-23 15:36:56 +05:30
4d0901b4dd
Implemented functionality to upload captured attendance images to Amazon S3 and record associated data in the database.
2025-04-23 15:00:38 +05:30
6c99a625b5
Add Models and Controller methods for Forum feature
2025-04-22 09:56:59 +05:30
fa5a8c178d
Add API tag in controll rout path
2025-04-19 12:58:34 +05:30
dcd39db3b0
Move request demo api to separate market controller
2025-04-19 12:40:03 +05:30
aa1d5020f7
Merge pull request 'Created API to Request Demo of application and added table to store the data of user as well send to selected emails' ( #22 ) from Ashutosh_Task_#67_Request_Demo into Feature_Task_management
...
Reviewed-on: #22
2025-04-19 05:31:45 +00:00
91cffbc632
Changed email seprator from "," to ";"
2025-04-18 18:10:53 +05:30
f45f75befb
Created API to Request Demo of application and added table to store the data of user
2025-04-18 14:07:08 +05:30
0ac0de143d
Merge pull request 'Added A new API to get list of Industries from its master table' ( #21 ) from Ashutosh_Task_#79_Get_Industries_API into Feature_Task_management
...
Reviewed-on: #21
2025-04-16 11:42:45 +00:00
85319cdf49
Added A new API to get list of Industries from its master table
2025-04-16 11:42:45 +00:00
bda8cbc466
Merge pull request 'Fixed the employee duplication bug while adding the email to employee that does not have one' ( #20 ) from Ashutosh_Bug_#75_Employee_duplicatation into Feature_Task_management
...
Reviewed-on: #20
2025-04-16 05:24:17 +00:00
2af750fbb3
Fixed the employee duplication bug while adding the email to employee that does not have one
2025-04-16 05:24:17 +00:00
fe503a70dc
Merge pull request 'In this commit fixed the Bug #74 where when the regularization request sent it takes the date of request as checkout date' ( #19 ) from Ashutosh_Bug_#74_Attendance_Regularization_Date into Feature_Task_management
...
Reviewed-on: #19
2025-04-16 05:23:49 +00:00
a9f4610063
In this commit fixed the Bug #74 where when the regularization request sent it takes the date of request as checkout date
2025-04-16 09:21:39 +05:30
c7304dc80b
Renamed columns in ActivityChecklist
2025-04-15 18:05:42 +05:30
f906e8f7d0
Merge pull request 'Modify Email Templates' ( #18 ) from vikas_64_modifyemail_template into Feature_Task_management
...
Reviewed-on: #18
2025-04-15 12:12:35 +00:00
b93b581d60
Modify Email Templates
...
- Remove address and contact number
- Add link to email
- change twitter logo to x
- link x logo to company twitter account
Add new template to inform password change success
- add code to send email on password change success
2025-04-15 12:12:35 +00:00
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
40d9c335c4
Fixed the error of empty checkList in get activities
2025-04-14 16:07:30 +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
832555d2b2
Merge pull request 'Ashutosh_ActivityMaster_managenment' ( #17 ) from Ashutosh_ActivityMaster_managenment into Feature_Task_management
...
Reviewed-on: #17
2025-04-14 09:23:47 +00:00
829a421ab0
Fixed Confilts
2025-04-14 13:37:27 +05:30
f57e40219e
Merge branch 'Ashutosh_ActivityMaster_managenment' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_ActivityMaster_managenment
2025-04-14 12:57:06 +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
a25fa069de
Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management
2025-04-14 12:49:20 +05:30
dc9b696265
Fixed Confilt
2025-04-14 12:48:42 +05:30
ad1b2d35fb
Merge pull request 'Add code to hide server information in response header' ( #15 ) from Ashutosh_AddServerHeade_False into Feature_Task_management
...
Reviewed-on: #15
2025-04-14 07:11:47 +00:00
f488109a4c
Add code to hide server information in response header
2025-04-14 07:11:47 +00:00
a51c11389d
Added the Check list in Activity Master APIs
2025-04-14 12:28:25 +05:30
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
