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

revision and receipt is also availabe in advanced workflow mode

Browse Source
This commit is contained in:
Uwe Steinmann 2018-03-27 18:23:00 +02:00
parent c0215ffef3
commit 820b88c9cf
1 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
views/bootstrap/class.Tasks.php
View File

@ -68,45 +68,42 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
} }
} }
} }
if($workflowmode == 'traditional') if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) { $tasks['receipt'] = array();
$tasks['receipt'] = array(); $resArr = $dms->getDocumentList('ReceiptByMe', $user);
$resArr = $dms->getDocumentList('ReceiptByMe', $user); if($resArr) {
if($resArr) { foreach ($resArr as $res) {
foreach ($resArr as $res) { $document = $dms->getDocument($res["id"]);
$document = $dms->getDocument($res["id"]); if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { $tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
}
} }
} }
} }
if($workflowmode == 'traditional') }
if(!$tasksinmenu || in_array('revision', $tasksinmenu)) { if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
$tasks['revision'] = array(); $tasks['revision'] = array();
$resArr = $dms->getDocumentList('ReviseByMe', $user); $resArr = $dms->getDocumentList('ReviseByMe', $user);
if($resArr) { if($resArr) {
foreach ($resArr as $res) { foreach ($resArr as $res) {
$document = $dms->getDocument($res["id"]); $document = $dms->getDocument($res["id"]);
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']); $tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
}
} }
} }
} }
if($workflowmode == 'traditional') }
if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) { if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
$tasks['needscorrection'] = array(); $tasks['needscorrection'] = array();
$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user); $resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
if($resArr) { if($resArr) {
foreach ($resArr as $res) { foreach ($resArr as $res) {
$document = $dms->getDocument($res["id"]); $document = $dms->getDocument($res["id"]);
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']); $tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
}
} }
} }
} }
}
if($workflowmode == 'advanced') if($workflowmode == 'advanced')
if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) { if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
$tasks['workflow'] = array(); $tasks['workflow'] = array();
@ -188,14 +185,14 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$ct[] = count($tasks['review']); $ct[] = count($tasks['review']);
if(isset($tasks['approval'])) if(isset($tasks['approval']))
$ct[] = count($tasks['approval']); $ct[] = count($tasks['approval']);
if(isset($tasks['workflow']))
$ct[] = count($tasks['workflow']);
if(isset($tasks['receipt'])) if(isset($tasks['receipt']))
$ct[] = count($tasks['receipt']); $ct[] = count($tasks['receipt']);
if(isset($tasks['revision'])) if(isset($tasks['revision']))
$ct[] = count($tasks['revision']); $ct[] = count($tasks['revision']);
if(isset($tasks['needscorrection'])) if(isset($tasks['needscorrection']))
$ct[] = count($tasks['needscorrection']); $ct[] = count($tasks['needscorrection']);
if(isset($tasks['workflow']))
$ct[] = count($tasks['workflow']);
$content .= implode('/', $ct); $content .= implode('/', $ct);
$content .= ")"; $content .= ")";
if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow'])) { if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow'])) {
@ -223,17 +220,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$content .= " </ul>\n"; $content .= " </ul>\n";
$content .= " </li>\n"; $content .= " </li>\n";
} }
if(!empty($tasks['receipt'])) {
$content .= " <li class=\"dropdown-submenu\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n";
foreach($tasks['receipt'] as $t) {
$doc = $dms->getDocument($t['id']);
$content .= " <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
}
$content .= " </ul>\n";
$content .= " </li>\n";
}
if(!empty($tasks['workflow'])) { if(!empty($tasks['workflow'])) {
$content .= " <li class=\"dropdown-submenu\">\n"; $content .= " <li class=\"dropdown-submenu\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n"; $content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n";
@ -245,6 +231,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$content .= " </ul>\n"; $content .= " </ul>\n";
$content .= " </li>\n"; $content .= " </li>\n";
} }
if(!empty($tasks['receipt'])) {
$content .= " <li class=\"dropdown-submenu\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
$content .= " <ul class=\"dropdown-menu\" role=\"menu\">\n";
foreach($tasks['receipt'] as $t) {
$doc = $dms->getDocument($t['id']);
$content .= " <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
}
$content .= " </ul>\n";
$content .= " </li>\n";
}
if(!empty($tasks['revision'])) { if(!empty($tasks['revision'])) {
$content .= " <li class=\"dropdown-submenu\">\n"; $content .= " <li class=\"dropdown-submenu\">\n";
$content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n"; $content .= " <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";