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

2570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pramod Mahajan
d3f7c44922 removed table header icons 2025-05-27 12:53:58 +05:30
Pramod Mahajan
466f11382a removed table header icons 2025-05-27 12:50:47 +05:30
Pramod Mahajan
3072759ba8 incresed modal width for manage buckets 2025-05-27 12:47:47 +05:30
Pramod Mahajan
a17a32a7cf added background color, backdrop 2025-05-27 12:46:36 +05:30
Pramod Mahajan
991a833dbf removed fix height 2025-05-27 12:39:54 +05:30
Pramod Mahajan
5287b40cd0 changed font size 2025-05-27 12:37:02 +05:30
Pramod Mahajan
dd35de14a7 removed project select validation, it no longer required 2025-05-27 12:35:23 +05:30
Pramod Mahajan
8fba237173 changed font-size 2025-05-27 12:33:25 +05:30
Pramod Mahajan
c3643683c8 added filter action while apply filter 2025-05-27 12:31:48 +05:30
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
Pramod Mahajan
ad145db3c7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-05-27 10:15:06 +05:30
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
Vikas Nale
2224b10842 Merge pull request 'pramod_Task-#355 : implemented Manage Buckets modal with bucket creation and listing' (#145) from pramod_Task-#355 into Feature_Directory 
Reviewed-on: #145
 2025-05-26 09:36:34 +00:00
Pramod Mahajan
8abb8a3aa5 added API methods for creating and updating directory buckets 2025-05-26 09:36:34 +00:00
Pramod Mahajan
51c3857675 splited Directory component into smaller components 2025-05-26 09:36:34 +00:00
Pramod Mahajan
8f94cf6e2d added new modal for bucket management and splited code 2025-05-26 09:36:34 +00:00
Pramod Mahajan
199cf4867f created new component for bucket managment 2025-05-26 09:36:34 +00:00
Pramod Mahajan
06c0c5ebb3 added schema for bucket form validation 2025-05-26 09:36:34 +00:00
Vikas Nale
16f40f7566 Merge branch 'pramod_Task-#358' into Feature_Directory 
# Conflicts:
#	src/components/master/MasterModal.jsx
 2025-05-26 15:00:25 +05:30
Vikas Nale
d11174984d Merge branch 'pramod_Task-#227' into Feature_Directory 
# Conflicts:
#	src/repositories/MastersRepository.jsx
 2025-05-26 14:58:56 +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
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
ff56245119 Merge pull request 'pramod_Task#351: Contact Tag Delete and Update' (#141) from pramod_Task#351 into Feature_Directory 
Reviewed-on: #141
 2025-05-24 12:22:59 +00:00
Pramod Mahajan
1cdaefbec4 added EditcontactCatgorry component in modal for update 2025-05-24 17:27:47 +05:30
Pramod Mahajan
36b09747b0 created new component for update contact category 2025-05-24 17:27:03 +05:30
Pramod Mahajan
695369cbf8 modified url endpoint 2025-05-24 17:26:20 +05:30
Pramod Mahajan
dcaa9ae7ec Add support for deleting contact categories 2025-05-24 16:27:11 +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
Pramod Mahajan
79e38f6cd5 modified url for delete and update contact tag 2025-05-24 16:02:46 +05:30
Pramod Mahajan
3593e7d46c added new modal for edit contact tag and delete contact tag 2025-05-24 16:02:16 +05:30
Pramod Mahajan
144817aef6 added new component for Edit contact Tag 2025-05-24 16:00:23 +05:30
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