fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 10829 Paginacion en documents no muetsra documentos en la pagina siguiente SOLVED

Browse Source 
- En Home/Documents vamos a la paginacion y al darle click para ir a la pagina 2 no vemos los docuemntos faltantes, viendo que tenemos mas de 100 documentos.
- Adjustment in the list of the documents.
This commit is contained in:
Hector Cortez
2013-02-26 17:49:57 -04:00
parent f5a0675034
commit 521e1d4481
3 changed files with 144 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/AppFolder.php
View File

@@ -323,12 +323,14 @@ class AppFolder extends BaseAppFolder
$numRecTotal = AppDocumentPeer::doCount($oCriteria);
/*
$auxCriteria = clone $oCriteria;
$auxCriteria->addJoin(AppDocumentPeer::DOC_UID, OutputDocumentPeer::OUT_DOC_UID);
$auxCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
$auxCriteria->add(OutputDocumentPeer::OUT_DOC_UID, '-1', Criteria::NOT_EQUAL);
$auxCriteria->add(OutputDocumentPeer::OUT_DOC_GENERATE, 'BOTH');
$numRecTotal += AppDocumentPeer::doCount($auxCriteria);
*/
$oCase->verifyTable();

73
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -284,12 +284,14 @@ function expandNode()
if (isset($folderContent)) {
foreach ($folderContent as $key => $obj) {
$tempTree ['text'] = $obj['APP_DOC_FILENAME'];
$tempTree ['name'] = $obj['APP_DOC_FILENAME'];
$mimeInformation=getMime($obj['APP_DOC_FILENAME']);
$tempTree ['type'] = $mimeInformation['description'];
$tempTree ['icon'] = $mimeInformation['icon'];
$mimeInformation = getMime($obj["APP_DOC_FILENAME"]);
$tempTree["text"] = $obj["APP_DOC_FILENAME"];
$tempTree["name"] = $obj["APP_DOC_FILENAME"];
$tempTree["type"] = $mimeInformation["description"];
$tempTree["icon"] = $mimeInformation["icon"];
/*
if (isset($obj['OUT_DOC_GENERATE'])) {
if ($obj['OUT_DOC_GENERATE'] == "BOTH") {
$arrayType=array("PDF","DOC");
@@ -304,6 +306,7 @@ function expandNode()
$tempTree ['icon'.$fileType] = $mimeInformation['icon'];
}
}
*/
$tempTree ['appdocid'] = $obj['APP_DOC_UID'];
$tempTree ['id'] = $obj['APP_DOC_UID_VERSION'];
@@ -378,20 +381,53 @@ function expandNode()
$tempTree ['expanded'] = true;
}
*/
if (isset($obj['OUT_DOC_GENERATE'])) {
foreach ($arrayType as $keyType => $fileType) {
$tempTree ['text'] = $tempTree ['text'.$fileType];
$tempTree ['name'] = $tempTree ['name'.$fileType];
$tempTree ['type'] = $tempTree ['type'.$fileType];
$tempTree ['icon'] = $tempTree ['icon'.$fileType];
$tempTree ['appDocFileName'] = $tempTree ['name'.$fileType];
$tempTree["outDocGenerate"] = "";
$tempTree ['downloadLabel'] = $tempTree ['downloadLabel'.$fileType];
$tempTree ['downloadLink'] = $tempTree ['downloadLink'.$fileType];
if (isset($obj["OUT_DOC_GENERATE"])) {
switch ($obj["OUT_DOC_GENERATE"]) {
case "PDF":
case "DOC":
$mimeInformation = getMime($obj["APP_DOC_FILENAME"] . "." . strtolower($obj["OUT_DOC_GENERATE"]));
$tempTree ['id']=$tempTree ['id']."_".$fileType;
$processListTree [] = $tempTree;
$tempTree["text"] = $obj["APP_DOC_FILENAME"] . "." . strtolower($obj["OUT_DOC_GENERATE"]);
$tempTree["name"] = $obj["APP_DOC_FILENAME"] . "." . strtolower($obj["OUT_DOC_GENERATE"]);
$tempTree["type"] = $mimeInformation["description"];
$tempTree["icon"] = $mimeInformation["icon"];
$tempTree["appDocFileName"] = $tempTree["name"];
$tempTree["downloadLabel"] = $tempTree["downloadLabel" . $obj["OUT_DOC_GENERATE"]];
$tempTree["downloadLink"] = $tempTree["downloadLink" . $obj["OUT_DOC_GENERATE"]];
$tempTree["id"] = $tempTree["id"] . "_" . $obj["OUT_DOC_GENERATE"];
$processListTree[] = $tempTree;
break;
case "BOTH":
$strExpander = null;
$mimeInformation = getMime($obj["APP_DOC_FILENAME"] . ".pdf");
$strExpander = $strExpander . "<a href=\"javascript:openActionDialog(this, 'download', 'pdf');\" style=\"color: #000000; text-decoration: none;\"><img src=\"/images/documents/extension/pdf.png\" style=\"margin-left: 25px; border: 0;\" alt=\"\" /> <b>" . $obj["APP_DOC_FILENAME"] . ".pdf</b> (" . $mimeInformation["description"] . ")</a>";
$strExpander = $strExpander . "<br />";
$mimeInformation = getMime($obj["APP_DOC_FILENAME"] . ".doc");
$strExpander = $strExpander . "<a href=\"javascript:openActionDialog(this, 'download', 'doc');\" style=\"color: #000000; text-decoration: none;\"><img src=\"/images/documents/extension/doc.png\" style=\"margin-left: 25px; border: 0;\" alt=\"\" /> <b>" . $obj["APP_DOC_FILENAME"] . ".pdf</b> (" . $mimeInformation["description"] . ")</a>";
$tempTree["outDocGenerate"] = $strExpander;
$tempTree["text"] = $obj["APP_DOC_FILENAME"];
$tempTree["name"] = $obj["APP_DOC_FILENAME"];
$tempTree["type"] = "";
$tempTree["icon"] = "/images/documents/extension/document.png";
$tempTree["appDocFileName"] = $tempTree["name"];
//$tempTree["downloadLabel"] = $obj["DOWNLOAD_LABEL"];
//$tempTree["downloadLink"] = $obj["DOWNLOAD_LINK"];
$tempTree["id"] = $tempTree["id"] . "_" . $obj["OUT_DOC_GENERATE"];
$processListTree[] = $tempTree;
break;
//case "NOFILE":
// break;
}
} else {
if ($obj["APP_DOC_TYPE"] == "OUTPUT" &&
@@ -407,9 +443,10 @@ function expandNode()
$tempTree["icon"] = $mimeInformation["icon"];
}
$processListTree [] = $tempTree;
$processListTree[] = $tempTree;
}
$tempTree=array();
$tempTree = array();
}
}

151
workflow/engine/templates/cases/casesDocuments.js
View File

File diff suppressed because it is too large Load Diff