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

764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
78bc8802d7 Merge pull request 'In Employee Management when we select Project then this toggle button will be disabled.' (#178) from Kartik_Bug#432 into Issue_Jun_1W 
Reviewed-on: #178
 2025-06-03 11:52:53 +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
4d1d3f8cca Merge pull request 'Display completion percentage for each Work Area header' (#174) from pramod_Task-#438 into Issue_Jun_1W 
Reviewed-on: #174
 2025-06-03 11:47:18 +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
Vikas Nale
346e7b1d1d Merge pull request 'In Employee selection double Date is shown in Front.' (#173) from Kartik_Bug#345 into Issue_Jun_1W 
Reviewed-on: #173
 2025-06-03 10:44:27 +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
Vikas Nale
8c3b10f1cb Merge pull request 'pramod_Bug-#215 : Fixed : Display correct icon for approved check-out regularization requests in employee attendance profile' (#168) from pramod_Bug-#215 into Issue_Jun_1W 
Reviewed-on: #168
 2025-06-02 07:53:58 +00:00
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
Vikas Nale
fe933ff983 Merge pull request 'pramod_Bug#361 : conditionally render Actions column based on permissions and project status' (#167) from pramod_Bug-#361 into Issue_Jun_1W 
Reviewed-on: #167
 2025-05-31 12:28:18 +00:00
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30
Vikas Nale
edf88a1d57 Merge pull request 'pramod_Bug#160 :Unnecessary Multiple profile API Requests call on Page Load' (#166) from pramod_Bug#160 into Issue_May_5W 
Reviewed-on: #166
 2025-05-31 10:17:48 +00:00
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
Vikas Nale
471be2edd8 Merge pull request 'Status code 400 showing on Logs tab and Daily Progress Report datepicker issue.' (#157) from Kartik_Bug#392 into Issue_May_5W 
Reviewed-on: #157
 2025-05-31 08:09:07 +00:00
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
Vikas Nale
3e615b3cd6 Merge pull request 'Comments popup submit button issue.' (#154) from Kartik_Bug#389 into Issue_May_5W 
Reviewed-on: #154
 2025-05-28 10:29:14 +00:00
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
ashutosh.nehete
c1020f4693 Merge pull request 'Correction in Comment popup from Daily Progress Report.' (#152) from Kartik_Bug#350 into Issue_May_5W 
Reviewed-on: #152
 2025-05-27 11:56:52 +00:00
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
ashutosh.nehete
a68bd7dc38 Merge pull request 'In Create New Project form is not empty when we click on cancel button or cross.' (#151) from Kartik_bug#386 into Issue_May_5W 
Reviewed-on: #151
 2025-05-27 10:57:12 +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
Vikas Nale
b198e7142a Merge pull request 'Convert all date to DD-MM-YYYY accross all component.' (#150) from Kartik_Bug#368 into Issue_May_5W 
Reviewed-on: #150
 2025-05-27 07:53:31 +00:00
kartik.sharma
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
Vikas Nale
b479325816 Merge pull request 'In Assign Role popup double loading is visible.' (#148) from Kartik_Bug#367 into Issue_May_5W 
Reviewed-on: #148
 2025-05-27 06:20:13 +00:00
kartik.sharma
126ed3809f In Assign Role popup double loading is visible. 2025-05-27 09:58:20 +05:30
Vikas Nale
e15a7b887d Merge pull request 'In Report Popup from Daily Progress Report where validation message not showing properly in Completed Work Text box.' (#147) from Kartik_Enhancement#362 into Issue_May_5W 
Reviewed-on: #147
 2025-05-26 09:36:49 +00:00
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
Vikas Nale
478b0ddad0 Merge pull request 'Dashboard Component View.' (#146) from Kartik_Development#26 into Issue_May_4W 
Reviewed-on: #146
 2025-05-26 05:52:13 +00:00
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
Vikas Nale
4c73060b82 Merge pull request 'Error message work Properly.' (#140) from Kartik_Enhancement#279 into Issue_May_4W 
Reviewed-on: #140
 2025-05-24 10:52:41 +00:00
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
9d90f05f1c Merge pull request 'Adding Switch button in attendence component.' (#129) from Kartik_Enhancement#274 into Issue_May_4W 
Reviewed-on: #129
 2025-05-24 10:17:20 +00:00
Vikas Nale
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00