|
|
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 |
|
|
|
3857fec32e
|
add cosmatic changes
|
2025-06-09 11:38:35 +00:00 |
|
|
|
3a45f80f36
|
Changes in Change Password Popup improve its layout and functionality.
|
2025-06-09 11:38:35 +00:00 |
|
|
|
b4b64c4c91
|
Creating a Change Password page.
|
2025-06-09 11:38:35 +00:00 |
|
Pramod Mahajan
|
77fb787d46
|
removed console.log
|
2025-06-09 12:41:57 +05:30 |
|
|
|
9e03e6ae19
|
Handle conditon to hide unwanted OR label
|
2025-06-09 11:49:34 +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 |
|
|
|
d37068b8d9
|
Modify typo
|
2025-06-09 11:46:00 +05:30 |
|
|
|
ef47bbf8a4
|
When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate.
|
2025-06-09 06:00:26 +00:00 |
|
|
|
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 |
|
Pramod Mahajan
|
ab6316ef56
|
Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#482
|
2025-06-07 17:42:16 +05:30 |
|
Pramod Mahajan
|
d345977fdc
|
set constant time for expire time for OTP
|
2025-06-07 17:41:24 +05:30 |
|
Pramod Mahajan
|
8640a96901
|
set new route login through OTP
|
2025-06-07 17:40:49 +05:30 |
|
Pramod Mahajan
|
beeba834e2
|
added send and verify OTP api
|
2025-06-07 17:40:24 +05:30 |
|
Pramod Mahajan
|
def6524566
|
created new component for verify OTP
|
2025-06-07 17:40:03 +05:30 |
|
Pramod Mahajan
|
194087c0a3
|
added login with otp feature, added send otp api
|
2025-06-07 17:39:37 +05:30 |
|
|
|
40f4f2f254
|
Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2
|
2025-06-06 18:37:40 +05:30 |
|
|
|
96ed0428c4
|
Changes in Reset Password Page and adding field in Dialog box is " Change Password"
|
2025-06-05 18:06:58 +05:30 |
|
|
|
f3b16a9fc0
|
Creating a Change Password Page and adding Change Password field in Dialog box.
|
2025-06-05 17:57:53 +05:30 |
|
|
|
101baa2b78
|
Todays date is not visible in Daily Progress Report.
|
2025-06-05 05:26:06 +00:00 |
|
|
|
4345c55247
|
In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.
|
2025-06-04 17:11:55 +05:30 |
|
|
|
176535f53f
|
Added Column Today's Planned to Project Infrastructure
|
2025-06-03 11:59:46 +00:00 |
|
|
|
3486a6bc3a
|
In Teams Tab when we Assign a project then this dropdown not change its state .
|
2025-06-03 11:56:04 +00:00 |
|
|
|
cf8a67bc2c
|
Adding a error message on InActive selection on Teams tab on Projects.
|
2025-06-03 11:54:33 +00:00 |
|
|
|
18d848b697
|
Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W
Reviewed-on: #179
|
2025-06-03 11:53:32 +00:00 |
|
|
|
5df397488a
|
In Employee Management when we select Project then this toggle button will be disabled.
|
2025-06-03 11:52:53 +00:00 |
|
|
|
493689fb1a
|
Add progress bar for work area on Infra Page
|
2025-06-03 11:47:18 +00:00 |
|
Pramod Mahajan
|
80d3434bbf
|
Display completion percentage for each Work Area header
|
2025-06-03 11:47:18 +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 |
|
|
|
7e05cfbd61
|
In Employee selection double Date is shown in Front.
|
2025-06-02 17:31:07 +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 |
|
Pramod Mahajan
|
628bf006d6
|
conditionally render Actions column based on permissions and project status
|
2025-05-31 17:02:36 +05:30 |
|
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 |
|
