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

COD STYLE changes

Browse Source 
files  modified:   workflow/engine/methods/cases/casesListExtJs.php
       modified:   workflow/engine/methods/cases/casesListExtJsRedirector.php
       modified:   workflow/engine/methods/cases/casesList_Ajax.php
       modified:   workflow/engine/methods/cases/casesMenuLoader.php
       modified:   workflow/engine/methods/cases/cases_Step.php
       modified:   workflow/engine/methods/cases/cases_StepToRevise.php
       modified:   workflow/engine/methods/cases/cases_StepToReviseInputs.php
       modified:   workflow/engine/methods/cases/cases_StepToReviseOutputs.php
       modified:   workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
       modified:   workflow/engine/methods/cases/cases_ToReviseInputDocView.php
       modified:   workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
       modified:   workflow/engine/methods/cases/cases_UsersReassign.php
       modified:   workflow/engine/methods/cases/cases_toRevise.php
This commit is contained in:
Ralph Asendeteufrer
2012-10-19 17:17:53 -04:00
parent 8f152c9daa
commit b51c9f6de4
13 changed files with 3128 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -2,9 +2,10 @@
//get the action from GET or POST, default is todo //get the action from GET or POST, default is todo
$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo'); $action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
//fix a previous inconsistency //fix a previous inconsistency
if ($action == 'selfservice') if ($action == 'selfservice') {
$action = 'unassigned'; $action = 'unassigned';
//if ( $action == 'sent' ) $action = 'participated'; //if ( $action == 'sent' ) $action = 'participated';
}
G::LoadClass( "BasePeer" ); G::LoadClass( "BasePeer" );
G::LoadClass( 'configuration' ); G::LoadClass( 'configuration' );
@@ -183,8 +184,9 @@ function getAllUsersArray ($action)
$cUsers = $oAppCache->getToReassignListCriteria(); $cUsers = $oAppCache->getToReassignListCriteria();
$cUsers->addSelectColumn( AppCacheViewPeer::USR_UID ); $cUsers->addSelectColumn( AppCacheViewPeer::USR_UID );
if (g::MySQLSintaxis()) if (g::MySQLSintaxis()) {
$cUsers->addGroupByColumn( AppCacheViewPeer::USR_UID ); $cUsers->addGroupByColumn( AppCacheViewPeer::USR_UID );
}
$cUsers->addAscendingOrderByColumn( AppCacheViewPeer::APP_CURRENT_USER ); $cUsers->addAscendingOrderByColumn( AppCacheViewPeer::APP_CURRENT_USER );
$oDataset = AppCacheViewPeer::doSelectRS( $cUsers ); $oDataset = AppCacheViewPeer::doSelectRS( $cUsers );
@@ -224,7 +226,6 @@ function getStatusArray ($action, $userUid)
} }
return $status; return $status;
break; break;
case 'selfservice': case 'selfservice':
$cStatus = $oAppCache->getUnassignedListCriteria( $userUid ); $cStatus = $oAppCache->getUnassignedListCriteria( $userUid );
break; break;
@@ -990,7 +991,8 @@ function getReassignUsersList ()
function getAdditionalFields ($action, $confCasesList = array()) function getAdditionalFields ($action, $confCasesList = array())
{ {
if (! empty( $confCasesList ) && ! empty( $confCasesList['second']['data'] )) { // For the case list builder in the enterprise plugin if (! empty( $confCasesList ) && ! empty( $confCasesList['second']['data'] )) {
// For the case list builder in the enterprise plugin
$caseColumns = array (); $caseColumns = array ();
$caseReaderFields = array (); $caseReaderFields = array ();

1
workflow/engine/methods/cases/casesListExtJsRedirector.php
View File

@@ -24,4 +24,5 @@ if (isset( $_GET['ux'] )) {
?> ?>
} }
</script> </script>
<?php

34
workflow/engine/methods/cases/casesList_Ajax.php
View File

@@ -238,13 +238,35 @@ if ($actionAjax == 'showDynaformListHistory') {
html { html {
color: black !important; color: black !important;
} }
body { body {
color: black !important; color: black !important;
} }
</style> </style>
<script language="Javascript"> <script language="Javascript">
globalMd5Return=function(s,raw,hexcase,chrsz){raw=raw||false;hexcase=hexcase||false;chrsz=chrsz||8;function safe_add(x,y){var lsw=(x&0xFFFF)+(y&0xFFFF);var msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&0xFFFF)}function bit_rol(num,cnt){return(num<<cnt)|(num>>>(32-cnt))}function md5_cmn(q,a,b,x,s,t){return safe_add(bit_rol(safe_add(safe_add(a,q),safe_add(x,t)),s),b)}function md5_ff(a,b,c,d,x,s,t){return md5_cmn((b&c)|((~b)&d),a,b,x,s,t)}function md5_gg(a,b,c,d,x,s,t){return md5_cmn((b&d)|(c&(~d)),a,b,x,s,t)}function md5_hh(a,b,c,d,x,s,t){return md5_cmn(b^c^d,a,b,x,s,t)}function md5_ii(a,b,c,d,x,s,t){return md5_cmn(c^(b|(~d)),a,b,x,s,t)}function core_md5(x,len){x[len>>5]|=0x80<<((len)%32);x[(((len+64)>>>9)<<4)+14]=len;var a=1732584193;var b=-271733879;var c=-1732584194;var d=271733878;for(var i=0;i<x.length;i+=16){var olda=a;var oldb=b;var oldc=c;var oldd=d;a=md5_ff(a,b,c,d,x[i+0],7,-680876936);d=md5_ff(d,a,b,c,x[i+1],12,-389564586);c=md5_ff(c,d,a,b,x[i+2],17,606105819);b=md5_ff(b,c,d,a,x[i+3],22,-1044525330);a=md5_ff(a,b,c,d,x[i+4],7,-176418897);d=md5_ff(d,a,b,c,x[i+5],12,1200080426);c=md5_ff(c,d,a,b,x[i+6],17,-1473231341);b=md5_ff(b,c,d,a,x[i+7],22,-45705983);a=md5_ff(a,b,c,d,x[i+8],7,1770035416);d=md5_ff(d,a,b,c,x[i+9],12,-1958414417);c=md5_ff(c,d,a,b,x[i+10],17,-42063);b=md5_ff(b,c,d,a,x[i+11],22,-1990404162);a=md5_ff(a,b,c,d,x[i+12],7,1804603682);d=md5_ff(d,a,b,c,x[i+13],12,-40341101);c=md5_ff(c,d,a,b,x[i+14],17,-1502002290);b=md5_ff(b,c,d,a,x[i+15],22,1236535329);a=md5_gg(a,b,c,d,x[i+1],5,-165796510);d=md5_gg(d,a,b,c,x[i+6],9,-1069501632);c=md5_gg(c,d,a,b,x[i+11],14,643717713);b=md5_gg(b,c,d,a,x[i+0],20,-373897302);a=md5_gg(a,b,c,d,x[i+5],5,-701558691);d=md5_gg(d,a,b,c,x[i+10],9,38016083);c=md5_gg(c,d,a,b,x[i+15],14,-660478335);b=md5_gg(b,c,d,a,x[i+4],20,-405537848);a=md5_gg(a,b,c,d,x[i+9],5,568446438);d=md5_gg(d,a,b,c,x[i+14],9,-1019803690);c=md5_gg(c,d,a,b,x[i+3],14,-187363961);b=md5_gg(b,c,d,a,x[i+8],20,1163531501);a=md5_gg(a,b,c,d,x[i+13],5,-1444681467);d=md5_gg(d,a,b,c,x[i+2],9,-51403784);c=md5_gg(c,d,a,b,x[i+7],14,1735328473);b=md5_gg(b,c,d,a,x[i+12],20,-1926607734);a=md5_hh(a,b,c,d,x[i+5],4,-378558);d=md5_hh(d,a,b,c,x[i+8],11,-2022574463);c=md5_hh(c,d,a,b,x[i+11],16,1839030562);b=md5_hh(b,c,d,a,x[i+14],23,-35309556);a=md5_hh(a,b,c,d,x[i+1],4,-1530992060);d=md5_hh(d,a,b,c,x[i+4],11,1272893353);c=md5_hh(c,d,a,b,x[i+7],16,-155497632);b=md5_hh(b,c,d,a,x[i+10],23,-1094730640);a=md5_hh(a,b,c,d,x[i+13],4,681279174);d=md5_hh(d,a,b,c,x[i+0],11,-358537222);c=md5_hh(c,d,a,b,x[i+3],16,-722521979);b=md5_hh(b,c,d,a,x[i+6],23,76029189);a=md5_hh(a,b,c,d,x[i+9],4,-640364487);d=md5_hh(d,a,b,c,x[i+12],11,-421815835);c=md5_hh(c,d,a,b,x[i+15],16,530742520);b=md5_hh(b,c,d,a,x[i+2],23,-995338651);a=md5_ii(a,b,c,d,x[i+0],6,-198630844);d=md5_ii(d,a,b,c,x[i+7],10,1126891415);c=md5_ii(c,d,a,b,x[i+14],15,-1416354905);b=md5_ii(b,c,d,a,x[i+5],21,-57434055);a=md5_ii(a,b,c,d,x[i+12],6,1700485571);d=md5_ii(d,a,b,c,x[i+3],10,-1894986606);c=md5_ii(c,d,a,b,x[i+10],15,-1051523);b=md5_ii(b,c,d,a,x[i+1],21,-2054922799);a=md5_ii(a,b,c,d,x[i+8],6,1873313359);d=md5_ii(d,a,b,c,x[i+15],10,-30611744);c=md5_ii(c,d,a,b,x[i+6],15,-1560198380);b=md5_ii(b,c,d,a,x[i+13],21,1309151649);a=md5_ii(a,b,c,d,x[i+4],6,-145523070);d=md5_ii(d,a,b,c,x[i+11],10,-1120210379);c=md5_ii(c,d,a,b,x[i+2],15,718787259);b=md5_ii(b,c,d,a,x[i+9],21,-343485551);a=safe_add(a,olda);b=safe_add(b,oldb);c=safe_add(c,oldc);d=safe_add(d,oldd)}return[a,b,c,d]}function str2binl(str){var bin=[];var mask=(1<<chrsz)-1;for(var i=0;i<str.length*chrsz;i+=chrsz){bin[i>>5]|=(str.charCodeAt(i/chrsz)&mask)<<(i%32)}return bin}function binl2str(bin){var str="";var mask=(1<<chrsz)-1;for(var i=0;i<bin.length*32;i+=chrsz){str+=String.fromCharCode((bin[i>>5]>>>(i%32))&mask)}return str}function binl2hex(binarray){var hex_tab=hexcase?"0123456789ABCDEF":"0123456789abcdef";var str="";for(var i=0;i<binarray.length*4;i++){str+=hex_tab.charAt((binarray[i>>2]>>((i%4)*8+4))&0xF)+hex_tab.charAt((binarray[i>>2]>>((i%4)*8))&0xF)}return str}return(raw?binl2str(core_md5(str2binl(s),s.length*chrsz)):binl2hex(core_md5(str2binl(s),s.length*chrsz)))}; globalMd5Return=function(s,raw,hexcase,chrsz){
raw=raw||false;hexcase=hexcase||false;chrsz=chrsz||8;function safe_add(x,y){
var lsw=(x&0xFFFF)+(y&0xFFFF);var msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&0xFFFF)}
function bit_rol(num,cnt){return(num<<cnt)|(num>>>(32-cnt))}function md5_cmn(q,a,b,x,s,t){
return safe_add(bit_rol(safe_add(safe_add(a,q),safe_add(x,t)),s),b)}function md5_ff(a,b,c,d,x,s,t){
return md5_cmn((b&c)|((~b)&d),a,b,x,s,t)}
function md5_gg(a,b,c,d,x,s,t){
return md5_cmn((b&d)|(c&(~d)),a,b,x,s,t)}
function md5_hh(a,b,c,d,x,s,t){
return md5_cmn(b^c^d,a,b,x,s,t)}
function md5_ii(a,b,c,d,x,s,t){
return md5_cmn(c^(b|(~d)),a,b,x,s,t)}
function core_md5(x,len){x[len>>5]|=0x80<<((len)%32);x[(((len+64)>>>9)<<4)+14]=len;var a=1732584193;var b=-271733879;var c=-1732584194;var d=271733878;for(var i=0;i<x.length;i+=16){
var olda=a;var oldb=b;var oldc=c;var oldd=d;a=md5_ff(a,b,c,d,x[i+0],7,-680876936);d=md5_ff(d,a,b,c,x[i+1],12,-389564586);c=md5_ff(c,d,a,b,x[i+2],17,606105819);b=md5_ff(b,c,d,a,x[i+3],22,-1044525330);a=md5_ff(a,b,c,d,x[i+4],7,-176418897);d=md5_ff(d,a,b,c,x[i+5],12,1200080426);c=md5_ff(c,d,a,b,x[i+6],17,-1473231341);b=md5_ff(b,c,d,a,x[i+7],22,-45705983);a=md5_ff(a,b,c,d,x[i+8],7,1770035416);d=md5_ff(d,a,b,c,x[i+9],12,-1958414417);c=md5_ff(c,d,a,b,x[i+10],17,-42063);b=md5_ff(b,c,d,a,x[i+11],22,-1990404162);a=md5_ff(a,b,c,d,x[i+12],7,1804603682);d=md5_ff(d,a,b,c,x[i+13],12,-40341101);c=md5_ff(c,d,a,b,x[i+14],17,-1502002290);b=md5_ff(b,c,d,a,x[i+15],22,1236535329);a=md5_gg(a,b,c,d,x[i+1],5,-165796510);d=md5_gg(d,a,b,c,x[i+6],9,-1069501632);c=md5_gg(c,d,a,b,x[i+11],14,643717713);b=md5_gg(b,c,d,a,x[i+0],20,-373897302);a=md5_gg(a,b,c,d,x[i+5],5,-701558691);d=md5_gg(d,a,b,c,x[i+10],9,38016083);c=md5_gg(c,d,a,b,x[i+15],14,-660478335);b=md5_gg(b,c,d,a,x[i+4],20,-405537848);a=md5_gg(a,b,c,d,x[i+9],5,568446438);d=md5_gg(d,a,b,c,x[i+14],9,-1019803690);c=md5_gg(c,d,a,b,x[i+3],14,-187363961);b=md5_gg(b,c,d,a,x[i+8],20,1163531501);a=md5_gg(a,b,c,d,x[i+13],5,-1444681467);d=md5_gg(d,a,b,c,x[i+2],9,-51403784);c=md5_gg(c,d,a,b,x[i+7],14,1735328473);b=md5_gg(b,c,d,a,x[i+12],20,-1926607734);a=md5_hh(a,b,c,d,x[i+5],4,-378558);d=md5_hh(d,a,b,c,x[i+8],11,-2022574463);c=md5_hh(c,d,a,b,x[i+11],16,1839030562);b=md5_hh(b,c,d,a,x[i+14],23,-35309556);a=md5_hh(a,b,c,d,x[i+1],4,-1530992060);d=md5_hh(d,a,b,c,x[i+4],11,1272893353);c=md5_hh(c,d,a,b,x[i+7],16,-155497632);b=md5_hh(b,c,d,a,x[i+10],23,-1094730640);a=md5_hh(a,b,c,d,x[i+13],4,681279174);d=md5_hh(d,a,b,c,x[i+0],11,-358537222);c=md5_hh(c,d,a,b,x[i+3],16,-722521979);b=md5_hh(b,c,d,a,x[i+6],23,76029189);a=md5_hh(a,b,c,d,x[i+9],4,-640364487);d=md5_hh(d,a,b,c,x[i+12],11,-421815835);c=md5_hh(c,d,a,b,x[i+15],16,530742520);b=md5_hh(b,c,d,a,x[i+2],23,-995338651);
a=md5_ii(a,b,c,d,x[i+0],6,-198630844);d=md5_ii(d,a,b,c,x[i+7],10,1126891415);c=md5_ii(c,d,a,b,x[i+14],15,-1416354905);
b=md5_ii(b,c,d,a,x[i+5],21,-57434055);a=md5_ii(a,b,c,d,x[i+12],6,1700485571);d=md5_ii(d,a,b,c,x[i+3],10,-1894986606);c=md5_ii(c,d,a,b,x[i+10],15,-1051523);b=md5_ii(b,c,d,a,x[i+1],21,-2054922799);a=md5_ii(a,b,c,d,x[i+8],6,1873313359);
d=md5_ii(d,a,b,c,x[i+15],10,-30611744);c=md5_ii(c,d,a,b,x[i+6],15,-1560198380);b=md5_ii(b,c,d,a,x[i+13],21,1309151649);a=md5_ii(a,b,c,d,x[i+4],6,-145523070);d=md5_ii(d,a,b,c,x[i+11],10,-1120210379);c=md5_ii(c,d,a,b,x[i+2],15,718787259);b=md5_ii(b,c,d,a,x[i+9],21,-343485551);a=safe_add(a,olda);b=safe_add(b,oldb);c=safe_add(c,oldc);d=safe_add(d,oldd)}
return[a,b,c,d]}
function str2binl(str){var bin=[];var mask=(1<<chrsz)-1;for(var i=0;i<str.length*chrsz;i+=chrsz){bin[i>>5]|=(str.charCodeAt(i/chrsz)&mask)<<(i%32)}
return bin}
function binl2str(bin){var str="";var mask=(1<<chrsz)-1;for(var i=0;i<bin.length*32;i+=chrsz){str+=String.fromCharCode((bin[i>>5]>>>(i%32))&mask)}return str}
function binl2hex(binarray){var hex_tab=hexcase?"0123456789ABCDEF":"0123456789abcdef";var str="";for(var i=0;i<binarray.length*4;i++){str+=hex_tab.charAt((binarray[i>>2]>>((i%4)*8+4))&0xF)+hex_tab.charAt((binarray[i>>2]>>((i%4)*8))&0xF)}
return str}
return(raw?binl2str(core_md5(str2binl(s),s.length*chrsz)):binl2hex(core_md5(str2binl(s),s.length*chrsz)))};
//!Code that simulated reload library javascript maborak //!Code that simulated reload library javascript maborak
var leimnud = {}; var leimnud = {};
@@ -325,15 +347,11 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
html { html {
color: black !important; color: black !important;
} }
body { body {
color: black !important; color: black !important;
} }
</style> </style>
<script language="Javascript"> <script language="Javascript">
//!Code that simulated reload library javascript maborak //!Code that simulated reload library javascript maborak
var leimnud = {}; var leimnud = {};
leimnud.exec = ""; leimnud.exec = "";
@@ -372,9 +390,7 @@ body {
} }
</script> </script>
<?php <?php
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} }
if ($actionAjax == 'historyDynaformGridPreview') { if ($actionAjax == 'historyDynaformGridPreview') {
?> ?>
@@ -383,7 +399,6 @@ if ($actionAjax == 'historyDynaformGridPreview') {
html { html {
color: black !important; color: black !important;
} }
body { body {
color: black !important; color: black !important;
} }
@@ -430,7 +445,6 @@ body {
} }
</script> </script>
<?php <?php
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} }

156
workflow/engine/methods/cases/cases_Step.php
View File

@@ -99,7 +99,8 @@ $oProcessFieds = $oProcess->Load( $_SESSION['PROCESS'] );
#trigger debug routines... #trigger debug routines...
if (isset( $oProcessFieds['PRO_DEBUG'] ) && $oProcessFieds['PRO_DEBUG']) { #here we must verify if is a debugg session if (isset( $oProcessFieds['PRO_DEBUG'] ) && $oProcessFieds['PRO_DEBUG']) {
#here we must verify if is a debugg session
$_SESSION['TRIGGER_DEBUG']['ISSET'] = 1; $_SESSION['TRIGGER_DEBUG']['ISSET'] = 1;
$_SESSION['PMDEBUGGER'] = true; $_SESSION['PMDEBUGGER'] = true;
} else { } else {
@@ -109,8 +110,9 @@ if (isset( $oProcessFieds['PRO_DEBUG'] ) && $oProcessFieds['PRO_DEBUG']) { #here
//cleaning debug variables //cleaning debug variables
if (! isset( $_GET['breakpoint'] )) { if (! isset( $_GET['breakpoint'] )) {
if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) {
unset( $_SESSION['TRIGGER_DEBUG']['info'] ); unset( $_SESSION['TRIGGER_DEBUG']['info'] );
}
if (! isset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] )) { if (! isset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] )) {
$_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array (); $_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array ();
@@ -228,7 +230,6 @@ try {
$G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower( $oStep->getStepMode() ) != 'edit' ? strtolower( $oStep->getStepMode() ) : '') ); $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower( $oStep->getStepMode() ) != 'edit' ? strtolower( $oStep->getStepMode() ) : '') );
break; break;
case 'INPUT_DOCUMENT': case 'INPUT_DOCUMENT':
if ($noShowTitle == 0) { if ($noShowTitle == 0) {
$G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array ); $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
@@ -267,9 +268,9 @@ try {
$Fields['MESSAGE2'] = G::LoadTranslation( 'ID_PLEASE_SELECT_FILE' ); $Fields['MESSAGE2'] = G::LoadTranslation( 'ID_PLEASE_SELECT_FILE' );
//START: If there is a Break Step registered from Plugin Similar as a Trigger debug //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
$oPluginRegistry = & PMPluginRegistry::getSingleton(); $oPluginRegistry = & PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) { //If a Plugin has registered a Break Page Evaluator if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) {
$oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED'] //If a Plugin has registered a Break Page Evaluator
) ); $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED']) );
} }
//END: If there is a Break Step registered from Plugin //END: If there is a Break Step registered from Plugin
$G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID'] ), array_merge( array ('DOC_UID' => $_GET['UID'] $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID'] ), array_merge( array ('DOC_UID' => $_GET['UID']
@@ -289,12 +290,12 @@ try {
$oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher = & headPublisher::getSingleton();
$titleDocument = "<h3>" . $Fields['INP_DOC_TITLE'] . "<br><small>" . G::LoadTranslation( 'ID_INPUT_DOCUMENT' ) . "</small></h3>"; $titleDocument = "<h3>" . $Fields['INP_DOC_TITLE'] . "<br><small>" . G::LoadTranslation( 'ID_INPUT_DOCUMENT' ) . "</small></h3>";
if ($Fields['INP_DOC_DESCRIPTION']) if ($Fields['INP_DOC_DESCRIPTION']) {
$titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( htmlentities( utf8_decode( $Fields['INP_DOC_DESCRIPTION'] ) ) ) ) ) . ""; $titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( htmlentities( utf8_decode( $Fields['INP_DOC_DESCRIPTION'] ) ) ) ) ) . "";
}
$oHeadPublisher->addScriptCode( "documentName='{$titleDocument}';" ); $oHeadPublisher->addScriptCode( "documentName='{$titleDocument}';" );
break; break;
case 'VIEW': case 'VIEW':
require_once 'classes/model/AppDocument.php'; require_once 'classes/model/AppDocument.php';
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
@@ -321,11 +322,9 @@ try {
break; break;
} }
break; break;
case 'OUTPUT_DOCUMENT': case 'OUTPUT_DOCUMENT':
//$G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); //$G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
require_once 'classes/model/OutputDocument.php'; require_once 'classes/model/OutputDocument.php';
$oOutputDocument = new OutputDocument(); $oOutputDocument = new OutputDocument();
$aOD = $oOutputDocument->load( $_GET['UID'] ); $aOD = $oOutputDocument->load( $_GET['UID'] );
@@ -341,13 +340,12 @@ try {
case 'GENERATE': case 'GENERATE':
//START: If there is a Break Step registered from Plugin Similar as a Trigger debug //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
$oPluginRegistry = & PMPluginRegistry::getSingleton(); $oPluginRegistry = & PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) { //If a Plugin has registered a Break Page Evaluator if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) {
$oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED'] //If a Plugin has registered a Break Page Evaluator
) ); $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED']) );
} }
//END: If there is a Break Step registered from Plugin //END: If there is a Break Step registered from Plugin
$sFilenameOriginal = $sFilename = preg_replace( '[^A-Za-z0-9_]', '_', G::replaceDataField( $aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA'] ) ); $sFilenameOriginal = $sFilename = preg_replace( '[^A-Za-z0-9_]', '_', G::replaceDataField( $aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA'] ) );
require_once 'classes/model/AppFolder.php'; require_once 'classes/model/AppFolder.php';
require_once 'classes/model/AppDocument.php'; require_once 'classes/model/AppDocument.php';
@@ -369,7 +367,6 @@ try {
// $lastDocVersion++; // $lastDocVersion++;
//} //}
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->add( AppDocumentPeer::APP_UID, $_SESSION['APPLICATION'] ); $oCriteria->add( AppDocumentPeer::APP_UID, $_SESSION['APPLICATION'] );
//$oCriteria->add(AppDocumentPeer::DEL_INDEX, $_SESSION['INDEX']); //$oCriteria->add(AppDocumentPeer::DEL_INDEX, $_SESSION['INDEX']);
@@ -379,7 +376,8 @@ try {
$oDataset = AppDocumentPeer::doSelectRS( $oCriteria ); $oDataset = AppDocumentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
if (($aOD['OUT_DOC_VERSIONING']) && ($lastDocVersion != 0)) { //Create new Version of current output if (($aOD['OUT_DOC_VERSIONING']) && ($lastDocVersion != 0)) {
//Create new Version of current output
$lastDocVersion ++; $lastDocVersion ++;
if ($aRow = $oDataset->getRow()) { if ($aRow = $oDataset->getRow()) {
$aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion + 1,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion + 1,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
@@ -388,18 +386,20 @@ try {
$oAppDocument->create( $aFields ); $oAppDocument->create( $aFields );
$sDocUID = $aRow['APP_DOC_UID']; $sDocUID = $aRow['APP_DOC_UID'];
} }
} else { //No versioning so Update a current Output or Create new if no exist } else {
if ($aRow = $oDataset->getRow()) { //Update //No versioning so Update a current Output or Create new if no exist
$aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags if ($aRow = $oDataset->getRow()) {
); //Update
$aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags );
$oAppDocument = new AppDocument(); $oAppDocument = new AppDocument();
$oAppDocument->update( $aFields ); $oAppDocument->update( $aFields );
$sDocUID = $aRow['APP_DOC_UID']; $sDocUID = $aRow['APP_DOC_UID'];
} else { //create } else {
if ($lastDocVersion == 0) //create
if ($lastDocVersion == 0) {
$lastDocVersion ++; $lastDocVersion ++;
$aFields = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags }
); $aFields = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags);
$oAppDocument = new AppDocument(); $oAppDocument = new AppDocument();
$aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create( $aFields ); $aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create( $aFields );
@@ -409,7 +409,6 @@ try {
//$sFilename = ereg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA'])); //$sFilename = ereg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
//if ( $sFilename == '' ) $sFilename='_'; //if ( $sFilename == '' ) $sFilename='_';
$sFilename = $aFields['APP_DOC_UID'] . "_" . $lastDocVersion; $sFilename = $aFields['APP_DOC_UID'] . "_" . $lastDocVersion;
$pathOutput = PATH_DOCUMENT . $_SESSION['APPLICATION'] . PATH_SEP . 'outdocs' . PATH_SEP; $pathOutput = PATH_DOCUMENT . $_SESSION['APPLICATION'] . PATH_SEP . 'outdocs' . PATH_SEP;
@@ -419,24 +418,26 @@ try {
$aProperties = array (); //maui $aProperties = array (); //maui
if (! isset( $aOD['OUT_DOC_MEDIA'] )) {
if (! isset( $aOD['OUT_DOC_MEDIA'] ))
$aOD['OUT_DOC_MEDIA'] = 'Letter'; $aOD['OUT_DOC_MEDIA'] = 'Letter';
if (! isset( $aOD['OUT_DOC_LEFT_MARGIN'] )) }
if (! isset( $aOD['OUT_DOC_LEFT_MARGIN'] )) {
$aOD['OUT_DOC_LEFT_MARGIN'] = '15'; $aOD['OUT_DOC_LEFT_MARGIN'] = '15';
if (! isset( $aOD['OUT_DOC_RIGHT_MARGIN'] )) }
if (! isset( $aOD['OUT_DOC_RIGHT_MARGIN'] )) {
$aOD['OUT_DOC_RIGHT_MARGIN'] = '15'; $aOD['OUT_DOC_RIGHT_MARGIN'] = '15';
if (! isset( $aOD['OUT_DOC_TOP_MARGIN'] )) }
if (! isset( $aOD['OUT_DOC_TOP_MARGIN'] )) {
$aOD['OUT_DOC_TOP_MARGIN'] = '15'; $aOD['OUT_DOC_TOP_MARGIN'] = '15';
if (! isset( $aOD['OUT_DOC_BOTTOM_MARGIN'] )) }
if (! isset( $aOD['OUT_DOC_BOTTOM_MARGIN'] )) {
$aOD['OUT_DOC_BOTTOM_MARGIN'] = '15'; $aOD['OUT_DOC_BOTTOM_MARGIN'] = '15';
}
$aProperties['media'] = $aOD['OUT_DOC_MEDIA']; $aProperties['media'] = $aOD['OUT_DOC_MEDIA'];
$aProperties['margins'] = array ('left' => $aOD['OUT_DOC_LEFT_MARGIN'],'right' => $aOD['OUT_DOC_RIGHT_MARGIN'],'top' => $aOD['OUT_DOC_TOP_MARGIN'],'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN'] $aProperties['margins'] = array ('left' => $aOD['OUT_DOC_LEFT_MARGIN'],'right' => $aOD['OUT_DOC_RIGHT_MARGIN'],'top' => $aOD['OUT_DOC_TOP_MARGIN'],'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']);
);
if ($aOD['OUT_DOC_PDF_SECURITY_ENABLED'] == '1') { if ($aOD['OUT_DOC_PDF_SECURITY_ENABLED'] == '1') {
$aProperties['pdfSecurity'] = array ('openPassword' => $aOD['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],'ownerPassword' => $aOD['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],'permissions' => $aOD['OUT_DOC_PDF_SECURITY_PERMISSIONS'] $aProperties['pdfSecurity'] = array ('openPassword' => $aOD['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],'ownerPassword' => $aOD['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],'permissions' => $aOD['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
);
} }
$oOutputDocument->generate( $_GET['UID'], $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties ); $oOutputDocument->generate( $_GET['UID'], $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties );
//$sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'] ); //$sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'] );
@@ -479,7 +480,6 @@ try {
$xmlData .= "</dynaform>\n"; $xmlData .= "</dynaform>\n";
//$iSize = file_put_contents ( $javaOutput . 'addressBook.xml' , $xmlData ); //$iSize = file_put_contents ( $javaOutput . 'addressBook.xml' , $xmlData );
G::LoadClass( 'javaBridgePM' ); G::LoadClass( 'javaBridgePM' );
$JBPM = new JavaBridgePM(); $JBPM = new JavaBridgePM();
$JBPM->checkJavaExtension(); $JBPM->checkJavaExtension();
@@ -506,12 +506,10 @@ try {
$Fields['TAS_UID'] = $_SESSION['TASK']; $Fields['TAS_UID'] = $_SESSION['TASK'];
//Execute after triggers - End //Execute after triggers - End
//Save data - Start //Save data - Start
$oCase->updateCase( $_SESSION['APPLICATION'], $Fields ); $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
//Save data - End //Save data - End
//Plugin Hook PM_UPLOAD_DOCUMENT for upload document //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
$oPluginRegistry = & PMPluginRegistry::getSingleton(); $oPluginRegistry = & PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) { if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) {
@@ -528,7 +526,8 @@ try {
$documentData->sFileType = "PDF"; $documentData->sFileType = "PDF";
$documentData->bUseOutputFolder = true; $documentData->bUseOutputFolder = true;
$uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData ); $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
if ($uploadReturn) { //Only delete if the file was saved correctly if ($uploadReturn) {
//Only delete if the file was saved correctly
$aFields['APP_DOC_PLUGIN'] = $triggerDetail->sNamespace; $aFields['APP_DOC_PLUGIN'] = $triggerDetail->sNamespace;
//$oAppDocument = new AppDocument(); //$oAppDocument = new AppDocument();
//$oAppDocument->update($aFields); //$oAppDocument->update($aFields);
@@ -540,10 +539,10 @@ try {
$documentData->sFileType = "DOC"; $documentData->sFileType = "DOC";
$documentData->bUseOutputFolder = true; $documentData->bUseOutputFolder = true;
$uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData ); $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
if ($uploadReturn) { //Only delete if the file was saved correctly if ($uploadReturn) {
//Only delete if the file was saved correctly
unlink( $pathOutput . $sFilename . '.doc' ); unlink( $pathOutput . $sFilename . '.doc' );
} }
break; break;
case "PDF": case "PDF":
$documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion() ); $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
@@ -551,7 +550,8 @@ try {
$documentData->sFileType = "PDF"; $documentData->sFileType = "PDF";
$documentData->bUseOutputFolder = true; $documentData->bUseOutputFolder = true;
$uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData ); $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
if ($uploadReturn) { //Only delete if the file was saved correctly if ($uploadReturn) {
//Only delete if the file was saved correctly
unlink( $pathOutput . $sFilename . '.pdf' ); unlink( $pathOutput . $sFilename . '.pdf' );
} }
break; break;
@@ -561,7 +561,8 @@ try {
$documentData->sFileType = "DOC"; $documentData->sFileType = "DOC";
$documentData->bUseOutputFolder = true; $documentData->bUseOutputFolder = true;
$uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData ); $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
if ($uploadReturn) { //Only delete if the file was saved correctly if ($uploadReturn) {
//Only delete if the file was saved correctly
unlink( $pathOutput . $sFilename . '.doc' ); unlink( $pathOutput . $sFilename . '.doc' );
} }
break; break;
@@ -608,7 +609,8 @@ try {
$aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v=' . $lastDocVersion . '&ext=pdf&random=' . rand() . '&PHPSESSID=' . @session_id(); $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v=' . $lastDocVersion . '&ext=pdf&random=' . rand() . '&PHPSESSID=' . @session_id();
if (is_array( $listing )) { //If exist in Plugin Document List if (is_array( $listing )) {
//If exist in Plugin Document List
foreach ($listing as $folderitem) { foreach ($listing as $folderitem) {
if (($folderitem->filename == $aFields['APP_DOC_UID']) && ($folderitem->type == 'DOC')) { if (($folderitem->filename == $aFields['APP_DOC_UID']) && ($folderitem->type == 'DOC')) {
$aFields['VIEW1'] = G::LoadTranslation( 'ID_GET_EXTERNAL_FILE' ); $aFields['VIEW1'] = G::LoadTranslation( 'ID_GET_EXTERNAL_FILE' );
@@ -623,19 +625,20 @@ try {
} }
} }
if (($aGields['OUT_DOC_GENERATE'] == 'BOTH') || ($aGields['OUT_DOC_GENERATE'] == '')) if (($aGields['OUT_DOC_GENERATE'] == 'BOTH') || ($aGields['OUT_DOC_GENERATE'] == '')) {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges( $aOD, $aFields ), '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges( $aOD, $aFields ), '' );
}
if ($aGields['OUT_DOC_GENERATE'] == 'DOC') if ($aGields['OUT_DOC_GENERATE'] == 'DOC') {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument2', '', G::array_merges( $aOD, $aFields ), '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument2', '', G::array_merges( $aOD, $aFields ), '' );
}
if ($aGields['OUT_DOC_GENERATE'] == 'PDF') if ($aGields['OUT_DOC_GENERATE'] == 'PDF') {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument3', '', G::array_merges( $aOD, $aFields ), '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument3', '', G::array_merges( $aOD, $aFields ), '' );
}
break; break;
} }
break; break;
case 'ASSIGN_TASK': case 'ASSIGN_TASK':
$oDerivation = new Derivation(); $oDerivation = new Derivation();
$oProcess = new Process(); $oProcess = new Process();
@@ -699,9 +702,11 @@ try {
//var_dump($aFields); //var_dump($aFields);
//there is a error with reportsTo, when the USR_UID is empty means there are no manager for this user, so we are disabling buttons //there is a error with reportsTo, when the USR_UID is empty means there are no manager for this user, so we are disabling buttons
//but this validation is not for SELF_SERVICE //but this validation is not for SELF_SERVICE
if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE') if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE') {
if ($aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] == '') if ($aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] == '') {
$aFields['PROCESS']['ERROR'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME']; $aFields['PROCESS']['ERROR'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME'];
}
}
break; break;
case 'MANUAL': case 'MANUAL':
$Aux = array (); $Aux = array ();
@@ -728,19 +733,23 @@ try {
if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] != '') { if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] != '') {
if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )] )) { if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )] )) {
$sMIinstanceVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )]; $sMIinstanceVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )];
if ($sMIinstanceVar > $cntInstanceUsers) if ($sMIinstanceVar > $cntInstanceUsers) {
throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." )); throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." ));
else if ($sMIinstanceVar == 0) } elseif ($sMIinstanceVar == 0) {
throw (new Exception( "Total Multiple Instance Task cannot be zero." )); throw (new Exception( "Total Multiple Instance Task cannot be zero." ));
}
} elseif (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )) { } elseif (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )) {
$sMIinstanceVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE']; $sMIinstanceVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'];
if ($sMIinstanceVar > $cntInstanceUsers) if ($sMIinstanceVar > $cntInstanceUsers) {
throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." )); throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." ));
} else }
} else {
throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." )); throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." ));
} else }
} else {
throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." )); throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." ));
////set TAS_MI_INSTANCE_VARIABLE value ////set TAS_MI_INSTANCE_VARIABLE value
}
//set TAS_MI_COMPLETE_VARIABLE value //set TAS_MI_COMPLETE_VARIABLE value
@@ -749,17 +758,21 @@ try {
if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )] )) { if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )] )) {
$sMIcompleteVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )]; $sMIcompleteVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )];
// //
if ($sMIcompleteVar > $sMIinstanceVar) if ($sMIcompleteVar > $sMIinstanceVar) {
throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." )); throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." ));
}
} elseif (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )) { } elseif (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )) {
$sMIcompleteVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE']; $sMIcompleteVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'];
if ($sMIcompleteVar > $sMIinstanceVar) if ($sMIcompleteVar > $sMIinstanceVar) {
throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." )); throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." ));
} else }
} else {
throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." )); throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." ));
}
} else } else {
throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." )); throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." ));
}
//set TAS_MI_COMPLETE_VARIABLE value //set TAS_MI_COMPLETE_VARIABLE value
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']; $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
@@ -804,17 +817,18 @@ try {
/* Allow user defined Timing Control /* Allow user defined Timing Control
* Values in the dropdown will be populated from the Table TASK. * Values in the dropdown will be populated from the Table TASK.
*/ */
if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != '') //Check for End of Process if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != '') {
{ //Check for End of Process
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_FLY'] = strtolower( $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] ); $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_FLY'] = strtolower( $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] );
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] = "<input type=hidden name='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' id='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' value=" . $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] . ">"; $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] = "<input type=hidden name='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' id='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' value=" . $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] . ">";
if ($aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] == 'true') { if ($aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] == 'true') {
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DURATION'] = '<input type="text" size="5" name="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" id="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" value="' . $aValues['NEXT_TASK']['TAS_DURATION'] . '">'; $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DURATION'] = '<input type="text" size="5" name="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" id="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" value="' . $aValues['NEXT_TASK']['TAS_DURATION'] . '">';
$hoursSelected = $daysSelected = ''; $hoursSelected = $daysSelected = '';
if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS') if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS') {
$hoursSelected = "selected = 'selected'"; $hoursSelected = "selected = 'selected'";
else } else {
$daysSelected = "selected = 'selected'"; $daysSelected = "selected = 'selected'";
}
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] '; $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] ';
$sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> "; $sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> ";
@@ -823,10 +837,11 @@ try {
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux; $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux;
$workSelected = $calendarSelected = ''; $workSelected = $calendarSelected = '';
if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TYPE_DAY'] == '1') if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TYPE_DAY'] == '1') {
$workSelected = "selected = 'selected'"; $workSelected = "selected = 'selected'";
else } else {
$calendarSelected = "selected = 'selected'"; $calendarSelected = "selected = 'selected'";
}
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] id= ' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] '; $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] id= ' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] ';
$sAux .= "<option " . $workSelected . " value='1'>Work Days</option> "; $sAux .= "<option " . $workSelected . " value='1'>Work Days</option> ";
@@ -875,10 +890,12 @@ try {
$tasDerivationScreenTpl = $task->getTasDerivationScreenTpl(); $tasDerivationScreenTpl = $task->getTasDerivationScreenTpl();
if (! empty( $tasDerivationScreenTpl )) { //erik: first, verify if the task has a personalized template (for derivation screen) if (! empty( $tasDerivationScreenTpl )) {
//erik: first, verify if the task has a personalized template (for derivation screen)
$tplFile = $tasDerivationScreenTpl; $tplFile = $tasDerivationScreenTpl;
$tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile; $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
} else { //erik: verify if the process has a personalized template (for derivation screen) } else {
//erik: verify if the process has a personalized template (for derivation screen)
if (! empty( $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'] )) { if (! empty( $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'] )) {
$tplFile = $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL']; $tplFile = $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'];
$tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile; $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
@@ -890,8 +907,7 @@ try {
if (isset( $aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){ if (isset( $aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){
if($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED']!="ERROR" && is_array($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){ if($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED']!="ERROR" && is_array($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){
$G_PUBLISH->AddContent('smarty', 'cases/cases_ScreenDerivation', '', '', $aFields); $G_PUBLISH->AddContent('smarty', 'cases/cases_ScreenDerivation', '', '', $aFields);
} } else {
else {
$sMessageError = "The current user does not have a valid Reports To user. Please contact administrator."; $sMessageError = "The current user does not have a valid Reports To user. Please contact administrator.";
//$aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $sMessageError . '">'; //$aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $sMessageError . '">';
G::SendTemporalMessage ('UID_UNDEFINED_USER', "Error"); G::SendTemporalMessage ('UID_UNDEFINED_USER', "Error");

2
workflow/engine/methods/cases/cases_StepToRevise.php
View File

@@ -149,3 +149,5 @@ function setSelect()
} }
</script> </script>
<?php

2
workflow/engine/methods/cases/cases_StepToReviseInputs.php
View File

@@ -151,3 +151,5 @@ function setSelect()
} }
</script> </script>
<?php

4
workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
View File

@@ -92,8 +92,9 @@ $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocumentToR
// //
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
if (! isset( $_GET['ex'] )) if (! isset( $_GET['ex'] )) {
$_GET['ex'] = 0; $_GET['ex'] = 0;
}
?> ?>
<script type="text/javascript"> <script type="text/javascript">
@@ -116,4 +117,5 @@ function setSelect()
} }
} }
</script> </script>
<?php

3
workflow/engine/methods/cases/cases_toRevise.php
View File

@@ -13,8 +13,9 @@ switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
break; break;
} }
if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
return $RBAC_Response; return $RBAC_Response;
}
$G_MAIN_MENU = 'processmaker'; $G_MAIN_MENU = 'processmaker';
$G_SUB_MENU = 'cases'; $G_SUB_MENU = 'cases';