From 6890a8b76b0839fdcc29b28ec7ef8f1b81a153c9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 7 Dec 2016 16:47:44 +0100 Subject: [PATCH 1/2] show workflow state if document is in workflow --- views/bootstrap/class.MyDocuments.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 675e3e5df..d6b3d8894 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -494,6 +494,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n"; print "".getMLText("name")."\n"; print "".getMLText("owner")."\n"; + print "".getMLText("status")."\n"; print "".getMLText("version")."\n"; print "".getMLText("last_update")."\n"; print "".getMLText("expires")."\n"; @@ -503,6 +504,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n"; $latestContent = $document->getLatestContent(); + $workflow = $latestContent->getWorkflow(); $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { @@ -511,6 +513,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; + $workflowstate = $latestContent->getWorkflowState(); + print ''.getOverallStatusText($docIdx[$st["document"]][$st["version"]]["status"]).': '.$workflow->getName().'
'.$workflowstate->getName().''; print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"]).""; print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"]).""; print "".$st["version"].""; @@ -532,6 +536,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n"; print "".getMLText("name")."\n"; print "".getMLText("owner")."\n"; + print "".getMLText("status")."\n"; print "".getMLText("version")."\n"; print "".getMLText("last_update")."\n"; print "".getMLText("expires")."\n"; @@ -541,6 +546,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n"; $latestContent = $document->getLatestContent(); + $workflow = $latestContent->getWorkflow(); $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { @@ -551,6 +557,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print ""; print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"]).""; print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"]).""; + $workflowstate = $latestContent->getWorkflowState(); + print ''.getOverallStatusText($docIdx[$st["document"]][$st["version"]]["status"]).': '.$workflow->getName().'
'.$workflowstate->getName().''; print "".$st["version"].""; print "".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]).""; print "".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"])).""; @@ -614,7 +622,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { // verify expiry if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ - if ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){ + if ( $res["status"]==S_IN_WORKFLOW ){ $res["status"]=S_EXPIRED; } } @@ -701,6 +709,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n"; $latestContent = $document->getLatestContent(); + if($workflowmode == 'advanced') + $workflow = $latestContent->getWorkflow(); $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { @@ -710,7 +720,12 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } print ""; print "" . htmlspecialchars($res["name"]) . "\n"; - print "".getOverallStatusText($res["status"]).""; + if($workflowmode == 'advanced' && $workflow) { + $workflowstate = $latestContent->getWorkflowState(); + print ''.getOverallStatusText($res["status"]).': '.$workflow->getName().'
'.$workflowstate->getName().''; + } else { + print "".getOverallStatusText($res["status"]).""; + } print "".$res["version"].""; print "".$res["statusDate"]." ".htmlspecialchars($res["statusName"]).""; print "".(!$res["expires"] ? "-":getReadableDate($res["expires"])).""; From d2d731fc816c3bd55d5b73baaf0d49bdb1610384 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 7 Dec 2016 16:48:07 +0100 Subject: [PATCH 2/2] add entry for 4.3.31 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index d4713cd73..325661e4a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ - uncheck checkbox for expiration date if date is selected. - remove some old references to Lucene when indexing a document uploaded by fast upload +- show workflow state in list of documents instead of just 'in workflow' -------------------------------------------------------------------------------- Changes in version 4.3.30