084454112a
Merge branch 'Kartik_Task#400' into Issue_May_5W
...
# Conflicts:
# src/components/Dashboard/Dashboard.jsx
# src/hooks/useDashboard_Data.jsx
2025-05-31 13:41:15 +05:30
d80082bc9b
Status code 400 showing on Logs tab and Daily Progress Report datepicker issue.
2025-05-31 08:09:07 +00:00
d16675bf71
Adding New Weidge in Dashboard Name is "Activity".
2025-05-30 16:19:20 +05:30
50d5c69db1
Convert all date to DD-MM-YYYY accross all component.
2025-05-27 07:53:31 +00:00
4c9ea7add8
Attendence component date customize
2025-05-21 07:42:42 +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
Pramod Mahajan
ea0c3b5ca7
handled correct time slots
2025-05-10 10:41:59 +00:00
Pramod Mahajan
71a47f320c
added data props in confrima modal
2025-05-09 11:53:40 +00:00
Pramod Mahajan
f76b524ded
changed padding of modal-body and and button postion
2025-05-08 18:22:03 +05:30
Pramod Mahajan
71bb1c25dd
changed position of header
2025-05-07 17:18:57 +05:30
Pramod Mahajan
9682de0854
customize confirm modal
2025-05-07 16:23:35 +05:30
Pramod Mahajan
9e3101ebf4
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity
2025-05-07 13:00:09 +05:30
a14e5c88b4
Dynamic date range for DateRange Picker in task allocation log
2025-05-04 12:50:53 +05:30
f1e22e944e
added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day.
2025-05-04 12:24:27 +05:30
d5cbe67d3e
update TimePicker slot logic based on check-in and check-out time conditions
2025-05-04 12:20:16 +05:30
e53635f910
time slot should display according activity
2025-05-04 12:09:05 +05:30
Pramod Mahajan
fec6de8a54
removed console
2025-04-29 23:54:59 +05:30
Pramod Mahajan
7e45f6c429
Fixed issue where logged-in users couldn't select future time slots
2025-04-29 11:04:21 +05:30
Pramod Mahajan
054ef8fd17
Updated TimePicker to disable future times and allow only current or past selections
2025-04-29 00:51:31 +05:30
Pramod Mahajan
786a5a689e
made custome TagInput.
2025-04-25 11:02:03 +00:00
Pramod Mahajan
3160da69d2
added one more css property radius
2025-04-25 11:02:03 +00:00
Pramod Mahajan
3c9e68f91b
created new progressBar component
2025-04-23 10:48:47 +05:30
Pramod Mahajan
450c8143ff
removed extra padding.
2025-04-22 10:33:58 +00:00
68b23c8d5e
Fixed the bug of mismatch dates where dates showing one day earlier than expected
2025-04-19 16:36:21 +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
1418f84976
Remove warnings
2025-04-17 17:29:18 +05:30
83b6c2a307
Merge branch 'pramod_Enhancement#86_plannedDisplayInReport' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#86_plannedDisplayInReport
2025-04-17 16:27:07 +05:30
0e7c54e09f
Adding missed change during merge conflict
2025-04-17 16:08:32 +05:30
ea93f62faf
Merge branch 'pramod_Enhancement#76_ImproveEmpl_ListView' into Feature_Task_Management
2025-04-17 16:05:46 +05:30
6ab45d10e4
refactor: optimize Avatar component for better performance and readability
2025-04-17 12:04:36 +05:30
Pramod Mahajan
a63765566b
customize avatar size
2025-04-17 12:04:17 +05:30
c93919602e
- Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed
...
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
2025-04-17 12:04:17 +05:30
0c48ae70b8
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
2025-04-16 16:13:12 +05:30
6bf8fcf9a2
refactor: optimize Avatar component for better performance and readability
2025-04-16 10:35:47 +00:00
64904c3cee
- Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed
...
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
2025-04-16 16:00:48 +05:30
Pramod Mahajan
ff0595b021
customize avatar size
2025-04-16 09:34:40 +00:00
Pramod Mahajan
86b58a7e41
customize avatar size
2025-04-16 11:01:02 +05:30
Pramod Mahajan
6df20de749
it will take default range date, initially whenever component mount
2025-04-14 22:53:38 +05:30
Pramod Mahajan
777b8d8d0b
set up deafult dates
2025-04-14 17:30:29 +05:30
Pramod Mahajan
4c2fbf7bc6
made sepearte dataPickers
2025-04-13 17:26:36 +05:30
Pramod Mahajan
85c2401514
fixed progress bar and team size on project Card
2025-04-09 13:43:34 +05:30
5995c74ae6
change class= to className=
2025-04-08 09:37:38 +05:30
Pramod Mahajan
10d6f96ea7
added taskreport, commentTask feature
2025-04-06 18:03:10 +05:30
Pramod Mahajan
5a7ca02952
added use-rights functionality according to users
2025-04-01 17:17:35 +05:30
ba302898b8
Add UserRights branch from github changeset: 10a346901a9018735d9fd70a1a79a737595177ab
2025-03-25 17:22:23 +05:30
11241696b3
Add first version in main branch
2025-03-25 17:14:14 +05:30
