gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 23:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

workflow mode can be traditional without review

Browse Source
This commit is contained in:
Uwe Steinmann 2015-03-16 08:58:10 +01:00
parent b4195171f9
commit 8f96bbaa1d
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.SetReviewersApprovers.php
View File

@ -37,6 +37,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
$folder = $this->params['folder']; $folder = $this->params['folder'];
$document = $this->params['document']; $document = $this->params['document'];
$content = $this->params['version']; $content = $this->params['version'];
$workflowmode = $this->params['workflowmode'];
$enableadminrevapp = $this->params['enableadminrevapp']; $enableadminrevapp = $this->params['enableadminrevapp'];
$enableownerrevapp = $this->params['enableownerrevapp']; $enableownerrevapp = $this->params['enableownerrevapp'];
$enableselfrevapp = $this->params['enableselfrevapp']; $enableselfrevapp = $this->params['enableselfrevapp'];
@ -82,6 +83,9 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
<form action="../op/op.SetReviewersApprovers.php" method="post" name="form1"> <form action="../op/op.SetReviewersApprovers.php" method="post" name="form1">
<?php
if($workflowmode != 'traditional_only_approval') {
?>
<?php $this->contentSubHeading(getMLText("update_reviewers"));?> <?php $this->contentSubHeading(getMLText("update_reviewers"));?>
<div class="cbSelectTitle"><?php printMLText("individuals")?>:</div> <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
@ -151,6 +155,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
} }
?> ?>
</select> </select>
<?php } ?>
<?php $this->contentSubHeading(getMLText("update_approvers"));?> <?php $this->contentSubHeading(getMLText("update_approvers"));?>

1
views/bootstrap/class.Settings.php
View File

@ -470,6 +470,7 @@ if(!is_writeable($settings->_configFilePath)) {
<td> <td>
<select name="workflowMode"> <select name="workflowMode">
<option value="traditional" <?php if ($settings->_workflowMode=='traditional') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional");?></option> <option value="traditional" <?php if ($settings->_workflowMode=='traditional') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional");?></option>
<option value="traditional_only_approval" <?php if ($settings->_workflowMode=='traditional_only_approval') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional_only_approval");?></option>
<option value="advanced" <?php if ($settings->_workflowMode=='advanced') echo "selected" ?>><?php printMLText("settings_workflowMode_valadvanced");?></option> <option value="advanced" <?php if ($settings->_workflowMode=='advanced') echo "selected" ?>><?php printMLText("settings_workflowMode_valadvanced");?></option>
</select> </select>
</td> </td>

6
views/bootstrap/class.UpdateDocument.php
View File

@ -132,7 +132,7 @@ function checkForm()
$latestContent = $document->getLatestContent(); $latestContent = $document->getLatestContent();
$reviewStatus = $latestContent->getReviewStatus(); $reviewStatus = $latestContent->getReviewStatus();
$approvalStatus = $latestContent->getApprovalStatus(); $approvalStatus = $latestContent->getApprovalStatus();
if($workflowmode != 'traditional') { if($workflowmode == 'advanced') {
if($status = $latestContent->getStatus()) { if($status = $latestContent->getStatus()) {
if($status["status"] == S_IN_WORKFLOW) { if($status["status"] == S_IN_WORKFLOW) {
$this->warningMsg("The current version of this document is in a workflow. This will be interrupted and cannot be completed if you upload a new version."); $this->warningMsg("The current version of this document is in a workflow. This will be interrupted and cannot be completed if you upload a new version.");
@ -204,10 +204,11 @@ function checkForm()
<?php <?php
} }
} }
if($workflowmode == 'traditional') { if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
// Retrieve a list of all users and groups that have review / approve // Retrieve a list of all users and groups that have review / approve
// privileges. // privileges.
$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp); $docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
if($workflowmode != 'traditional_only_approval') {
?> ?>
<tr> <tr>
<td colspan="2"> <td colspan="2">
@ -346,6 +347,7 @@ function checkForm()
?> ?>
</td> </td>
</tr> </tr>
<?php } ?>
<tr> <tr>
<td colspan=2> <td colspan=2>
<?php $this->contentSubHeading(getMLText("assign_approvers")); ?> <?php $this->contentSubHeading(getMLText("assign_approvers")); ?>

16
views/bootstrap/class.ViewDocument.php
View File

@ -115,7 +115,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
/* Retrieve latest content */ /* Retrieve latest content */
$latestContent = $document->getLatestContent(); $latestContent = $document->getLatestContent();
$needwkflaction = false; $needwkflaction = false;
if($workflowmode == 'traditional') { if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
} else { } else {
$workflow = $latestContent->getWorkflow(); $workflow = $latestContent->getWorkflow();
if($workflow) { if($workflow) {
@ -259,11 +259,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<li><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li> <li><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
<?php <?php
} }
if($workflowmode == 'traditional') { if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if((is_array($reviewStatus) && count($reviewStatus)>0) || if((is_array($reviewStatus) && count($reviewStatus)>0) ||
(is_array($approvalStatus) && count($approvalStatus)>0)) { (is_array($approvalStatus) && count($approvalStatus)>0)) {
?> ?>
<li><a data-target="#revapp" data-toggle="tab"><?php echo getMLText('reviewers')."/".getMLText('approvers'); ?></a></li> <li><a data-target="#revapp" data-toggle="tab"><?php if($workflowmode == 'traditional') echo getMLText('reviewers')."/"; echo getMLText('approvers'); ?></a></li>
<?php <?php
} }
} else { } else {
@ -383,7 +383,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($accessop->mayOverwriteStatus()) { if($accessop->mayOverwriteStatus()) {
print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>"; print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
} }
if($workflowmode == 'traditional') { if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
// Allow changing reviewers/approvals only if not reviewed // Allow changing reviewers/approvals only if not reviewed
if($accessop->maySetReviewersApprovers()) { if($accessop->maySetReviewersApprovers()) {
print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>"; print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
@ -454,7 +454,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?> ?>
</div> </div>
<?php <?php
if($workflowmode == 'traditional') { if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if((is_array($reviewStatus) && count($reviewStatus)>0) || if((is_array($reviewStatus) && count($reviewStatus)>0) ||
(is_array($approvalStatus) && count($approvalStatus)>0)) { (is_array($approvalStatus) && count($approvalStatus)>0)) {
?> ?>
@ -463,7 +463,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->contentContainerstart(); $this->contentContainerstart();
print "<table class=\"table-condensed\">\n"; print "<table class=\"table-condensed\">\n";
if (is_array($reviewStatus) && count($reviewStatus)>0) { if ($workflowmode != 'traditional_only_approval' && is_array($reviewStatus) && count($reviewStatus)>0) {
print "<tr><td colspan=5>\n"; print "<tr><td colspan=5>\n";
$this->contentSubHeading(getMLText("reviewers")); $this->contentSubHeading(getMLText("reviewers"));
@ -647,6 +647,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?> ?>
</table> </table>
</div> </div>
<?php
if($workflowmode != 'traditional_only_approval') {
?>
<div class="span6"> <div class="span6">
<legend><?php printMLText('review_log'); ?></legend> <legend><?php printMLText('review_log'); ?></legend>
<table class="table condensed"> <table class="table condensed">
@ -699,6 +702,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
</div> </div>
<?php <?php
} }
}
?> ?>
</div> </div>
</div> </div>