Added project contract names to list #2880

AtlasOfLivingAustralia · Aug 26, 2024 · 5e9906b · 5e9906b
1 parent 9ced452
commit 5e9906b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/grails-app/assets/stylesheets/projects-by-program.css b/grails-app/assets/stylesheets/projects-by-program.css
@@ -32,6 +32,38 @@
     margin-top: 10px;
 }
 
+.projects-wrapper th.projectId, .projects-wrapper td.projectId {
+    width: 10%;
+}
+
+.projects-wrapper th.internalOrderId, .projects-wrapper td.internalOrderId {
+    width: 12%;
+    white-space: normal;
+}
+
+.projects-wrapper th.organisation, .projects-wrapper td.organisation {
+    width: 18%;
+}
+
+.projects-wrapper th.name, .projects-wrapper td.name {
+    width: 30%;
+}
+
+.projects-wrapper th.startDate, .projects-wrapper td.startDate {
+    width: 8%;
+}
+
+.projects-wrapper th.endDate, .projects-wrapper td.endDate {
+    width: 8%;
+}
+
+.projects-wrapper th.statusCol, .projects-wrapper td.statusCol {
+    width: 8%;
+}
+
+
+
+
 
 /** Get rid of extra padding inside tabs when dataTables is applied */
 .dataTables_wrapper.container-fluid {

diff --git a/grails-app/views/shared/_projectListByProgram.gsp b/grails-app/views/shared/_projectListByProgram.gsp
@@ -9,8 +9,8 @@
             <table id="projectList-${i}" class="table table-striped table-bordered">
                 <thead class="thead-light">
                 <th class="projectId">${g.message(code:'label.merit.projectID')}</th>
-                <th class="internalOrderId"><g:message code="label.externalId.INTERNAL_ORDER_NUMBER"/></th>
-                <th class="techOneCode"><g:message code="label.externalId.TECH_ONE_CODE"/></th>
+                <th class="internalOrderId"><g:message code="label.externalId.INTERNAL_ORDER_NUMBER"/> / <g:message code="label.externalId.TECH_ONE_CODE"/></th>
+                <th class="organisation">Contract name/s</th>
                 <th class="name">Name</th>
                 <th class="startDate">Start Date</th>
                 <th class="endDate">End Date</th>
@@ -20,8 +20,10 @@
                 <g:each var="project" in="${programDetails.projects}">
                     <tr>
                         <td class="projectId"><a href="${g.createLink(controller:'project', action:'index', id:project.projectId)}" >${project.grantId}</a></td>
-                        <td class="internalOrderId"><fc:externalIds externalIds="${project.externalIds}" idType="INTERNAL_ORDER_NUMBER"/></td>
-                        <td class="internalOrderId"><fc:externalIds externalIds="${project.externalIds}" idType="TECH_ONE_CODE"/></td>
+                        <td class="internalOrderId"><fc:externalIds externalIds="${project.externalIds}" idType="INTERNAL_ORDER_NUMBER"/>
+                            <fc:externalIds externalIds="${project.externalIds}" idType="TECH_ONE_CODE"/>
+                        </td>
+                        <td class="organisation">${project.associatedOrgs?.collect{it.name?.encodeAsHTML()}?.join(', ')}</td>
                         <td class="name">${project.name?.encodeAsHTML()}</td>
                         <td class="startDate">${au.org.ala.merit.DateUtils.isoToDisplayFormat(project.plannedStartDate)}</td>
                         <td class="endDate">${au.org.ala.merit.DateUtils.isoToDisplayFormat(project.plannedEndDate)}</td>