X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.LayoutDialog.js;h=d2629aa39d36fb056777692a8d795e7917446243;hb=1be141aa5ec3768dca510628250ba1603a7d5d10;hp=52e3c245126a1dfb707dfa400bb220dc07a04b47;hpb=4b1994c11c3e4f6030d03b8d2c309b5c14cdbd3e;p=app.Builder.js
diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 52e3c2451..d2629aa39 100644
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -9,15 +9,16 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
_strings : {
'b021df6aac4654c454f46c77646e745f' :"Label",
'793548e77e782c209a78ed67f255b5e2' :"Display Field",
+ '040076bde7f6b3387448e32b66c2eee0' :"To BJS",
'4ce58cbe362a5d7b156992a496d55bf3' :"Database Column",
'189efd19c4153526994a6d7ea5f6f068' :"Field Type",
'2f616612593df62aeed112de4f03110e' :"Edit a Grid",
'0ccc2bf3fb98387c23b6ca5500244d6e' :"Use ",
'c671c787b49f50a3ace9fdc5bd597825' :"core_enum",
- 'dc30ec20708ef7b0f641ef78b7880a15' :"DEBUG",
'32954654ac8fe66a1d09be19001de2d4' :"Width",
'a1fa27779242b4902f7ae3bdd5c6d508' :"Type",
- '6e7376dca68a2386a8737944196ab491' :"Create / Edit Grid"
+ '6e7376dca68a2386a8737944196ab491' :"Create / Edit Grid",
+ 'f541774a08fc687f6e2016c77a6ebca5' :"Load Data"
},
part : ["Editors", "LayoutDialog" ],
@@ -74,13 +75,12 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
},
{
'|xns' : 'Roo.Toolbar',
- text : _this._strings['dc30ec20708ef7b0f641ef78b7880a15'],
+ text : _this._strings['f541774a08fc687f6e2016c77a6ebca5'],
xns : Roo.Toolbar,
xtype : 'Button',
listeners : {
click : function (_self, e)
{
- Roo.log(_this.ftype_combo);
var data = {
"manage_scale_id": {
"Field": "manage_scale_id",
@@ -240,9 +240,29 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
}
};
- Roo.log('debuging...');
+ Roo.log('Loading Data...');
_this.panel.loadData(data);
+ }
+ }
+ },
+ {
+ '|xns' : 'Roo.Toolbar',
+ xns : Roo.Toolbar,
+ xtype : 'Separator'
+ },
+ {
+ '|xns' : 'Roo.Toolbar',
+ text : _this._strings['040076bde7f6b3387448e32b66c2eee0'],
+ xns : Roo.Toolbar,
+ xtype : 'Button',
+ listeners : {
+ click : function (_self, e)
+ {
+
+ Roo.log('Converting to BJS...');
+ _this.panel.toBJS();
+
}
}
}
@@ -513,6 +533,38 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
var r = data[k];
var has_s = typeof(r.relates_to_schema) != 'undefined';
+ var field_type = 'TextField';
+
+ var regex = /(.*?)\((.*?)\)/;
+
+ if(regex.test(r.Type)){
+ var type_match = regex.exec(r.Type);
+
+ switch type_match[1] {
+ case 'varchar' :
+ break;
+ case 'int' :
+
+ field_type = 'NumberField';
+
+ if(type_match[2] * 1 < 11){
+ field_type = 'CheckBox';
+ }
+
+ }
+
+ } esle {
+ switch r.Type {
+ case 'text' :
+ field_type = 'TextArea';
+ break;
+ case 'date' :
+ case 'datetime':
+ field_type = 'DateField';
+ }
+
+ }
+
var rt = '', rc = '', rs = [];
if(has_s){
@@ -525,16 +577,20 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
rs.push([rr.Field]);
}
+
+ field_type = 'ComboBox';
}
+
+
var o = {
active : !has_s,
dataIndex : r.Field,
type : r.Type,
title : r.Field,
- width : 100,
+ width : 200,
ftype : 'TextField',
- display_field : r.Field + '_display_name',
+ display_field : rc, //r.Field + '_display_name',
relates_to_table : rt,
relates_to_col : rc,
relates_to_schema : rs
@@ -542,26 +598,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
d.push(o);
- if (!has_s) {
- continue;
- }
-
- for (var kk in r.relates_to_schema) {
- var rr = r.relates_to_schema[kk];
- if (rr.Field == r.relates_to_col) {
- continue;
- }
-
- var o = {
- active : false,
- dataIndex : r.Field + '_'+ rr.Field,
- type : r.Type,
- title : r.Field,
- width : 100
- };
-
- d.push(o);
- }
}
var ar = [];
@@ -581,8 +617,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
ar.push(a);
});
-
- Roo.log(ar);
this.schema = data;
//alert("IPC:TEST:" + JSON.stringify(ar));
@@ -611,33 +645,36 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
var el = {
fieldLabel : rec.data.title,
name : rec.data.dataIndex,
- width : 200, //row.type == 'string' ? 200 : 75,
+ width : rec.data.width,
'|xns' : 'Roo.form',
xtype : rec.data.ftype
}
- if (xtype == 'DateField') {
+ if (el.xtype == 'DateField') {
el.format = 'Y-m-d';
el.useIso = true;
el.width = 100;
}
- if (xtype == 'TextArea') {
+ if (el.xtype == 'TextArea') {
el.height = 100;
}
- if (xtype == 'Hidden') {
+ if (el.xtype == 'Hidden') {
delete el.fieldLabel;
delete el.width;
}
- if (xtype == 'Combobox') {
+ if (el.xtype == 'ComboBox') {
- el.queryParam = 'query[' + combofields_name + ']';// SET WHEN USED
+ el.queryParam = 'query[' + rec.data.display_field + ']';// SET WHEN USED
el.hiddenName = rec.data.dataIndex // SET WHEN USED eg. project_id
- el.displayField = combofields_name; // SET WHEN USED eg. project_id
- el.name = old.name + '_' + combofields_name; // SET WHEN USED eg. project_id_name
- el.tpl = '{' + combofields_name +'}
'; // SET WHEN USED
+ el.name = rec.data.dataIndex + '_' + rec.data.display_field; // SET WHEN USED eg. project_id_name
+
+ el.displayField = rec.data.display_field // SET WHEN USED eg. project_id
+ el.valueField = rec.data.relates_to_col
+
+ el.tpl = '{' + rec.data.display_field +'}
'; // SET WHEN USED
el.items = [
@@ -661,7 +698,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
'xtype' : 'HttpProxy',
'method' : 'GET',
'|xns' : 'Roo.data',
- '|url' : "baseURL + '/Roo/" + reftable + ".php'",
+ '|url' : "baseURL + '/Roo/" + rec.data.relates_to_table + ".php'",
},
{
@@ -680,10 +717,27 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
}
+ if (el.xtype == 'HtmlEditor') {
+ el.height = 250,
+ el.resizable = 's',
+ el.items = [
+ {
+ '* prop' : 'toolbars[]',
+ '|xns' : 'Roo.form.HtmlEditor',
+ 'xtype' : 'ToolbarContext'
+ },
+ {
+ '* prop' : 'toolbars[]',
+ '|xns' : 'Roo.form.HtmlEditor',
+ 'xtype' : 'ToolbarStandard'
+
+ }
+ ]
+ }
formElements.push(el);
- formHeight += rec.data.ftype == 'TextArea' ? 100 : 30;
+ formHeight += rec.data.ftype == 'TextArea' ? 100 : ((rec.data.ftype == 'HtmlEditor') ? 250 : 30);
});