Pramod Mahajan
|
936636c29b
|
optimized custom hook usage
|
2025-05-31 10:17:48 +00:00 |
|
Pramod Mahajan
|
d10d47e642
|
added title name for assign employee modal
|
2025-05-31 10:17:48 +00:00 |
|
Pramod Mahajan
|
14b851b87e
|
added modal name- Assign Employee
|
2025-05-31 10:17:48 +00:00 |
|
|
|
bf9f09d5b4
|
Merge branch 'Issue_May_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_5W
|
2025-05-31 15:37:05 +05:30 |
|
|
|
f72c309c0c
|
Comment code in Dashboard.
|
2025-05-31 15:35:36 +05:30 |
|
|
|
ccbe89f407
|
Cosmatic changes for Attendance Widget
|
2025-05-31 15:30:41 +05:30 |
|
|
|
383162c4c3
|
Merge branch 'Kartik_Task#414' into Issue_May_5W
# Conflicts:
# src/components/Dashboard/Dashboard.jsx
# src/hooks/useDashboard_Data.jsx
# src/repositories/GlobalRepository.jsx
|
2025-05-31 13:49:01 +05:30 |
|
|
|
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 |
|
|
|
f511292f5a
|
Merge pull request 'Adding new Weidget in Dashboadr name is "Pending Attendance".' (#156) from Kartik_Task#342 into Issue_May_5W
Reviewed-on: #156
|
2025-05-31 08:08:50 +00:00 |
|
|
|
dbc9bbffa2
|
Create a new Weidget in Dashboard name "Attendance" and Adding a features to show chart and Table on it.
|
2025-05-31 11:39:15 +05:30 |
|
|
|
d16675bf71
|
Adding New Weidge in Dashboard Name is "Activity".
|
2025-05-30 16:19:20 +05:30 |
|
|
|
627d4f898e
|
Adding new Weidget in Dashboadr name is "Pending Attendance".
|
2025-05-28 13:06:03 +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 |
|
|
|
235ddb58ba
|
In Create New Project form is not empty when we click on cancel button or cross.
|
2025-05-27 10:57:12 +00:00 |
|
|
|
50d5c69db1
|
Convert all date to DD-MM-YYYY accross all component.
|
2025-05-27 07:53:31 +00:00 |
|
|
|
126ed3809f
|
In Assign Role popup double loading is visible.
|
2025-05-27 09:58:20 +05:30 |
|
|
|
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 |
|
|
|
4445ef18ab
|
Dashboard Component View.
|
2025-05-26 11:19:59 +05:30 |
|
|
|
7a1a55f52f
|
Merge branch 'Kartik_Bug#301' into Issue_May_4W
# Conflicts:
# src/components/Project/Infrastructure/FloorModel.jsx
|
2025-05-24 20:48:37 +05:30 |
|
|
|
ae18b51668
|
Removing Unnecessary gap in Assign Employee popup from Teams.
|
2025-05-24 18:52:56 +05:30 |
|
|
|
decc388bf1
|
Error message work Properly.
|
2025-05-24 10:52:41 +00:00 |
|
|
|
7804e44b85
|
Error message in Manage floor popup in Infrastructure.
|
2025-05-24 15:54:31 +05:30 |
|
|
|
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 |
|
|
|
a6c6a73899
|
Correction in Assign Task popup.
|
2025-05-24 14:45:29 +05:30 |
|
|
|
aa50aeff98
|
Merge branch 'Kartik_Enhancement#335' into Issue_May_4W
# Conflicts:
# src/components/Dashboard/Dashboard.jsx
|
2025-05-24 10:27:20 +05:30 |
|
|
|
78d7b9b521
|
Merge branch 'Kartik_Enhancement#336' into Issue_May_4W
# Conflicts:
# src/components/Dashboard/Dashboard.jsx
|
2025-05-24 10:26:01 +05:30 |
|
|
|
7afa4f4449
|
Merge branch 'Kartik_Enhancement#337' into Issue_May_4W
# Conflicts:
# src/components/Dashboard/Dashboard.jsx
|
2025-05-24 10:24:28 +05:30 |
|
|
|
9e57e21b8c
|
Merge branch 'Kartik_Enhancement#338' into Issue_May_4W
# Conflicts:
# src/components/Dashboard/Dashboard.jsx
|
2025-05-24 10:22:08 +05:30 |
|
|
|
9a60cebc42
|
Merge pull request 'Move all the project-related code from the Dashboard component into a new component named 'Projects'.' (#131) from Kartik_Enhancement#334 into Issue_May_4W
Reviewed-on: #131
|
2025-05-24 04:49:05 +00:00 |
|
|
|
38607ab482
|
Move all the Teams-related code from the Dashboard component into a new component named 'Teams'
|
2025-05-23 14:38:28 +05:30 |
|
|
|
377c024e33
|
Move all the Tasks-related code from the Dashboard component into a new component named 'Tasks'.
|
2025-05-23 14:25:04 +05:30 |
|
|
|
5e462a88f7
|
Move all the Projects Completion Status-related code from the Dashboard component into a new component named 'Projects Completion Status'.
|
2025-05-23 14:18:53 +05:30 |
|
|
|
cf11e995de
|
Move all the project-related code from the Dashboard component into a new component named 'Progress Overview by Project'.
|
2025-05-23 13:56:50 +05:30 |
|
|
|
7cc9181fb9
|
Move all the project-related code from the Dashboard component into a new component named 'Projects'.
|
2025-05-23 11:18:58 +05:30 |
|
|
|
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 |
|
|
|
5cb1e55292
|
Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.
|
2025-05-22 06:11:23 +00:00 |
|
|
|
f01a6235e7
|
Adding Date Box in Check-in and Check-out popup from Attendence component.
|
2025-05-21 16:27:45 +05:30 |
|
|
|
4c9ea7add8
|
Attendence component date customize
|
2025-05-21 07:42:42 +00:00 |
|
|
|
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 |
|
|
|
d117c0d09b
|
Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_3W
# Conflicts:
# src/components/Project/AssignRole.jsx
|
2025-05-17 17:39:36 +05:30 |
|
|
|
2a5e716615
|
Merge branch 'kartik_Enhancement#222' into Issue_May_3W
|
2025-05-17 17:38:35 +05:30 |
|
