admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
727 Commits 240 Branches 0 Tags
Commit Graph

584 Commits

Author SHA1 Message Date
Umesh Desai
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
Vikas Nale
40f4f2f254 Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2 2025-06-06 18:37:40 +05:30
Umesh Desai
96ed0428c4 Changes in Reset Password Page and adding field in Dialog box is " Change Password" 2025-06-05 18:06:58 +05:30
Umesh Desai
f3b16a9fc0 Creating a Change Password Page and adding Change Password field in Dialog box. 2025-06-05 17:57:53 +05:30
ashutosh.nehete
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
Umesh Desai
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
Umesh Desai
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
Vikas Nale
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
Umesh Desai
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
Vikas Nale
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
Umesh Desai
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
kartik.sharma
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
kartik.sharma
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
kartik.sharma
f72c309c0c Comment code in Dashboard. 2025-05-31 15:35:36 +05:30
Vikas Nale
ccbe89f407 Cosmatic changes for Attendance Widget 2025-05-31 15:30:41 +05:30
Vikas Nale
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
Vikas Nale
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
kartik.sharma
d80082bc9b Status code 400 showing on Logs tab and Daily Progress Report datepicker issue. 2025-05-31 08:09:07 +00:00
Vikas Nale
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
kartik.sharma
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
kartik.sharma
d16675bf71 Adding New Weidge in Dashboard Name is "Activity". 2025-05-30 16:19:20 +05:30
kartik.sharma
627d4f898e Adding new Weidget in Dashboadr name is "Pending Attendance". 2025-05-28 13:06:03 +05:30
kartik.sharma
0880540560 Comments popup submit button issue. 2025-05-28 12:03:36 +05:30
kartik.sharma
94c9430406 Changes in Comment popup 2025-05-27 11:56:52 +00:00
kartik.sharma
cd3983dd19 Correction in Comment popup from Daily Progress Report. 2025-05-27 11:56:52 +00:00
kartik.sharma
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
kartik.sharma
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
kartik.sharma
126ed3809f In Assign Role popup double loading is visible. 2025-05-27 09:58:20 +05:30
kartik.sharma
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
kartik.sharma
4445ef18ab Dashboard Component View. 2025-05-26 11:19:59 +05:30
Vikas Nale
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
kartik.sharma
ae18b51668 Removing Unnecessary gap in Assign Employee popup from Teams. 2025-05-24 18:52:56 +05:30
kartik.sharma
decc388bf1 Error message work Properly. 2025-05-24 10:52:41 +00:00
kartik.sharma
7804e44b85 Error message in Manage floor popup in Infrastructure. 2025-05-24 15:54:31 +05:30
Vikas Nale
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00
kartik.sharma
a60d7f7a25 Changes in Attendance Switch on-off button. 2025-05-24 10:17:20 +00:00
kartik.sharma
3157a30948 Adding Switch button in attendence component. 2025-05-24 10:17:20 +00:00
kartik.sharma
a6c6a73899 Correction in Assign Task popup. 2025-05-24 14:45:29 +05:30
Vikas Nale
aa50aeff98 Merge branch 'Kartik_Enhancement#335' into Issue_May_4W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
 2025-05-24 10:27:20 +05:30
Vikas Nale
78d7b9b521 Merge branch 'Kartik_Enhancement#336' into Issue_May_4W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
 2025-05-24 10:26:01 +05:30
Vikas Nale
7afa4f4449 Merge branch 'Kartik_Enhancement#337' into Issue_May_4W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
 2025-05-24 10:24:28 +05:30
Vikas Nale
9e57e21b8c Merge branch 'Kartik_Enhancement#338' into Issue_May_4W 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
 2025-05-24 10:22:08 +05:30
Vikas Nale
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