Peter M. Groen / knowledgetree

Commit bb839c8d95a8fa29b7d0f72bb7e50aa5aac42696

Authored by rob
1 parent 9e2f7f5f

no message 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@793 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 119 additions and 97 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @bb839c8
@@ -150,8 +150,8 @@ function getEditPage($oDocument) { @@ -150,8 +150,8 @@ function getEditPage($oDocument) {
150 $sToRender .= "<tr>\n"; 150 $sToRender .= "<tr>\n";
151 //$sToRender .= "<td><input type=\"image\" srcvalue=\"Edit\"></td>\n"; 151 //$sToRender .= "<td><input type=\"image\" srcvalue=\"Edit\"></td>\n";
152 $sToRender .= "<td><input type=\"image\" src=\"$default->owl_graphics_url/widgets/edit.gif\"></td>\n"; 152 $sToRender .= "<td><input type=\"image\" src=\"$default->owl_graphics_url/widgets/edit.gif\"></td>\n";
153 - $sToRender .= "<td><a href=\"" . $_SERVER["PHP_SELF"] . "?fDocumentID=" . $oDocument->getID() . "&fForDownload=1\"><img src=\"$default->owl_graphics_url/widgets/download.gif\" /></a></td>\n";  
154 - $sToRender .= "<td><a href=\"$default->owl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->owl_graphics_url/widgets/email.gif\" /></a></td>\n"; 153 + $sToRender .= "<td><a href=\"" . $_SERVER["PHP_SELF"] . "?fDocumentID=" . $oDocument->getID() . "&fForDownload=1\"><img src=\"$default->owl_graphics_url/widgets/download.gif\" border=\"0\" /></a></td>\n";
  154 + $sToRender .= "<td><a href=\"$default->owl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->owl_graphics_url/widgets/email.gif\" border=\"0\" /></a></td>\n";
155 $sToRender .= "</tr>\n"; 155 $sToRender .= "</tr>\n";
156 $sToRender .= "</table>\n"; 156 $sToRender .= "</table>\n";
157 157
@@ -191,7 +191,7 @@ function getViewPage($oDocument) { @@ -191,7 +191,7 @@ function getViewPage($oDocument) {
191 $sToRender .= "<table>\n"; 191 $sToRender .= "<table>\n";
192 $sToRender .= "<tr>\n"; 192 $sToRender .= "<tr>\n";
193 $sToRender .= "<td><a href=\"" . $_SERVER["PHP_SELF"] . "?fDocumentID=" . $oDocument->getID() . "&fForDownload=1\">Download</a></td>\n"; 193 $sToRender .= "<td><a href=\"" . $_SERVER["PHP_SELF"] . "?fDocumentID=" . $oDocument->getID() . "&fForDownload=1\">Download</a></td>\n";
194 - $sToRender .= "<td><a href=\"$default->owl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\">Email link</a></td>\n"; 194 + $sToRender .= "<td><a href=\"$default->owl_root_url/control.php?action=emailDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->owl_graphics_url/widgets/email.gif\" border=\"0\" /></a></td>\n";
195 $sToRender .= "</tr>\n"; 195 $sToRender .= "</tr>\n";
196 $sToRender .= "</table>\n"; 196 $sToRender .= "</table>\n";
197 197
presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php
  View file @bb839c8
@@ -3,26 +3,72 @@ @@ -3,26 +3,72 @@
3 * Document collaboration business logic - contains business logic to set up 3 * Document collaboration business logic - contains business logic to set up
4 * document approval process 4 * document approval process
5 * 5 *
  6 +* Expected form variables:
  7 +* o fFolderCollaborationID -
  8 +* o fForAdd -
  9 +*
6 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa 10 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
7 * @date 28 January 2003 11 * @date 28 January 2003
8 -* @package presentation.lookAndFeel.knowledgeTree.documentmanagement 12 +* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
9 * 13 *
10 */ 14 */
11 15
12 require_once("../../../../config/dmsDefaults.php"); 16 require_once("../../../../config/dmsDefaults.php");
13 17
14 -if (checkSession()) { 18 +if (checkSession()) {
15 require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc"); 19 require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
  20 + require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
  21 + require_once("$default->owl_fs_root/lib/foldermanagement/FolderCollaboration.inc");
  22 + require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
16 require_once("collaborationUI.inc"); 23 require_once("collaborationUI.inc");
17 - require_once("$default->owl_fs_root/lib/security/permission.inc");  
18 - require_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); 24 + require_once("$default->owl_fs_root/lib/security/permission.inc");
19 require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc"); 25 require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
20 -  
21 - $oPatternCustom = & new PatternCustom();  
22 - $oPatternCustom->setHtml(getDocumentRoutingPage(null, 1));  
23 - $main->setCentralPayload($oPatternCustom);  
24 - $main->setFormAction("$default->owl_root_url/control.php?action=viewDocument&fDocumentID=1");  
25 - $main->render(); 26 + require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  27 + require_once("$default->owl_fs_root/presentation/Html.inc");
  28 +
  29 + if (isset($fForAdd)) {
  30 + //we are adding a new entry
  31 + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  32 + $oPatternCustom = & new PatternCustom();
  33 + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID));
  34 + $main->setCentralPayload($oPatternCustom);
  35 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fForCreate=1");
  36 + $main->render();
  37 + } else if (isset($fForStore)) {
  38 + //we are storing a new entry
  39 + $oFolderCollaboration = & FolderCollaboration::get($fFolderCollaborationID);
  40 + $oFolderCollaboration->setGroupID($fGroupID);
  41 + if ($fRoleID != -1) {
  42 + $oFolderCollaboration->setRoleID($fRoleID);
  43 + } else {
  44 + $oFolderCollaboration->setRoleID(null);
  45 + }
  46 + $oFolderCollaboration->setSequenceNumber($fSequenceNumber);
  47 + $oFolderCollaboration->update();
  48 + redirect("$default->owl_root_url/control.php?action=editFolder&fFolderID=$fFolderID");
  49 + } else {
  50 + //we are editing an existing entry
  51 + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  52 + $oPatternCustom = & new PatternCustom();
  53 + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID));
  54 + $main->setCentralPayload($oPatternCustom);
  55 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=editFolder&fFolderID$fFolderID"));
  56 + $main->render();
  57 + }
  58 + /*if (isset($fForAdd)) {
  59 + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  60 + $oPatternCustom = & new PatternCustom();
  61 + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID));
  62 + $main->setCentralPayload($oPatternCustom);
  63 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fForCreate=1");
  64 + $main->render();
  65 + } else {
  66 + require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  67 + $oPatternCustom = & new PatternCustom();
  68 + $oPatternCustom->setHtml(getEditPage($fFolderCollaborationID, $fFolderID));
  69 + $main->setCentralPayload($oPatternCustom);
  70 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->owl_root_url/control.php?action=editFolder&fFolderID$fFolderID"));
  71 + $main->render();
  72 + }*/
26 } 73 }
27 -  
28 ?> 74 ?>
presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc
  View file @bb839c8
@@ -8,112 +8,88 @@ @@ -8,112 +8,88 @@
8 * 8 *
9 */ 9 */
10 10
11 -function getGroupDropDown($iDocumentRoutingID, $fDocumentID) {  
12 - global $_POST, $default;  
13 - $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID");  
14 - $oPatternListBox->setPostBackOnChange(true);  
15 - $sOnChangeAction = $_SERVER["PHP_SELF"] . "?fForFilter=1&fDocumentRoutingID=$iDocumentRoutingID&fDocumentID=$fDocumentID";  
16 - $oPatternListBox->setOnChangeAction("setActionAndSubmit('$sOnChangeAction')");  
17 - if (isset($_POST["fGroupID"])) {  
18 - $oPatternListBox->setSelectedValue($_POST["fGroupID"]);  
19 - }  
20 - $oPatternListBox->setEmptyErrorMessage("There are no groups");  
21 - return $oPatternListBox->render(); 11 +function getFolderPath($iFolderID) {
  12 + global $default;
  13 + return displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse");
  14 +}
  15 +
  16 +function getFolderCollaborationData($iFolderCollaborationID) {
  17 + global $default;
  18 + $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 " .
  19 + "FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN $default->owl_folders_table AS F ON GFAL.folder_id = F.id " .
  20 + "INNER JOIN $default->owl_groups_table AS G ON GFAL.group_id = G.id " .
  21 + "LEFT OUTER JOIN $default->owl_roles_table AS R ON GFAL.role_id = R.id " .
  22 + "WHERE GFAL.id = $iFolderCollaborationID";
  23 +
  24 + $aDisplayColumns = array("group_name", "role_name", "precedence");
  25 + $aStoreColumns = array("group_id", "role_id", "precedence");
  26 + $aColumnNames = array("Group","Role", "Sequence");
  27 + $aDisplayColumnTypes = array(3,3,1);
  28 + $aDatabaseColumnTypes = array(0,0,1);
  29 + $aDropDownListTables = array($default->owl_groups_table, $default->owl_roles_table);
  30 +
  31 + $oPatternEditableListFromQuery = & new PatternEditableListFromQuery($sQuery, $default->owl_groups_folders_approval_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes);
  32 + $oPatternEditableListFromQuery->setDropDownListTableNames($aDropDownListTables);
  33 + $oPatternEditableListFromQuery->setUniqueName("folderCollab");
  34 +
  35 + return $oPatternEditableListFromQuery->render();
  36 +
22 } 37 }
23 38
24 -function getUserDropDown() {  
25 - global $_GET, $_POST, $default;  
26 - $oPatternListBox = & new PatternListBox("$default->owl_users_table", "name", "id", "fUserID");  
27 - if (isset($_GET["fForFilter"])) {  
28 - $sFromClause = "INNER JOIN $default->owl_users_groups_table AS UGL ON ST.id = UGL.user_id ";  
29 - $oPatternListBox->setFromClause($sFromClause);  
30 - $sWhereClause = "UGL.group_id = " . $_POST["fGroupID"];  
31 - $oPatternListBox->setWhereClause($sWhereClause);  
32 - }  
33 -  
34 - $oPatternListBox->setEmptyErrorMessage("There are no users in this group"); 39 +function getEditPage($iFolderCollaborationID, $iFolderID) {
  40 + global $default;
  41 + $sToRender .= "<table border=\"1\" width=\"100%\">\n";
  42 + $sToRender .= "<tr>\n";
  43 + $sToRender .= "<td>" . getFolderPath($iFolderID) . "</td>\n";
  44 + $sToRender .= "</tr>\n";
  45 + $sToRender .= "</table>\n";
  46 + $sToRender .= "<table border=\"0\" width=\"100%\">\n";
  47 + $sToRender .= "<tr>\n";
  48 + $sToRender .= "<td>" . getFolderCollaborationData($iFolderID) . "</td>\n";
  49 + $sToRender .= "</tr>\n";
  50 + $sToRender .= "<tr>\n";
  51 + $sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->owl_graphics_url\widgets\update.gif\" /></td><td><a href=\"$default->owl_root_url/control.php?action=editFolder&fFolderID=" . $iFolderID . "\"><img src=\"$default->owl_graphics_url\widgets\cancel.gif\" border=\"0\" /></a></td></tr></table>\n";
  52 + $sToRender .= "</tr>\n";
  53 + $sToRender .= "</table>\n";
  54 +
  55 + return $sToRender;
  56 +}
  57 +
  58 +function getGroupDropDown() {
  59 + global $default;
  60 + $oPatternListBox = & new PatternListBox("$default->owl_groups_table", "name", "id", "fGroupID");
  61 + $oPatternListBox->setIncludeDefaultValue(false);
  62 + $oPatternListBox->setEmptyErrorMessage("There are no groups");
35 return $oPatternListBox->render(); 63 return $oPatternListBox->render();
36 } 64 }
37 65
38 function getRoleDropDown() { 66 function getRoleDropDown() {
39 global $default; 67 global $default;
40 - $oPatternListBox = & new PatternListBox("$default->owl_roles_table", "name", "id", "fRole");  
41 - $oPatternListBox->setEmptyErrorMessage("There are no users in this group"); 68 + $oPatternListBox = & new PatternListBox("$default->owl_roles_table", "name", "id", "fRoleID");
  69 + $oPatternListBox->setEmptyErrorMessage("There are no users in this group");
42 return $oPatternListBox->render(); 70 return $oPatternListBox->render();
43 } 71 }
44 72
45 -function getDocumentRoutingPage($oDocumentRouting, $fDocumentID) { 73 +function getAddPage() {
46 global $default; 74 global $default;
47 return "<table border=0>\n" . 75 return "<table border=0>\n" .
48 - "<caption><b>Edit document routing information</b></caption>\n" . 76 + "<caption><b>Edit folder routing information</b></caption>\n" .
49 "<tr>\n" . 77 "<tr>\n" .
50 - "<td><b>Group</b></td><td>".getGroupDropDown(1, 1)."</td>\n" .  
51 - "</tr>\n" .  
52 - "<tr>\n" .  
53 - "<td><b>User</b></td><td>".getUserDropDown()."</td>\n" .  
54 - "</tr>\n" . 78 + "<td><b>Group</b></td><td>". getGroupDropDown() ."</td>\n" .
  79 + "</tr>\n" .
55 "<tr>\n" . 80 "<tr>\n" .
56 "<td><b>Role</b></td><td>".getRoleDropDown()."</td>\n" . 81 "<td><b>Role</b></td><td>".getRoleDropDown()."</td>\n" .
57 "</tr>\n" . 82 "</tr>\n" .
58 "<tr>\n" . 83 "<tr>\n" .
59 "<tr>\n" . 84 "<tr>\n" .
60 - "<td><b>Seq. no.</b></td><td><input type=\"text\" size=\"5\" /></td>\n" . 85 + "<td><b>Seq. no.</b></td><td><input type=\"text\" name=\"fSequenceNumber\" size=\"5\" value=1 /></td>\n" .
61 "</tr>\n" . 86 "</tr>\n" .
62 "<tr>\n" . 87 "<tr>\n" .
63 "<td colspan=\"2\">&nbsp</td>\n" . 88 "<td colspan=\"2\">&nbsp</td>\n" .
64 "</tr>\n" . 89 "</tr>\n" .
65 "<tr>\n" . 90 "<tr>\n" .
66 - "<td><b><input type=\"submit\" value=\"Submit\" /></b></td><td><a href=\"$default->owl_root_url/control.php?action=viewDocument&fDocumentID=$fDocumentID \">Cancel</a></td>\n" . 91 + "<td><b><input type=\"image\" src=\"$default->owl_graphics_url\widgets\update.gif\" /></b></td><td><a href=\"$default->owl_root_url/control.php?action=editFolder&fFolderID=$iFolderID \"><img src=\"$default->owl_graphics_url\widgets\cancel.gif\" border=\"0\" /></a></td>\n" .
67 "</tr>\n" . 92 "</tr>\n" .
68 "</table>\n"; 93 "</table>\n";
69 } 94 }
70 -  
71 -/*function getRoutingRow($iSequenceValue, $iIndex) {  
72 - $sToRender = "<tr>\n";  
73 - $sToRender .= "\t<td>" . renderGroupDropDown($iIndex) . "</td>\n";  
74 - $sToRender .= "\t<td>" . renderUserDropDown($iIndex) . "</td>\n";  
75 - $sToRender .= "\t<td>" . renderRoleDropDown($iIndex) . "</td>\n";  
76 - $sToRender .= "\t<td><input type=\"text\" value=\"$iSequenceValue\"</td>\n";  
77 - $sToRender .= "</tr>\n";  
78 - return $sToRender;  
79 -}  
80 -  
81 -function something($fDocumentID) {  
82 - $sQuery = "SELECT GFAL.id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence " .  
83 - "FROM documents AS D INNER JOIN groups_folders_approval_link AS GFAL ON D.folder_id = GFAL.folder_id " .  
84 - "INNER JOIN roles AS R ON GFAL.role_id = R.id " .  
85 - "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.folder_id = D.folder_id " .  
86 - "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " .  
87 - "WHERE D.id = $fDocumentID " .  
88 - "ORDER BY GFAL.precedence, role_name ASC";  
89 - $sql = new Owl_DB();  
90 - $sql->query($sQuery);  
91 -  
92 - $sToRender .= "<table border=\"1\">\n";  
93 - $sToRender .= "<th>Group</th>\n";  
94 - $sToRender .= "<th>User</th>\n";  
95 - $sToRender .= "<th>Role</th>\n";  
96 - $sToRender .= "<th>Sequence no.</th>\n";  
97 -  
98 - $iIndex = 0;  
99 - while ($sql->next_record()) {  
100 - $sToRender .= getRoutingRow($sql->f("id"), $sql->f("precedence"));  
101 - $iIndex++;  
102 - }  
103 - $sToRender .= "</table>\n";  
104 -  
105 - return $sToRender;  
106 -}  
107 -  
108 -function getPage($fSelectedGroupID, $iSequenceValue, $iIndex) {  
109 - $sToRender .= "<table>\n";  
110 - $sToRender .= "<th>Group</th>\n";  
111 - $sToRender .= "<th>User</th>\n";  
112 - $sToRender .= "<th>Sequence no.</th>\n";  
113 - for ($i = 0; $i < 5; $i++) {  
114 - $sToRender .= getRoutingRow($fSelectedGroupID, $iSequenceValue, $i);  
115 - }  
116 - $sToRender .= "</table>\n";  
117 -}*/  
118 -  
119 ?> 95 ?>
presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
  View file @bb839c8
@@ -82,7 +82,7 @@ function renderFolderList($fFolderID, $sLinkURL) { @@ -82,7 +82,7 @@ function renderFolderList($fFolderID, $sLinkURL) {
82 $aColumns = array("name"); 82 $aColumns = array("name");
83 $aColumnTypes = array(3); 83 $aColumnTypes = array(3);
84 $aColumnHeaderNames = array("Folder"); 84 $aColumnHeaderNames = array("Folder");
85 - $aDBColumns = array("id"); 85 + $aDBColumns = array("id","id");
86 $aQueryStringVariableNames = array("fFolderID"); 86 $aQueryStringVariableNames = array("fFolderID");
87 87
88 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL", $aDBColumns, $aQueryStringVariableNames); 88 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL", $aDBColumns, $aQueryStringVariableNames);