X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=dbgenerate.js;h=45eb63a5da597bd9892278571e6be4ea015d511d;hp=231246fb920cfa03039c0a453abb42a1c2ed6123;hb=3953708b530c60d7d0fd22aade5caac52a267e6b;hpb=af19fceea1cdde21a0b96197153d0e36bfb85e53

diff --git a/dbgenerate.js b/dbgenerate.js
index 231246fb9..45eb63a5d 100644
--- a/dbgenerate.js
+++ b/dbgenerate.js
@@ -96,7 +96,8 @@ Gda.DataSelect.prototype.fetchAll = function()
 
 var map = {
     'date' : 'date',
-    'datetime' : 'string',
+    'datetime' : 'date',
+    'time' : 'string', //bogus
     'int' : 'int',
     'bigint' : 'int',
     
@@ -472,6 +473,7 @@ readers.forEach(function(reader) {
         root : "data",
         '*prop' : "reader",
         id : 'id', // maybe no..
+       
         '|fields' :  JSON.stringify(reader.reader, null,4).replace(/"/g,"'")
     };
     
@@ -502,6 +504,7 @@ readers.forEach(function(reader) {
             "fitContainer": true,
             "tableName": reader.table,
             "background": true,
+            "region" : 'center',
             "listeners": {
                 "|activate": "function() {\n    _this.panel = this;\n    if (_this.grid) {\n        _this.grid.footer.onClick('first');\n    }\n}"
             },
@@ -514,12 +517,19 @@ readers.forEach(function(reader) {
                     "listeners": {
                         "|render": "function() \n" +
                             "{\n" +
-                            "   _this.grid = this; \n" +
+                            "    _this.grid = this; \n" +
                             "    //_this.dialog = Pman.Dialog.FILL_IN\n" +
                             "    if (_this.panel.active) {\n" +
                             "       this.footer.onClick('first');\n" +
                             "    }\n" +
-                            "}"
+                            "}",
+                        "|rowdblclick": "function (_self, rowIndex, e)\n" + 
+                            "{\n" + 
+                            "    if (!_this.dialog) return;\n" + 
+                            "    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n" + 
+                            "        _this.grid.footer.onClick('first');\n" + 
+                            "    }); \n" + 
+                            "}\n"
                     },
                     "|xns": "Roo.grid",
 
@@ -527,7 +537,8 @@ readers.forEach(function(reader) {
                         {
                             "*prop": "dataSource",
                             "xtype": "Store",
-                            
+                             remoteSort : true,
+                            '|sortInfo' : "{ field : '" + reader.firstTxtCol  +  "', direction: 'ASC' }", 
                             "|xns": "Roo.data",
                             "items": [
                                 
@@ -563,9 +574,10 @@ readers.forEach(function(reader) {
                                     "listeners": {
                                         "|click": "function()\n"+
                                             "{\n"+
-                                            "   //yourdialog.show( { id : 0 } , function() {\n"+
-                                            "   //  _this.grid.footer.onClick('first');\n"+
-                                            "   //}); \n"+
+                                            "    if (!_this.dialog) return;\n" +
+                                            "    _this.dialog.show( { id : 0 } , function() {\n"+
+                                            "        _this.grid.footer.onClick('first');\n"+
+                                            "   }); \n"+
                                             "}\n"
                                     },
                                     "|xns": "Roo.Toolbar"
@@ -583,10 +595,10 @@ readers.forEach(function(reader) {
                                             "        Roo.MessageBox.alert(\"Error\", s.length ? \"Select only one Row\" : \"Select a Row\");\n"+
                                             "        return;\n"+
                                             "    }\n"+
-                                            "    \n"+
-                                            "    //_this.dialog.show(s[0].data, function() {\n"+
-                                            "    //    _this.grid.footer.onClick('first');\n"+
-                                            "    //   }); \n"+
+                                            "    if (!_this.dialog) return;\n" +
+                                            "    _this.dialog.show(s[0].data, function() {\n"+
+                                            "        _this.grid.footer.onClick('first');\n"+
+                                            "    }); \n"+
                                             "    \n"+
                                             "}\n" 
                                         
@@ -601,7 +613,7 @@ readers.forEach(function(reader) {
                                     "listeners": {
                                         "|click": "function()\n"+
                                             "{\n"+
-                                            "   //Pman.genericDelete(_this, _this.grid.tableName); \n"+
+                                            "     Pman.genericDelete(_this, '" + reader.table + "'); \n"+
                                             "}\n"+
                                             "        "
                                     },
@@ -624,13 +636,19 @@ readers.forEach(function(reader) {
         File.mkdir(dir);
     }
     var formElements = [];
+    var formHeight = 50;
     for (var k in reader.form) {
         if (k == 'id') { // should really do primary key testing..
             continue;
         }
+        formHeight += reader.form[k].xtype == 'TextArea' ? 100 : 30;
+        
         formElements.push(reader.form[k]);
     }
-    formElements.push(reader.form['id']);
+    if (reader.form['id']) {
+        formElements.push(reader.form['id']);
+    }
+    
 
     print("WRITE: " +  dir + '/' + cfg.DBNAME + '_' + reader.table + '.json');
     var frmCfg = 
@@ -732,9 +750,9 @@ readers.forEach(function(reader) {
        
             "closable": false,
             "collapsible": false,
-            "height": 120,
+            "height": formHeight,
             "resizable": false,
-            "title": "Edit / Create Port",
+            "title": "Edit / Create " + reader.table,
             "width": 400,
             "xtype": "LayoutDialog",
             "|xns": "Roo",
@@ -751,20 +769,8 @@ readers.forEach(function(reader) {
                     "items": [
                         frmCfg
                     ]
-                }
-            ]
-        }, null,4);
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-    
+                },
+                
                 {
                     "listeners": {
                         "click": "function (_self, e)\n{\n    _this.dialog.hide();\n}"
@@ -784,7 +790,11 @@ readers.forEach(function(reader) {
                     "|xns": "Roo"
                 }
             ]
-        }
-    ]
-}
+        }, null,4)
+    );
+   
+   
+   
+});
+