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

2341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pramod Mahajan
cae2f2fffd intergated delete api 2025-05-28 11:58:16 +05:30
Pramod Mahajan
fc30db8532 added validation for bucket at least one bucket required 2025-05-28 11:57:48 +05:30
Pramod Mahajan
0ec3d0c3e3 created new float button component 2025-05-28 11:57:21 +05:30
Pramod Mahajan
a553ac2fe2 added delete bucket api 2025-05-28 10:45:33 +05:30
Pramod Mahajan
e316858c0a center empty state messages in employee table with spacing 2025-05-28 00:05:27 +05:30
Pramod Mahajan
ed72f29f01 removed fixed height from select label field 2025-05-27 23:11:58 +05:30
Pramod Mahajan
f8c3a6e767 add card-minHeight class for consistent card sizing 2025-05-27 22:57:10 +05:30
Pramod Mahajan
fc82989577 added .card-minHeight class with 430px min-height 2025-05-27 22:32:47 +05:30
Pramod Mahajan
6605293c47 added sorting button to table header 2025-05-27 22:23:32 +05:30
Pramod Mahajan
c382d9238d created new hook for sorting table data 2025-05-27 22:18:44 +05:30
Pramod Mahajan
45e88c07a9 increased padding for suggestion menu 2025-05-27 22:17:56 +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
Pramod Mahajan
eb0e424a18 created new hook useOrganization 2025-05-27 15:05:35 +05:30
Pramod Mahajan
3f7456e5e7 replaced standard input with custom InputSuggestions component for organization field 2025-05-27 15:04:55 +05:30
Pramod Mahajan
478aedf2ae added marign for select item 2025-05-27 15:03:21 +05:30
Pramod Mahajan
866049e385 added mirgin form bottom for select badge 2025-05-27 15:02:42 +05:30
Pramod Mahajan
8786f01b40 created new component for organization sugger field 2025-05-27 15:01:34 +05:30
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