corrected version_history and metadata history.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4268 c91229c3-7414-0410-bfa2-8a42b809f60b

corrected version_history and metadata history.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4268 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 1a396b9c
Showing 4 changed files with 117 additions and 20 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php
templates/kt3/document/metadata_history.smarty
templates/kt3/view_document_history.smarty
@@ -246,8 +246,26 @@ class KTEditDocumentDispatcher extends KTStandardDispatcher {
 		//return '<pre>' . print_r($field_values, true) . '</pre>';
 		$this->startTransaction();
+		$res = KTDocumentUtil::createMetadataVersion($oDocument);
+		if (PEAR::isError($res)) {
+		     $this->errorRedirectToMain('Unable to create a metadata version of the document.');
+		}
+		
+		$oDocument->setLastModifiedDate(getCurrentDateTime());
+		$oDocument->setModifiedUserId($this->oUser->getId());
+        $oDocumentTransaction = & new DocumentTransaction($oDocument->getID(), 'update metadata.', UPDATE);
+        $res = $oDocumentTransaction->create();
+		if (PEAR::isError($res)) {
+		     $this->errorRedirectToMain('Failed to create transaction.');
+		}
+		
+		$res = $oDocument->update();
+		if (PEAR::isError($res)) {
+		     $this->errorRedirectToMain('Failed to change basic details about the document..');
+		}
 		$res = KTDocumentUtil::saveMetadata($oDocument, $field_values);
+		
 		if (PEAR::isError($res)) {
 		   $this->rollbackTransaction();		
@@ -185,6 +185,45 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 	}
+    function do_versionhistory() {	 
+	    // this is the list of documents past.
+		$document_data = array();
+		$document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
+		if ($document_id === null) { 
+		    $this->oPage->addError('No document was requested.  Please <a href="/presentation/lookAndFeel/knowledgeTree/browse.php">browse</a> for one.');
+			return $this->do_error();
+		}
+		$document_data["document_id"] = $document_id;
+		
+		// try get the document.
+		$oDocument =& Document::get($document_id);
+		if (PEAR::isError($oDocument)) {
+		    $this->oPage->addError('The document you attempted to retrieve is invalid.   Please <a href="/presentation/lookAndFeel/knowledgeTree/browse.php">browse</a> for one.');
+			return $this->do_error();		
+		}
+		// fixme check perms
+		
+		$this->oDocument =& $oDocument;
+        $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument));
+		$this->oPage->setBreadcrumbDetails("history");
+		$this->addPortlets("History");
+		
+		$aVersions = Document::getByLiveDocument($oDocument);
+		//var_dump($aVersions);
+		
+		// render pass.
+		$this->oPage->title = "Document History : " . $oDocument->getName();
+        $oTemplating = new KTTemplating;
+		$oTemplate = $oTemplating->loadTemplate("kt3/document/metadata_history");
+		$aTemplateData = array(
+              "context" => $this,
+			  "document_id" => $document_id,
+			  "document" => $oDocument,
+			  "versions" => $aVersions,
+		);
+		return $oTemplate->render($aTemplateData);		
+	}
+	
 	// FIXME refactor out the document-info creation into a single utility function.
 	// this gets in:
 	//   fDocumentId (document to compare against)
@@ -219,17 +258,20 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 			return $this->do_error();
 		}
-		// FIXME when transaction history accurately stores metadata_version, this is no longer required.
-		// FIXME detect that the metadata_version was "manufactured"
-		// <testing>
-		$oComparison =& $oDocument;
-		$comparison_data =& $document_data; // no copy.
-		
-		// </testing>
-		
-		
+		$oComparison =& Document::get($comparison_version);
+		if (PEAR::isError($oComparison)) {
+		    $this->errorRedirectToMain('Invalid document to compare against.');
+		}
+		$comparison_data = array();
+		$comparison_data['document_id'] = $oComparison->getId();
+
 		$document_data["document"] = $oDocument;
+		$comparison_data['document'] = $oComparison;
+		
 		$document_data["document_type"] =& DocumentType::get($oDocument->getDocumentTypeID());
+		$comparison_data["document_type"] =& DocumentType::get($oComparison->getDocumentTypeID());
+		
+		// follow twice:  once for normal, once for comparison.
 		$is_valid_doctype = true;
 		if (PEAR::isError($document_data["document_type"])) {
@@ -247,9 +289,16 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		$document_data["field_values"] = $field_values;
+		$mdlist =& DocumentFieldLink::getList(array('document_id = ?', array($comparison_version)));
+
+		$field_values = array();
+		foreach ($mdlist as $oFieldLink) {
+            $field_values[$oFieldLink->getDocumentFieldID()] = $oFieldLink->getValue();
+		}
+		
+		$comparison_data["field_values"] = $field_values;
+
-		// FIXME generate portlets
-		// FIXME generate breadcrumb
 		// Fieldset generation.
 		// 
@@ -281,11 +330,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 				array_push($fieldsets, new $displayClass($oFieldset));
 			}
 		}
-		
-		// <testing>
-		$document_data["is_manufactured"] = 1;
-		// </testing>
-		
+			
 		// FIXME handle ad-hoc fieldsets.
         $oTemplating = new KTTemplating;
@@ -308,6 +353,11 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 	    return ''; // allow normal rendering of errors.
 		// FIXME show something useful / generic.
 	}
+	
+	function getUserForId($iUserId) {
+	    $u = User::get($iUserId);
+		return $u->getName();
+	} 
 }
 $oDispatcher = new ViewDocumentDispatcher;
+<h2>Metadata History: {$document->getName()}</h2>
+
+<p class="descriptiveText">This lists the older versions of the document, as the metadata about it has been changed.</p>
+
+
+    <table class="document_history" summary="Document History for KnowledgeTree New UI Presentation" cellspacing="0">
+
+        <thead>
+            <tr>
+                <th class="username">User</th>
+                <th class="date">Content Version</th>
+                <th class="compare">Compare</th>
+
+            </tr>
+        </thead>
+        <tbody>
+            <tr class="{cycle options=even,odd}">
+                <td class="username">{$context->getUserForId($document->getModifiedUserId())}</td>
+                <td class="date">{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</td>
+                <td class="compare">Current</td>                
+            </tr>
+
+          {foreach item=oVersion from=$versions}
+            <tr class="{cycle options=even,odd}">
+                <td class="username">{$context->getUserForId($oVersion->getModifiedUserId())}</td>
+                <td class="date">{$oVersion->getMajorVersionNumber()}.{$oVersion->getMinorVersionNumber()}</td>
+                <td class="compare"><a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getId()}">compare with current</a></td>                
+            </tr>
+            {/foreach}
+        </tbody>
+        
+    </table>
@@ -11,7 +11,7 @@
                 <th class="action">Action</th>
                 <th class="date">Date</th>
                 <th class="contentversion">Content version</th>
-                <th class="comment" colspan="2">Comment</th>
+                <th class="comment">Comment</th>
             </tr>
         </thead>
         <tbody>
@@ -22,9 +22,6 @@
                 <td class="date">{$aTransactionRow.datetime}</td>
                 <td class="contentversion">{$aTransactionRow.version}</td>                
                 <td class="comment">{$aTransactionRow.comment}</td>
-                <td class="compare">
-                    <a href="?action=viewComparison&fDocumentId={$document_id}&fComparisonVersion={$aTransactionRow.version}">Compare with current version</a>
-                </td>
             </tr>
             {/foreach}
         </tbody>