From 72646416a004754157189775926254124f3b3ea0 Mon Sep 17 00:00:00 2001
From: Mats Bovin <mats.bovin@gmail.com>
Date: Thu, 11 Jul 2024 11:34:05 +0200
Subject: [PATCH] Fix issues and improve the repatriate review page

---
 grails-app/i18n/messages.properties           |  1 +
 grails-app/views/manage/repatriateReview.gsp  | 17 ++++++++++-------
 sbdi/data/config/collectory-config.properties |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
index 65897d2e..d72de286 100644
--- a/grails-app/i18n/messages.properties
+++ b/grails-app/i18n/messages.properties
@@ -1369,6 +1369,7 @@ manage.extloadr.label06=Add Resource
 manage.extloadr.label07=Update Metadata
 manage.extloadr.label08=(Re) download dataset
 manage.extloadr.label09=Record count
+manage.extloadr.label10=Type
 manage.extloadr.button01=...
 manage.extloadr.button.cancel=Cancel
 manage.extloadr.button.ok=Ok
diff --git a/grails-app/views/manage/repatriateReview.gsp b/grails-app/views/manage/repatriateReview.gsp
index 0f671212..9962c492 100644
--- a/grails-app/views/manage/repatriateReview.gsp
+++ b/grails-app/views/manage/repatriateReview.gsp
@@ -6,7 +6,7 @@
           content="${createLink(action: 'list', controller: 'manage')},${message(code: 'manage.list.title01')}"
     />
     <meta name="breadcrumbs"
-          content="${createLink(action: 'list', controller: 'manage')},Repatriation tools"
+          content="${createLink(action: 'repatriate', controller: 'manage')},Repatriation tools"
     />
     <meta name="layout" content="${grailsApplication.config.skin.layout}" />
     <title><g:message code="manage.extloadr.title" /></title>
@@ -49,11 +49,12 @@
                     <th>ID</th>
                     <th><g:message code="manage.extloadr.label01"/></th>
                     <th><g:message code="manage.extloadr.label03"/></th>
+                    <th><g:message code="manage.extloadr.label10"/></th>
                     <th><g:message code="manage.extloadr.label04"/></th>
                     <th><g:message code="manage.extloadr.label05"/></th>
-                    <th><g:message code="manage.extloadr.label06"/> <button type="btn btn-sm" onclick="invertColumn('.addResource'); return false"><span class="glyphicon glyphicon-check"></span></button></th>
-                    <th><g:message code="manage.extloadr.label07"/> <button type="btn btn-sm" onclick="invertColumn('.updateMetadata'); return false"><span class="glyphicon glyphicon-check"></span></button></th>
-                    <th><g:message code="manage.extloadr.label08"/> <button type="btn btn-sm" onclick="invertColumn('.updateConnection'); return false"><span class="glyphicon glyphicon-check"></span></button></th>
+                    <th><g:message code="manage.extloadr.label06"/> <span class="btn btn-default btn-xs" onclick="invertColumn('.addResource'); return false">x</span></th>
+                    <th><g:message code="manage.extloadr.label07"/> <span class="btn btn-default btn-xs" onclick="invertColumn('.updateMetadata'); return false">x</span></th>
+                    <th><g:message code="manage.extloadr.label08"/> <span class="btn btn-default btn-xs" onclick="invertColumn('.updateConnection'); return false">x</span></th>
                     <th><g:message code="manage.extloadr.label09"/></th>
                 </tr>
             </thead>
@@ -69,8 +70,9 @@
                     <g:hiddenField name="resources[${rs}].guid" value="${res.guid}"/>
                     <g:hiddenField name="resources[${rs}].source" value="${res.source}"/>
                     <g:hiddenField name="resources[${rs}].country" value="${configuration.country}"/>
-                    <g:textField class="resource-name col-xs-4" name="resources[${rs}].name" value="${res.name}" />
+                    <g:textField class="resource-name col-xs-4" style="width: 24em" name="resources[${rs}].name" value="${res.name}" />
                 </td>
+                <td>${res.type}</td>
                 <td><span title="<g:message code="manage.extstatus.${res.status}.detail"/>"><g:message code="manage.extstatus.${res.status}"/></span></td>
                 <td class="resource-mapping"><span id="existing-${rs}"><g:if test="${res.uid}">
                     <g:link controller="dataResource" action="show" id="${res.uid}" target="_new"> <g:fieldValue field="uid" bean="${res}"/></g:link>
@@ -80,7 +82,7 @@
                 <td><g:checkBox name="resources[${rs}].addResource" value="${res.addResource}"/></td>
                 <td><g:checkBox name="resources[${rs}].updateMetadata" value="${res.updateMetadata}"/></td>
                 <td><g:checkBox name="resources[${rs}].updateConnection" value="${res.updateConnection}"/></td>
-                <td>${res.recordCount}</td>
+                <td><g:formatNumber number="${res.recordCount}" format="###,###,##0" /></td>
             </tr>
             </g:each>
             </g:if>
@@ -136,10 +138,11 @@
                 null,
                 null,
                 null,
+                null,
                 {"orderable": false},
                 {"orderable": false},
                 {"orderable": false},
-                {"orderable": false}
+                null
             ]
         });
     } );
diff --git a/sbdi/data/config/collectory-config.properties b/sbdi/data/config/collectory-config.properties
index 7c8f58d6..068c256a 100644
--- a/sbdi/data/config/collectory-config.properties
+++ b/sbdi/data/config/collectory-config.properties
@@ -207,4 +207,4 @@ repatriate.defaults.country=SE
 repatriate.defaults.dataProviderUId=dp4
 repatriate.defaults.maxDatasetCount=5
 repatriate.defaults.minRecordCount=100
-repatriate.defaults.maxRecordcount=5000000
+repatriate.defaults.maxRecordCount=5000000