diff --git a/tests/documentmanagement/viewBL.php b/tests/documentmanagement/viewBL.php index b886771..4b7ae80 100644 --- a/tests/documentmanagement/viewBL.php +++ b/tests/documentmanagement/viewBL.php @@ -228,9 +228,9 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); if ($oDocument->isLive()) { if (Permission::userHasDocumentWritePermission($fDocumentID)) { - $oPatternCustom->setHtml(getEditPage($oDocument)); + $oPatternCustom->setHtml(getPage($oDocument, true)); } else if (Permission::userHasDocumentReadPermission($fDocumentID)) { - $oPatternCustom->setHtml(getViewPage($oDocument)); + $oPatternCustom->setHtml(getPage($oDocument, false)); } } else if ($oDocument->isArchived()) { // cancel @@ -238,12 +238,13 @@ if (checkSession()) { $main->setErrorMessage("This document has been archived."); } $main->setCentralPayload($oPatternCustom); + $main->setDHTMLScrolling(false); $main->setOnLoadJavaScript("switchDiv('documentData')"); $main->setFormAction("$default->rootUrl/control.php?action=modifyDocument&fDocumentID=" . $oDocument->getID()); $main->render(); } else { require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - + $oDocument = & Document::get($fDocumentID); $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml("graphicsUrl/widgets/back.gif\" border=\"0\" />\n"); $main->setErrorMessage("Either you do not have permission to view this document, or the document you have chosen no longer exists on the file system."); diff --git a/tests/documentmanagement/viewUI.inc b/tests/documentmanagement/viewUI.inc index c7ceee8..e7dc889 100644 --- a/tests/documentmanagement/viewUI.inc +++ b/tests/documentmanagement/viewUI.inc @@ -20,7 +20,7 @@ function renderDocumentPath($oDocument) { $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > "; $sDocumentPath .= "rootUrl/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php?fDocumentID=" . $oDocument->getID() . "&fForInlineView=1\">" . $oDocument->getName() . ""; - return "
$sDocumentPathActions
\n"; + return "
$sDocumentPathActions
\n"; } function renderDocumentData($oDocument, $sDivName, $bEditable) { @@ -41,7 +41,7 @@ function renderDocumentData($oDocument, $sDivName, $bEditable) { $aColumnTypes = array(1,1,1,1,1,1,1,1); $oPatternListFromQuery = & new PatternListFromQuery($sQuery, $aColumns, $aColumnNames, $aColumnTypes); $oPatternListFromQuery->setTableHeading("Document Data"); - $oPatternListFromQuery->setTableWidth("530"); + $oPatternListFromQuery->setTableWidth("400"); $sToRender .= "\t\n"; $sToRender .= "\t\n"; @@ -58,7 +58,7 @@ function renderDocumentData($oDocument, $sDivName, $bEditable) { } -function renderGenericMetaData($oDocument, $sDivName) { +function renderGenericMetaData($oDocument, $sDivName, $bEditable) { global $default; $sQuery = "SELECT DF.name AS name, DFL.value as value " . "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_fields_table AS DFL ON D.id = DFL.document_id " . @@ -75,15 +75,17 @@ function renderGenericMetaData($oDocument, $sDivName) { $sToRender .= "\t\n"; $sToRender .= "\t\n"; $sToRender .= "\t\n"; - $sToRender .= "\t\n"; - $sToRender .= "\n"; - $sToRender .= "\t\n"; + if ($bEditable) { + $sToRender .= "\t\n"; + $sToRender .= "\n"; + $sToRender .= "\t\n"; + } $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
rootUrl/control.php?action=modifyDocumentGenericMetaData&fDocumentID=" . $oDocument->getID() . "\">graphicsUrl/widgets/edit.gif\" border=\"0\">
rootUrl/control.php?action=modifyDocumentGenericMetaData&fDocumentID=" . $oDocument->getID() . "\">graphicsUrl/widgets/edit.gif\" border=\"0\">
\n"; return renderDiv($sDivName, $sToRender); } -function renderTypeSpecificMetaData($oDocument, $sDivName) { +function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { global $default; $sQuery = "SELECT DF.name AS name, DFL.value AS value " . @@ -104,15 +106,17 @@ function renderTypeSpecificMetaData($oDocument, $sDivName) { $sToRender .= "\t\n"; $sToRender .= "\t\t" . $oPatternTableSqlQuery->render() . "\n"; $sToRender .= "\t\n"; - $sToRender .= "\t\n"; - $sToRender .= "rootUrl/control.php?action=modifyDocumentTypeMetaData&fDocumentID=" . $oDocument->getID() . "\">graphicsUrl/widgets/edit.gif\" border=\"0\">\n"; - $sToRender .= "\t\n"; + if ($bEditable) { + $sToRender .= "\t\n"; + $sToRender .= "rootUrl/control.php?action=modifyDocumentTypeMetaData&fDocumentID=" . $oDocument->getID() . "\">graphicsUrl/widgets/edit.gif\" border=\"0\">\n"; + $sToRender .= "\t\n"; + } $sToRender .= "\t\n"; return renderDiv($sDivName, $sToRender); } -function renderDocumentArchiveSettings($oDocument, $sDivName) { - global $default; +function renderEditableDocumentArchiveSettings($oDocument) { + global $default; $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->owl_document_archiving_table AS da " . "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " . "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . @@ -128,17 +132,39 @@ function renderDocumentArchiveSettings($oDocument, $sDivName) { $oPatternTableSqlQuery->setTableHeading("Archiving Settings"); $oPatternTableSqlQuery->setEmptyTableMessage("No archiving settings"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); + return $oPatternTableSqlQuery->render(); +} +function renderNonEditableDocumentArchiveSettings($oDocument) { + global $default; + $sQuery = "SELECT d.id, atl.name FROM $default->owl_document_archiving_table AS da " . + "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " . + "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . + "WHERE d.id = " . $oDocument->getID(); + $aColumns = array("name"); + $aColumnHeaders = array("Archiving Type"); + $aColumnTypes = array(1); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540", $aLinkURLs ,$aDBColumnArray,$aQueryStringVariableNames); + $oPatternTableSqlQuery->setTableHeading("Archiving Settings"); + $oPatternTableSqlQuery->setEmptyTableMessage("No archiving settings"); + $oPatternTableSqlQuery->setDisplayColumnHeadings(true); + return $oPatternTableSqlQuery->render(); +} + +function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) { + global $default; $sToRender .= "\t\n"; $sToRender .= "\t\n"; - $sToRender .= "\t\t\n"; + $sToRender .= "\t\t\n"; $sToRender .= "\t"; - $sToRender .= "\t \n"; - // if there are no archiving settings then allow their addition - $oDocumentArchiving = DocumentArchiving::getFromDocumentID($oDocument->getID()); - $sToRender .= "\t\t\n"; - $sToRender .= "\t"; + if ($bEditable) { + $sToRender .= "\t\n"; + // if there are no archiving settings then allow their addition + $oDocumentArchiving = DocumentArchiving::getFromDocumentID($oDocument->getID()); + $sToRender .= "\t\t\n"; + $sToRender .= "\t"; + } $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "" . ($bEditable ? renderEditableDocumentArchiveSettings($oDocument) : renderNonEditableDocumentArchiveSettings($oDocument)) . "
" . ($oDocumentArchiving ? "" : generateControllerLink("addDocumentArchiveSettings", "fDocumentID=" . $oDocument->getID(), "graphicsUrl/widgets/add.gif\" border=\"0\"/>")) . "
" . ($oDocumentArchiving ? "" : generateControllerLink("addDocumentArchiveSettings", "fDocumentID=" . $oDocument->getID(), "graphicsUrl/widgets/add.gif\" border=\"0\"/>")) . "
\n"; return renderDiv($sDivName, $sToRender); @@ -206,7 +232,7 @@ function renderEditableDocumentRouting($oDocument, $sDivName) { return renderDiv($sDivName, $sToRender); } -function renderNonEditableDocumentRouting($oDocument) { +function renderNonEditableDocumentRouting($oDocument, $sDivName) { global $default; $sQuery = "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 documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . @@ -222,8 +248,24 @@ function renderNonEditableDocumentRouting($oDocument) { $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540", "$default->rootUrl/control.php?action=modifyDocumentRouting",$aDBColumnArray,$aQueryStringVariableNames); $oPatternTableSqlQuery->setTableHeading("Document Routing"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - return $oPatternTableSqlQuery->render(); + $sToRender .= "\t\n"; + $sToRender .= "\t\n"; + $sToRender .= "\t\t\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
" . $oPatternTableSqlQuery->render() . "
\n"; + $sToRender .= "\t\t\n"; + $sToRender .= "\t\t\n"; + $sToRender .= "\t\t\n"; + $sToRender .= "\t\t
You currently have an active role
in the collaboration process		graphicsUrl/widgets/approve.gif\" border=\"0\"/>rootUrl/control.php?action=collaborationStepReject&fDocumentID=$iDocumentID\">graphicsUrl/widgets/reject.gif\" border=\"0\"/>
\n"; + + return renderDiv($sDivName, $sToRender); } function renderEditableLinkedDocuments($oDocument, $sDivName) { @@ -268,11 +310,11 @@ function renderNonEditableLinkedDocuments($oDocument, $sDivName) { $oPatternListFromQuery = & new PatternListFromQuery($sQuery, $aColumns, $aColumnNames, $aColumnTypes); $oPatternListFromQuery->setTableHeading("Linked documents"); - $oPatternListFromQuery->setTableWidth("100%"); + $oPatternListFromQuery->setTableWidth("540"); $sToRender .= "\t\n"; $sToRender .= "\t\n"; - $sToRender .= "\t\t\n"; + $sToRender .= "\t\t\n"; $sToRender .= "\t"; $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "" . $oPatternListFromQuery->render() . "
\n"; return renderDiv($sDivName, $sToRender); @@ -281,13 +323,14 @@ function renderNonEditableLinkedDocuments($oDocument, $sDivName) { function displayActionButtons($oDocument, $bEdit) { global $default; + $sToRender .= "graphicsUrl/widgets/discussion.gif\" border=\"0\" />\n"; if ($bEdit) { // display the check in button if the document is checked out and you checked the document out if ($oDocument->getIsCheckedOut() && ($oDocument->getCheckedOutUserID() == $_SESSION["userID"])) { - $sToRender = "graphicsUrl/widgets/checkin.gif\" border=\"0\" />\n"; + $sToRender .= "graphicsUrl/widgets/checkin.gif\" border=\"0\" />\n"; // otherwise display the check out button } else { - $sToRender = "graphicsUrl/widgets/checkout.gif\" border=\"0\" />\n"; + $sToRender .= "graphicsUrl/widgets/checkout.gif\" border=\"0\" />\n"; } } @@ -308,11 +351,13 @@ function displayActionButtons($oDocument, $bEdit) { $sToRender .= "graphicsUrl/widgets/subscribe.gif\" border=\"0\" />\n"; } $sToRender .= "graphicsUrl/widgets/download.gif\" border=\"0\" />\n"; - $sToRender .= "graphicsUrl/widgets/discussion.gif\" border=\"0\" />\n"; + //$sToRender .= "graphicsUrl/widgets/discussion.gif\" border=\"0\" />\n"; // only display the archive button for available documents if (!$oDocument->getIsCheckedOut() || !$oDocument->hasCollaboration() || (!DocumentCollaboration::documentCollaborationStarted($oDocument->getID()))) { $sToRender .= "graphicsUrl/widgets/archive.gif\" border=\"0\" />\n"; } + + $sToRender .= "graphicsUrl/widgets/archive.gif\" border=\"0\" />\n"; return $sToRender; } @@ -320,10 +365,10 @@ function displayActionButtons($oDocument, $bEdit) { function renderDiv($sDivName, $sHtml) { global $default; - if ( in_array($default->browser, array("moz", "ns")) ) { - return ""; + if ( $default->browser = "ie" ) { + return ""; } else { - return ""; + return ""; } } @@ -334,15 +379,15 @@ function renderDocumentSection($sHeading) { function getEditPage($oDocument) { global $default; -// if ( ($default->browser == "moz") && ($default->version <= 4.79) ) { + if ( $default->browser = "ie" ) { + $sToRender = "
"; + } else { $sToRender = "
"; -// } else { -// $sToRender = "
"; -// } + } $sToRender .= renderHeading("Document Detail"); $sToRender .= renderDocumentPath($oDocument) . "\n\n"; - $sToRender .= ""; + $sToRender .= "
"; $sToRender .= renderDocumentSection("Document Data"); $sToRender .= renderDocumentSection("Generic Meta Data"); $sToRender .= renderDocumentSection("Type Specific Meta Data"); @@ -359,11 +404,11 @@ function getEditPage($oDocument) { $sToRender .= renderEditableLinkedDocuments($oDocument, "linkedDocuments"); $sToRender .= renderTypeSpecificMetaData($oDocument, "typeSpecificMetaData"); -// if ( ($default->browser == "moz") && ($default->version <= 4.79) ) { -// $sToRender .= "
"; -// } else { + if ( $default->browser = "ie" ) { + $sToRender .= "
"; + } else { $sToRender .= "
"; -// } + } $sToRender .= "
\n"; $sToRender .= displayActionButtons($oDocument, true); $sToRender .= "
\n"; @@ -372,6 +417,56 @@ function getEditPage($oDocument) { return $sToRender; } +function getPage($oDocument, $bEdit) { + global $default; + + if ( $default->browser = "ie" ) { + $sToRender = "
"; + } else { + $sToRender = "
"; + } + + $sToRender .= renderHeading("Document Detail"); + $sToRender .= renderDocumentPath($oDocument) . "\n\n"; + $sToRender .= ""; + $sToRender .= renderDocumentSection("Document Data"); + $sToRender .= renderDocumentSection("Generic Meta Data"); + $sToRender .= renderDocumentSection("Type Specific Meta Data"); + $sToRender .= renderDocumentSection("Archive Settings"); + $sToRender .= renderDocumentSection("Document Routing"); + $sToRender .= renderDocumentSection("Linked Documents"); + $sToRender .= "
"; + $sToRender .= "
"; + + $sToRender .= renderDocumentData($oDocument, "documentData", $bEdit); + $sToRender .= renderDocumentArchiveSettings($oDocument, "archiveSettings", $bEdit); + if ($bEdit) { + $sToRender .= renderEditableDocumentRouting($oDocument, "documentRouting"); + } else { + $sToRender .= renderNonEditableDocumentRouting($oDocument, "documentRouting"); + } + + $sToRender .= renderGenericMetaData($oDocument, "genericMetaData", $bEdit); + if ($bEdit) { + $sToRender .= renderEditableLinkedDocuments($oDocument, "linkedDocuments"); + } else { + $sToRender .= renderNonEditableLinkedDocuments($oDocument, "linkedDocuments", $bEdit); + } + $sToRender .= renderTypeSpecificMetaData($oDocument, "typeSpecificMetaData", $bEdit); + + if ( $default->browser = "ie" ) { + $sToRender .= "
"; + } else { + $sToRender .= "
"; + } + $sToRender .= "\n"; + $sToRender .= displayActionButtons($oDocument, $bEdit); + $sToRender .= "
\n"; + $sToRender .= "
"; + + return $sToRender; +} + function getViewPage($oDocument) { global $default; $iDocumentID = $oDocument->getID();