resources/Editors/Editor.Roo.LayoutDialog.bjs

[app.Builder.js] / resources / Editors / Editor.Roo.LayoutDialog.js

diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 721f2d0..a5824bb 100644 (file)
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -69,8 +69,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
        listeners : {
         click : function (_self, e)
          {
-             Roo.log("Test");
-         
+             Roo.log(_this.ftype_combo);
              var data = {    
                  "manage_scale_id": {
                      "Field": "manage_scale_id",
@@ -317,8 +316,8 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
               [ 'TextArea', "TextArea"],
               [ 'HtmlEditor', "HtmlEditor"],
               [ 'Hidden', "Hidden"],
-              [ 'DateField', "DateField"]    ,
-               [ 'Checkbox', "Checkbox"]    
+              [ 'DateField', "DateField"],
+              [ 'Checkbox', "Checkbox"]    
               // checkbox?
           ],
           fields : [  'ftype', 'fname'],
@@ -332,7 +331,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
          hiddenName : 'status',
          listWidth : 200,
          mode : 'local',
-         name : 'field_type',
+         name : 'ftype',
          triggerAction : 'all',
          valueField : 'ftype',
          width : 150,
@@ -387,7 +386,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
          hiddenName : 'status',
          listWidth : 200,
          mode : 'local',
-         name : 'combo_display',
+         name : 'display_field',
          triggerAction : 'all',
          valueField : 'ftype',
          width : 150,
@@ -486,17 +485,46 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
    fitToframe : true,
    loadData : function(data) { 
    
-       alert("IPC:TEST:" + JSON.stringify(data,null,4));
+       //alert("IPC:TEST:" + JSON.stringify(data,null,4));
    
+       var fields = _this.grid.dataSource.reader.recordType.prototype.fields;
+       
        var ar = [];
        for (var k in data) { 
            var r = data[k];
-           var has_s = typeof(r.relates_to_schema) != 'undefined'
+           var has_s = typeof(r.relates_to_schema) != 'undefined';
+           
+           var o = {
+               active : !has_s,
+               dataIndex : r.Field,
+               type : r.Type,
+               title : r.Field,
+               width : 100,
+               ftype : 'TextField',
+               display_field : r.Field + '_display_name',
+               relates_to_table : false,
+               relates_to_col : false,
+               relates_to_schema : []
+           };
+           
+           var d = [];
+           
+           for(var j = 0; j = fields.length; j++){
+               var f = fields.items[j];
+               Roo.log(f);
+               if(o.hasOwnProperty(f.name)){
+                   d.push(o[f.name]);
+               }
+           }
+           
+           ar.push(d);
+           
+           /*
            ar.push([ !has_s , r.Field, r.Type,  r.Field, 100 , 'TextField', r.Field + '_display_name'] );
            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) {
@@ -506,7 +534,10 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            }
            */
        }
+       
+       Roo.log(ar);
        this.schema = data;
+       
        //alert("IPC:TEST:" + JSON.stringify(ar));
        this.grid.dataSource.loadData(ar);
    },