fernando/luos
1
0
Fork 0
Code Releases Activity

Changes to the variable picker feature before revision meeting with the CTO

Browse Source
This commit is contained in:
user
2012-11-27 15:42:28 -04:00
parent c8f209d90d
commit 8dd2b641da
4 changed files with 124 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js vendored
View File

@@ -44,12 +44,12 @@ function pmVariablePicker(field_name, url, type, win) {
strUploaderURL = strUploaderURL + "&type=" + type + "&d=" + strUploadPath + "&subs=" + strSubstitutePath; strUploaderURL = strUploaderURL + "&type=" + type + "&d=" + strUploadPath + "&subs=" + strSubstitutePath;
} }
tinyMCE.activeEditor.windowManager.open({ // open the plugin popup tinyMCE.activeEditor.windowManager.open({ // open the plugin popup
//file : strUploaderURL, file : '/sysworkflow/en/classic/controls/varsAjax?displayOption=tinyMCE&sSymbol=@@',
file : strPluginPath + '/VariablePicker.html',
title : 'Upload Variable', title : 'Upload Variable',
width : '600px', width : '400px',
height : '150px', height : '350px',
resizable : "yes", resizable : "yes",
overflow : false,
inline : 1, // This parameter only has an effect if you use the inlinepopups plugin! inline : 1, // This parameter only has an effect if you use the inlinepopups plugin!
close_previous : "no" close_previous : "no"
}, { }, {
@@ -69,3 +69,8 @@ function closePluginPopup(){
function updateEditorContent(serializedHTML){ function updateEditorContent(serializedHTML){
tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML); tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML);
} }
function insertFormVar(fieldName,serializedHTML){
tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML);
closePluginPopup();
}

52
workflow/engine/js/controls/variablePicker.js
View File

@@ -1,15 +1,10 @@
//function onLoad(){ var setVariablePickerJS = function(){
// generateListValues(document.getElementById('prefix').value);
//}
//window.onload=function(){
//generateListValues(document.getElementById('prefix').value);
//};
var getValue = function (list) { document.getElementById('_Var_Form_').addEventListener('dblclick', function(){
insertFormVar(document.getElementById('selectedField').value,list.value); insertFormVar(document.getElementById('selectedField').value, this.value);
} });
var getVariableList = function (queryText, proUid, varType){ var getVariableList = function (queryText, proUid, varType){
varType = varType.toLowerCase(); varType = varType.toLowerCase();
var responseData var responseData
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
@@ -24,9 +19,9 @@ var getVariableList = function (queryText, proUid, varType){
responseData = eval ("(" +oRPC.xmlhttp.responseText+ ")"); responseData = eval ("(" +oRPC.xmlhttp.responseText+ ")");
return responseData; return responseData;
} }
var getPrefix = function (prefix) { var getPrefix = function (prefix) {
if(document.getElementById('prefix').value=='ID_TO_STRING') if(document.getElementById('prefix').value=='ID_TO_STRING')
prefix='@@'; prefix='@@';
else if(document.getElementById('prefix').value=='ID_TO_FLOAT') else if(document.getElementById('prefix').value=='ID_TO_FLOAT')
@@ -40,9 +35,9 @@ var getPrefix = function (prefix) {
else if(document.getElementById('prefix').value=='ID_REPLACE_WITHOUT_CHANGES') else if(document.getElementById('prefix').value=='ID_REPLACE_WITHOUT_CHANGES')
prefix='@='; prefix='@=';
return prefix; return prefix;
} }
var getPrefixInfo = function (prefix){ var getPrefixInfo = function (prefix){
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : "../processes/processes_Ajax", url : "../processes/processes_Ajax",
async : false, async : false,
@@ -51,23 +46,23 @@ var getPrefixInfo = function (prefix){
}); });
oRPC.make(); oRPC.make();
return oRPC.xmlhttp.responseText; return oRPC.xmlhttp.responseText;
} }
leimnud.event.add(document.getElementById('type_variables'), 'change', function(event) { leimnud.event.add(document.getElementById('type_variables'), 'change', function(event) {
var prefix=getPrefix(document.getElementById('prefix').value); var prefix=getPrefix(document.getElementById('prefix').value);
generateListValues(prefix); generateListValues(prefix);
}); });
leimnud.event.add(document.getElementById('prefix'), 'change', function(event) { leimnud.event.add(document.getElementById('prefix'), 'change', function(event) {
var prefix=getPrefix(document.getElementById('prefix').value); var prefix=getPrefix(document.getElementById('prefix').value);
generateListValues(prefix); generateListValues(prefix);
}); });
leimnud.event.add(document.getElementById('_Var_Form_'), 'change', function(event) { leimnud.event.add(document.getElementById('_Var_Form_'), 'change', function(event) {
document.getElementById('selectedVariableLabel').textContent = document.getElementById('_Var_Form_').value document.getElementById('selectedVariableLabel').textContent = document.getElementById('_Var_Form_').value
}); });
leimnud.event.add(document.getElementById('search'), 'keypress', function(e) { leimnud.event.add(document.getElementById('search'), 'keypress', function(e) {
var prefix=getPrefix(document.getElementById('prefix').value); var prefix=getPrefix(document.getElementById('prefix').value);
var key = e.keyCode; var key = e.keyCode;
@@ -81,9 +76,9 @@ leimnud.event.add(document.getElementById('search'), 'keypress', function(e) {
e.preventDefault(); e.preventDefault();
} }
} }
}); });
function generateListValues (prefix){ function generateListValues (prefix){
var list = getVariableList(document.getElementById('search').value, document.getElementById('process').value, document.getElementById('type_variables').value); var list = getVariableList(document.getElementById('search').value, document.getElementById('process').value, document.getElementById('type_variables').value);
var combo = document.getElementById("_Var_Form_"); var combo = document.getElementById("_Var_Form_");
var option = document.createElement('option'); var option = document.createElement('option');
@@ -98,7 +93,7 @@ function generateListValues (prefix){
for(i=0; i<list.length; i++) for(i=0; i<list.length; i++)
{ {
option = document.createElement("OPTION"); option = document.createElement("OPTION");
option.value = list[i].sName; option.value = prefix+list[i].sName;
option.text = prefix+list[i].sName+' ('+list[i].sLabel+')'; option.text = prefix+list[i].sName+' ('+list[i].sLabel+')';
combo.add(option); combo.add(option);
} }
@@ -108,4 +103,11 @@ function generateListValues (prefix){
option.text = 'No results'; option.text = 'No results';
combo.add(option); combo.add(option);
} }
}
} }
if (document.readyState == 'complete'){
setVariablePickerJS();
} else {
document.body.onload = setVariablePickerJS;
}

13
workflow/engine/methods/controls/varsAjax.php
View File

@@ -95,10 +95,10 @@ $aFields = getDynaformsVars( $_POST['sProcess'], true, isset( $_POST['bIncMulSel
//$html .= '<select name="_Var_Form_" id="_Var_Form_" size="' . count( $aFields ) . '" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">'; //$html .= '<select name="_Var_Form_" id="_Var_Form_" size="' . count( $aFields ) . '" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">';
$html .= '<select name="_Var_Form_" id="_Var_Form_" size="8" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:170;' : '') . '" ondblclick="getValue(this);">'; $html .= '<select name="_Var_Form_" id="_Var_Form_" size="8" style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:170;' : '') . '" >';
foreach ($aFields as $aField) { foreach ($aFields as $aField) {
$html .= '<option value="' . $_POST['sSymbol'] . $aField['sName'] . '">' . $_POST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>'; $html .= '<option value="' . $_REQUEST['sSymbol'] . $aField['sName'] . '">' . $_REQUEST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>';
} }
$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char'); $aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char');
@@ -134,13 +134,20 @@ $html .= '</div>';
$html .= '</form>'; $html .= '</form>';
$display = 'raw';
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptFile('/jscore/controls/variablePicker.js'); $oHeadPublisher->addScriptFile('/jscore/controls/variablePicker.js');
if($_REQUEST['displayOption']=='tinyMCE'){
$display = 'blank';
$oHeadPublisher->addScriptFile('/js/tinymce/jscripts/tiny_mce/tiny_mce_popup.js');
$oHeadPublisher->addScriptFile('/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js');
}
echo $html; echo $html;
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', $display );
/* /*
$alll = '<script type="text/javascript" language="javascript">'; $alll = '<script type="text/javascript" language="javascript">';
$alll .= 'function Seleccionar(combo){'; $alll .= 'function Seleccionar(combo){';

2
workflow/engine/xmlform/processes/processes_FileEdit.xml
View File

@@ -8,7 +8,7 @@
<en><![CDATA[<div align="center">Edit @#filename email template</div>]]></en> <en><![CDATA[<div align="center">Edit @#filename email template</div>]]></en>
</TITLE> </TITLE>
<fcontent type="wysiwyg_editor" editorType="EMAIL_TEMPLATE" height="420" width="720" defaultValue=""> <fcontent type="wysiwyg_editor" editorType="EMAIL_TEMPLATE" height="380" width="720" defaultValue="">
<en/> <en/>
</fcontent> </fcontent>