From 626a325df7c3b0050cfeff9331a9ca94fe0b4057 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 May 2023 18:24:09 +0200 Subject: [PATCH] add database search by modification date --- out/out.Search.php | 6 +++--- views/bootstrap/class.Search.php | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/out/out.Search.php b/out/out.Search.php index 216aeae5f..c56138c05 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -734,13 +734,13 @@ if($settings->_showSingleSearchHit && count($entries) == 1) { $view->setParam('createstartdate', $createstartts); $view->setParam('createenddate', $createendts); $view->setParam('created', $created); + $view->setParam('modifystartdate', $modifystartts); + $view->setParam('modifyenddate', $modifyendts); + $view->setParam('modified', $modified); $view->setParam('expstartdate', !empty($expstartdate) ? getReadableDate($expstartts) : ''); $view->setParam('expenddate', !empty($expenddate) ? getReadableDate($expendts) : ''); $view->setParam('statusstartdate', !empty($statusstartdate) ? getReadableDate($statusstartts) : ''); $view->setParam('statusenddate', !empty($statusenddate) ? getReadableDate($statusendts) : ''); - $view->setParam('creationdate', isset($creationdate) ? $creationdate : ''); - $view->setParam('expirationdate', isset($expirationdate) ? $expirationdate: ''); - $view->setParam('statusdate', isset($statusdate) ? $statusdate: ''); $view->setParam('status', $status); $view->setParam('recordtype', isset($record_type) ? $record_type : null); $view->setParam('categories', isset($categories) ? $categories : ''); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 54e7a80e8..d0f7b9b77 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -419,13 +419,13 @@ $(document).ready(function() { $createstartdate = $this->params['createstartdate']; $createenddate = $this->params['createenddate']; $created = $this->params['created']; + $modifystartdate = $this->params['modifystartdate']; + $modifyenddate = $this->params['modifyenddate']; + $modified = $this->params['modified']; $expstartdate = $this->params['expstartdate']; $expenddate = $this->params['expenddate']; $statusstartdate = $this->params['statusstartdate']; $statusenddate = $this->params['statusenddate']; - $creationdate = $this->params['creationdate']; - $expirationdate = $this->params['expirationdate']; - $statusdate = $this->params['statusdate']; $status = $this->params['status']; $record_type = $this->params['recordtype']; $this->query = $this->params['query']; @@ -635,9 +635,11 @@ $(document).ready(function() { $openfilterdlg = true; if($status) $openfilterdlg = true; - if($expirationdate) + if($modifyenddate || $modifystartdate) $openfilterdlg = true; - if($statusdate) + if($expenddate || $expstartdate) + $openfilterdlg = true; + if($statusstartdate || $statusenddate) $openfilterdlg = true; /* Start of fields only applicable to documents */ @@ -685,6 +687,14 @@ $(document).ready(function() { 'options'=>$options ) ); + $this->formField( + getMLText("modified")." (".getMLText('from').")", + $this->getDateChooser(!empty($modifystartdate) ? getReadableDate($modifystartdate) : null, "modified[from]", $this->params['session']->getLanguage()) + ); + $this->formField( + getMLText("modified")." (".getMLText('to').")", + $this->getDateChooser(!empty($modifyenddate) ? getReadableDate($modifyenddate) : null, "modified[to]", $this->params['session']->getLanguage()) + ); $this->formField( getMLText("expires")." (".getMLText('from').")", $this->getDateChooser($expstartdate, "expirationstart", $this->params['session']->getLanguage())