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); $numRecTotal = AppDocumentPeer::doCount($oCriteria);
/*
$auxCriteria = clone $oCriteria; $auxCriteria = clone $oCriteria;
$auxCriteria->addJoin(AppDocumentPeer::DOC_UID, OutputDocumentPeer::OUT_DOC_UID); $auxCriteria->addJoin(AppDocumentPeer::DOC_UID, OutputDocumentPeer::OUT_DOC_UID);
$auxCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT'); $auxCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
$auxCriteria->add(OutputDocumentPeer::OUT_DOC_UID, '-1', Criteria::NOT_EQUAL); $auxCriteria->add(OutputDocumentPeer::OUT_DOC_UID, '-1', Criteria::NOT_EQUAL);
$auxCriteria->add(OutputDocumentPeer::OUT_DOC_GENERATE, 'BOTH'); $auxCriteria->add(OutputDocumentPeer::OUT_DOC_GENERATE, 'BOTH');
$numRecTotal += AppDocumentPeer::doCount($auxCriteria); $numRecTotal += AppDocumentPeer::doCount($auxCriteria);
*/
$oCase->verifyTable(); $oCase->verifyTable();

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

@@ -284,12 +284,14 @@ function expandNode()
if (isset($folderContent)) { if (isset($folderContent)) {
foreach ($folderContent as $key => $obj) { foreach ($folderContent as $key => $obj) {
$tempTree ['text'] = $obj['APP_DOC_FILENAME']; $mimeInformation = getMime($obj["APP_DOC_FILENAME"]);
$tempTree ['name'] = $obj['APP_DOC_FILENAME'];
$mimeInformation=getMime($obj['APP_DOC_FILENAME']);
$tempTree ['type'] = $mimeInformation['description'];
$tempTree ['icon'] = $mimeInformation['icon'];
$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 (isset($obj['OUT_DOC_GENERATE'])) {
if ($obj['OUT_DOC_GENERATE'] == "BOTH") { if ($obj['OUT_DOC_GENERATE'] == "BOTH") {
$arrayType=array("PDF","DOC"); $arrayType=array("PDF","DOC");
@@ -304,6 +306,7 @@ function expandNode()
$tempTree ['icon'.$fileType] = $mimeInformation['icon']; $tempTree ['icon'.$fileType] = $mimeInformation['icon'];
} }
} }
*/
$tempTree ['appdocid'] = $obj['APP_DOC_UID']; $tempTree ['appdocid'] = $obj['APP_DOC_UID'];
$tempTree ['id'] = $obj['APP_DOC_UID_VERSION']; $tempTree ['id'] = $obj['APP_DOC_UID_VERSION'];
@@ -378,20 +381,53 @@ function expandNode()
$tempTree ['expanded'] = true; $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["outDocGenerate"] = "";
$tempTree ['icon'] = $tempTree ['icon'.$fileType];
$tempTree ['appDocFileName'] = $tempTree ['name'.$fileType];
$tempTree ['downloadLabel'] = $tempTree ['downloadLabel'.$fileType]; if (isset($obj["OUT_DOC_GENERATE"])) {
$tempTree ['downloadLink'] = $tempTree ['downloadLink'.$fileType]; switch ($obj["OUT_DOC_GENERATE"]) {
case "PDF":
case "DOC":
$mimeInformation = getMime($obj["APP_DOC_FILENAME"] . "." . strtolower($obj["OUT_DOC_GENERATE"]));
$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"];
$tempTree ['id']=$tempTree ['id']."_".$fileType;
$processListTree[] = $tempTree; $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 { } else {
if ($obj["APP_DOC_TYPE"] == "OUTPUT" && if ($obj["APP_DOC_TYPE"] == "OUTPUT" &&
@@ -409,6 +445,7 @@ function expandNode()
$processListTree[] = $tempTree; $processListTree[] = $tempTree;
} }
$tempTree = array(); $tempTree = array();
} }
} }

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

@@ -274,7 +274,8 @@ function getURLParam( strParamName, myWindow){
return strReturn; return strReturn;
} }
function openActionDialog( caller, action ) { function openActionDialog(caller, action, dataAux)
{
// console.log("Dialog open: "+caller+" ->"+action); // console.log("Dialog open: "+caller+" ->"+action);
var dialog; var dialog;
var selectedRows = ext_itemgrid.getSelectionModel().getSelections(); var selectedRows = ext_itemgrid.getSelectionModel().getSelections();
@@ -460,14 +461,20 @@ function openActionDialog( caller, action ) {
var urlDownload = ext_itemgrid.getSelectionModel().getSelected().get("downloadLink"); var urlDownload = ext_itemgrid.getSelectionModel().getSelected().get("downloadLink");
if (selectedRows.length == 1) {
if (ext_itemgrid.getSelectionModel().getSelected().get("appDocType") == "Output" && ext_itemgrid.getSelectionModel().getSelected().get("outDocGenerate") != "") {
dataAux = (dataAux != "")? dataAux : "pdf";
urlDownload = stringReplace("&ext=.{3,}&", "&ext=" + dataAux + "&", urlDownload);
}
if (ext_itemgrid.getSelectionModel().getSelected().get("appDocPlugin") != "") { if (ext_itemgrid.getSelectionModel().getSelected().get("appDocPlugin") != "") {
messageText = TRANSLATIONS.ID_DOWNLOADING_FILE + " " + ext_itemgrid.getSelectionModel().getSelected().get("name"); messageText = _("ID_DOWNLOADING_FILE") + " " + ext_itemgrid.getSelectionModel().getSelected().get("name");
statusBarMessage(messageText, true, true); statusBarMessage(messageText, true, true);
try { try {
Ext.destroy(Ext.get("downloadIframe")); Ext.destroy(Ext.get("downloadIframe"));
} } catch (e) {
catch (e) {
} }
Ext.DomHelper.append(document.body, { Ext.DomHelper.append(document.body, {
@@ -479,10 +486,10 @@ function openActionDialog( caller, action ) {
css: "display: none; visibility: hidden; height: 0px;", css: "display: none; visibility: hidden; height: 0px;",
src: urlDownload src: urlDownload
}); });
} } else {
else {
streamFilefromPM(urlDownload); streamFilefromPM(urlDownload);
} }
}
/* /*
* if(document.location = * if(document.location =
@@ -820,8 +827,9 @@ datastore = new Ext.data.Store({
name : "downloadLink" name : "downloadLink"
},{ },{
name : "downloadLabel" name : "downloadLabel"
}, {
name: "outDocGenerate"
} }
])), ])),
// turn on remote sorting // turn on remote sorting
@@ -856,13 +864,20 @@ function renderFileName(value, p, record) {
'<img src="{0}" alt="* " align="absmiddle" />&nbsp;<b>{1}</b>', '<img src="{0}" alt="* " align="absmiddle" />&nbsp;<b>{1}</b>',
record.get('icon'), value); record.get('icon'), value);
} }
function renderType(value, p, record) {
if(record.get('appDocType')!=""){ function renderType(value, p, record)
return String.format('{1}, {0}', value,record.get('appDocType')); {
if (record.get("appDocType") != "") {
if (record.get("appDocType") == "Output" && record.get("outDocGenerate") != "") {
return String.format("{0}", _("ID_OUTPUT_DOCUMENT"));
} else { } else {
return String.format('<i>{0}</i>', value); return String.format("{1}, {0}", value, record.get("appDocType"));
}
} else {
return String.format("<i>{0}</i>", value);
} }
} }
function renderVersion(value, p, record) { function renderVersion(value, p, record) {
if(record.get("appDocVersionable")=="1"){ if(record.get("appDocVersionable")=="1"){
if(value>1){ if(value>1){
@@ -951,7 +966,7 @@ var gridtb = new Ext.Toolbar(
disabled : true, disabled : true,
hidden: true, hidden: true,
handler : function() { handler : function() {
openActionDialog(this, 'search'); openActionDialog(this, "search", "");
} }
}, },
'-', '-',
@@ -965,7 +980,7 @@ var gridtb = new Ext.Toolbar(
cls : 'x-btn-icon', cls : 'x-btn-icon',
// disabled : false, // disabled : false,
handler : function() { handler : function() {
openActionDialog(this, 'newFolder'); openActionDialog(this, "newFolder", "");
} }
}, },
{ {
@@ -979,7 +994,7 @@ var gridtb = new Ext.Toolbar(
disabled : false, disabled : false,
hidden: true, hidden: true,
handler : function() { handler : function() {
openActionDialog(this, 'copyAction'); openActionDialog(this, "copyAction", "");
} }
}, },
{ {
@@ -992,7 +1007,7 @@ var gridtb = new Ext.Toolbar(
disabled : false, disabled : false,
hidden: true, hidden: true,
handler : function() { handler : function() {
openActionDialog(this, 'moveAction'); openActionDialog(this, "moveAction", "");
} }
}, },
{ {
@@ -1006,8 +1021,8 @@ var gridtb = new Ext.Toolbar(
disabled : false, disabled : false,
// hidden: (showdelete==1)?false:true, // hidden: (showdelete==1)?false:true,
handler : function() { handler : function() {
openActionDialog(this, 'delete'); openActionDialog(this, "delete", "");
// openActionDialog(this, 'deleteDir'); // openActionDialog(this, "deleteDir", "");
} }
}, },
{ {
@@ -1020,7 +1035,7 @@ var gridtb = new Ext.Toolbar(
disabled : true, disabled : true,
hidden: true, hidden: true,
handler : function() { handler : function() {
openActionDialog(this, 'rename'); openActionDialog(this, "rename", "");
} }
}, },
'-', '-',
@@ -1034,7 +1049,7 @@ var gridtb = new Ext.Toolbar(
cls : 'x-btn-icon', cls : 'x-btn-icon',
// disabled : true, // disabled : true,
handler : function() { handler : function() {
openActionDialog(this, 'download'); openActionDialog(this, "download", "");
} }
}, },
{ {
@@ -1054,10 +1069,10 @@ var gridtb = new Ext.Toolbar(
* .load("/scripts/extjs3-ext/ux.swfupload/SwfUpload.js"); * .load("/scripts/extjs3-ext/ux.swfupload/SwfUpload.js");
* Ext.ux.OnDemandLoad .load( * Ext.ux.OnDemandLoad .load(
* "/scripts/extjs3-ext/ux.swfupload/SwfUploadPanel.js", * "/scripts/extjs3-ext/ux.swfupload/SwfUploadPanel.js",
* function(options) { openActionDialog(this, 'upload'); * function(options) { openActionDialog(this, "upload", "");
* }); * });
*/ */
openActionDialog(this, 'uploadDocument'); openActionDialog(this, "uploadDocument", "");
} }
}, },
'-', '-',
@@ -1146,13 +1161,13 @@ var getGrid = function( data, element) {
return grid; return grid;
}; };
/*
var expander = new Ext.ux.grid.RowExpander({ var expander = new Ext.ux.grid.RowExpander({
tpl : '<div class="ux-row-expander-box" style="border: 2px solid red;"></div>', tpl : '<div class="ux-row-expander-box" style="border: 2px solid red;"></div>',
// header:'Version', // header:'Version',
/*
* tpl : new Ext.Template( '<p><b>Company:</b> {company}</p><br>', '<p><b>Summary:</b> //* tpl : new Ext.Template( '<p><b>Company:</b> {company}</p><br>', '<p><b>Summary:</b>
* {desc}</p>' ), //* {desc}</p>' ),
*/
// width : 50, // width : 50,
@@ -1172,11 +1187,19 @@ var expander = new Ext.ux.grid.RowExpander({
}, },
renderer : renderVersionExpander renderer : renderVersionExpander
}); });
*/
var rowExpander = new Ext.ux.grid.RowExpander({
tpl: new Ext.Template(
"{outDocGenerate}"
)
});
//The column model has information about grid columns //The column model has information about grid columns
//dataIndex maps the column to the specific data field in //dataIndex maps the column to the specific data field in
//the data store //the data store
var cm = new Ext.grid.ColumnModel([{ var cm = new Ext.grid.ColumnModel([
rowExpander, {
id: "gridcm", //id assigned so we can apply custom css (e.g. -> .x-grid-col-topic b { color:#333 }) id: "gridcm", //id assigned so we can apply custom css (e.g. -> .x-grid-col-topic b { color:#333 })
header: _("ID_NAME"), header: _("ID_NAME"),
dataIndex: "name", dataIndex: "name",
@@ -1288,6 +1311,10 @@ var cm = new Ext.grid.ColumnModel([{
dataIndex: "id", dataIndex: "id",
hidden: true, hidden: true,
hideable: false hideable: false
}, {
dataIndex: "outDocGenerate",
hidden: true,
hideable: false
}]); }]);
//By default columns are sortable //By default columns are sortable
@@ -1380,7 +1407,7 @@ gridCtxMenu = new Ext.menu.Menu({
// '/images/documents/_editcopy.png', // '/images/documents/_editcopy.png',
text : TRANSLATIONS.ID_COPY, text : TRANSLATIONS.ID_COPY,
handler : function() { handler : function() {
openActionDialog(this, 'copyAction'); openActionDialog(this, "copyAction", "");
} }
}, { }, {
id : 'gc_move', id : 'gc_move',
@@ -1388,7 +1415,7 @@ gridCtxMenu = new Ext.menu.Menu({
// '/images/documents/_move.png', // '/images/documents/_move.png',
text : TRANSLATIONS.ID_MOVE, text : TRANSLATIONS.ID_MOVE,
handler : function() { handler : function() {
openActionDialog(this, 'moveAction'); openActionDialog(this, "moveAction", "");
} }
},*/ { },*/ {
id : 'gc_delete', id : 'gc_delete',
@@ -1396,8 +1423,8 @@ gridCtxMenu = new Ext.menu.Menu({
// '/images/documents/_editdelete.png', // '/images/documents/_editdelete.png',
text : TRANSLATIONS.ID_DELETE, text : TRANSLATIONS.ID_DELETE,
handler : function() { handler : function() {
openActionDialog(this, 'delete'); openActionDialog(this, "delete", "");
// openActionDialog(this, 'deleteDocument'); // openActionDialog(this, "deleteDocument", "");
} }
}, '-', { }, '-', {
@@ -1406,7 +1433,7 @@ gridCtxMenu = new Ext.menu.Menu({
// '/images/documents/_down.png', // '/images/documents/_down.png',
text : TRANSLATIONS.ID_DOWNLOAD, text : TRANSLATIONS.ID_DOWNLOAD,
handler : function() { handler : function() {
openActionDialog(this, 'download'); openActionDialog(this, "download", "");
} }
}, },
@@ -1522,7 +1549,7 @@ var dirCtxMenu = new Ext.menu.Menu(
text : TRANSLATIONS.ID_NEW_FOLDER, text : TRANSLATIONS.ID_NEW_FOLDER,
handler : function() { handler : function() {
dirCtxMenu.hide(); dirCtxMenu.hide();
openActionDialog(this, 'newFolder'); openActionDialog(this, "newFolder", "");
} }
}, },
{ {
@@ -1531,7 +1558,7 @@ var dirCtxMenu = new Ext.menu.Menu(
text : TRANSLATIONS.ID_RENAME, text : TRANSLATIONS.ID_RENAME,
handler : function() { handler : function() {
dirCtxMenu.hide(); dirCtxMenu.hide();
openActionDialog(this, 'rename'); openActionDialog(this, "rename", "");
} }
}, },
{ {
@@ -1542,7 +1569,7 @@ var dirCtxMenu = new Ext.menu.Menu(
text : TRANSLATIONS.ID_COPY, text : TRANSLATIONS.ID_COPY,
handler : function() { handler : function() {
dirCtxMenu.hide(); dirCtxMenu.hide();
openActionDialog(this, 'copyAction'); openActionDialog(this, "copyAction", "");
} }
}, },
{ {
@@ -1553,7 +1580,7 @@ var dirCtxMenu = new Ext.menu.Menu(
text : TRANSLATIONS.ID_MOVE, text : TRANSLATIONS.ID_MOVE,
handler : function() { handler : function() {
dirCtxMenu.hide(); dirCtxMenu.hide();
openActionDialog(this, 'moveAction'); openActionDialog(this, "moveAction", "");
} }
}, },
{ {
@@ -1762,7 +1789,8 @@ var documentsTab = {
bbar : gridbb, bbar : gridbb,
ddGroup : 'TreeDD', ddGroup : 'TreeDD',
enableDragDrop: true, enableDragDrop: true,
plugins: expander, //plugins: expander,
plugins: rowExpander,
selModel : new Ext.grid.RowSelectionModel({ selModel : new Ext.grid.RowSelectionModel({
listeners : { listeners : {
'rowselect' : { 'rowselect' : {
@@ -1780,8 +1808,7 @@ var documentsTab = {
ctrl : true, ctrl : true,
stopEvent : true, stopEvent : true,
handler : function() { handler : function() {
openActionDialog(this, openActionDialog(this, "copyAction", "");
'copyAction');
} }
}, },
@@ -1790,8 +1817,7 @@ var documentsTab = {
ctrl : true, ctrl : true,
stopEvent : true, stopEvent : true,
handler : function() { handler : function() {
openActionDialog(this, openActionDialog(this, "moveAction", "");
'moveAction');
} }
}, },
@@ -1808,8 +1834,7 @@ var documentsTab = {
{ {
key : Ext.EventObject.DELETE, key : Ext.EventObject.DELETE,
handler : function() { handler : function() {
openActionDialog(this, openActionDialog(this, "delete", "");
'delete');
} }
} ], } ],
listeners : { listeners : {
@@ -1845,12 +1870,10 @@ var documentsTab = {
.get('id')); .get('id'));
} else if (selections[0] } else if (selections[0]
.get('is_editable')) { .get('is_editable')) {
openActionDialog(this, openActionDialog(this, "edit", "");
'edit');
} else if (selections[0] } else if (selections[0]
.get('is_readable')) { .get('is_readable')) {
openActionDialog(this, openActionDialog(this, "view", "");
'view');
} }
} }
} }