gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-05 07:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

show workflow state if document is in workflow

Browse Source
This commit is contained in:
Uwe Steinmann 2016-12-07 16:47:44 +01:00
parent e5ab79b067
commit 6890a8b76b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
views/bootstrap/class.MyDocuments.php
View File

@ -494,6 +494,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<th></th>\n";
print "<th>".getMLText("name")."</th>\n";
print "<th>".getMLText("owner")."</th>\n";
print "<th>".getMLText("status")."</th>\n";
print "<th>".getMLText("version")."</th>\n";
print "<th>".getMLText("last_update")."</th>\n";
print "<th>".getMLText("expires")."</th>\n";
@ -503,6 +504,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<tr>\n";
$latestContent = $document->getLatestContent();
$workflow = $latestContent->getWorkflow();
$previewer->createPreview($latestContent);
print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
if($previewer->hasPreview($latestContent)) {
@ -511,6 +513,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
}
print "</a></td>";
$workflowstate = $latestContent->getWorkflowState();
print '<td>'.getOverallStatusText($docIdx[$st["document"]][$st["version"]]["status"]).': '.$workflow->getName().'<br />'.$workflowstate->getName().'</td>';
print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
print "<td>".$st["version"]."</td>";
@ -532,6 +536,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<th></th>\n";
print "<th>".getMLText("name")."</th>\n";
print "<th>".getMLText("owner")."</th>\n";
print "<th>".getMLText("status")."</th>\n";
print "<th>".getMLText("version")."</th>\n";
print "<th>".getMLText("last_update")."</th>\n";
print "<th>".getMLText("expires")."</th>\n";
@ -541,6 +546,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<tr>\n";
$latestContent = $document->getLatestContent();
$workflow = $latestContent->getWorkflow();
$previewer->createPreview($latestContent);
print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
if($previewer->hasPreview($latestContent)) {
@ -551,6 +557,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "</a></td>";
print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
$workflowstate = $latestContent->getWorkflowState();
print '<td>'.getOverallStatusText($docIdx[$st["document"]][$st["version"]]["status"]).': '.$workflow->getName().'<br />'.$workflowstate->getName().'</td>';
print "<td>".$st["version"]."</td>";
print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";
@ -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 "<tr>\n";
$latestContent = $document->getLatestContent();
if($workflowmode == 'advanced')
$workflow = $latestContent->getWorkflow();
$previewer->createPreview($latestContent);
print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
if($previewer->hasPreview($latestContent)) {
@ -710,7 +720,12 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
}
print "</a></td>";
print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
print "<td>".getOverallStatusText($res["status"])."</td>";
if($workflowmode == 'advanced' && $workflow) {
$workflowstate = $latestContent->getWorkflowState();
print '<td>'.getOverallStatusText($res["status"]).': '.$workflow->getName().'<br />'.$workflowstate->getName().'</td>';
} else {
print "<td>".getOverallStatusText($res["status"])."</td>";
}
print "<td>".$res["version"]."</td>";
print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";