From ecaf7ff7a9a35950c2da1301774752dc9cb91054 Mon Sep 17 00:00:00 2001 From: Correia Lopes Dylan Date: Tue, 27 Feb 2018 10:25:16 +0100 Subject: [PATCH 1/2] 7179 - audit search --- src/presentation/maarchRM/Presenter/audit/event.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/presentation/maarchRM/Presenter/audit/event.php b/src/presentation/maarchRM/Presenter/audit/event.php index 9c820f135..edd54e79c 100755 --- a/src/presentation/maarchRM/Presenter/audit/event.php +++ b/src/presentation/maarchRM/Presenter/audit/event.php @@ -137,7 +137,7 @@ EOD } /** - * Get reseult + * Get result * * @param Array $events Array of audit/event object * @@ -167,10 +167,10 @@ EOD if ($multipleInstance) { $dataTable->setUnsortableColumns(5); - $dataTable->setSorting(array(array(2, 'desc'))); + $dataTable->setSorting(array(array(1, 'desc'))); } else { $dataTable->setUnsortableColumns(4); - $dataTable->setSorting(array(array(1, 'desc'))); + $dataTable->setSorting(array(array(0, 'desc'))); } return $this->view->saveHtml(); -- GitLab From 712364dea1cbe55b88680124e513ccef0f5f19d1 Mon Sep 17 00:00:00 2001 From: Correia Lopes Dylan Date: Tue, 27 Feb 2018 11:19:06 +0100 Subject: [PATCH 2/2] 7179 - archive lifeCycle bordereaux --- .../maarchRM/Presenter/recordsManagement/archive.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php index dbdd6003b..5c9d488d3 100755 --- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php +++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php @@ -314,6 +314,16 @@ class archive } } + $dataTable = $this->view->getElementsByClass("dataTable")->item(2)->plugin['dataTable']; + $dataTable->setPaginationType("full_numbers"); + $dataTable->setUnsortableColumns(3); + $dataTable->setSorting(array(array(2, 'desc'))); + + $dataTable = $this->view->getElementsByClass("dataTable")->item(0)->plugin['dataTable']; + $dataTable->setPaginationType("full_numbers"); + $dataTable->setUnsortableColumns(2); + $dataTable->setSorting(array(array(0, 'desc'))); + //$this->view->setSource("visible", $visible); $this->view->setSource("archive", $archive); -- GitLab