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

set end date to end of day if day is set

Browse Source
This commit is contained in:
Uwe Steinmann 2015-11-19 07:16:46 +01:00
parent f5bf326605
commit 2f15d75508
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
views/bootstrap/class.Timeline.php
View File

@ -82,13 +82,13 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
} }
if($todate) { if($todate) {
$to = makeTsFromLongDate($todate.' 00:00:00'); $to = makeTsFromLongDate($todate.' 23:59:59');
} else { } else {
$to = time()-7*86400; $to = time()-7*86400;
} }
if($data = $dms->getTimeline($from, $to)) { if($data = $dms->getTimeline($from, $to)) {
foreach($data as &$item) { foreach($data as $i=>$item) {
switch($item['type']) { switch($item['type']) {
case 'add_version': case 'add_version':
$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'])); $msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
@ -102,7 +102,7 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
default: default:
$msg = '???'; $msg = '???';
} }
$item['msg'] = $msg; $data[$i]['msg'] = $msg;
} }
} }
@ -144,7 +144,7 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
} }
if($todate) { if($todate) {
$to = makeTsFromLongDate($todate.' 00:00:00'); $to = makeTsFromLongDate($todate.' 23:59:59');
} else { } else {
$to = time(); $to = time();
} }
@ -206,7 +206,6 @@ echo "<div class=\"well\">\n";
$(document).ready(function () { $(document).ready(function () {
$('#update').click(function(ev){ $('#update').click(function(ev){
ev.preventDefault(); ev.preventDefault();
console.log($('#form1').serialize());
$.getJSON( $.getJSON(
'out.Timeline.php?action=data&' + $('#form1').serialize(), 'out.Timeline.php?action=data&' + $('#form1').serialize(),
function(data) { function(data) {