diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
index 3b3bfc9..4da80f9 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
@@ -301,100 +301,6 @@ function renderDocumentArchiveSettings($oDocument, $bEditable) {
return $sToRender;
}
-function renderEditableDocumentRouting($oDocument) {
- global $default;
- /*ok*/ $sQuery = array("SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.name, U2.name) AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done, 'Edit User' as edit " .
- "FROM $default->documents_table AS D INNER JOIN $default->groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " .
- "INNER JOIN $default->roles_table AS R ON GFAL.role_id = R.id " .
- "LEFT OUTER JOIN $default->folders_user_roles_table AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " .
- "LEFT OUTER JOIN $default->users_table AS U ON FURL.user_id = U.id " .
- "LEFT OUTER JOIN $default->users_table AS U2 ON GFAL.user_id = U2.id " .
- "WHERE D.id = ? " .
- "ORDER BY GFAL.precedence, role_name ASC", $oDocument->getID());
- $aColumns = array("role_name", "name", "precedence", "active", "done", "edit");
- $aColumnHeaders = array(_("Role"), _("User"), _("Seq"), _("Active"), _("Done"), _("Edit"));
- $aColumnTypes = array(1,1,1,2,2,3);
- $aDBColumnArray = array("id","document_id","active","done");
- $aQueryStringVariableNames = array("fFolderCollaborationID", "fDocumentID","fIsActive","fIsDone");
- $aLinkURLs = array(5=>"$default->rootUrl/control.php?action=modifyDocumentRouting");
-
- $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames);
- $oPatternTableSqlQuery->setTableHeading(_("Document Routing"));
- $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
-
- $sToRender .= "\t
\n";
- $sToRender .= "\t\n";
- $sToRender .= "\t\t| " . $oPatternTableSqlQuery->render() . " | \n";
- $sToRender .= "\t
";
- $sToRender .= "\t\n";
- // display the begin collaboration button if:
- // collaboration cannot be started or approved/rejected unless the document is not checked out
- // the document has collaboration
- // collaboration hasn't started
- // the current user created the document, or is a system adminstrator
- if (!$oDocument->getIsCheckedOut() &&
- $oDocument->hasCollaboration() &&
- (!DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) &&
- ( ($_SESSION["userID"] == $oDocument->getCreatorID()) || Permission::userIsSystemAdministrator() ) ) {
- //if not all collaboration steps have been set, then you cannot start the collaboration process
- //only the creator of the document can start the collaboration process
- $sToRender .= "\t\tgetID() . "&fBeginCollaboration=1> ";
- $sToRender .= " | \n";
- // else if collboration has started and the current user has been assigned this step, display the approve/reject buttons
- } else if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($oDocument->getID())) {
- //if the current user is responsible for an active step in the collaboration process
- $sToRender .= "\t\t | \n";
- }
-
- $sToRender .= "\t
";
- $sToRender .= "\t
\n";
-
- return $sToRender;
-}
-
-function renderNonEditableDocumentRouting($oDocument) {
- global $default;
- /*ok*/ $sQuery = array("SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done " .
- "FROM $default->documents_table AS D INNER JOIN $default->groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " .
- "INNER JOIN $default->roles_table AS R ON GFAL.role_id = R.id " .
- "LEFT OUTER JOIN $default->folders_user_roles_table AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " .
- "LEFT OUTER JOIN $default->users_table AS U ON FURL.user_id = U.id " .
- "WHERE D.id = ? " .
- "ORDER BY GFAL.precedence, role_name ASC", $oDocument->getID());
-
- $aColumns = array("role_name", "name", "precedence", "active", "done");
- $aColumnHeaders = array(_("Role"), _("User"), _("Seq"), _("Active"), _("Done"));
- $aColumnTypes = array(1,1,1,2,2);
- $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500", "$default->rootUrl/control.php?action=modifyDocumentRouting",$aDBColumnArray,$aQueryStringVariableNames);
- $oPatternTableSqlQuery->setTableHeading(_("Document Routing"));
- $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
-
- $sToRender .= "\t\n";
- $sToRender .= "\t\n";
- $sToRender .= "\t\t| " . $oPatternTableSqlQuery->render() . " | \n";
- $sToRender .= "\t
";
-
- if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($oDocument->getID())) {
- //if the current user is responsible for an active step in the collaboration process
- $sToRender .= "\t\t |
\n";
- }
-
- $sToRender .= "\t
\n";
-
- return $sToRender;
-}
-
function renderEditableLinkedDocuments($oDocument) {
global $default;
@@ -628,7 +534,6 @@ function getPage($oDocument, $bEdit, $sStatusMessage = "") {
$sToRender .= renderDocumentSection("genericMetaData", _("Generic Meta Data"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("typeSpecificMetaData", _("Type Specific Meta Data"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("archiveSettings", _("Archive Settings"), $bDisplayLink, $oDocument->getID());
- $sToRender .= renderDocumentSection("documentRouting", _("Document Routing"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("linkedDocuments", _("Linked Documents"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("metadataVersions", _("Metadata Versions"), $bDisplayLink, $oDocument->getID());
@@ -648,10 +553,8 @@ function getPage($oDocument, $bEdit, $sStatusMessage = "") {
$sToRender .= renderSectionDiv("typeSpecificMetaData", renderTypeSpecificMetaData($oDocument, $bEdit));
$sToRender .= renderSectionDiv("archiveSettings", renderDocumentArchiveSettings($oDocument, $bEdit));
if ($bEdit) {
- $sToRender .= renderSectionDiv("documentRouting", renderEditableDocumentRouting($oDocument));
$sToRender .= renderSectionDiv("linkedDocuments", renderEditableLinkedDocuments($oDocument) . renderDependantDocuments($oDocument, $bEdit));
} else {
- $sToRender .= renderSectionDiv("documentRouting", renderNonEditableDocumentRouting($oDocument));
$sToRender .= renderSectionDiv("linkedDocuments", renderNonEditableLinkedDocuments($oDocument, $bEdit) . renderDependantDocuments($oDocument, $bEdit));
}
$sToRender .= renderSectionDiv("metadataVersions", renderDocumentVersions($oDocument));
@@ -692,7 +595,6 @@ function getStatusPage($oDocument, $sStatusMessage) {
$sToRender .= renderDocumentSection("genericMetaData", _("Generic Meta Data"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("typeSpecificMetaData", _("Type Specific Meta Data"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("archiveSettings", _("Archive Settings"), $bDisplayLink, $oDocument->getID());
- $sToRender .= renderDocumentSection("documentRouting", _("Document Routing"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("linkedDocuments", _("Linked Documents"), $bDisplayLink, $oDocument->getID());
$sToRender .= renderDocumentSection("metadataVersions", _("Document Versions"), $bDisplayLink, $oDocument->getID());
$sToRender .= "";