diff app/controller/Sql.js @ 491:850ccfe5f3c4

Code style.
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 31 Oct 2014 23:23:32 +0100
parents debfcc7713e3
children 9fec6df13be8
line wrap: on
line diff
--- a/app/controller/Sql.js	Fri Oct 31 21:28:31 2014 +0100
+++ b/app/controller/Sql.js	Fri Oct 31 23:23:32 2014 +0100
@@ -14,18 +14,21 @@
  */
 Ext.define('Lada.controller.Sql', {
     extend: 'Ext.app.Controller',
+
+    requires: [
+        'Lada.view.widgets.Mst',
+        'Lada.view.widgets.Uwb',
+        'Lada.view.widgets.Datetime',
+        'Lada.view.About'
+    ],
+
     stores: [
         'Proben',    // List of found Proben
         'ProbenList',    // List of found Proben
         'Queries',
         'Info'
     ],
-    requires: [
-        'Lada.view.widgets.Mst',
-        'Lada.view.widgets.Uwb',
-        'Lada.view.widgets.Datetime',
-        'Lada.view.About'
-    ],
+
     init: function() {
         console.log('Initialising the Sql controller');
         this.control({
@@ -50,10 +53,9 @@
                 click: this.about
             }
         });
+        this.callParent(arguments);
     },
-    onPanelRendered: function() {
-        console.log('The panel was rendered');
-    },
+
     /**
      * Function called when the user selects a SQL query in the dropdownlist.
      * The function will hide/display additional element related to the
@@ -104,31 +106,72 @@
             var field = null;
             if (type == "text") {
                 console.log("Found text filter");
-                field = Ext.create('Ext.form.field.Text', { name: name, fieldLabel: label });
-            } else if (type == "number") {
+                field = Ext.create('Ext.form.field.Text', {
+                    name: name,
+                    fieldLabel: label
+                });
+            }
+            else if (type == "number") {
                 console.log("Found number filter");
-                field = Ext.create('Ext.form.field.Number', { name: name, fieldLabel: label });
-            } else if (type == "datetime") {
+                field = Ext.create('Ext.form.field.Number', {
+                    name: name,
+                    fieldLabel: label
+                });
+            }
+            else if (type == "datetime") {
                 console.log("Found datetime filter");
-                field = Ext.create('Lada.view.widgets.Datetime', { name: name, fieldLabel: label });
-            } else if (type == "bool") {
+                field = Ext.create('Lada.view.widgets.Datetime', {
+                    name: name,
+                    fieldLabel: label
+                });
+            }
+            else if (type == "bool") {
                 console.log("Found bool filter");
-                field = Ext.create('Lada.view.widgets.Testdatensatz', { name: name, fieldLabel: label, emptyText: '' });
-            } else if (type == "listmst") {
+                field = Ext.create('Lada.view.widgets.Testdatensatz', {
+                    name: name,
+                    fieldLabel: label,
+                    emptyText: ''
+                });
+            }
+            else if (type == "listmst") {
                 console.log("Found listmst filter");
-                field = Ext.create('Lada.view.widgets.Mst', { name: name, fieldLabel: label, multiSelect: multi });
-            } else if (type == "listumw") {
+                field = Ext.create('Lada.view.widgets.Mst', {
+                    name: name,
+                    fieldLabel: label,
+                    multiSelect: multi
+                });
+            }
+            else if (type == "listumw") {
                 console.log("Found listumw filter");
-                field = Ext.create('Lada.view.widgets.Uwb', { name: name, fieldLabel: label, multiSelect: multi });
-            } else if (type == "listdbasis") {
+                field = Ext.create('Lada.view.widgets.Uwb', {
+                    name: name,
+                    fieldLabel: label,
+                    multiSelect: multi
+                });
+            }
+            else if (type == "listdbasis") {
                 console.log("Found listdbasis filter");
-                field = Ext.create('Lada.view.widgets.Datenbasis', { name: name, fieldLabel: label, multiSelect: multi });
-            } else if (type == "listver") {
+                field = Ext.create('Lada.view.widgets.Datenbasis', {
+                    name: name,
+                    fieldLabel: label,
+                    multiSelect: multi
+                });
+            }
+            else if (type == "listver") {
                 console.log("Found listver filter");
-                field = Ext.create('Lada.view.widgets.Verwaltungseinheit', { name: name, fieldLabel: label, multiSelect: multi });
-            } else if (type == "listnetz") {
+                field = Ext.create('Lada.view.widgets.Verwaltungseinheit', {
+                    name: name,
+                    fieldLabel: label,
+                    multiSelect: multi
+                });
+            }
+            else if (type == "listnetz") {
                 console.log("Found listnetz filter");
-                field = Ext.create('Lada.view.widgets.Netzbetreiber', { name: name, fieldLabel: label, multiSelect: multi });
+                field = Ext.create('Lada.view.widgets.Netzbetreiber', {
+                    name: name,
+                    fieldLabel: label,
+                    multiSelect: multi
+                });
             }
             if (field) {
                 console.log("Pushing field to filters");
@@ -142,6 +185,7 @@
         }
         buttons.show();
     },
+
     /**
      * Function is called when the user clicks the search button. The function
      * will perform a search to the server on refreshes the result list.
@@ -154,7 +198,7 @@
         // Get search parameters:
         var searchParams = {};
         searchParams['qid'] = search.getValue();
-        for (var i = filters.items.length - 1; i >= 0; i--){
+        for (var i = filters.items.length - 1; i >= 0; i--) {
             var filter = filters.items.items[i];
             var value = filter.getValue();
             if (value instanceof Array) {
@@ -162,13 +206,13 @@
             }
             searchParams[filter.getName()] = value;
         }
-        console.log('Loading store with the following search params: ' + searchParams);
         result.getStore().load({
             params: searchParams
         });
         console.log('Store loaded');
         result.show();
     },
+
     reset: function(element, record, index) {
         var buttons = Ext.getCmp('SearchBtnPanel');
         var result = Ext.getCmp('result');
@@ -179,8 +223,11 @@
         //result.hide();
         //buttons.hide();
     },
+
     about: function(element, record, index) {
         var info = this.getInfoStore();
-        var view = Ext.widget('about', {info: info});
+        var view = Ext.widget('about', {
+            info: info
+        });
     }
 });

http://lada.wald.intevation.org