# HG changeset patch # User Torsten Irländer # Date 1370014856 -7200 # Node ID 9e2e09e819fd22462d1d562c2bea1c89a66c5749 # Parent a4a24e737deb9656f321b2e4fa294f16dbc8101c Added a new Dialog to create proben without any kommentare or other additional values. diff -r a4a24e737deb -r 9e2e09e819fd app/controller/Proben.js --- a/app/controller/Proben.js Fri May 31 17:34:34 2013 +0200 +++ b/app/controller/Proben.js Fri May 31 17:40:56 2013 +0200 @@ -2,7 +2,8 @@ extend: 'Ext.app.Controller', views: [ 'proben.List', - 'proben.Edit' + 'proben.Edit', + 'proben.Create' ], stores: [ 'Proben', @@ -40,7 +41,7 @@ }, addProbe: function(button) { console.log('Adding new Probe'); - var view = Ext.widget('probenedit'); + var view = Ext.widget('probencreate'); var form = view.down('form'); // Create a new Kommentar var record = Ext.create('Lada.model.Probe'); diff -r a4a24e737deb -r 9e2e09e819fd app/model/Probe.js --- a/app/model/Probe.js Fri May 31 17:34:34 2013 +0200 +++ b/app/model/Probe.js Fri May 31 17:40:56 2013 +0200 @@ -25,6 +25,7 @@ {name: "test"}, {name: "umwId"} ], + idProperty: "probeId", proxy: { type: 'rest', appendId: true, //default diff -r a4a24e737deb -r 9e2e09e819fd app/view/proben/Create.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/view/proben/Create.js Fri May 31 17:40:56 2013 +0200 @@ -0,0 +1,186 @@ +Ext.define('Lada.view.proben.Create', { + extend: 'Ext.window.Window', + alias: 'widget.probencreate', + + title: 'Maske für §3-Proben', + // Make size of the dialog dependend of the available space. + // TODO: Handle resizing the browser window. + width: Ext.getBody().getViewSize().width - 30, + height: Ext.getBody().getViewSize().height - 30, + autoShow: true, + autoScroll: true, + modal: true, + + requires: [ + 'Lada.view.widgets.Uwb', + 'Lada.view.widgets.Datenbasis', + 'Lada.view.widgets.Probenart', + 'Lada.view.widgets.Betriebsart', + 'Lada.view.widgets.Testdatensatz' + ], + + initComponent: function() { + this.items = [ + { + //Define the form + xtype: 'form', + bodyPadding: '10 10', + border: 0, + items: [ + // Probenangaben + { + xtype: 'fieldset', + title: 'Probenangaben', + defaults: { + labelWidth: 150 + }, + items: [ + { + xtype: 'textfield', + name: 'mstId', + fieldLabel: 'Messstelle' + }, + { + xtype: 'textfield', + name: 'hauptprobenNr', + fieldLabel: 'Hauptprobennr.' + }, + { + xtype: 'textfield', + name: 'probeId', + fieldLabel: 'Probe-ID' + }, + { + xtype: 'fieldset', + title: 'Erweiterte Probenangaben', + collapsible: true, + collapsed: false, + items: [ + { + xtype: 'datenbasis', + id: 'datenbasis', + editable: false, + name: 'datenbasisId', + fieldLabel: 'Datenbasis' + }, + { + xtype: 'betriebsart', + name: 'baId', + fieldLabel: 'Betriebsart' + }, + { + xtype: 'testdatensatz', + name: 'test', + fieldLabel: 'Testdatensatz' + }, + { + xtype: 'probenart', + id: 'probenart', + editable: false, + name: 'probenartId', + fieldLabel: 'Probenart' + }, + { + xtype: 'textfield', + name: 'probenartId', + fieldLabel: 'Probennehmer' + }, + { + xtype: 'textfield', + name: 'x11', + fieldLabel: 'Datensatzerzeuger' + } + ] + } + ] + }, + // Medium + { + xtype: 'fieldset', + title: 'Medium', + defaults: { + labelWidth: 150 + }, + items: [ + { + xtype: 'uwb', + name: 'umwId', + fieldLabel: 'Umweltbereich' + }, + { + xtype: 'textfield', + name: 'media', + fieldLabel: 'Medienbezeichnung' + }, + { + xtype: 'textfield', + name: 'mediaDesk', + fieldLabel: 'Deskriptoren' + }, + { + xtype: 'fieldset', + title: 'Details Deskriptoren', + collapsible: true, + collapsed: true, + defaultType: 'textfield', + items: this.buildDescriptors() + } + ] + }, + // Zeit + { + xtype: 'fieldset', + title: 'Zeit', + defaultType: 'datefield', + defaults: { + labelWidth: 150 + }, + items: [ + { + fieldLabel: 'Probennahme Beginn', + name: 'probeentnahmeBeginn' + }, + { + fieldLabel: 'Probennahme Ende', + name: 'probeentnahmeEnde' + }, + { + fieldLabel: 'Sollzeit Von', + name: 'solldatumBeginn' + }, + { + fieldLabel: 'Sollzeit Bis', + name: 'solldatumEnde' + }, + { + fieldLabel: 'Ursprungszeit', + name: 'z5' + } + ] + } + ] + } + ]; + + this.buttons = [ + { + text: 'Speichern', + action: 'save' + }, + { + text: 'Verwerfen', + scope: this, + handler: this.close + } + ]; + this.callParent(arguments); + }, + buildDescriptors: function() { + var fields = new Array(); + for ($i=0; $i<12; $i++) { + fields[$i] = {fieldLabel: 'S'+$i, name: 's'+$i}; + } + return fields; + } +}); +