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

BUG 9558 "Suggest field functionality is not intuitive..." SOLVED

Browse Source 
- New feature, change SUGGEST field behavior for the insertion of
  a new record
- SUGGEST displays a temporary message to be placed in this field
- SUGGEST when you insert a new record to the database, it displays
  a popup message indicating the insertion
- SUGGEST this field allows the insertion of a new record by pressing
  the key Intro
- Is improved SUGGEST field behavior (when there are results, and when
  there are none)
- Problem solved by adding the SUGGEST field in the Dynaform (in the
  editor DynaForms) this in IE, when ckeck the option "Store new entry"
- Problem solved in method "String.prototype.trim" (JavaScript)
This commit is contained in:
Victor Saisa Lopez
2012-08-16 15:37:15 -04:00
parent 3ca7bbaa5f
commit 41f9312f7a
10 changed files with 494 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulliver/js/common/core/common.js
View File

@@ -1786,7 +1786,7 @@ function highlightRow(o, color){
* @Return <none>
*/
String.prototype.trim = function () {
return this.replace(/^\s+|\s+get/g,"");
return this.replace(/^\s+|\s+$/g, "");
}
function clearCalendar(id){
@@ -2114,6 +2114,16 @@ function _()
return trn;
}
/**
* String Replace function, if StrSearch has special characters "(", "[", must be escape "\\(", "\\[".
*/
function stringReplace(strSearch, stringReplace, str)
{
var expression = eval("/" + strSearch + "/g");
return str.replace(expression, stringReplace);
}
var mb_strlen = function(str) {
var len = 0;
for (var i = 0; i < str.length; i++) {
@@ -2121,3 +2131,4 @@ var mb_strlen = function(str) {
}
return len;
};

3
gulliver/js/ext/pmos-common.js
View File

@@ -474,8 +474,7 @@ Ext.util.Format.capitalize = (function(){
* left and right delete the blank characteres (String prototype)
*/
String.prototype.trim = function () {
return this.replace(/^\s+|\s+get/g,"");
//return Ext.util.Format.trim(this);
return this.replace(/^\s+|\s+$/g, "");
}
String.prototype.nl2br = function () {

8
gulliver/js/form/core/form.js
View File

@@ -3547,11 +3547,5 @@ function dateSetMask(mask) {
return mask;
}
function stringReplace(strSearch, stringReplace, str)
{
var expression = eval("/" + strSearch + "/g");
return str.replace(expression, stringReplace);
}
/* end file */

136
gulliver/js/widgets/suggest/bsn.AutoSuggest_2.1.3.js
View File

@@ -11,6 +11,7 @@
//static variable for suggest responses. @By Erik <erik@colosa.com>
var Static_AutosuggestResponseData;
var swStoreEntry = 1;
if (typeof(bsn) == "undefined")
@@ -74,7 +75,6 @@ _b.AutoSuggest = function (id, param)
_b.AutoSuggest.prototype.onKeyPress = function (ev)
{
var key = (window.event)? window.event.keyCode : ev.keyCode;
var RETURN = 13;
@@ -83,25 +83,53 @@ _b.AutoSuggest.prototype.onKeyPress = function(ev)
var bubble = 1;
switch(key)
{
switch (key) {
case RETURN:
if (typeof this.oP.storeEntryData != "undefined" && this.oP.storeEntryData[0] == 1) {
var elem = document.getElementById(this.oP.storeEntryData[1]);
if (elem.value != "" && swStoreEntry == 1 &&
typeof Static_AutosuggestResponseData != "undefined" && Static_AutosuggestResponseData.results.length > 0
) {
for (var i = 0 ; i <= Static_AutosuggestResponseData.results.length - 1; i++) {
if (Static_AutosuggestResponseData.results[i].value == elem.value) {
swStoreEntry = 0;
}
}
}
if (elem.value == "") {
swStoreEntry = 0;
}
if (swStoreEntry == 1) {
storeEntryProcessAjax(
elem,
this.oP.storeEntryData[2],
this.oP.storeEntryData[3],
this.oP.storeEntryData[4],
this.oP.storeEntryData[5],
this.oP.storeEntryData[6]
);
}
}
this.setHighlightedValue();
bubble = 0;
//added by erik, this is for enter press, no new line into text area
return false;
break;
case ESC:
this.clearSuggestions();
break;
default:
swStoreEntry = 1;
break;
}
return bubble;
};
_b.AutoSuggest.prototype.onKeyUp = function (ev)
{
var key = (window.event)? window.event.keyCode : ev.keyCode;
@@ -111,37 +139,27 @@ _b.AutoSuggest.prototype.onKeyUp = function(ev)
var bubble = 1;
switch(key)
{
switch (key) {
case ARRUP:
this.changeHighlight(key);
this.setHighlightedValue2();
bubble = 0;
swStoreEntry = 0;
break;
case ARRDN:
this.changeHighlight(key);
this.setHighlightedValue2();
bubble = 0;
swStoreEntry = 0;
break;
default:
this.getSuggestions(this.fld.value);
break;
}
return bubble;
};
_b.AutoSuggest.prototype.getSuggestions = function (val)
{
@@ -764,23 +782,78 @@ _b.Fader.prototype._tween = function(t,b,c,d)
return b + ( (c-b) * (t/d) );
};
function storeEntryMessageHide(id)
{
if (document.getElementById(id)) {
document.getElementById(id).parentNode.removeChild(document.getElementById(id));
}
}
function storeEntry(o, cnn, table, pk, pkt, fld){
if( typeof('Static_AutosuggestResponseData') != 'undefined' && Static_AutosuggestResponseData.results.length == 0 ){
//alert('store it '+ ' -> '+o.id+' val '+ o.value);
function storeEntryProcessAjax(o, cnn, table, pk, pkt, fld)
{
var myAjax = new _b.Ajax();
myAjax.makeRequest('../gulliver/genericAjax?request=storeInTmp'+'&cnn='+cnn+'&table='+table+'&pk='+pk+'&pkt='+pkt+'&fld='+fld+'&value='+o.value, 'POST',
function(req){
var response = eval('('+req.responseText+')');
if( response.status != 0 ){
myAjax.makeRequest(
"../gulliver/genericAjax?request=storeInTmp" + "&cnn=" + cnn + "&table=" + table + "&pk=" + pk + "&pkt=" + pkt + "&fld=" + fld + "&value=" + o.value,
"POST",
function (req)
{
var response = eval("(" + req.responseText + ")");
switch (response.status) {
case 1:
var w1 = document.documentElement.clientWidth;
var sbX1 = document.documentElement.scrollLeft;
var sbY1 = document.documentElement.scrollTop;
var w2 = document.body.clientWidth;
var sbX2 = document.body.scrollLeft;
var sbY2 = document.body.scrollTop;
var bodyW = (w1 > 0)? w1 : w2;
var scrollbarX = (sbX1 > 0)? sbX1 : sbX2;
var scrollbarY = (sbY1 > 0)? sbY1 : sbY2;
storeEntryMessageHide("myIframe");
var myIframe = document.createElement("iframe");
myIframe.setAttribute("id", "myIframe");
myIframe.style.position = "absolute";
myIframe.style.left = (parseInt(bodyW / 2) - 200 + scrollbarX) + "px";
myIframe.style.top = (scrollbarY + 5) + "px";
myIframe.src = "about:blank";
myIframe.frameBorder = 0;
myIframe.scrolling = "no";
myIframe.style.width = "400px";
myIframe.style.height = "45px";
leimnud.event.add(
myIframe,
"load",
function (evt)
{
document.getElementById("myIframe").contentWindow.document.body.style.margin = 0;
document.getElementById("myIframe").contentWindow.document.body.style.padding = 0;
document.getElementById("myIframe").contentWindow.document.body.innerHTML = "<div style=\"border: 1px solid #808080; width: 398px; height: 43px; background: #ADDCC7; font:0.9em arial, verdana, helvetica, sans-serif;\"><div style=\"margin: 0.5em 0 0 0.5em;\"><img src=\"/images/documents/_accept.png\" alt=\"\" style=\"margin-right: 0.8em; vertical-align: middle;\" />" + _("ID_FIELD_DYNAFORM_SUGGEST_MESSAGE_TEMPORAL") + "</div></div>";
}
);
document.body.appendChild(myIframe);
setTimeout("storeEntryMessageHide(\"myIframe\")", 1750);
swStoreEntry = 0;
break;
default:
alert(response.message);
break;
}
},
function(req){
//alert(req)
} );
function (req)
{
//alert(req);
}
);
}
function html_entity_decode( string, quote_style ) {
@@ -802,3 +875,4 @@ function html_entity_decode( string, quote_style ) {
return tmp_str;
}

8
gulliver/methods/genericAjax.php
View File

@@ -168,12 +168,14 @@ if( isset($request) ){
}
$rs = $con->executeQuery("INSERT INTO {$_GET['table']} ({$_GET['pk']}, {$_GET['fld']}) VALUES ('$gKey', '{$_GET['value']}');");
echo '{status:0, message:"success"}';
echo "{status: 1, message: \"success\"}";
} catch (Exception $e) {
$err = $e->getMessage();
//$err = eregi_replace("[\n|\r|\n\r]", ' ', $err);
$err = preg_replace("[\n|\r|\n\r]", ' ', $err); // Made compatible to PHP 5.3
echo '{result:1, message:"'.$err.'"}';
$err = preg_replace("[\n|\r|\n\r]", " ", $err); //Made compatible to PHP 5.3
echo "{status: 0, message: \"" . $err . "\"}";
}
break;
}

18
gulliver/system/class.xmlform.php
View File

@@ -1167,9 +1167,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
'size' => '"'.$this->size.'"',
);
$storeEntry = '';
$storeEntry = null;
$storeEntryData = ", storeEntryData: [0]";
if ($this->store_new_entry) {
$storeEntry = 'onchange="storeEntry(this, \''.$this->sqlConnection.'\', \''.$this->table.'\', \''.$this->primary_key.'\', \''.$this->primary_key_type.'\', \''.$this->field.'\')"';
$storeEntry = ' title="' . G::LoadTranslation("ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE") . '"';
$storeEntryData = ", storeEntryData: [1, \"form[". $this->name . "_label]\", \"" . $this->sqlConnection . "\", \"" . $this->table . "\", \"" . $this->primary_key . "\", \"" . $this->primary_key_type . "\", \"" . $this->field . "\"]";
}
$formVariableValue = '';
@@ -1270,9 +1273,10 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$setValue = ($this->savelabel == '1') ? 'obj.value' : 'obj.id';
$sOptions .= 'callback: function (obj) { ';
$sOptions .= 'if (typeof obj != "undefined") { ';
$sOptions .= ' var jField = { };';
$sOptions .= ' var sField = "[]"; ';
if ($count > 0) {
for ($cnt = 0; $cnt < $count; $cnt++ ) {
$sOptions .= 'if ( "' . $this->name . '" == "' . $aDepFields[$cnt] . '" ) {';
@@ -1286,7 +1290,6 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$sOptions .= ' var sField = "["+ encodeURIComponent(jField.toJSONString()) + "]"; ';
$sOptions .= $sCallBack . '; getField("' . $this->name . '").value = obj.id;';
$sOptions .= 'var response = ajax_function("../gulliver/defaultAjaxDynaform", "reloadField", ';
$sOptions .= ' "form=' . $owner->id . '&fields=" + sField, "POST"); ';
@@ -1316,11 +1319,12 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
$sOptions .= '} else { ';
$sOptions .= ' alert(\'Invalid response: \' + response); ' ;
$sOptions .= '} ';
$sOptions .= 'return false; }';
$sOptions .= '} ';
$sOptions .= 'return false; ';
$sOptions .= '}';
$str .= '<script type="text/javascript">';
$str .= 'var as_json = new bsn.AutoSuggest(\'form[' . $this->name . '_label]\', {'.$sOptions.'});';
$str .= 'var as_json = new bsn.AutoSuggest(\'form[' . $this->name . '_label]\', {' . $sOptions . $storeEntryData . '});';
$str .= '</script>';
return $str;

7
workflow/engine/js/dbConnections/main.js
View File

@@ -6,9 +6,8 @@
var PROCESS_REQUEST_FILE = '../dbConnections/dbConnectionsAjax';
String.prototype.trim = function()
{
return this.replace(/^\s+|\s+get/g,"");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
var oPanel;
@@ -500,5 +499,3 @@ function showEncodes(pre){
hideRowById('DBS_ENCODE');
}
}

3
workflow/engine/js/setup/emails.js
View File

@@ -223,8 +223,9 @@ function cancelTestConnection() {
// /************* Adds routines *************///
String.prototype.trim = function () {
return this.replace(/^\s+|\s+get/g, "");
return this.replace(/^\s+|\s+$/g, "");
}
function $(id) {
return document.getElementById(id);
}

73
workflow/engine/xmlform/dynaforms/fields/suggest.xml
View File

@@ -140,40 +140,45 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
<en>Save</en>
</PME_ACCEPT>
<PME_JS type="javascript"><![CDATA[
<PME_JS type="javascript">
<![CDATA[
var fieldForm = "text";
var fieldName = getField("PME_XMLNODE_NAME", fieldForm);
var savedFieldName = fieldName.value;
var pme_validating;
fieldName.focus();
fieldName.select();
leimnud.event.add(fieldName, 'change', {method:dynaformVerifyFieldName, instance:fieldName, event:true});
leimnud.event.add(fieldName, "change", {method: dynaformVerifyFieldName, instance: fieldName, event: true});
var dyntype = "@#PME_DYN_TYPE";
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
storeNewEntriesOptions(getField('PME_STORE_NEW_ENTRY'));
leimnud.event.add(getField('PME_STORE_NEW_ENTRY'), 'click', function(){
storeNewEntriesOptions(this);
});
leimnud.event.add(
getField("PME_STORE_NEW_ENTRY"),
"click",
function ()
{
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
}
);
function storeNewEntriesOptions(o){
function storeNewEntriesOptions(o)
{
if (o.checked) {
showRowById('PME_PRIMARY_KEY');
showRowById("PME_PRIMARY_KEY");
getTablesNames();
getTableFields()
getField('PME_TABLE').value = getField('PME_TABLE_DATA').value.trim();
getField('PME_PRIMARY_KEY').value = getField('PME_PRIMARY_KEY_DATA').value.trim();
getField('PME_PRIMARY_KEY_TYPE').value = getField('PME_PRIMARY_KEY_TYPE_DATA').value.trim();
getField("PME_TABLE").value = getField("PME_TABLE_DATA").value.trim();
getField("PME_PRIMARY_KEY").value = getField("PME_PRIMARY_KEY_DATA").value.trim();
getField("PME_PRIMARY_KEY_TYPE").value = getField("PME_PRIMARY_KEY_TYPE_DATA").value.trim();
} else {
hideRowById('PME_PRIMARY_KEY');
hideRowById("PME_PRIMARY_KEY");
}
}
leimnud.event.add(getField('PME_XMLNODE_VALUE'), 'keyup', function(){
getTablesNames();
});
@@ -199,8 +204,14 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
});
function getTablesNames() {
var s0 = getField('PME_XMLNODE_VALUE').value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
var strSql = getField("PME_XMLNODE_VALUE").value;
strSql = stringReplace("\\x0A", " ", strSql); //\n 10
strSql = stringReplace("\\x0D", " ", strSql); //\r 13
strSql = stringReplace("\\x09", " ", strSql); //\t 9
var s0 = strSql;
var s = strSql.toUpperCase();
p1 = s.indexOf(" FROM ");
if(p1 > 0){
@@ -230,16 +241,26 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0");
otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){
var newOption = new Option(aTables[i], aTables[i]);
var t = "";
for (var i = 0; i <= aTables.length - 1; i++) {
t = aTables[i].trim();
var newOption = new Option(t, t);
otable.options[i + 1] = newOption;
}
}
}
function getTableFields() {
var s0 = getField('PME_XMLNODE_VALUE').value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
var strSql = getField("PME_XMLNODE_VALUE").value;
strSql = stringReplace("\\x0A", " ", strSql); //\n 10
strSql = stringReplace("\\x0D", " ", strSql); //\r 13
strSql = stringReplace("\\x09", " ", strSql); //\t 9
var s0 = strSql;
var s = strSql.toUpperCase();
p1 = s.indexOf("SELECT ");
if(p1 >= 0){
@@ -258,8 +279,12 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0");
otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){
var newOption = new Option(aTables[i], aTables[i]);
var t = "";
for (var i = 0; i <= aTables.length - 1; i++) {
t = aTables[i].trim();
var newOption = new Option(t, t);
otable.options[i + 1] = newOption;
}
}

5
workflow/engine/xmlform/roles/roles_Options.xml
View File

@@ -404,9 +404,8 @@ function AJAX()
return xmlhttp;
}
String.prototype.trim = function()
{
return this.replace(/^\s+|\s+get/g,"");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
function $(id){