mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-29 04:57:20 +00:00
expired documents can be filtered by user
This commit is contained in:
parent
d377bd81ab
commit
3fb3434c61
|
@ -49,6 +49,7 @@ if (isset($_GET["orderdir"]) && strlen($_GET["orderdir"])==1 ) {
|
|||
$days = null;
|
||||
$startts = null;
|
||||
$endts = null;
|
||||
$seluser = null;
|
||||
if(isset($_GET['days']) && is_numeric($_GET['days'])) {
|
||||
$days = (int) $_GET['days'];
|
||||
} else {
|
||||
|
@ -59,6 +60,9 @@ if(isset($_GET['days']) && is_numeric($_GET['days'])) {
|
|||
$endts = makeTsFromDate($_GET['enddate']);
|
||||
}
|
||||
}
|
||||
if(isset($_GET['seluserid'])) {
|
||||
$seluser = $dms->getUser((int) $_GET['seluserid']);
|
||||
}
|
||||
|
||||
if($view) {
|
||||
$view->setParam('conversionmgr', $conversionmgr);
|
||||
|
@ -68,6 +72,7 @@ if($view) {
|
|||
$view->setParam('days', $days);
|
||||
$view->setParam('startts', $startts);
|
||||
$view->setParam('endts', $endts);
|
||||
$view->setParam('seluser', $seluser);
|
||||
$view->setParam('cachedir', $settings->_cacheDir);
|
||||
$view->setParam('previewWidthList', $settings->_previewWidthList);
|
||||
$view->setParam('timeout', $settings->_cmdTimeout);
|
||||
|
|
|
@ -45,6 +45,7 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
|
|||
function show() { /* {{{ */
|
||||
$dms = $this->params['dms'];
|
||||
$user = $this->params['user'];
|
||||
$settings = $this->params['settings'];
|
||||
$orderby = $this->params['orderby'];
|
||||
$orderdir = $this->params['orderdir'];
|
||||
$conversionmgr = $this->params['conversionmgr'];
|
||||
|
@ -56,6 +57,7 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
|
|||
$days = $this->params['days'];
|
||||
$startts = $this->params['startts'];
|
||||
$endts = $this->params['endts'];
|
||||
$seluser = $this->params['seluser'];
|
||||
|
||||
$db = $dms->getDB();
|
||||
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
|
||||
|
@ -91,6 +93,21 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
|
|||
getMLText("enddate"),
|
||||
$this->getDateChooser(getReadableDate($endts), "enddate", $this->params['session']->getLanguage(), '', '')
|
||||
);
|
||||
$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
|
||||
foreach ($allUsers as $currUser) {
|
||||
if (!$currUser->isGuest())
|
||||
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), $seluser && ($seluser->getId() == $currUser->getId()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
|
||||
}
|
||||
$this->formField(
|
||||
getMLText("user"),
|
||||
array(
|
||||
'element'=>'select',
|
||||
'name'=>'seluserid',
|
||||
'class'=>'chzn-select',
|
||||
'options'=>$options,
|
||||
'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_user'))),
|
||||
)
|
||||
);
|
||||
$this->formSubmit("<i class=\"fa fa-refresh\"></i> ".getMLText('update'));
|
||||
?>
|
||||
</form>
|
||||
|
@ -99,7 +116,7 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
|
|||
$this->columnStart(8);
|
||||
|
||||
if(is_numeric($days)) {
|
||||
$docs = $dms->getDocumentsExpired($days, null, $orderby, $orderdir, true);
|
||||
$docs = $dms->getDocumentsExpired($days, $seluser, $orderby, $orderdir, true);
|
||||
$this->contentHeading(''.$days);
|
||||
} else {
|
||||
$d = [];
|
||||
|
@ -107,7 +124,7 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
|
|||
$d['start'] = $startts;
|
||||
if($endts)
|
||||
$d['end'] = $endts+86400;
|
||||
$docs = $dms->getDocumentsExpired($d, null, $orderby, $orderdir, true);
|
||||
$docs = $dms->getDocumentsExpired($d, $seluser, $orderby, $orderdir, true);
|
||||
$this->contentHeading(getReadableDate($startts)." - ".getReadableDate($endts));
|
||||
}
|
||||
if($docs) {
|
||||
|
@ -137,4 +154,3 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
|
|||
$this->htmlEndPage();
|
||||
} /* }}} */
|
||||
}
|
||||
?>
|
||||
|
|
Loading…
Reference in New Issue
Block a user