From 9c1e441dcd1b10b1d82d1dfdb745dc9d9216603e Mon Sep 17 00:00:00 2001
From: Ago <alexandre.goldstein@maarch.org>
Date: Mon, 25 Mar 2019 10:54:34 +0100
Subject: [PATCH 1/5] fixSortingDesc

---
 .../Resources/view/recordsManagement/archive/message.html  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
index e8859db66..5acb6d862 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
@@ -1,7 +1,7 @@
 <div id="messagesTable" class="table-responsive" >
     <table class="table table-condensed table-striped dataTable" id="messageTable">
         <thead>
-            <th>Date</th>
+            <th id="messageDate">Date</th>
             <th data-translate-context="message">Reference</th>
             <th>Type</th>   
             <th style="opacity:0;cursor:initial;"/>
@@ -37,6 +37,11 @@
         $('#messagesTable').find('.dataTable-footer:first').remove();
     });*/
 
+    // TODO search/find a better solution to sort table by descending date...
+    if ($('#messageDate').hasClass('sorting_asc')){
+        $('#messageDate').click();
+    }
+
     $("#messagesTable").on('click', '.viewMessage', function() {
         $.ajax({
             url      : "/medona/message/" + $(this).data('message-id'),
-- 
GitLab


From d63c285438739035bb06386296011ed89373ea79 Mon Sep 17 00:00:00 2001
From: "arnaud.pauget" <arnaud.pauget@maarch.org>
Date: Mon, 25 Mar 2019 11:59:44 +0100
Subject: [PATCH 2/5] Fix dataTable order on message & lifeCycle tabs in
 archive information modal

---
 .../maarchRM/Presenter/recordsManagement/archive.php     | 9 +++++++--
 .../view/recordsManagement/archive/lifeCycle.html        | 8 --------
 .../view/recordsManagement/archive/message.html          | 9 ---------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
index 6b73b3abe..d868957c7 100755
--- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
+++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
@@ -244,8 +244,13 @@ class archive
 
         $this->view->setSource("archive", $archive);
 
-        $this->view->getElementById('lifeCycleTable')->plugin['dataTable']->setSortingColumn(1, 1);
-        $this->view->getElementById('messageTable')->plugin['dataTable']->setSortingColumn(1, 1);
+        $messageDataTable = $this->view->getElementById('messageTable')->plugin['dataTable'];
+        $messageDataTable->setPaginationType("full_numbers");
+        $messageDataTable->setSorting(array(array(0, 'desc')));
+
+        $messageDataTable = $this->view->getElementById('lifeCycleTable')->plugin['dataTable'];
+        $messageDataTable->setPaginationType("full_numbers");
+        $messageDataTable->setSorting(array(array(0, 'desc')));
 
         $this->view->translate();
         $this->view->merge();
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html
index 3800a6797..a0b7bbdfc 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html
@@ -25,11 +25,3 @@
         </tbody>
     </table>
 </div>
-
-<script>
-
-// TODO search/find a better solution to sort table by descending date...
-if ($('#dateColumn').hasClass('sorting_asc')){
-    $('#dateColumn').click();
-}
-</script>
\ No newline at end of file
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
index 5acb6d862..ac865d531 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
@@ -33,15 +33,6 @@
 </div>
 
 <script>
-    /*$('#messagesTable').ready(function() {
-        $('#messagesTable').find('.dataTable-footer:first').remove();
-    });*/
-
-    // TODO search/find a better solution to sort table by descending date...
-    if ($('#messageDate').hasClass('sorting_asc')){
-        $('#messageDate').click();
-    }
-
     $("#messagesTable").on('click', '.viewMessage', function() {
         $.ajax({
             url      : "/medona/message/" + $(this).data('message-id'),
-- 
GitLab


From 25fa42f6ea52a85c5e3b5b39b7ede97c02977c7d Mon Sep 17 00:00:00 2001
From: "arnaud.pauget" <arnaud.pauget@maarch.org>
Date: Mon, 25 Mar 2019 12:02:20 +0100
Subject: [PATCH 3/5] Remove useless id on table header

---
 .../Resources/view/recordsManagement/archive/message.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
index ac865d531..53f15d469 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/message.html
@@ -1,7 +1,7 @@
 <div id="messagesTable" class="table-responsive" >
     <table class="table table-condensed table-striped dataTable" id="messageTable">
         <thead>
-            <th id="messageDate">Date</th>
+            <th>Date</th>
             <th data-translate-context="message">Reference</th>
             <th>Type</th>   
             <th style="opacity:0;cursor:initial;"/>
-- 
GitLab


From ca610cb08735b8a0e73560ec701f663f977c1d7c Mon Sep 17 00:00:00 2001
From: "arnaud.pauget" <arnaud.pauget@maarch.org>
Date: Mon, 25 Mar 2019 12:03:22 +0100
Subject: [PATCH 4/5] Rename wrong variable

---
 .../maarchRM/Presenter/recordsManagement/archive.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
index d868957c7..c853a194a 100755
--- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
+++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php
@@ -248,9 +248,9 @@ class archive
         $messageDataTable->setPaginationType("full_numbers");
         $messageDataTable->setSorting(array(array(0, 'desc')));
 
-        $messageDataTable = $this->view->getElementById('lifeCycleTable')->plugin['dataTable'];
-        $messageDataTable->setPaginationType("full_numbers");
-        $messageDataTable->setSorting(array(array(0, 'desc')));
+        $lifeCycleDataTable = $this->view->getElementById('lifeCycleTable')->plugin['dataTable'];
+        $lifeCycleDataTable->setPaginationType("full_numbers");
+        $lifeCycleDataTable->setSorting(array(array(0, 'desc')));
 
         $this->view->translate();
         $this->view->merge();
-- 
GitLab


From e04ead33c334951a7c050d4a573b97af959e3e47 Mon Sep 17 00:00:00 2001
From: Alexandre Goldstein <alexandre.goldstein@maarch.org>
Date: Tue, 26 Mar 2019 11:39:31 +0100
Subject: [PATCH 5/5] Update lifeCycle.html

---
 .../Resources/view/recordsManagement/archive/lifeCycle.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html
index a0b7bbdfc..870c10c91 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/lifeCycle.html
@@ -1,7 +1,7 @@
 <div class="table-responsive" data-translate-catalog="lifeCycle/messages">
     <table id="lifeCycleTable" class="table table-condensed table-striped dataTable" >
         <thead>
-            <th id="dateColumn">Date</th>
+            <th>Date</th>
             <th>Description</th>
             <th style="opacity: 0;cursor:initial;"/>
         </thead>
-- 
GitLab