# HG changeset patch # User Torsten Irländer # Date 1374581801 -7200 # Node ID 9a2c04b19874221d902540e472079fe1277d45ec # Parent 7097182150d92f4899207558c904ddbadb3df203 Put all available search filters to the viewport. They are later hidden and shown when the user selects the search query diff -r 7097182150d9 -r 9a2c04b19874 app/view/Viewport.js --- a/app/view/Viewport.js Tue Jul 23 14:14:45 2013 +0200 +++ b/app/view/Viewport.js Tue Jul 23 14:16:41 2013 +0200 @@ -2,9 +2,10 @@ extend: 'Ext.container.Viewport', requires: [ 'Lada.view.search.List', - 'Lada.view.search.Query1', - 'Lada.view.search.Query2', - 'Lada.view.proben.List' + 'Lada.view.proben.List', + 'Lada.view.widgets.Mst', + 'Lada.view.widgets.Uwb', + 'Lada.view.widgets.Datetime' ], initComponent: function() { @@ -108,15 +109,33 @@ }, // Variables settings for the current selected sql statement. { - id: 'query1', - xtype: 'query1', - hidden: true - }, - { - id: 'query2', - xtype: 'query2', - hidden: true - + xtype: 'fieldset', + id: 'queryfilters', + title: 'Variablenbelegung', + hidden: true, + items: [ + { + id: 'filter-mstId', + xtype: 'mst', + fieldLabel: 'Messstelle', + labelWidth: 100, + hidden: true + }, + { + id: 'filter-umwId', + xtype: 'uwb', + fieldLabel: 'Umweltbereich', + labelWidth: 100, + hidden: true + }, + { + id: 'pbegin', + xtype: 'datetime', + fieldLabel: 'Probenbeginn', + labelWidth: 100, + hidden: true + } + ] }, // Buttons to trigger the search. {