From bb839c8d95a8fa29b7d0f72bb7e50aa5aac42696 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 3 Feb 2003 16:19:29 +0000 Subject: [PATCH] no message --- presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc | 6 +++--- presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc | 2 +- 4 files changed, 119 insertions(+), 97 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc index 21b059f..8973182 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc @@ -150,8 +150,8 @@ function getEditPage($oDocument) { $sToRender .= "\n"; //$sToRender .= "\n"; $sToRender .= "owl_graphics_url/widgets/edit.gif\">\n"; - $sToRender .= "owl_graphics_url/widgets/download.gif\" />\n"; - $sToRender .= "owl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\">owl_graphics_url/widgets/email.gif\" />\n"; + $sToRender .= "owl_graphics_url/widgets/download.gif\" border=\"0\" />\n"; + $sToRender .= "owl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\">owl_graphics_url/widgets/email.gif\" border=\"0\" />\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -191,7 +191,7 @@ function getViewPage($oDocument) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
Downloadowl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\">Email linkowl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\">owl_graphics_url/widgets/email.gif\" border=\"0\" />
\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php index 4ca5382..58e5b7a 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php @@ -3,26 +3,72 @@ * Document collaboration business logic - contains business logic to set up * document approval process * +* Expected form variables: +* o fFolderCollaborationID - +* o fForAdd - +* * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa * @date 28 January 2003 -* @package presentation.lookAndFeel.knowledgeTree.documentmanagement +* @package presentation.lookAndFeel.knowledgeTree.foldermanagement * */ require_once("../../../../config/dmsDefaults.php"); -if (checkSession()) { +if (checkSession()) { require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc"); + require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc"); + require_once("$default->owl_fs_root/lib/foldermanagement/FolderCollaboration.inc"); + require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc"); require_once("collaborationUI.inc"); - require_once("$default->owl_fs_root/lib/security/permission.inc"); - require_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); + require_once("$default->owl_fs_root/lib/security/permission.inc"); require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc"); - - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getDocumentRoutingPage(null, 1)); - $main->setCentralPayload($oPatternCustom); - $main->setFormAction("$default->owl_root_url/control.php?action=viewDocument&fDocumentID=1"); - $main->render(); + require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); + require_once("$default->owl_fs_root/presentation/Html.inc"); + + if (isset($fForAdd)) { + //we are adding a new entry + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID)); + $main->setCentralPayload($oPatternCustom); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fForCreate=1"); + $main->render(); + } else if (isset($fForStore)) { + //we are storing a new entry + $oFolderCollaboration = & FolderCollaboration::get($fFolderCollaborationID); + $oFolderCollaboration->setGroupID($fGroupID); + if ($fRoleID != -1) { + $oFolderCollaboration->setRoleID($fRoleID); + } else { + $oFolderCollaboration->setRoleID(null); + } + $oFolderCollaboration->setSequenceNumber($fSequenceNumber); + $oFolderCollaboration->update(); + redirect("$default->owl_root_url/control.php?action=editFolder&fFolderID=$fFolderID"); + } else { + //we are editing an existing entry + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID)); + $main->setCentralPayload($oPatternCustom); + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=editFolder&fFolderID$fFolderID")); + $main->render(); + } + /*if (isset($fForAdd)) { + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID)); + $main->setCentralPayload($oPatternCustom); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fForCreate=1"); + $main->render(); + } else { + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID)); + $main->setCentralPayload($oPatternCustom); + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=editFolder&fFolderID$fFolderID")); + $main->render(); + }*/ } - ?> diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc index 29d7d8a..9cffa6b 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc @@ -8,112 +8,88 @@ * */ -function getGroupDropDown($iDocumentRoutingID, $fDocumentID) { - global $_POST, $default; - $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID"); - $oPatternListBox->setPostBackOnChange(true); - $sOnChangeAction = $_SERVER["PHP_SELF"] . "?fForFilter=1&fDocumentRoutingID=$iDocumentRoutingID&fDocumentID=$fDocumentID"; - $oPatternListBox->setOnChangeAction("setActionAndSubmit('$sOnChangeAction')"); - if (isset($_POST["fGroupID"])) { - $oPatternListBox->setSelectedValue($_POST["fGroupID"]); - } - $oPatternListBox->setEmptyErrorMessage("There are no groups"); - return $oPatternListBox->render(); +function getFolderPath($iFolderID) { + global $default; + return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse"); +} + +function getFolderCollaborationData($iFolderCollaborationID) { + global $default; + $sQuery = "SELECT GFAL.id, GFAL.folder_id, F.name AS folder_name, GFAL.group_id, G.name AS group_name, GFAL.role_id, R.name AS role_name, GFAL.precedence " . + "FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN $default->owl_folders_table AS F ON GFAL.folder_id = F.id " . + "INNER JOIN $default->owl_groups_table AS G ON GFAL.group_id = G.id " . + "LEFT OUTER JOIN $default->owl_roles_table AS R ON GFAL.role_id = R.id " . + "WHERE GFAL.id = $iFolderCollaborationID"; + + $aDisplayColumns = array("group_name", "role_name", "precedence"); + $aStoreColumns = array("group_id", "role_id", "precedence"); + $aColumnNames = array("Group","Role", "Sequence"); + $aDisplayColumnTypes = array(3,3,1); + $aDatabaseColumnTypes = array(0,0,1); + $aDropDownListTables = array($default->owl_groups_table, $default->owl_roles_table); + + $oPatternEditableListFromQuery = & new PatternEditableListFromQuery($sQuery, $default->owl_groups_folders_approval_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes); + $oPatternEditableListFromQuery->setDropDownListTableNames($aDropDownListTables); + $oPatternEditableListFromQuery->setUniqueName("folderCollab"); + + return $oPatternEditableListFromQuery->render(); + } -function getUserDropDown() { - global $_GET, $_POST, $default; - $oPatternListBox = & new PatternListBox("$default->owl_users_table", "name", "id", "fUserID"); - if (isset($_GET["fForFilter"])) { - $sFromClause = "INNER JOIN $default->owl_users_groups_table AS UGL ON ST.id = UGL.user_id "; - $oPatternListBox->setFromClause($sFromClause); - $sWhereClause = "UGL.group_id = " . $_POST["fGroupID"]; - $oPatternListBox->setWhereClause($sWhereClause); - } - - $oPatternListBox->setEmptyErrorMessage("There are no users in this group"); +function getEditPage($iFolderCollaborationID, $iFolderID) { + global $default; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "
" . getFolderPath($iFolderID) . "
\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "
" . getFolderCollaborationData($iFolderID) . "
owl_graphics_url\widgets\update.gif\" />owl_root_url/control.php?action=editFolder&fFolderID=" . $iFolderID . "\">owl_graphics_url\widgets\cancel.gif\" border=\"0\" />
\n"; + $sToRender .= "
\n"; + + return $sToRender; +} + +function getGroupDropDown() { + global $default; + $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID"); + $oPatternListBox->setIncludeDefaultValue(false); + $oPatternListBox->setEmptyErrorMessage("There are no groups"); return $oPatternListBox->render(); } function getRoleDropDown() { global $default; - $oPatternListBox = & new PatternListBox("$default->owl_roles_table", "name", "id", "fRole"); - $oPatternListBox->setEmptyErrorMessage("There are no users in this group"); + $oPatternListBox = & new PatternListBox("$default->owl_roles_table", "name", "id", "fRoleID"); + $oPatternListBox->setEmptyErrorMessage("There are no users in this group"); return $oPatternListBox->render(); } -function getDocumentRoutingPage($oDocumentRouting, $fDocumentID) { +function getAddPage() { global $default; return "\n" . - "\n" . + "\n" . "\n" . - "\n" . - "\n" . - "\n" . - "\n" . - "\n" . + "\n" . + "\n" . "\n" . "\n" . "\n" . "\n" . "\n" . - "\n" . + "\n" . "\n" . "\n" . "\n" . "\n" . "\n" . - "\n" . + "\n" . "\n" . "
Edit document routing informationEdit folder routing information
Group".getGroupDropDown(1, 1)."
User".getUserDropDown()."
Group". getGroupDropDown() ."
Role".getRoleDropDown()."
Seq. no.Seq. no.
 
owl_root_url/control.php?action=viewDocument&fDocumentID=$fDocumentID \">Cancelowl_graphics_url\widgets\update.gif\" />owl_root_url/control.php?action=editFolder&fFolderID=$iFolderID \">owl_graphics_url\widgets\cancel.gif\" border=\"0\" />
\n"; } - -/*function getRoutingRow($iSequenceValue, $iIndex) { - $sToRender = "\n"; - $sToRender .= "\t" . renderGroupDropDown($iIndex) . "\n"; - $sToRender .= "\t" . renderUserDropDown($iIndex) . "\n"; - $sToRender .= "\t" . renderRoleDropDown($iIndex) . "\n"; - $sToRender .= "\t\n"; - $sToRender .= "\n"; - return $sToRender; -} - -function something($fDocumentID) { - $sQuery = "SELECT GFAL.id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence " . - "FROM documents AS D INNER JOIN groups_folders_approval_link AS GFAL ON D.folder_id = GFAL.folder_id " . - "INNER JOIN roles AS R ON GFAL.role_id = R.id " . - "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.folder_id = D.folder_id " . - "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . - "WHERE D.id = $fDocumentID " . - "ORDER BY GFAL.precedence, role_name ASC"; - $sql = new Owl_DB(); - $sql->query($sQuery); - - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - - $iIndex = 0; - while ($sql->next_record()) { - $sToRender .= getRoutingRow($sql->f("id"), $sql->f("precedence")); - $iIndex++; - } - $sToRender .= "
GroupUserRoleSequence no.
\n"; - - return $sToRender; -} - -function getPage($fSelectedGroupID, $iSequenceValue, $iIndex) { - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - for ($i = 0; $i < 5; $i++) { - $sToRender .= getRoutingRow($fSelectedGroupID, $iSequenceValue, $i); - } - $sToRender .= "
GroupUserSequence no.
\n"; -}*/ - ?> diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc index f09befa..9013d4d 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc @@ -82,7 +82,7 @@ function renderFolderList($fFolderID, $sLinkURL) { $aColumns = array("name"); $aColumnTypes = array(3); $aColumnHeaderNames = array("Folder"); - $aDBColumns = array("id"); + $aDBColumns = array("id","id"); $aQueryStringVariableNames = array("fFolderID"); $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL", $aDBColumns, $aQueryStringVariableNames); -- libgit2 0.21.4