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

701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kartik.sharma
cf2ec55d4e Creating the Weidgets in Dashboard name Pending Attendance, Attendance, Activities. 2025-06-02 14:17:30 +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
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
Vikas Nale
9b26924eba Merge pull request 'Correction in Assign Task popup.' (#137) from Kartik_Enhancement#352 into Issue_May_4W 
Reviewed-on: #137
 2025-05-24 10:12:32 +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
kartik.sharma
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
kartik.sharma
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
kartik.sharma
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