Merge remote branch 'upstream/master'
This commit is contained in:
@@ -506,7 +506,6 @@ class XmlForm_Field
|
||||
if ($e !== '') {
|
||||
$correct = false;
|
||||
}
|
||||
|
||||
//##,###.## --> ^...$ no parece pero no, o mejor si, donde # es \d?, en general todos
|
||||
// es valida cuando no encuentra un caracter que no deberia estar, puede no terminar la mascara
|
||||
// pero si sobran caracteres en el value entonces no se cumple la mascara.
|
||||
@@ -4246,7 +4245,6 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
|
||||
* $html .= '<input type="hidden" id="'.$idIsoDate.'" name="'.$idIsoDate.'" value="'.$valisoDate.'"/>';
|
||||
* *
|
||||
*/
|
||||
|
||||
if ($this->gridFieldType == '') {
|
||||
$html .= $this->renderHint();
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ class Applications
|
||||
$Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
|
||||
$CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
|
||||
}
|
||||
} else if ($dateTo != '') {
|
||||
} elseif ($dateTo != '') {
|
||||
$Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
|
||||
$CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,73 +1,77 @@
|
||||
<?php
|
||||
require_once 'classes/model/Application.php';
|
||||
G::LoadClass('case');
|
||||
class adhocUserProxy extends HttpProxyController
|
||||
{
|
||||
//list of users into adhoc option
|
||||
function adhocAssignUsersk($params){
|
||||
|
||||
G::LoadClass('groups');
|
||||
G::LoadClass('tasks');
|
||||
$oTasks = new Tasks();
|
||||
$aAux = $oTasks->getGroupsOfTask($_SESSION['TASK'], 2);
|
||||
$aAdhocUsers = array();
|
||||
$oGroups = new Groups();
|
||||
foreach($aAux as $aGroup) {
|
||||
$aUsers = $oGroups->getUsersOfGroup($aGroup['GRP_UID']);
|
||||
foreach($aUsers as $aUser) {
|
||||
if($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
|
||||
$aAdhocUsers[] = $aUser['USR_UID'];
|
||||
}
|
||||
}
|
||||
}
|
||||
$aAux = $oTasks->getUsersOfTask($_SESSION['TASK'], 2);
|
||||
foreach($aAux as $aUser) {
|
||||
if($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
|
||||
$aAdhocUsers[] = $aUser['USR_UID'];
|
||||
}
|
||||
}
|
||||
require_once 'classes/model/Users.php';
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->addSelectColumn(UsersPeer::USR_UID);
|
||||
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
||||
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
|
||||
$oCriteria->add(UsersPeer::USR_UID, $aAdhocUsers, Criteria::IN);
|
||||
$oDataset = UsersPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$aData=array();
|
||||
while ($oDataset->next()){
|
||||
$aData[] = $oDataset->getRow();
|
||||
}
|
||||
|
||||
$this->data = $aData;
|
||||
|
||||
}
|
||||
//assign user adhoc
|
||||
function reassignCase($params){
|
||||
|
||||
$cases = new Cases();
|
||||
$cases->reassignCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $_POST['USR_UID'], $_POST['THETYPE']);
|
||||
$this->success = true;
|
||||
|
||||
}
|
||||
//delete case adhoc
|
||||
function deleteCase($params){
|
||||
$ainfoCase = array();
|
||||
try{
|
||||
$applicationUID = (isset($_POST['APP_UID'])) ? $_POST['APP_UID'] : $_SESSION['APPLICATION'];
|
||||
$app = new Application();
|
||||
$caseData = $app->load($applicationUID);
|
||||
$data['APP_NUMBER'] = $caseData['APP_NUMBER'];
|
||||
|
||||
$oCase = new Cases();
|
||||
$oCase->removeCase($applicationUID);
|
||||
|
||||
$this->success = true;
|
||||
$this->msg = G::LoadTranslation('ID_CASE_DELETED_SUCCESSFULLY', SYS_LANG, $data);
|
||||
} catch(Exception $e) {
|
||||
$this->success = false;
|
||||
$this->msg = $e->getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
} //End adhocUserProxy
|
||||
<?php
|
||||
require_once 'classes/model/Application.php';
|
||||
G::LoadClass( 'case' );
|
||||
|
||||
class adhocUserProxy extends HttpProxyController
|
||||
{
|
||||
//list of users into adhoc option
|
||||
function adhocAssignUsersk ($params)
|
||||
{
|
||||
|
||||
G::LoadClass( 'groups' );
|
||||
G::LoadClass( 'tasks' );
|
||||
$oTasks = new Tasks();
|
||||
$aAux = $oTasks->getGroupsOfTask( $_SESSION['TASK'], 2 );
|
||||
$aAdhocUsers = array ();
|
||||
$oGroups = new Groups();
|
||||
foreach ($aAux as $aGroup) {
|
||||
$aUsers = $oGroups->getUsersOfGroup( $aGroup['GRP_UID'] );
|
||||
foreach ($aUsers as $aUser) {
|
||||
if ($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
|
||||
$aAdhocUsers[] = $aUser['USR_UID'];
|
||||
}
|
||||
}
|
||||
}
|
||||
$aAux = $oTasks->getUsersOfTask( $_SESSION['TASK'], 2 );
|
||||
foreach ($aAux as $aUser) {
|
||||
if ($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
|
||||
$aAdhocUsers[] = $aUser['USR_UID'];
|
||||
}
|
||||
}
|
||||
require_once 'classes/model/Users.php';
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$oCriteria->addSelectColumn( UsersPeer::USR_UID );
|
||||
$oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
|
||||
$oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
|
||||
$oCriteria->add( UsersPeer::USR_UID, $aAdhocUsers, Criteria::IN );
|
||||
$oDataset = UsersPeer::doSelectRS( $oCriteria );
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$aData = array ();
|
||||
while ($oDataset->next()) {
|
||||
$aData[] = $oDataset->getRow();
|
||||
}
|
||||
|
||||
$this->data = $aData;
|
||||
|
||||
}
|
||||
//assign user adhoc
|
||||
function reassignCase ($params)
|
||||
{
|
||||
$cases = new Cases();
|
||||
$cases->reassignCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $_POST['USR_UID'], $_POST['THETYPE'] );
|
||||
$this->success = true;
|
||||
}
|
||||
//delete case adhoc
|
||||
function deleteCase ($params)
|
||||
{
|
||||
$ainfoCase = array ();
|
||||
try {
|
||||
$applicationUID = (isset( $_POST['APP_UID'] )) ? $_POST['APP_UID'] : $_SESSION['APPLICATION'];
|
||||
$app = new Application();
|
||||
$caseData = $app->load( $applicationUID );
|
||||
$data['APP_NUMBER'] = $caseData['APP_NUMBER'];
|
||||
|
||||
$oCase = new Cases();
|
||||
$oCase->removeCase( $applicationUID );
|
||||
|
||||
$this->success = true;
|
||||
$this->msg = G::LoadTranslation( 'ID_CASE_DELETED_SUCCESSFULLY', SYS_LANG, $data );
|
||||
} catch (Exception $e) {
|
||||
$this->success = false;
|
||||
$this->msg = $e->getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//End adhocUserProxy
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,102 +1,81 @@
|
||||
<?php
|
||||
<?php
|
||||
|
||||
class authSourceProxy extends HttpProxyController
|
||||
{
|
||||
|
||||
function testingOption ($params)
|
||||
{
|
||||
/*global $RBAC;
|
||||
$fields = array('AUTH_SOURCE_PROVIDER' => $params->optionAuthS);
|
||||
$G_PUBLISH = new Publisher();
|
||||
$data=array();
|
||||
$aCommonFields = array('AUTH_SOURCE_UID',
|
||||
'AUTH_SOURCE_NAME',
|
||||
'AUTH_SOURCE_PROVIDER',
|
||||
'AUTH_SOURCE_SERVER_NAME',
|
||||
'AUTH_SOURCE_PORT',
|
||||
'AUTH_SOURCE_ENABLED_TLS',
|
||||
'AUTH_ANONYMOUS',
|
||||
'AUTH_SOURCE_SEARCH_USER',
|
||||
'AUTH_SOURCE_PASSWORD',
|
||||
'AUTH_SOURCE_VERSION',
|
||||
'AUTH_SOURCE_BASE_DN',
|
||||
'AUTH_SOURCE_OBJECT_CLASSES',
|
||||
'AUTH_SOURCE_ATTRIBUTES');
|
||||
$aFields = $aData = array();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class authSourceProxy extends HttpProxyController {
|
||||
|
||||
function testingOption($params){
|
||||
/*global $RBAC;
|
||||
|
||||
$fields = array('AUTH_SOURCE_PROVIDER' => $params->optionAuthS);
|
||||
|
||||
$G_PUBLISH = new Publisher();
|
||||
$data=array();
|
||||
|
||||
$aCommonFields = array('AUTH_SOURCE_UID',
|
||||
'AUTH_SOURCE_NAME',
|
||||
'AUTH_SOURCE_PROVIDER',
|
||||
'AUTH_SOURCE_SERVER_NAME',
|
||||
'AUTH_SOURCE_PORT',
|
||||
'AUTH_SOURCE_ENABLED_TLS',
|
||||
'AUTH_ANONYMOUS',
|
||||
'AUTH_SOURCE_SEARCH_USER',
|
||||
'AUTH_SOURCE_PASSWORD',
|
||||
'AUTH_SOURCE_VERSION',
|
||||
'AUTH_SOURCE_BASE_DN',
|
||||
'AUTH_SOURCE_OBJECT_CLASSES',
|
||||
'AUTH_SOURCE_ATTRIBUTES');
|
||||
|
||||
$aFields = $aData = array();
|
||||
|
||||
unset($params->PHPSESSID);
|
||||
foreach ($params as $sField => $sValue) {
|
||||
if (in_array($sField, $aCommonFields)) {
|
||||
$aFields[$sField] = (($sField=='AUTH_SOURCE_ENABLED_TLS' || $sField=='AUTH_ANONYMOUS'))? ($sValue=='yes')?1:0 :$sValue;
|
||||
}
|
||||
else {
|
||||
$aData[$sField] = $sValue;
|
||||
}
|
||||
}
|
||||
$aFields['AUTH_SOURCE_DATA'] = $aData;
|
||||
if (isset($aFields['AUTH_SOURCE_UID']) && $aFields['AUTH_SOURCE_UID'] != '') {
|
||||
$RBAC->updateAuthSource($aFields);
|
||||
}
|
||||
else {
|
||||
$aAuth = $RBAC->createAuthSource($aFields);
|
||||
}*/
|
||||
//G::pr($aAuth);die;
|
||||
$data['success'] = true;
|
||||
$data['optionAuthS'] = $params->optionAuthS;
|
||||
//$data['sUID'] = $aAuth;
|
||||
return $data;
|
||||
}
|
||||
|
||||
function saveAuthSources($params){
|
||||
|
||||
global $RBAC;
|
||||
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
|
||||
G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
|
||||
G::header('location: ../login/login');
|
||||
die;
|
||||
}
|
||||
$aCommonFields = array('AUTH_SOURCE_UID',
|
||||
'AUTH_SOURCE_NAME',
|
||||
'AUTH_SOURCE_PROVIDER',
|
||||
'AUTH_SOURCE_SERVER_NAME',
|
||||
'AUTH_SOURCE_PORT',
|
||||
'AUTH_SOURCE_ENABLED_TLS',
|
||||
'AUTH_ANONYMOUS',
|
||||
'AUTH_SOURCE_SEARCH_USER',
|
||||
'AUTH_SOURCE_PASSWORD',
|
||||
'AUTH_SOURCE_VERSION',
|
||||
'AUTH_SOURCE_BASE_DN',
|
||||
'AUTH_SOURCE_OBJECT_CLASSES',
|
||||
'AUTH_SOURCE_ATTRIBUTES');
|
||||
|
||||
$aFields = $aData = array();
|
||||
|
||||
unset($params->PHPSESSID);
|
||||
foreach ($params as $sField => $sValue) {
|
||||
if (in_array($sField, $aCommonFields)) {
|
||||
$aFields[$sField] = (($sField=='AUTH_SOURCE_ENABLED_TLS' || $sField=='AUTH_ANONYMOUS'))? ($sValue=='yes')?1:0 :$sValue;
|
||||
}
|
||||
else {
|
||||
$aData[$sField] = $sValue;
|
||||
}
|
||||
}
|
||||
$aFields['AUTH_SOURCE_DATA'] = $aData;
|
||||
if ($aFields['AUTH_SOURCE_UID'] == '') {
|
||||
$RBAC->createAuthSource($aFields);
|
||||
}
|
||||
else {
|
||||
$RBAC->updateAuthSource($aFields);
|
||||
}
|
||||
$data=array();
|
||||
$data['success'] = true;
|
||||
return $data;
|
||||
}//end saveAuthSoruces function
|
||||
|
||||
|
||||
} //end authSourceProxy class
|
||||
unset($params->PHPSESSID);
|
||||
foreach ($params as $sField => $sValue) {
|
||||
if (in_array($sField, $aCommonFields)) {
|
||||
$aFields[$sField] = (($sField=='AUTH_SOURCE_ENABLED_TLS' || $sField=='AUTH_ANONYMOUS'))? ($sValue=='yes')?1:0 :$sValue;
|
||||
}
|
||||
else {
|
||||
$aData[$sField] = $sValue;
|
||||
}
|
||||
}
|
||||
$aFields['AUTH_SOURCE_DATA'] = $aData;
|
||||
if (isset($aFields['AUTH_SOURCE_UID']) && $aFields['AUTH_SOURCE_UID'] != '') {
|
||||
$RBAC->updateAuthSource($aFields);
|
||||
}
|
||||
else {
|
||||
$aAuth = $RBAC->createAuthSource($aFields);
|
||||
}*/
|
||||
//G::pr($aAuth);die;
|
||||
$data['success'] = true;
|
||||
$data['optionAuthS'] = $params->optionAuthS;
|
||||
//$data['sUID'] = $aAuth;
|
||||
return $data;
|
||||
}
|
||||
|
||||
function saveAuthSources ($params)
|
||||
{
|
||||
global $RBAC;
|
||||
if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
|
||||
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
|
||||
G::header( 'location: ../login/login' );
|
||||
die();
|
||||
}
|
||||
$aCommonFields = array ('AUTH_SOURCE_UID','AUTH_SOURCE_NAME','AUTH_SOURCE_PROVIDER','AUTH_SOURCE_SERVER_NAME','AUTH_SOURCE_PORT','AUTH_SOURCE_ENABLED_TLS','AUTH_ANONYMOUS','AUTH_SOURCE_SEARCH_USER','AUTH_SOURCE_PASSWORD','AUTH_SOURCE_VERSION','AUTH_SOURCE_BASE_DN','AUTH_SOURCE_OBJECT_CLASSES','AUTH_SOURCE_ATTRIBUTES');
|
||||
|
||||
$aFields = $aData = array ();
|
||||
|
||||
unset( $params->PHPSESSID );
|
||||
foreach ($params as $sField => $sValue) {
|
||||
if (in_array( $sField, $aCommonFields )) {
|
||||
$aFields[$sField] = (($sField == 'AUTH_SOURCE_ENABLED_TLS' || $sField == 'AUTH_ANONYMOUS')) ? ($sValue == 'yes') ? 1 : 0 : $sValue;
|
||||
} else {
|
||||
$aData[$sField] = $sValue;
|
||||
}
|
||||
}
|
||||
$aFields['AUTH_SOURCE_DATA'] = $aData;
|
||||
if ($aFields['AUTH_SOURCE_UID'] == '') {
|
||||
$RBAC->createAuthSource( $aFields );
|
||||
} else {
|
||||
$RBAC->updateAuthSource( $aFields );
|
||||
}
|
||||
$data = array ();
|
||||
$data['success'] = true;
|
||||
return $data;
|
||||
} //end saveAuthSoruces function
|
||||
} //end authSourceProxy class
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -74,7 +74,6 @@ function casesShowOuputDocumentExist ($url)
|
||||
|
||||
if ($actionAjax == 'casesGenerateDocumentPage') {
|
||||
global $G_PUBLISH;
|
||||
|
||||
$oHeadPublisher = & headPublisher::getSingleton();
|
||||
G::loadClass( 'configuration' );
|
||||
$conf = new Configurations();
|
||||
@@ -128,7 +127,6 @@ if ($actionAjax == 'generateDocumentGrid_Ajax') {
|
||||
if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
|
||||
$dateFormat = $generalConfCasesList['casesListDateFormat'];
|
||||
}
|
||||
|
||||
$newDir = '/tmp/test/directory';
|
||||
$r = G::verifyPath( $newDir );
|
||||
$r->data = $aProcesses;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -6,7 +6,6 @@ if ($action == 'selfservice')
|
||||
$action = 'unassigned';
|
||||
//if ( $action == 'sent' ) $action = 'participated';
|
||||
|
||||
|
||||
G::LoadClass( "BasePeer" );
|
||||
G::LoadClass( 'configuration' );
|
||||
require_once ("classes/model/Fields.php");
|
||||
@@ -16,8 +15,6 @@ require_once ("classes/model/Users.php");
|
||||
|
||||
$oHeadPublisher = & headPublisher::getSingleton();
|
||||
// oHeadPublisher->setExtSkin( 'xtheme-blue');
|
||||
|
||||
|
||||
//get the configuration for this action
|
||||
$conf = new Configurations();
|
||||
try {
|
||||
@@ -57,8 +54,7 @@ if ($action == 'draft' /* && $action == 'cancelled' */) {
|
||||
//array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'deleteLink' ) );
|
||||
}
|
||||
if ($action == 'selfservice') {
|
||||
array_unshift( $columns, array ('header' => '','width' => 50,'sortable' => false,'id' => 'viewLink'
|
||||
) );
|
||||
array_unshift( $columns, array ('header' => '','width' => 50,'sortable' => false,'id' => 'viewLink') );
|
||||
}
|
||||
|
||||
if ($action == 'paused') {
|
||||
@@ -79,8 +75,7 @@ $oAppCache = new AppCacheView();
|
||||
$oAppCache->confCasesList = $confCasesList;
|
||||
|
||||
//get values for the comboBoxes
|
||||
$processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' )
|
||||
);
|
||||
$processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' ));
|
||||
$status = getStatusArray( $action, $userUid );
|
||||
$category = getCategoryArray();
|
||||
$users = getUserArray( $action, $userUid );
|
||||
@@ -101,7 +96,6 @@ $oHeadPublisher->assign( 'userValues', $users ); //Sending the listing of users
|
||||
$oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of all users
|
||||
$oHeadPublisher->assign( "solrEnabled", (($aux = System::solrEnv()) !== false) ? 1 : 0 ); //Sending the status of solar
|
||||
|
||||
|
||||
//menu permissions
|
||||
/*$c = new Criteria('workflow');
|
||||
$c->clearSelectColumns();
|
||||
@@ -112,11 +106,7 @@ $oHeadPublisher->assign( "solrEnabled", (($aux = System::solrEnv()) !== false) ?
|
||||
$cnt = '';
|
||||
$menuPerms = '';
|
||||
$menuPerms = $menuPerms . ($RBAC->userCanAccess( 'PM_REASSIGNCASE' ) == 1) ? 'R' : ''; //can reassign case
|
||||
|
||||
|
||||
$oHeadPublisher->assign( '___p34315105', $menuPerms ); // user menu permissions
|
||||
|
||||
|
||||
G::LoadClass( 'configuration' );
|
||||
$c = new Configurations();
|
||||
|
||||
@@ -131,10 +121,8 @@ function getUserArray ($action, $userUid)
|
||||
{
|
||||
global $oAppCache;
|
||||
$status = array ();
|
||||
$users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" )
|
||||
);
|
||||
$users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" )
|
||||
);
|
||||
$users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" ));
|
||||
$users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" ));
|
||||
|
||||
//now get users, just for the Search action
|
||||
switch ($action) {
|
||||
@@ -149,8 +137,7 @@ function getUserArray ($action, $userUid)
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next();
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
$users[] = array ($aRow['USR_UID'],$aRow['USR_LASTNAME'] . ' ' . $aRow['USR_FIRSTNAME']
|
||||
);
|
||||
$users[] = array ($aRow['USR_UID'],$aRow['USR_LASTNAME'] . ' ' . $aRow['USR_FIRSTNAME']);
|
||||
$oDataset->next();
|
||||
}
|
||||
break;
|
||||
@@ -176,8 +163,7 @@ function getCategoryArray ()
|
||||
$dataset->next();
|
||||
|
||||
while ($row = $dataset->getRow()) {
|
||||
$category[] = array ($row['CATEGORY_UID'],$row['CATEGORY_NAME']
|
||||
);
|
||||
$category[] = array ($row['CATEGORY_UID'],$row['CATEGORY_NAME']);
|
||||
$dataset->next();
|
||||
}
|
||||
return $category;
|
||||
@@ -205,8 +191,7 @@ function getAllUsersArray ($action)
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next();
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
$users[] = array ($aRow['USR_UID'],$aRow['APP_CURRENT_USER']
|
||||
);
|
||||
$users[] = array ($aRow['USR_UID'],$aRow['APP_CURRENT_USER']);
|
||||
$oDataset->next();
|
||||
}
|
||||
}
|
||||
@@ -217,8 +202,7 @@ function getStatusArray ($action, $userUid)
|
||||
{
|
||||
global $oAppCache;
|
||||
$status = array ();
|
||||
$status[] = array ('',G::LoadTranslation( 'ID_ALL_STATUS' )
|
||||
);
|
||||
$status[] = array ('',G::LoadTranslation( 'ID_ALL_STATUS' ));
|
||||
//get the list based in the action provided
|
||||
switch ($action) {
|
||||
case 'sent':
|
||||
@@ -274,8 +258,8 @@ function getStatusArray ($action, $userUid)
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$oDataset->next();
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
$status[] = array ($aRow['APP_STATUS'],G::LoadTranslation( 'ID_CASES_STATUS_' . $aRow['APP_STATUS'] )
|
||||
); //here we can have a translation for the status ( the second param)
|
||||
$status[] = array ($aRow['APP_STATUS'],G::LoadTranslation( 'ID_CASES_STATUS_' . $aRow['APP_STATUS'] ));
|
||||
//here we can have a translation for the status ( the second param)
|
||||
$oDataset->next();
|
||||
}
|
||||
}
|
||||
@@ -286,8 +270,7 @@ function getStatusArray ($action, $userUid)
|
||||
function getToDo ()
|
||||
{
|
||||
$caseColumns = array ();
|
||||
$caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
|
||||
);
|
||||
$caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center');
|
||||
$caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
|
||||
);
|
||||
$caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
|
||||
|
||||
@@ -14,17 +14,13 @@ if (isset( $_GET['ux'] )) {
|
||||
} else {
|
||||
$url = 'casesListExtJs';
|
||||
}
|
||||
|
||||
if (isset( $_GET['ux'] )) {
|
||||
echo 'if (typeof window.parent.ux_env != \'undefined\') {';
|
||||
}
|
||||
|
||||
echo " window.parent.location.href = '$url';";
|
||||
|
||||
if (isset( $_GET['ux'] )) {
|
||||
echo '} else { window.parent.location.href = \'casesListExtJs\'; }';
|
||||
}
|
||||
|
||||
?>
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -27,7 +27,6 @@ require_once 'classes/model/AppThread.php';
|
||||
require_once 'classes/model/AppDelay.php';
|
||||
require_once 'classes/model/Process.php';
|
||||
require_once 'classes/model/Task.php';
|
||||
|
||||
require_once ("classes/model/AppCacheView.php");
|
||||
require_once ("classes/model/AppDelegation.php");
|
||||
require_once ("classes/model/AdditionalTables.php");
|
||||
@@ -74,12 +73,9 @@ if ($actionAjax == "processListExtJs") {
|
||||
}
|
||||
$del = DBAdapter::getStringDelimiter();
|
||||
$conds = array ();
|
||||
$conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID
|
||||
);
|
||||
$conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del
|
||||
);
|
||||
$conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del
|
||||
);
|
||||
$conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID);
|
||||
$conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del);
|
||||
$conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del);
|
||||
$cProcess->addJoinMC( $conds, Criteria::LEFT_JOIN );
|
||||
$cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' );
|
||||
$oDataset = ProcessPeer::doSelectRS( $cProcess );
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<?php
|
||||
|
||||
$action = isset( $_GET['action'] ) ? $_GET['action'] : 'default';
|
||||
G::LoadClass( 'case' );
|
||||
G::LoadClass( 'configuration' );
|
||||
|
||||
$userId = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : '00000000000000000000000000000000';
|
||||
switch ($action) {
|
||||
case 'getAllCounters':
|
||||
@@ -26,16 +24,13 @@ function getLoadTreeMenuData ()
|
||||
$oMenu->load( 'cases' );
|
||||
|
||||
$oCases = new Cases();
|
||||
$aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice'
|
||||
$aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice');
|
||||
//'to_revise',
|
||||
//'to_reassign'
|
||||
;
|
||||
$aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice'
|
||||
$aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice');
|
||||
//'CASES_TO_REVISE'=>'to_revise',
|
||||
//'CASES_TO_REASSIGN'=>'to_reassign'
|
||||
;
|
||||
|
||||
$list = array ();
|
||||
$list = array ();
|
||||
$list['count'] = ' ';
|
||||
|
||||
$empty = array ();
|
||||
@@ -66,8 +61,7 @@ function getLoadTreeMenuData ()
|
||||
$menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i];
|
||||
$menuCases[$CurrentBlockID]['link'] = $oMenu->Options[$i];
|
||||
} else {
|
||||
$menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = Array ('label' => $oMenu->Labels[$i],'link' => $oMenu->Options[$i],'icon' => (isset( $oMenu->Icons[$i] ) && $oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'kcmdf.png'
|
||||
);
|
||||
$menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = Array ('label' => $oMenu->Labels[$i],'link' => $oMenu->Options[$i],'icon' => (isset( $oMenu->Icons[$i] ) && $oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'kcmdf.png');
|
||||
|
||||
if (isset( $aTypesID[$oMenu->Id[$i]] )) {
|
||||
$menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]]['cases_count'] = $aCount[$aTypesID[$oMenu->Id[$i]]]['count'];
|
||||
@@ -133,8 +127,7 @@ function getProcess ()
|
||||
$aTypesID['CASES_SELFSERVICE'] = 'selfservice';
|
||||
//$aTypesID['CASES_TO_REVISE'] = 'to_revise';
|
||||
//$aTypesID['CASES_TO_REASSIGN'] = 'to_reassign';
|
||||
$aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice','CASES_TO_REVISE' => 'to_revise','CASES_TO_REASSIGN' => 'to_reassign'
|
||||
);
|
||||
$aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice','CASES_TO_REVISE' => 'to_revise','CASES_TO_REASSIGN' => 'to_reassign');
|
||||
|
||||
$aCount = $oCases->getAllCounters( Array ($aTypesID[$type]
|
||||
), $userId, true );
|
||||
@@ -183,7 +176,6 @@ function getAllCounters ()
|
||||
//$aTypes['to_revise'] = 'CASES_TO_REVISE';
|
||||
//$aTypes['to_reassign'] = 'CASES_TO_REASSIGN';
|
||||
|
||||
|
||||
if ((($solrConf = System::solrEnv()) !== false)) {
|
||||
G::LoadClass( 'AppSolr' );
|
||||
$ApplicationSolrIndex = new AppSolr( $solrConf['solr_enabled'], $solrConf['solr_host'], $solrConf['solr_instance'] );
|
||||
@@ -191,8 +183,7 @@ function getAllCounters ()
|
||||
$aCount = $ApplicationSolrIndex->getCasesCount( $userUid );
|
||||
|
||||
//get paused count
|
||||
$aCountMissing = $oAppCache->getAllCounters( array ('paused','completed','cancelled'
|
||||
), $userUid );
|
||||
$aCountMissing = $oAppCache->getAllCounters( array ('paused','completed','cancelled'), $userUid );
|
||||
|
||||
$aCount = array_merge( $aCount, $aCountMissing );
|
||||
} else {
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
//$oForm = new Form ( $_SESSION ['PROCESS'] . '/' . $_GET ['UID'], PATH_DYNAFORM );
|
||||
//$oForm->validatePost ();
|
||||
|
||||
|
||||
/* @author Alvaro Campos Sanchez */
|
||||
/* Includes */
|
||||
G::LoadClass( 'case' );
|
||||
@@ -39,11 +38,7 @@ $Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], (array) $_POST['form'] )
|
||||
|
||||
#here we must verify if is a debug session
|
||||
$trigger_debug_session = $_SESSION['TRIGGER_DEBUG']['ISSET']; #here we must verify if is a debugg session
|
||||
|
||||
|
||||
#trigger debug routines...
|
||||
|
||||
|
||||
//cleaning debug variables
|
||||
$_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array ();
|
||||
$_SESSION['TRIGGER_DEBUG']['DATA'] = Array ();
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
|
||||
@@ -13,8 +13,6 @@ global $RBAC;
|
||||
switch ($page) {
|
||||
case "startCase":
|
||||
$oHeadPublisher->addExtJsScript( 'cases/casesStartCase', true ); //adding a javascript file .js
|
||||
|
||||
|
||||
$oHeadPublisher->addContent( 'cases/casesStartCase' ); //adding a html file .html.
|
||||
G::LoadClass( 'configuration' );
|
||||
$c = new Configurations();
|
||||
@@ -43,6 +41,5 @@ switch ($page) {
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
G::RenderPage( 'publish', 'extJs' );
|
||||
|
||||
|
||||
@@ -92,10 +92,7 @@ function getProcessList ()
|
||||
$tempTreeChild['otherAttributes'] = array_merge( $processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor( $processInfoChild['uid'], $processInfoChild['uid'], $processInfoChild['uid'] ) );
|
||||
$tempTreeChild['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTreeChild['otherAttributes']['PRO_TITLE'], "", $tempTreeChild['otherAttributes']["value"] ) ) ) );
|
||||
$tempTreeChild['qtip'] = $tempTreeChild['otherAttributes']['PRO_DESCRIPTION'];
|
||||
|
||||
//$tempTree['cls']='file';
|
||||
|
||||
|
||||
$tempTreeChildren[] = $tempTreeChild;
|
||||
}
|
||||
}
|
||||
@@ -289,16 +286,10 @@ function getSimpleDashboardData ()
|
||||
$Criteria->addSelectColumn( AppCacheViewPeer::USR_UID );
|
||||
$Criteria->addSelectColumn( AppCacheViewPeer::APP_THREAD_STATUS );
|
||||
|
||||
$Criteria->add( AppCacheViewPeer::APP_STATUS, array ("TO_DO","DRAFT"
|
||||
), CRITERIA::IN );
|
||||
$Criteria->add( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged,""
|
||||
), CRITERIA::IN );
|
||||
|
||||
$Criteria->add( AppCacheViewPeer::APP_STATUS, array ("TO_DO","DRAFT"), CRITERIA::IN );
|
||||
$Criteria->add( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged,""), CRITERIA::IN );
|
||||
$Criteria->add( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
|
||||
|
||||
//$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' );
|
||||
|
||||
|
||||
$Criteria->add( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' );
|
||||
|
||||
//execute the query
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
// $oHeadPublisher =& headPublisher::getSingleton();
|
||||
// $TRANSLATIONS = array_merge($TRANSLATIONS, $TRANSLATIONS2);
|
||||
// $TRANSLATIONS = array_merge($TRANSLATIONS, $TRANSLATIONS2);
|
||||
|
||||
$delIndex = $_GET['DEL_INDEX'];
|
||||
$appUid = $_GET['APP_UID'];
|
||||
// $oHeadPublisher->assign( 'TRANSLATIONS', $TRANSLATIONS); //translations
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
class TreeNode
|
||||
{
|
||||
public $text = "";
|
||||
@@ -43,9 +42,7 @@ class ExtJsTreeNode extends TreeNode
|
||||
}
|
||||
|
||||
G::LoadClass( 'case' );
|
||||
|
||||
$o = new Cases();
|
||||
|
||||
$PRO_UID = $_SESSION['PROCESS'];
|
||||
|
||||
$treeArray = array ();
|
||||
|
||||
@@ -69,18 +69,13 @@ $oCriteria->addDescendingOrderByColumn( LogCasesSchedulerPeer::EXEC_HOUR );
|
||||
|
||||
$oDataset = LogCasesSchedulerPeer::doSelectRS( $oCriteria );
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
|
||||
//$oDataset = LogCasesSchedulerPeer::doSelectRS ( $oCriteria );
|
||||
//$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
|
||||
|
||||
|
||||
$addTables = Array ();
|
||||
while ($oDataset->next()) {
|
||||
$addTables[] = $oDataset->getRow();
|
||||
}
|
||||
|
||||
//$oLogCasesScheduler = new LogCasesScheduler();
|
||||
//$arrData = $oLogCasesScheduler->getAll();
|
||||
|
||||
echo '{results: ' . $results . ', rows: ' . G::json_encode( $addTables ) . '}';
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) {
|
||||
} else {
|
||||
$aTriggers[0] = $_SESSION['TRIGGER_DEBUG'];
|
||||
}
|
||||
|
||||
//print_r($aTriggers);die;
|
||||
$triggersList = Array ();
|
||||
|
||||
@@ -21,8 +20,6 @@ foreach ($aTriggers as $aTrigger) {
|
||||
//$t_code = str_replace('"', '\'',$t_code);
|
||||
//$t_code = addslashes($t_code);
|
||||
//$t_code = Only1br($t_code);
|
||||
|
||||
|
||||
//highlighting the trigger code using the geshi third party library
|
||||
G::LoadThirdParty( 'geshi', 'geshi' );
|
||||
$geshi = new GeSHi( $aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'], 'php' );
|
||||
@@ -65,9 +62,7 @@ foreach ($DEBUG_ERRORS as $error) {
|
||||
]}';
|
||||
|
||||
*/
|
||||
|
||||
$triggersRet->total = count( $triggersList );
|
||||
$triggersRet->data = $triggersList;
|
||||
|
||||
echo G::json_encode( $triggersRet );
|
||||
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
<?php
|
||||
|
||||
$request = isset( $_POST['request'] ) ? $_POST['request'] : '';
|
||||
switch ($request) {
|
||||
case 'getRows':
|
||||
|
||||
$fieldname = $_POST['fieldname'];
|
||||
|
||||
G::LoadClass( 'case' );
|
||||
$oApp = new Cases();
|
||||
$aFields = $oApp->loadCase( $_SESSION['APPLICATION'] );
|
||||
|
||||
$aVars = Array ();
|
||||
for ($i = 0; $i < count( $_SESSION['TRIGGER_DEBUG']['DATA'] ); $i ++) {
|
||||
$aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
|
||||
@@ -86,10 +83,8 @@ switch ($request) {
|
||||
if (isset( $_POST['filter'] ) && $_POST['filter'] == 'sys') {
|
||||
$aVars = G::getSystemConstants();
|
||||
}
|
||||
|
||||
ksort( $aVars );
|
||||
$return_object->totalCount = 1;
|
||||
|
||||
foreach ($aVars as $i => $var) {
|
||||
if (is_array( $var ) || is_object( $var )) {
|
||||
$aVars[$i] = print_r( $var, true );
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
*
|
||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
||||
*
|
||||
*/
|
||||
//$newFile = str_replace ( 'index.php', 'cases_List.php' , __FILE__ ) ;
|
||||
$newFile = str_replace( 'index.php', 'main.php', __FILE__ );
|
||||
|
||||
@@ -83,6 +83,5 @@ $oHeadPublisher->assign( '_APP_NUM', '#: ' . $case['APP_NUMBER'] );
|
||||
$oHeadPublisher->assign( '_ENV_CURRENT_DATE', $conf->getSystemDate( date( 'Y-m-d' ) ) );
|
||||
$oHeadPublisher->assign( '_ENV_CURRENT_DATE_NO_FORMAT', date( 'Y-m-d' ) );
|
||||
$oHeadPublisher->assign( 'idfirstform', is_null( $oStep ) ? '' : $oStep->getStepUidObj() );
|
||||
|
||||
G::RenderPage( 'publish', 'extJs' );
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@ $dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : "";
|
||||
|
||||
try {
|
||||
$result = "";
|
||||
|
||||
$userUid = (isset( $_SESSION["USER_LOGGED"] ) && $_SESSION["USER_LOGGED"] != "") ? $_SESSION["USER_LOGGED"] : null;
|
||||
$user = ($user == "CURRENT_USER") ? $userUid : $user;
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ $option = '';
|
||||
if (isset( $_GET['t'] ))
|
||||
$option = $_GET['t'];
|
||||
try {
|
||||
|
||||
G::LoadClass( "BasePeer" );
|
||||
require_once ("classes/model/Process.php");
|
||||
require_once ("classes/model/AppCacheView.php");
|
||||
|
||||
@@ -21,8 +21,7 @@ $allTasUids = array ();
|
||||
// getting all App Uids and task Uids
|
||||
foreach ($sentUids as $sentUid) {
|
||||
$aItem = explode( '|', $sentUid );
|
||||
$allUidsRecords[] = array ('APP_UID' => $aItem[0],'TAS_UID' => $aItem[1],'DEL_INDEX' => $aItem[2]
|
||||
);
|
||||
$allUidsRecords[] = array ('APP_UID' => $aItem[0],'TAS_UID' => $aItem[1],'DEL_INDEX' => $aItem[2]);
|
||||
}
|
||||
|
||||
$sReassignFromUser = isset( $_POST['user'] ) ? $_POST['user'] : '';
|
||||
@@ -55,8 +54,8 @@ foreach ($allUidsRecords as $aRecord) {
|
||||
foreach ($aCaseUsers as $aCaseUser) {
|
||||
if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
|
||||
$aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
|
||||
$aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']
|
||||
); // . ' (' . $aCaseUserRecord['USR_USERNAME']
|
||||
$aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']);
|
||||
// . ' (' . $aCaseUserRecord['USR_USERNAME']
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<?php
|
||||
|
||||
G::LoadClass( 'configuration' );
|
||||
|
||||
$callback = isset( $_POST['callback'] ) ? $_POST['callback'] : 'stcCallback1001';
|
||||
$query = isset( $_POST['query'] ) ? $_POST['query'] : '';
|
||||
$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'DESC';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user