Merge branch 'seeddms-5.0.x' into develop

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -2521,6 +2521,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$timeline = array();
 
+		/* No need to add entries for new version because the status log
+		 * will generate an entry as well.
 		$queryStr = "SELECT * FROM tblDocumentContent WHERE document = " . $this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
@@ -2530,6 +2532,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$date = date('Y-m-d H:i:s', $row['date']);
 			$timeline[] = array('date'=>$date, 'msg'=>'Added version '.$row['version'], 'type'=>'add_version', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
 		}
+		 */
 
 		$queryStr = "SELECT * FROM tblDocumentFiles WHERE document = " . $this->_id;
 		$resArr = $db->getResultArray($queryStr);

views/bootstrap/class.Bootstrap.php

@@ -2244,7 +2244,9 @@ mayscript>
 	 *
 	 * @param object $document document
 	 */
-	protected function printTimeline($timeline, $height=300) { /* {{{ */
+	protected function printTimeline($timeline, $height=300, $start='', $end='') { /* {{{ */
+		if(!$timeline)
+			return;
 ?>
 	<script type="text/javascript">
 		var timeline;
@@ -2253,7 +2255,7 @@ mayscript>
 		data = [
 <?php 
 		foreach($timeline as $item) {
-			echo "{'start': new Date('".$item['date']."'), 'content': '".$item['msg']."'},";
+			echo "{'start': new Date('".$item['date']."'), 'content': '".$item['msg']."'},\n";
 		}
 ?>
 			/* {
@@ -2265,8 +2267,19 @@ mayscript>
 		// specify options
 		var options = {
 			'width':  '100%',
-			'height': '<?= $height ?>px',
-			'editable': false,   // enable dragging and editing events
+			'height': '100%',
+<?php
+		if($start) {
+			$tmp = explode('-', $start);
+			echo "\t\t\t'min': new Date(".$tmp[0].", ".($tmp[1]-1).", ".$tmp[2]."),\n";
+		}
+		if($end) {
+			$tmp = explode('-', $end);
+			echo "'\t\t\tmax': new Date(".$tmp[0].", ".($tmp[1]-1).", ".$tmp[2]."),\n";
+		}
+?>
+			'_editable': false,
+			'selectable': false,
 			'style': 'box',
 			'locale': 'de_DE'
 		};
@@ -2279,7 +2292,7 @@ mayscript>
 		});
 
 	</script>
-	<div id="timeline"></div>
+	<div id="timeline" style="height: <?= $height ?>px;"></div>
 <?php
 	} /* }}} */
 }

views/bootstrap/class.Timeline.php

@@ -87,23 +87,25 @@ echo "</div>\n";
 
 echo "<div class=\"span9\">\n";
 $this->contentHeading(getMLText("timeline"));
-		foreach($data as &$item) {
-			switch($item['type']) {
-			case 'add_version':
-				$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
-				break;
-			case 'add_file':
-				$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
-				break;
-			case 'status_change':
-				$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-				break;
-			default:
-				$msg = '???';
-			}
-			$item['msg'] = $msg;
+if($data) {
+	foreach($data as &$item) {
+		switch($item['type']) {
+		case 'add_version':
+			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
+			break;
+		case 'add_file':
+			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
+			break;
+		case 'status_change':
+			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+			break;
+		default:
+			$msg = '???';
 		}
-$this->printTimeline($data, 550);
+		$item['msg'] = $msg;
+	}
+	$this->printTimeline($data, 550, date('Y-m-d', $from), date('Y-m-d', $to+1));
+}
 echo "</div>\n";
 echo "</div>\n";
 

views/bootstrap/class.ViewDocument.php

@@ -1404,23 +1404,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($user->isAdmin()) {
 			$this->contentHeading(getMLText("timeline"));
 			$timeline = $document->getTimeline();
-			foreach($timeline as &$item) {
-				switch($item['type']) {
-				case 'add_version':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
-					break;
-				case 'add_file':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
-					break;
-				case 'status_change':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-					break;
-				default:
-					$msg = '???';
+			if($timeline) {
+				foreach($timeline as &$item) {
+					switch($item['type']) {
+					case 'add_version':
+						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
+						break;
+					case 'add_file':
+						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
+						break;
+					case 'status_change':
+						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+						break;
+					default:
+						$msg = '???';
+					}
+					$item['msg'] = $msg;
 				}
-				$item['msg'] = $msg;
+				$this->printTimeline($timeline, 300, '', date('Y-m-d'));
 			}
-			$this->printTimeline($timeline);
 		}
 ?>
 		  </div>