From 274d2cc348f94d1f2bc904fcf351f3b19dd4799a Mon Sep 17 00:00:00 2001
From: "arnaud.pauget" <arnaud.pauget@maarch.org>
Date: Mon, 25 Mar 2019 16:56:31 +0100
Subject: [PATCH 1/2] Add and sort by deposit date on result list

---
 .../maarchRM/Presenter/recordsManagement/archive.php        | 6 +++---
 .../view/recordsManagement/archive/resultList.html          | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
index 6b73b3abe..d4f42cc1b 100755
--- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
+++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
@@ -177,12 +177,12 @@ class archive
         $dataTable = $this->view->getElementsByClass("dataTable")->item(0)->plugin['dataTable'];
         $dataTable->setPaginationType("full_numbers");
 
-        $dataTable->setUnsortableColumns(7);
-        $dataTable->setUnsearchableColumns(7);
+        $dataTable->setUnsortableColumns(8);
+        $dataTable->setUnsearchableColumns(8);
 
         $dataTable->setUnsortableColumns(0);
         $dataTable->setUnsearchableColumns(0);
-        $dataTable->setSorting(array(array(1, 'desc')));
+        $dataTable->setSorting(array(array(2, 'desc')));
 
         $this->readPrivilegesOnArchives();
 
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html
index b6b36b242..fc5540a20 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html
@@ -18,6 +18,7 @@
                     <tr>
                         <th><input type="checkbox" id="archiveList_selectAll"/></th>
                         <th>Archive name</th>
+                        <th>Deposit date</th>
                         <th>Identifier</th>
                         <th>Originator</th>
                         <th>Profile</th>
@@ -39,6 +40,7 @@
                                 value="[?merge .archiveId ?]"/>
                         </td>
                         <td class="archiveName"><?merge .archiveName ?></td>
+                        <td><span class="hidden"><?merge .depositDate.format('Ymd') ?></span><?merge .depositDate.format('d-m-Y H:i:s') ?></td>
                         <td><?merge .archiveId ?></td>
                         <td class="originator"><?merge .originatorOrgName ?></td>
                         <td class="profile"><?merge .archivalProfileReference ?></td>
-- 
GitLab


From 0f0db562368fa1eae8d950aa27caa99704a5c260 Mon Sep 17 00:00:00 2001
From: "arnaud.pauget" <arnaud.pauget@maarch.org>
Date: Mon, 25 Mar 2019 17:41:49 +0100
Subject: [PATCH 2/2] Modify columns order in list

---
 .../maarchRM/Presenter/recordsManagement/archive.php          | 2 +-
 .../Resources/view/recordsManagement/archive/resultList.html  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
index d4f42cc1b..f76e23161 100755
--- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
+++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
@@ -182,7 +182,7 @@ class archive
 
         $dataTable->setUnsortableColumns(0);
         $dataTable->setUnsearchableColumns(0);
-        $dataTable->setSorting(array(array(2, 'desc')));
+        $dataTable->setSorting(array(array(5, 'desc')));
 
         $this->readPrivilegesOnArchives();
 
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html
index fc5540a20..ead77020c 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/resultList.html
@@ -18,10 +18,10 @@
                     <tr>
                         <th><input type="checkbox" id="archiveList_selectAll"/></th>
                         <th>Archive name</th>
-                        <th>Deposit date</th>
                         <th>Identifier</th>
                         <th>Originator</th>
                         <th>Profile</th>
+                        <th>Deposit date</th>
                         <th>Disposal date</th>
                         <th>Status</th>
                         <th style="min-width:150px;"></th>
@@ -40,10 +40,10 @@
                                 value="[?merge .archiveId ?]"/>
                         </td>
                         <td class="archiveName"><?merge .archiveName ?></td>
-                        <td><span class="hidden"><?merge .depositDate.format('Ymd') ?></span><?merge .depositDate.format('d-m-Y H:i:s') ?></td>
                         <td><?merge .archiveId ?></td>
                         <td class="originator"><?merge .originatorOrgName ?></td>
                         <td class="profile"><?merge .archivalProfileReference ?></td>
+                        <td><?merge .depositDate.format('d-m-Y H:i:s') ?></td>
                         <td data-order="[?merge .disposalDate.format('Y-m-d') ?]"><?merge .disposalDate ?></td>
                         <td class="status"><?merge .statusDesc ?></td>
                         <td>
-- 
GitLab