Peter M. Groen / knowledgetree

Commit b2d98236e99724cac9c334635e06105a0d574430

Authored by Michael Joseph
1 parent 971153ca

added active and done to non-editable view of document routing 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1344 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @b2d9823
@@ -103,7 +103,7 @@ function renderEditableDocumentRouting($oDocument) { @@ -103,7 +103,7 @@ function renderEditableDocumentRouting($oDocument) {
103 103
104 function renderNonEditableDocumentRouting($oDocument) { 104 function renderNonEditableDocumentRouting($oDocument) {
105 global $default; 105 global $default;
106 - $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 " . 106 + $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 " .
107 "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . 107 "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " .
108 "INNER JOIN roles AS R ON GFAL.role_id = R.id " . 108 "INNER JOIN roles AS R ON GFAL.role_id = R.id " .
109 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id " . 109 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id " .
@@ -111,9 +111,9 @@ function renderNonEditableDocumentRouting($oDocument) { @@ -111,9 +111,9 @@ function renderNonEditableDocumentRouting($oDocument) {
111 "WHERE D.id = " . $oDocument->getID() . " " . 111 "WHERE D.id = " . $oDocument->getID() . " " .
112 "ORDER BY GFAL.precedence, role_name ASC"; 112 "ORDER BY GFAL.precedence, role_name ASC";
113 113
114 - $aColumns = array("role_name", "name", "precedence");  
115 - $aColumnHeaders = array("Role", "Player", "Seq");  
116 - $aColumnTypes = array(1,1,1); 114 + $aColumns = array("role_name", "name", "precedence", "active", "done");
  115 + $aColumnHeaders = array("Role", "Player", "Seq", "Active", "Done");
  116 + $aColumnTypes = array(1,1,1,1,1);
117 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "10%", "$default->rootUrl/control.php?action=modifyDocumentRouting",$aDBColumnArray,$aQueryStringVariableNames); 117 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "10%", "$default->rootUrl/control.php?action=modifyDocumentRouting",$aDBColumnArray,$aQueryStringVariableNames);
118 $oPatternTableSqlQuery->setTableHeading("Document Routing"); 118 $oPatternTableSqlQuery->setTableHeading("Document Routing");
119 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 119 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);