admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Project_Branch_Management : New Feature Service Project - Branch Management #519

Merged
pramod.mahajan merged 76 commits from Project_Branch_Management into main 2025-11-25 09:42:48 +00:00
Conversation 0 Commits 76 Files Changed 69 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d3c006279c - Show all commits

4
src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx
View File

@ -117,10 +117,8 @@ const ServiceBranch = () => {
<i className="bx bx-sm bx-plus-circle me-2"></i> <i className="bx bx-sm bx-plus-circle me-2"></i>
<span className="d-none d-md-inline-block">Add Branch</span> <span className="d-none d-md-inline-block">Add Branch</span>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div className="mx-2 mt-3"> <div className="mx-2 mt-3">
@ -170,7 +168,7 @@ const ServiceBranch = () => {
!isError && !isError &&
data?.data?.length > 0 && data?.data?.length > 0 &&
data.data.map((branch) => ( data.data.map((branch) => (
<tr key={branch.id}> <tr key={branch.id} style={{ height: "35px" }}>
{columns.map((col) => ( {columns.map((col) => (
<td key={col.key} className={`${col.align} py-3`}> <td key={col.key} className={`${col.align} py-3`}>
{col.getValue(branch)} {col.getValue(branch)}

4
src/components/ServiceProject/ServiceProjectProfile.jsx
View File

@ -33,11 +33,11 @@ const ServiceProjectProfile = () => {
)} )}
<div className="row py-2"> <div className="row py-2">
<div className="col-md-6 col-lg-4 order-2 mb-6"> <div className="col-md-6 col-lg-5 order-2 mb-6">
<ServiceProfile data={data} setIsOpenModal={setIsOpenModal}/> <ServiceProfile data={data} setIsOpenModal={setIsOpenModal}/>
</div> </div>
<div className="col-md-6 col-lg-8 order-2 mb-6"> <div className="col-md-6 col-lg-7 order-2 mb-6">
<ServiceBranch /> <ServiceBranch />
</div> </div>
</div> </div>