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

BUG 9554 Event setup has a different way to pick Variables ... SOLVED

Browse Source 
- The Events->Action call other control "picker" because don't need the key cast description and the System variables
- Changed the appereance and behaviour of the control "picker" in the Event->Action panel
This commit is contained in:
Julio Cesar Laura
2012-08-14 10:58:44 -04:00
parent 49b4279a7f
commit 5be45bfc7a
4 changed files with 57 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processMap.php
View File

@@ -371,6 +371,8 @@ class processMap {
$oPM->taskOptions[]=$taskOption;
}
$_SESSION['PROCESS'] = $sProcessUID;
$oJSON = new Services_JSON();
return $oJSON->encode($oPM);
} catch (Exception $oError) {

2
workflow/engine/js/events/events.js
View File

@@ -146,7 +146,7 @@ var EventCompose = function(t){
oPanel = new leimnud.module.panel();
oPanel.options = {
size :{w:350,h:310},
size :{w:450,h:400},
position:{x:e.clientX,y:e.clientY,center:false},
title :'',
theme :"processmaker",

34
workflow/engine/methods/events/eventsAjax.php
View File

@@ -69,36 +69,17 @@ switch($req){
break;
case 'showDynavars':
G::LoadClass('processMap');
$oProcessMap = new processMap();
$aDynaforms = $oProcessMap->getDynaformsList($_SESSION['PROCESS']);
//g::pr($aDynaforms);
G::LoadSystem('dynaformhandler');
$aDynaformFields = Array();
foreach($aDynaforms as $dyn){
if( $dyn['DYN_TYPE'] == 'xmlform' ){
if( is_file(PATH_DYNAFORM . "{$_SESSION['PROCESS']}/{$dyn['DYN_UID']}" . '.xml') ){
$oDynaformHandler = new dynaFormHandler(PATH_DYNAFORM . "{$_SESSION['PROCESS']}/{$dyn['DYN_UID']}" . '.xml');
$aDynaformFields[$dyn['DYN_TITLE']] = $oDynaformHandler->getFieldNames();
G::LoadClass('xmlfield_InputPM');
$dynaformFields = getDynaformsVars($_SESSION['PROCESS'], false, false);
$fields = array(array('id' => 'char', 'dynaform' => 'char', 'name' => 'char'));
} else {
continue;
}
}
foreach ($dynaformFields as $dynaformField) {
$fields[] = array('id' => $dynaformField['sName'],
'name' => '<a href="#" style="color: black;" onclick="e.toAdd(\'' . $dynaformField['sName'] . '\', \'' . $dynaformField['sName'] . '\', \'dyn\');oPanel.remove();return false;">@#' . $dynaformField['sName'] . '</a>', 'label' => $dynaformField['sLabel']);
}
//G::pr($aDynaformFields); die;
$aRows = Array();
$aRows[0] = Array('id'=>'char', 'dynaform'=>'char', 'name'=>'char');
foreach($aDynaformFields as $dynName=>$aFields){
foreach($aFields as $sField){
array_push($aRows, Array('id'=>$sField, 'dynaform'=>$dynName, 'name'=>$sField));
}
}
//g::pr($aRows); die;
global $_DBArray;
$_DBArray['virtualtable'] = $aRows;
$_DBArray['virtualtable'] = $fields;
$_SESSION['_DBArray'] = $_DBArray;
G::LoadClass('ArrayPeer');
$oCriteria = new Criteria('dbarray');
@@ -107,6 +88,5 @@ switch($req){
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'events/dynavarsList', $oCriteria);
G::RenderPage('publish', 'raw');
break;
}

13
workflow/engine/xmlform/events/dynavarsList.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm width="100%" rowsPerPage="5">
<dynaForm width="450" rowsPerPage="10">
<id type="private" showInTable="0"/>
<name type="text" width="350" titleAlign="left" align="left">
<en>Var. name</en>
<name type="text" width="200" titleAlign="left" align="left" enableHtml="1">
<en>Variable</en>
</name>
<dynaform type="text" colWidth="350" titleAlign="left" align="left">
<en>Dynaform</en>
</dynaform>
<ASSIGN type="link" colWidth="40" value="@G::LoadTranslation(ID_ASSIGN)" link="#" onclick="e.toAdd(@qid, @qname, &#039;dyn&#039;);return false;"/>
<label type="text" width="250" titleAlign="left" align="left">
<en>Label</en>
</label>
</dynaForm>