204 Commits

Author SHA1 Message Date
130fffcc16 remove minor error while code review 2025-05-07 13:16:02 +05:30
Pramod Mahajan
978c7b8e4b removed unused code, console 2025-05-07 12:54:25 +05:30
Pramod Mahajan
76e88aad88 removed unused code , console 2025-05-07 12:53:18 +05:30
Pramod Mahajan
cf23803b99 added recored by column 2025-05-07 12:49:29 +05:30
Pramod Mahajan
9c41788a6c increased modal md to lg 2025-05-07 12:49:04 +05:30
a60cd6b1a9 Added row background color and also changed message on report submit 2025-05-07 06:33:11 +00:00
Pramod Mahajan
d48c6fd7e3 added activity icons, location coulms. if click on location it move on google map 2025-05-06 23:13:55 +05:30
Pramod Mahajan
9802746267 handled loading properly 2025-05-06 23:12:08 +05:30
029254e548 Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity 2025-05-05 18:20:24 +05:30
d1227a786b view button color changed, success to seconday 2025-05-04 12:31:43 +05:30
2fb08a0044 added sorting group by name, checkIn , checkOut, regularize, approved and reject 2025-05-04 12:30:35 +05:30
292f80c9a8 config checkIn and checkout in handleModalData for which slots show to user 2025-05-04 12:12:53 +05:30
bd91f60e08 passed checkout time to timepicker as props 2025-05-04 12:11:50 +05:30
e53635f910 time slot should display according activity 2025-05-04 12:09:05 +05:30
Pramod Mahajan
4bd574772f filtering projects according to logged user at data layer 2025-05-04 12:00:10 +05:30
1bbc8fd422 Conver Int to Guid 2025-05-03 21:43:15 +05:30
Pramod Mahajan
fec6de8a54 removed console 2025-04-29 23:54:59 +05:30
Pramod Mahajan
c53aa1ec92 Add activity column to logs for clearer action tracking 2025-04-29 00:56:01 +05:30
Pramod Mahajan
4f1cf7c0a5 Update logs to reflect check-in/check-out operations immediately 2025-04-29 00:54:31 +05:30
Pramod Mahajan
6b241b14de Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active 2025-04-29 00:47:32 +05:30
68b23c8d5e Fixed the bug of mismatch dates where dates showing one day earlier than expected 2025-04-19 16:36:21 +05:30
e236e4f5bf Merge branch 'Ashutosh_Task#67_Request_Demo' into Feature_Task_Management 2025-04-19 11:06:14 +05:30
a38d811603 Merge branch 'pramod_Bug#29InputLimmit' into Feature_Task_Management 2025-04-19 10:58:10 +05:30
Pramod Mahajan
fb774f45d1 modified cache for immiedtky reflacted on screen. 2025-04-19 04:54:44 +00:00
Pramod Mahajan
868f5038b0 added validation for character limit, user can't add more than 200 character for description 2025-04-18 23:23:10 +05:30
0019128daf Create form to request demo of application 2025-04-18 18:18:20 +05:30
920692d5aa Modify UX and font size, menu vertical spacing with new sneat css v3.0.1 2025-04-18 11:38:57 +00:00
b963f6bad9 Fix loading error. Hide existing content and then show loading 2025-04-17 17:52:09 +05:30
1418f84976 Remove warnings 2025-04-17 17:29:18 +05:30
Pramod Mahajan
05d36a920b added one more field plannedTask inside Task Report 2025-04-17 16:25:21 +05:30
07b14cc0d2 Create an empty object of checklist for passing it to API 2025-04-16 11:44:38 +00:00
0101f694fc Created a dummy checklist object in report task page for sending it to API 2025-04-16 11:44:38 +00:00
Pramod Mahajan
30a9908499 changed Task Report UI 2025-04-15 02:58:01 +05:30
Pramod Mahajan
f4a09c7f53 removed max validation for completedTask 2025-04-11 15:34:46 +05:30
Pramod Mahajan
4a5d9c05e6 set checkin-out button side right 2025-04-10 02:50:33 +05:30
Pramod Mahajan
9e32986969 remove debugger 2025-04-10 02:47:51 +05:30
Pramod Mahajan
aa6ddd7fe9 remove regularization request after approve or reject. 2025-04-10 02:46:54 +05:30
Pramod Mahajan
797ff9b5bc removed MISC and changed login page logo url 2025-04-09 12:00:50 +05:30
Pramod Mahajan
faf68cac25 fixed attendance logs, attendanance rolename and removed import-userProfile. 2025-04-09 11:23:34 +05:30
Pramod Mahajan
d56ba89a4a fixed regularization bugs- past employee is not able to regularized beacuse, id not sending to server 2025-04-08 18:21:59 +05:30
Pramod Mahajan
9c0f98dbaf Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-08 16:00:11 +05:30
a78c4b90db Fixed the error "project not found" in daily task planning 2025-04-08 09:54:02 +00:00
f9c6d1b7f8 Fixed the error "project not found" in daily task planning 2025-04-08 09:54:02 +00:00
Pramod Mahajan
df989605b9 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-08 13:03:12 +05:30
5995c74ae6 change class= to className= 2025-04-08 09:37:38 +05:30
Pramod Mahajan
9e17b74ba4 changed font size and removed console. 2025-04-07 18:44:19 +05:30
Pramod Mahajan
8bce23d9b6 added hid and visible functionality for password field. 2025-04-07 17:16:18 +05:30
Pramod Mahajan
2081b13d64 removed space between check and view button 2025-04-07 17:15:17 +05:30
Pramod Mahajan
10d6f96ea7 added taskreport, commentTask feature 2025-04-06 18:03:10 +05:30
Pramod Mahajan
ddfbed1020 updated project infra components and added assigntask 2025-04-05 13:10:24 +05:30