Merge pull request #154 from wethmiranasinghe/main

Deliverable Update
cepdnaclk · Oct 16, 2024 · 8b83d17 · 8b83d17
2 parents e80e06d + 8a07d8b
commit 8b83d17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/back-end/src/main/java/com/example/demo/Deliverables/Deliverable.java b/back-end/src/main/java/com/example/demo/Deliverables/Deliverable.java
@@ -26,7 +26,7 @@ public class Deliverable {
     private String workPackageNo;
     private String deliverableNo;
     private String deliverableName;
-    @Column(length = 5000)
+    @Column(columnDefinition = "TEXT")
     private String description;
     private String leadBeneficiary;
     private String type;

diff --git a/front-end/src/Pages/ProjectManagement.jsx b/front-end/src/Pages/ProjectManagement.jsx
@@ -435,9 +435,9 @@ if(loggedInUser){
            {
              users.map((user) => {
                let isAssignedTaskMember = checkIfAssigned(user);             
-               return(<div style={{display: "flex",gap: "10px", width:"100%",marginTop:"5%",verticalAlign:"middle"}}>
+               return(<div style={{display: "flex",gap: "10px", width:"100%",marginTop:"5%",height:"5px",verticalAlign:"middle"}}>
                <input type="checkbox" value={user.id} checked={isAssignedTaskMember} onChange={(e)=>onMemberChange(e)}></input>
-               <label style={{color:"black",height:"20px", width:"60%", marginTop:"-3.5%"}}>{user.title + user.firstName+" "+user.lastName}</label>
+               <label style={{color:"black",height:"20px", width:"60%", marginTop:"-3.5%"}}>{user.title +" "+ user.firstName+" "+user.lastName}</label>
                </div>
              )})
            }

diff --git a/front-end/src/components/Team.css b/front-end/src/components/Team.css
@@ -44,11 +44,13 @@
     display: flex;
     justify-content: space-between;
     gap: 10px;
+
 }
 
 .sub-tabs h4{
     margin: 0%;
     font-size: 14px;
+    color: #000000;
 }
 
 .sub-tabs button {