Pramod Mahajan
9043cfd49e
prevent to set first project from project-list at component mount
2025-06-12 23:56:36 +05:30
da440060e8
- Some cosmatic changes on Activity Details popup
...
- Header Global project filter hite set to ax 300px a
- header global project list sorted by name
2025-06-12 23:06:51 +05:30
Pramod Mahajan
3ed5999f29
added attachment views
2025-06-12 22:54:08 +05:30
Pramod Mahajan
ce1bdc3df7
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into GlobalSelectProject
2025-06-11 14:15:42 +05:30
Pramod Mahajan
28c995bbc0
hide select at local level - Task planning
2025-06-10 15:34:05 +05:30
Pramod Mahajan
117ac31d12
Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into newFeature_Directory
2025-06-10 09:47:56 +05:30
c4288fe35a
Comments popup submit button issue.
2025-06-09 13:16:24 +05:30
f6634eb527
Correction in Comment popup from Daily Progress Report.
2025-06-09 13:16:24 +05:30
Pramod Mahajan
a9a5206062
use ITEM_PER_PAGE constant to standardize pagination
2025-06-09 13:12:56 +05:30
945d79a250
Merge branch 'pramod_Task#482' into Issue_Jun_1W_2
...
# Conflicts:
# src/pages/authentication/LoginPage.jsx
2025-06-09 11:47:03 +05:30
b6330502cb
Hide Page Number on Website Until Data Exceeds Records Limit.
2025-06-09 05:46:12 +00:00
26191bccfe
Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity.
2025-06-09 05:39:43 +00:00
101baa2b78
Todays date is not visible in Daily Progress Report.
2025-06-05 05:26:06 +00:00
b697943787
In Report popup when we take value = 0 then giv error but now it is resolved.
2025-06-03 11:11:00 +05:30
Pramod Mahajan
c91682a871
fixed attendance status & logs logic with proper activity handling
2025-05-31 23:34:55 +05:30
Pramod Mahajan
cd9a02430e
Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#215
2025-05-31 19:45:08 +05:30
0880540560
Comments popup submit button issue.
2025-05-28 12:03:36 +05:30
94c9430406
Changes in Comment popup
2025-05-27 11:56:52 +00:00
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
