cd3983dd19
Correction in Comment popup from Daily Progress Report.
2025-05-27 11:56:52 +00:00
50d5c69db1
Convert all date to DD-MM-YYYY accross all component.
2025-05-27 07:53:31 +00:00
9763c45592
In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.
2025-05-26 12:54:24 +05:30
a60d7f7a25
Changes in Attendance Switch on-off button.
2025-05-24 10:17:20 +00:00
3157a30948
Adding Switch button in attendence component.
2025-05-24 10:17:20 +00:00
7970bce60d
Merge branch 'Kartik_Enhancement#319' into Issue_May_4W
...
# Conflicts:
# src/components/Activities/CheckCheckOutForm.jsx
2025-05-23 10:45:20 +05:30
279f2403d2
Correction in date box in checkin checkout popup from Attendence component.
2025-05-22 14:20:51 +05:30
af4a40bf81
Adding Date Box in Check-in and Check-out popup from Attendence component.
2025-05-22 06:12:24 +00:00
f01a6235e7
Adding Date Box in Check-in and Check-out popup from Attendence component.
2025-05-21 16:27:45 +05:30
7a57f47318
Merge pull request 'In the Attendance Component, dates are filtered to show logs from the last 7 days, including yesterday.' ( #122 ) from Kartik_Enhancement#273 into Issue_May_4W
...
Reviewed-on: #122
2025-05-20 07:32:12 +00:00
3d3dcb4f69
In the Attendance Component, dates are filtered to show logs from the last 7 days, including yesterday.
2025-05-20 12:56:05 +05:30
e659b9bb04
Checking all the popups and adding header on it.
2025-05-19 11:59:34 +05:30
115b49ac44
Modified assign task popup from Daily task planning component.
2025-05-16 16:53:51 +05:30
Pramod Mahajan
926168bb07
Modified report comments section.
2025-05-12 09:18:29 +00:00
8db6a16e15
revert 1827757f19bd15c05029e1ca9c72de3a65a68bf1
...
revert updated regularization logic based on 48-hour checkout threshold
- This update was mistakenly implemented in the wrong branch. Moving it here to align with the correct workflow.- pramod_Bug#-27
2025-05-12 07:58:04 +00:00
Pramod Mahajan
af6a6faa46
ensure activity updates reflect in Daily Task Planning without page refresh
2025-05-12 07:58:04 +00:00
Pramod Mahajan
216e9b0db0
updated regularization logic based on 48-hour checkout threshold for attendanceLogs.
2025-05-12 07:57:40 +00:00
Pramod Mahajan
7bfd1728c0
updated regularization logic based on 48-hour checkout threshold for attendanceLogs.
2025-05-12 11:33:04 +05:30
f26b708564
Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null.
2025-05-10 13:38:05 +00:00
Pramod Mahajan
16fd31eef7
added reset and setloader false once request completed
2025-05-10 10:42:37 +00:00
Pramod Mahajan
2fbd7462d5
time slot display correct slots and if check-In so must display grather than check-in
2025-05-10 10:41:59 +00:00
a896a722f1
revert 20f5dee5344e05c402e012daeebdf2404cbff39d
...
revert revert 77b94e89bd9297e00aa76b7c433628fee221d259
revert handled zero length of array error.
2025-05-09 11:31:14 +00:00
20f5dee534
revert 77b94e89bd9297e00aa76b7c433628fee221d259
...
revert handled zero length of array error.
2025-05-09 11:25:34 +00:00
Pramod Mahajan
77b94e89bd
handled zero length of array error.
2025-05-09 16:48:06 +05:30
Pramod Mahajan
8dddb38278
mismatch approved and reject icons. replaced them
2025-05-09 16:47:16 +05:30
Pramod Mahajan
2182e764bf
added "request " entry in filterwise
2025-05-09 16:46:31 +05:30
Pramod Mahajan
5427fda41e
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity
2025-05-07 17:01:31 +05:30
Pramod Mahajan
620bf064c9
changed class to className
2025-05-07 16:58:54 +05:30
16a9cab12a
Handled wrong implementation on attendance log popup to show Attendance By Employee name
2025-05-07 16:56:56 +05:30
3607bdc77d
increase page size
2025-05-07 16:43:21 +05:30
Pramod Mahajan
cf0a0f00b2
removed unused code
2025-05-07 16:22:11 +05:30
e795881c79
Implemented date-wise grouping of the Attendance Log based on the selected date range.
2025-05-07 16:04:38 +05:30
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
