fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 7108 Add the tabs in the summary to download and build documents

Browse Source
This commit is contained in:
Marco Antonio Nina
2012-02-23 12:34:33 -04:00
parent 54cee71502
commit f8fd7f1cf7
5 changed files with 116 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/controllers/appProxy.php
View File

@@ -2,7 +2,7 @@
/**
* App controller
* @author Erik Amaru Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
* @inherits Controller
* @herits Controller
* @access public
*/
@@ -131,6 +131,11 @@ class AppProxy extends HttpProxyController
$_SESSION['_applicationFields'] = $applicationFields;
$_SESSION['_processData'] = $processData;
$_SESSION['APPLICATION'] = $httpData->appUid;
$_SESSION['INDEX'] = $httpData->delIndex;
$_SESSION['PROCESS'] = $applicationFields['PRO_UID'];
$_SESSION['TASK'] = $applicationFields['TAS_UID'];
$_SESSION['STEP_POSITION'] = '';
}
/**
@@ -192,5 +197,4 @@ class AppProxy extends HttpProxyController
return $data;
}
}

17
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -477,6 +477,15 @@ $caseStep->getStepPosition());
G::RenderPage('publish', 'blank');
}
function uploadedDocumentsSummary()
{
global $G_PUBLISH;
$oCase = new Cases();
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_AllInputdocsList_Summary', $oCase->getAllUploadedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']));
G::RenderPage('publish', 'blank');
}
function generatedDocuments()
{
global $G_PUBLISH;
@@ -485,6 +494,14 @@ $caseStep->getStepPosition());
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_AllOutputdocsList', $oCase->getAllGeneratedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']));
G::RenderPage('publish', 'blank');
}
function generatedDocumentsSummary()
{
global $G_PUBLISH;
$oCase = new Cases();
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_AllOutputdocsList_Summary', $oCase->getAllGeneratedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']));
G::RenderPage('publish', 'blank');
}
function cancelCase()
{

28
workflow/engine/templates/app/main.js
View File

@@ -361,8 +361,8 @@ var openSummaryWindow = function(appUid, delIndex)
var summaryWindow = new Ext.Window({
title: _('ID_SUMMARY'),
layout: 'fit',
width: 500,
height: 400,
width: 600,
height: 450,
resizable: true,
closable: true,
modal: true,
@@ -382,14 +382,30 @@ var openSummaryWindow = function(appUid, delIndex)
],*/
});
if (response.dynUid != '') {
var tabs = new Array();
tabs.push(sumaryInfPanel);
if (response.dynUid != '') {
tabs.push({title: Ext.util.Format.capitalize(_('ID_MORE_INFORMATION')), bodyCfg: {
tag: 'iframe',
id: 'summaryIFrame',
src: '../cases/summary?APP_UID=' + appUid + '&DEL_INDEX=' + delIndex + '&DYN_UID=' + response.dynUid,
style: {border: '0px none', height: '440px'},
style: {border: '0px none', height: '300px'},
onload: ''
}});
}
tabs.push({title: Ext.util.Format.capitalize('Uploaded Documents'), bodyCfg: {
tag: 'iframe',
id: 'summaryIFrame',
src: '../cases/ajaxListener?action=uploadedDocumentsSummary',
style: {border: '0px none', height: '300px'},
onload: ''
}});
tabs.push({title: Ext.util.Format.capitalize('Generated Documents'), bodyCfg: {
tag: 'iframe',
id: 'summaryIFrame',
src: '../cases/ajaxListener?action=generatedDocumentsSummary',
style: {border: '0px none',height: '450px'},
onload: ''
}});
var summaryTabs = new Ext.TabPanel({
@@ -397,10 +413,6 @@ var openSummaryWindow = function(appUid, delIndex)
items: tabs
});
summaryWindow.add(summaryTabs);
}
else {
summaryWindow.add(sumaryInfPanel);
}
summaryWindow.doLayout();
summaryWindow.show();
}

35
workflow/engine/xmlform/cases/cases_AllInputdocsList_Summary.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm sqlConnection="" rowsPerPage="20" name="cases_AllInputdocsList">
<DOC_UID type="hidden" showInTable="0"/>
<POSITION type="hidden" showInTable="0"/>
<APP_DOC_UID type="hidden" showInTable="0"/>
<CONFIRM type="hidden" showInTable="0"/>
<DOWNLOAD_LABEL type="hidden" showInTable="0"/>
<TITLE type="text" colWidth="10" titleAlign="left" align="left">
<en>Filename</en>
</TITLE>
<APP_DOC_COMMENT type="text" colWidth="200" titleAlign="left" align="left">
<en>Comments</en>
</APP_DOC_COMMENT>
<CREATED_BY type="text" colWidth="150" titleAlign="left" align="left">
<en>Created By</en>
</CREATED_BY>
<CREATE_DATE type="text" colWidth="100" titleAlign="left" align="left">
<en>Create Date</en>
</CREATE_DATE>
<DELETE type="link" colWidth="" value="@#ID_DELETE" link="#" onclick="deleteUploadedDocument(@QAPP_DOC_UID);"><en></en></DELETE>
<DOWNLOAD type="link" colWidth="25" value="@#DOWNLOAD_LABEL" link="@#DOWNLOAD_LINK"/>
</dynaForm>

31
workflow/engine/xmlform/cases/cases_AllOutputdocsList_Summary.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm sqlConnection="" rowsPerPage="20" name="cases_AllOutputdocsList">
<DOC_UID type="hidden" showInTable="0"/>
<POSITION type="hidden" showInTable="0"/>
<APP_DOC_UID type="hidden" showInTable="0"/>
<CONFIRM type="hidden" showInTable="0"/>
<TITLE type="text" colWidth="200" titleAlign="left" align="left">
<en>Title</en>
<es><![CDATA[Título]]></es><pt><![CDATA[Título]]></pt></TITLE>
<OUTDOCTITLE type="text" colWidth="200" titleAlign="left" align="left">
<en>Output Document</en>
<es>Documento Generado</es><pt>Documento Generado</pt></OUTDOCTITLE>
<CREATE_DATE type="text" colWidth="100" titleAlign="left" align="left">
<en>Create Date</en>
<es><![CDATA[Fecha de creación]]></es></CREATE_DATE>
<DELETE type="link" colWidth="" value="@#ID_DELETE" link="#" onclick="deleteGeneratedDocument(@QAPP_DOC_UID);"><en></en></DELETE>
<DOWNLOAD_DOC type="link" colWidth="10" target="_blank" value="@#FILEDOCLABEL" link="@#FILEDOC"><en>Download</en></DOWNLOAD_DOC>
<DOWNLOAD_PDF type="link" colWidth="10" target="_blank" value="@#FILEPDFLABEL" link="@#FILEPDF"/>
</dynaForm>