Mercurial > lada > lada-client
changeset 231:edb2b636319f
Modified create dialogs to only contain fields to create a messung (without,
messwerte, status, kommentare).
Added Editdialog with all fields.
| author | Torsten Irländer <torsten.irlaender@intevation.de> |
|---|---|
| date | Wed, 17 Jul 2013 12:09:01 +0200 |
| parents | 7bea6974fb5b |
| children | 6ac95f587e10 |
| files | app/view/messungen/Create.js app/view/messungen/CreateForm.js app/view/messungen/Edit.js app/view/messungen/EditForm.js |
| diffstat | 4 files changed, 122 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/app/view/messungen/Create.js Wed Jul 17 12:06:44 2013 +0200 +++ b/app/view/messungen/Create.js Wed Jul 17 12:09:01 2013 +0200 @@ -3,8 +3,8 @@ alias: 'widget.messungencreate', title: 'Maske für Messungen', - width: Ext.getBody().getViewSize().width - 30, - height: Ext.getBody().getViewSize().height - 30, + //width: Ext.getBody().getViewSize().width - 30, + //height: Ext.getBody().getViewSize().height - 30, autoShow: true, autoScroll: true, modal: true,
--- a/app/view/messungen/CreateForm.js Wed Jul 17 12:06:44 2013 +0200 +++ b/app/view/messungen/CreateForm.js Wed Jul 17 12:09:01 2013 +0200 @@ -3,10 +3,7 @@ model: 'Lada.model.Messung', requires: [ 'Lada.view.widgets.Messmethode', - 'Lada.view.widgets.Testdatensatz', - 'Lada.view.mkommentare.List', - 'Lada.view.status.List', - 'Lada.view.messwerte.List' + 'Lada.view.widgets.Testdatensatz' ], initComponent: function() { this.items = [ @@ -40,51 +37,6 @@ xtype: 'testdatensatz', name: 'geplant', fieldLabel: 'Geplant' - }, - // Messwerte - { - xtype: 'fieldset', - title: 'Messwerte', - collapsible: true, - collapsed: false, - padding: '10 10', - items: [ - { - xtype: 'messwertelist', - parentId: this.model.get('messungsId'), - probeId: this.model.get('probeId') - } - ] - }, - // Status - { - xtype: 'fieldset', - title: 'Messungsstatus', - collapsible: true, - collapsed: false, - padding: '10 10', - items: [ - { - xtype: 'statuslist', - parentId: this.model.get('messungsId'), - probeId: this.model.get('probeId') - } - ] - }, - // Messungskommentare - { - xtype: 'fieldset', - title: 'Messungskommentare', - collapsible: true, - collapsed: false, - padding: '10 10', - items: [ - { - xtype: 'mkommentarelist', - parentId: this.model.get('messungsId'), - probeId: this.model.get('probeId') - } - ] } ]; this.callParent();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/view/messungen/Edit.js Wed Jul 17 12:09:01 2013 +0200 @@ -0,0 +1,27 @@ +Ext.define('Lada.view.messungen.Edit', { + extend: 'Ext.window.Window', + alias: 'widget.messungenedit', + + title: 'Maske für Messungen', + width: Ext.getBody().getViewSize().width - 30, + height: Ext.getBody().getViewSize().height - 30, + autoShow: true, + autoScroll: true, + modal: true, + + requires: [ + 'Lada.view.messungen.EditForm' + ], + initComponent: function() { + var form = Ext.create('Lada.view.messungen.EditForm', this.initialConfig); + this.items = [form]; + this.buttons = [ + { + text: 'Speichern', + scope: form, + action: 'save' + } + ]; + this.callParent(); + } +});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/view/messungen/EditForm.js Wed Jul 17 12:09:01 2013 +0200 @@ -0,0 +1,92 @@ +Ext.define('Lada.view.messungen.EditForm', { + extend: 'Lada.view.widgets.LadaForm', + model: 'Lada.model.Messung', + requires: [ + 'Lada.view.widgets.Messmethode', + 'Lada.view.widgets.Testdatensatz', + 'Lada.view.mkommentare.List', + 'Lada.view.status.List', + 'Lada.view.messwerte.List' + ], + initComponent: function() { + this.items = [ + { + xtype: 'textfield', + name: 'nebenprobenNr', + maxLength: 10, + fieldLabel: 'NPR' + }, + { + xtype: 'messmethode', + name: 'mmtId', + fieldLabel: 'MMT' + }, + { + xtype: 'datefield', + name: 'messzeitpunkt', + fieldLabel: 'Messzeitpunkt' + }, + { + xtype: 'textfield', + name: 'messdauer', + fieldLabel: 'Messdauer' + }, + { + xtype: 'testdatensatz', + name: 'fertig', + fieldLabel: 'Fertig' + }, + { + xtype: 'testdatensatz', + name: 'geplant', + fieldLabel: 'Geplant' + }, + // Messwerte + { + xtype: 'fieldset', + title: 'Messwerte', + collapsible: true, + collapsed: false, + padding: '10 10', + items: [ + { + xtype: 'messwertelist', + parentId: this.model.get('messungsId'), + probeId: this.model.get('probeId') + } + ] + }, + // Status + { + xtype: 'fieldset', + title: 'Messungsstatus', + collapsible: true, + collapsed: false, + padding: '10 10', + items: [ + { + xtype: 'statuslist', + parentId: this.model.get('messungsId'), + probeId: this.model.get('probeId') + } + ] + }, + // Messungskommentare + { + xtype: 'fieldset', + title: 'Messungskommentare', + collapsible: true, + collapsed: false, + padding: '10 10', + items: [ + { + xtype: 'mkommentarelist', + parentId: this.model.get('messungsId'), + probeId: this.model.get('probeId') + } + ] + } + ]; + this.callParent(); + } +});