gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-03-28 18:22:41 +01:00
commit 3e8a494f1a
2 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
out/out.ExpiredDocuments.php
View File

@ -46,11 +46,28 @@ if (isset($_GET["orderdir"]) && strlen($_GET["orderdir"])==1 ) {
$orderdir=$_GET["orderdir"]; $orderdir=$_GET["orderdir"];
} }
$days = null;
$starts = null;
$endts = null;
if(isset($_GET['days']) && is_numeric($_GET['days'])) {
$days = (int) $_GET['days'];
} else {
if(isset($_GET['startdate'])) {
$startts = makeTsFromDate($_GET['startdate']);
}
if(isset($_GET['enddate'])) {
$endts = makeTsFromDate($_GET['enddate']);
}
}
if($view) { if($view) {
$view->setParam('conversionmgr', $conversionmgr); $view->setParam('conversionmgr', $conversionmgr);
$view->setParam('showtree', showtree()); $view->setParam('showtree', showtree());
$view->setParam('orderby', $orderby); $view->setParam('orderby', $orderby);
$view->setParam('orderdir', $orderdir); $view->setParam('orderdir', $orderdir);
$view->setParam('days', $days);
$view->setParam('startts', $startts);
$view->setParam('endts', $endts);
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);

56
views/bootstrap/class.ExpiredDocuments.php
View File

@ -53,6 +53,9 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile']; $xsendfile = $this->params['xsendfile'];
$order = $orderby.$orderdir; $order = $orderby.$orderdir;
$days = $this->params['days'];
$startts = $this->params['startts'];
$endts = $this->params['endts'];
$db = $dms->getDB(); $db = $dms->getDB();
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
@ -64,17 +67,57 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
$this->contentStart(); $this->contentStart();
$this->pageNavigation(getMLText("expired_documents"), "admin_tools"); $this->pageNavigation(getMLText("expired_documents"), "admin_tools");
$this->rowStart();
$this->columnStart(4);
$this->contentHeading(getMLText("expired_documents")); $this->contentHeading(getMLText("expired_documents"));
// $this->contentContainerStart(); ?>
<form class="form-horizontal">
<?php
$this->formField(
getMLText("days"),
array(
'element'=>'input',
'type'=>'number',
'name'=>'days',
'id'=>'days',
'value'=>$days
)
);
$this->formField(
getMLText("startdate"),
$this->getDateChooser(getReadableDate($startts), "startdate", $this->params['session']->getLanguage(), '', '')
);
$this->formField(
getMLText("enddate"),
$this->getDateChooser(getReadableDate($endts), "enddate", $this->params['session']->getLanguage(), '', '')
);
$this->formSubmit("<i class=\"fa fa-refresh\"></i> ".getMLText('update'));
?>
</form>
<?php
$this->columnEnd();
$this->columnStart(8);
if($docs = $dms->getDocumentsExpired(-1400, null, $orderby, $orderdir, true)) { if(is_numeric($days)) {
$docs = $dms->getDocumentsExpired($days, null, $orderby, $orderdir, true);
$this->contentHeading(''.$days);
} else {
$d = [];
if($startts)
$d['start'] = $startts;
if($endts)
$d['end'] = $endts;
$docs = $dms->getDocumentsExpired($d, null, $orderby, $orderdir, true);
$this->contentHeading(getReadableDate($startts)." - ".getReadableDate($endts));
}
if($docs) {
print "<table class=\"table table-condensed\">"; print "<table class=\"table table-condensed table-sm\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th></th>"; print "<th></th>";
print "<th>".getMLText("name"); print "<th>".getMLText("name");
print " <a class=\"order-btn\" href=\"../out/out.ExpiredDocuments.php?".($order=="na"?"&orderby=n&orderdir=d":"&orderby=n&orderdir=a")."\" \"title=\"".getMLText("sort_by_name")."\">".($order=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($order=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>"; print " <a class=\"order-btn\" href=\"../out/out.ExpiredDocuments.php?".($order=="na"?"&orderby=n&orderdir=d":"&orderby=n&orderdir=a")."&days=".$days."&startdate=".getReadableDate($startts)."&enddate=".getReadableDate($endts)."\" \"title=\"".getMLText("sort_by_name")."\">".($order=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($order=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>";
print " <a class=\"order-btn\" href=\"../out/out.ExpiredDocuments.php?".($order=="ea"?"&orderby=e&orderdir=d":"&orderby=e&orderdir=a")."\" \"title=\"".getMLText("sort_by_expiration_date")."\">".($order=="ea"?' <i class="fa fa-sort-numeric-asc selected"></i>':($order=="ed"?' <i class="fa fa-sort-numeric-desc selected"></i>':' <i class="fa fa-sort-numeric-asc"></i>'))."</a>"; print " <a class=\"order-btn\" href=\"../out/out.ExpiredDocuments.php?".($order=="ea"?"&orderby=e&orderdir=d":"&orderby=e&orderdir=a")."&days=".$days."&startdate=".getReadableDate($startts)."&enddate=".getReadableDate($endts)."\" \"title=\"".getMLText("sort_by_expiration_date")."\">".($order=="ea"?' <i class="fa fa-sort-numeric-asc selected"></i>':($order=="ed"?' <i class="fa fa-sort-numeric-desc selected"></i>':' <i class="fa fa-sort-numeric-asc"></i>'))."</a>";
print "</th>\n"; print "</th>\n";
print "<th>".getMLText("status")."</th>\n"; print "<th>".getMLText("status")."</th>\n";
print "<th>".getMLText("action")."</th>\n"; print "<th>".getMLText("action")."</th>\n";
@ -87,7 +130,8 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
} }
else $this->infoMsg(getMLText("no_docs_expired")); else $this->infoMsg(getMLText("no_docs_expired"));
// $this->contentContainerEnd(); $this->columnEnd();
$this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();