\n";
break;
case 3:
@@ -176,43 +191,40 @@ class PatternBrowseableSearchResults {
}
}
$sToRender .= "
\n";
- $iDisplayed++;
- }
+ }
//if we displayed less results than the number to display
//simply pad the table
while ($iDisplayed < $this->iResultsToDisplay) {
- $sToRender .= "
\n";
+ $sToRender .= "
\n";
$iDisplayed++;
}
-
+ $sToRender .= "
";
+
+ $sToRender .= "
";
$sToRender .= "
\n";
-
- $sToRender .= "iStartIndex + $this->iResultsToDisplay) . "\" />\n";
- /* Display only the next button */
- if (($this->iStartIndex + $this->iResultsToDisplay) < $this->getResultCount($sql) && $this->iStartIndex == 0) {
- $sToRender .= "
\n";
}
- /* Display both the next and the previous buttons */
- else if (($this->iStartIndex + $this->iResultsToDisplay) < $this->getResultCount($sql) && $this->iStartIndex > 0) {
+ // Display both the next and the previous buttons
+ else if (($this->iStartIndex + $this->iResultsToDisplay) < $iTotalResults && $this->iStartIndex > 1) {
$sToRender .= "
\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/escalateDependantDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/escalateDependantDocumentBL.php
new file mode 100644
index 0000000..d14ede8
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/escalateDependantDocumentBL.php
@@ -0,0 +1,102 @@
+fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+ require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
+ require_once("$default->fileSystemRoot/lib/security/Permission.inc");
+ require_once("$default->fileSystemRoot/lib/email/Email.inc");
+ require_once("$default->fileSystemRoot/lib/documentmanagement/DependantDocumentInstance.inc");
+ require_once("$default->fileSystemRoot/presentation/Html.inc");
+ require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+
+ $oPatternCustom = & new PatternCustom();
+ $sTitle = "Dependant Document Send Escalation Message";
+ if ($fInstanceID) {
+ $oDependantDocument = DependantDocumentInstance::get($fInstanceID);
+ if ($oDependantDocument) {
+ if ($fSendMessage) {
+ $oUser = User::get($oDependantDocument->getUserID());
+ if ($oUser) {
+ if ($oUser->getEmailNotification()) {
+ $oTemplateDocument = & Document::get($oDependantDocument->getTemplateDocumentID());
+
+ $sMessage = "";
+ $oOriginatingUser = User::get($_SESSION["userID"]);
+ $oParentDocument = Document::get($oDependantDocument->getParentDocumentID());
+ $sMessage = $oUser->getName() . ", you have already received a request to create a new document for the document " . $oParentDocument->getDisplayPath() . ". " .
+ $oOriginatingUser->getName() . " has sent you a reminder message to create and upload this document : ";
+ if (strlen($fReminderMessage) > 0) {
+ $sMessage .= " Comments: $fReminderMessage
";
+ }
+ $sMessage .= generateLink("/control.php","action=dashboard","Log onto KnowledgeTree") . " and select the relevant link under the 'Dependant Documents' heading on your dashboard when you are ready to upload it.";
+ if ($oTemplateDocument) {
+ $sMessage .= "The document entitled " . generateLink("/control.php", "action=viewDocument&fDocumentID=" . $oTemplateDocument->getID(), $oTemplateDocument->getName()) . " " .
+ "can be used as a template";
+ }
+ $sMessage .= "";
+
+ $oEmail = & new Email();
+ if ($oEmail->send($oUser->getEmail(), "Dependant document creation reminder message", $sMessage)) {
+ //go back to the document page you were viewing
+ redirect(generateControllerUrl("viewDocument", "fDocumentID=" . $oDependantDocument->getParentDocumentID() . "&fShowSection=linkedDocuments"));
+ } else {
+ $default->log->error("escalateDependantDocumentBL.php email sending failed");
+ $oPatternCustom->setHtml(statusPage($sTitle, $sHeading, "The escalation message could not be sent due to a system error sending the notification.", "viewDocument", "fDocumentID=" . $oDependantDocument->getParentDocumentID() . "&fShowSection=linkedDocuments"));
+ }
+ } else {
+ $default->log->info("escalateDependantDocumentBL.php user id (" . $oUser->getID() . ") doesn't have email notification on =" . arrayToString($oUser));
+ $oPatternCustom->setHtml(statusPage($sTitle, $sHeading, "The escalation message could not be sent because " . $oUser->getName() . " has disabled notification", "viewDocument", "fDocumentID=" . $oDependantDocument->getParentDocumentID() . "&fShowSection=linkedDocuments"));
+ }
+ } else {
+ $default->log->info("escalateDependantDocumentBL.php couldn't instantiate user object for id=$fUserID");
+ $oPatternCustom->setHtml(statusPage($sTitle, "", "The dependant document user information could not be found.", "viewDocument", "fDocumentID=" . $oDependantDocument->getParentDocumentID() . "&fShowSection=linkedDocuments"));
+ }
+ } else {
+ // display escalation form
+ $oPatternCustom->setHtml(getPage($oDependantDocument));
+ }
+ } else {
+ //dependant document instantiation failed- generic error (statusPage)
+ $oPatternCustom->setHtml(statusPage($sTitle, "", "The dependant document information could not be found.", "browse"));
+ }
+ } else {
+ // error page, no instance id supplied- generic error
+ $oPatternCustom->setHtml(statusPage($sTitle, "", "The dependant document information could not be found.", "browse"));
+ }
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ $main->setCentralPayload($oPatternCustom);
+ $main->setFormAction($_SERVER["PHP_SELF"]); // . "?fDocumentID=$fInstanceID&fForStore=1");
+ $main->render();
+}
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/escalateDependantDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/escalateDependantDocumentUI.inc
new file mode 100644
index 0000000..f755360
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/escalateDependantDocumentUI.inc
@@ -0,0 +1,72 @@
+getParentDocumentID());
+ $iFolderID = $oDocument->getFolderID();
+ $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("browse", "fFolderID=$iFolderID"), false);
+ $sToRender .= "
\n";
+ $sToRender .= "
You have requested that the following document be created:
";
- if ($sStatusMessage) {
+ if (strlen($sStatusMessage) > 0) {
$sToRender .= "
$sStatusMessage
";
}
$sToRender .= "
" . $oPatternListFromQuery->render() . "
";
@@ -70,12 +70,12 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
global $default;
//had to use coalesce and left outer join for user_id because this column was a new addition
//and the user_ids for existing documents before this change will be null
- $sQuery = "SELECT GFAL.id as id, GFAL.folder_id AS folder_id, G.name AS group_name, G.id AS group_id, GFAL.role_id AS role_id, R.name AS role_name, GFAL.precedence AS precedence, COALESCE(U.id, -1) AS user_id, COALESCE(U.name, 'Not Assigned') AS user_name, 'Edit' as edit, 'Delete' as del, 'Dependant docs' as depn " .
- "FROM $default->groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " .
- "INNER JOIN $default->groups_table AS G ON G.id = GFAL.group_id " .
- "LEFT OUTER JOIN $default->users_table AS U ON U.id = GFAL.user_id " .
- "WHERE GFAL.folder_id = $iFolderID " .
- "ORDER BY GFAL.precedence, role_name ASC";
+ $sQuery = "SELECT GFAL.id as id, GFAL.folder_id AS folder_id, COALESCE(G.name, 'Not Assigned') AS group_name, G.id AS group_id, GFAL.role_id AS role_id, R.name AS role_name, GFAL.precedence AS precedence, COALESCE(U.id, -1) AS user_id, COALESCE(U.name, 'Not Assigned') AS user_name, 'Edit' as edit, 'Delete' as del, 'Dependant docs' as depn " .
+ "FROM $default->groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " .
+ "LEFT OUTER JOIN $default->groups_table AS G ON G.id = GFAL.group_id " .
+ "LEFT OUTER JOIN $default->users_table AS U ON U.id = GFAL.user_id " .
+ "WHERE GFAL.folder_id = $iFolderID " .
+ "ORDER BY GFAL.precedence, role_name ASC";
$aColumns = array("group_name", "role_name", "precedence", "user_name", "edit", "del", "depn");
$aColumnHeaders = array("Group", "Role", "Seq", "User", "", "");
@@ -89,6 +89,9 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
$oPatternTableSqlQuery->setDisplayColumnHeadings(true);
$sToRender .= "
";
+ if ($bCollaboration) {
+ $sToRender .= "
Documents in this folder are currently undergoing this collaboration process, so these steps can't be altered
If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button