Pramod Mahajan
|
f48d05ecee
|
changed hook name , replaced properly related logic name
|
2025-06-14 10:46:33 +05:30 |
|
Pramod Mahajan
|
dee44c63aa
|
handled loading properly
|
2025-06-14 10:45:43 +05:30 |
|
Pramod Mahajan
|
cbf376d5b6
|
added pending filter for attendaces using toggle buttons
|
2025-06-13 17:52:22 +05:30 |
|
|
|
dde953fa08
|
Fixed rebase conflicts
|
2025-06-13 10:56:37 +05:30 |
|
|
|
5611a46b95
|
Implemented attendance funcationality in attendance module
|
2025-06-13 10:50:13 +05:30 |
|
|
|
31ca0be50d
|
Avoided API calls
|
2025-06-13 10:47:21 +05:30 |
|
|
|
b1385d2f2f
|
Implmeneted signalR in today's attendance
|
2025-06-13 10:47:21 +05:30 |
|
Pramod Mahajan
|
3ed5999f29
|
added attachment views
|
2025-06-12 22:54:08 +05:30 |
|
|
|
909a1f72d9
|
Implemented signalR for create and update project
|
2025-06-12 20:45:32 +05:30 |
|
|
|
1c0be858e9
|
Implemented attendance funcationality in attendance module
|
2025-06-12 20:45:32 +05:30 |
|
|
|
b0fd14d0bb
|
Avoided API calls
|
2025-06-12 20:45:32 +05:30 |
|
|
|
e349d2622c
|
Implmeneted signalR in today's attendance
|
2025-06-12 20:45:31 +05:30 |
|
|
|
32fdc39e5c
|
Changes in Manage Buckets popup and Employess component Checkbox add.
|
2025-06-12 17:03:35 +05:30 |
|
Pramod Mahajan
|
deaf10c302
|
handled wrong uel for Breadcrumb
|
2025-06-11 19:34:28 +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 |
|
|
|
500006c1ef
|
Merge branch 'newFeature_Directory'
|
2025-06-10 20:18:25 +05:30 |
|
|
|
d3524c40f3
|
Updation In Daily Progress Report filter icon.
|
2025-06-10 14:26:57 +00:00 |
|
Pramod Mahajan
|
c1da916ca7
|
hide select at local level - AttendancePage
|
2025-06-10 15:35:30 +05:30 |
|
Pramod Mahajan
|
2b8764b402
|
hide select at local level - DailyTask
|
2025-06-10 15:31:43 +05:30 |
|
Pramod Mahajan
|
7f1ce2b863
|
removed unwannted code
|
2025-06-10 15:29:53 +05:30 |
|
Pramod Mahajan
|
9573daa8b0
|
changed toggle nutton position for well UI
|
2025-06-10 11:19:59 +05:30 |
|
|
|
19f58345d9
|
add cosmati changes
|
2025-06-09 11:54:49 +00:00 |
|
|
|
e2f3814934
|
Implement a spinner in the Daily Progress Report to indicate when data is being loaded.
|
2025-06-09 11:54:49 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
50d5c69db1
|
Convert all date to DD-MM-YYYY accross all component.
|
2025-05-27 07:53:31 +00:00 |
|
|
|
8d8a5edb19
|
Change label from "Pending" to "Pending Actions"
|
2025-05-24 10:17:20 +00:00 |
|
|
|
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 |
|
|
|
9e6cfdb659
|
Changes in Attendance tab.
1. Filter the view to show only "Today's" attendance.
2. Display today's date prominently above the names in that tab.
|
2025-05-17 10:58:14 +00:00 |
|
Pramod Mahajan
|
2ebd1a074f
|
show 'No Reports Found' message when task list is empty and loading is complete
|
2025-05-15 05:46:40 +00:00 |
|
|
|
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
|
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
|
f3bedf5826
|
handled console error
|
2025-05-07 16:41:25 +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 |
|
|
|
a60cd6b1a9
|
Added row background color and also changed message on report submit
|
2025-05-07 06:33:11 +00:00 |
|
|
|
25127659c8
|
Added fuctionality to Displayed Date-Wise Based on Selected Date Range
|
2025-05-07 06:33:11 +00:00 |
|
Pramod Mahajan
|
174b3f3bee
|
removed console
|
2025-05-06 12:45:19 +00:00 |
|
Pramod Mahajan
|
1a651ac5bc
|
after refresh attednace page, now it able get employee default selectedproject.
|
2025-05-06 12:45:19 +00:00 |
|
Pramod Mahajan
|
8483114f4d
|
set selectedProject on page refresh in DailyTask.jsx
- added fallback logic to select first project if selectedProject is undefined or 1
- used initialized flag to prevent multiple dispatches
|
2025-05-06 11:00:13 +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 |
|
|
|
a14e5c88b4
|
Dynamic date range for DateRange Picker in task allocation log
|
2025-05-04 12:50:53 +05:30 |
|
Pramod Mahajan
|
4bd574772f
|
filtering projects according to logged user at data layer
|
2025-05-04 12:00:10 +05:30 |
|
|
|
bb23d10996
|
Fixed bug of not getting data of correct project when going to attendance page
|
2025-05-04 09:32:12 +05:30 |
|
|
|
1bbc8fd422
|
Conver Int to Guid
|
2025-05-03 21:43:15 +05:30 |
|
Pramod Mahajan
|
8b9206ec74
|
remove accordion functionality from DailyTask component
|
2025-05-02 04:51:46 +00:00 |
|
Pramod Mahajan
|
fec6de8a54
|
removed console
|
2025-04-29 23:54:59 +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 |
|
