Mercurial > lada > lada-client
changeset 181:062aa9001eb6
Completed Messwertelist
| author | Torsten Irländer <torsten.irlaender@intevation.de> |
|---|---|
| date | Thu, 04 Jul 2013 15:11:01 +0200 |
| parents | 133df8f75a12 |
| children | 23f74ae3bb87 |
| files | app/controller/Messungen.js app/view/messungen/CreateForm.js |
| diffstat | 2 files changed, 36 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/Messungen.js Thu Jul 04 12:21:51 2013 +0200 +++ b/app/controller/Messungen.js Thu Jul 04 15:11:01 2013 +0200 @@ -7,7 +7,8 @@ 'Messungen', 'Messwerte', 'MKommentare', - 'Status' + 'Status', + 'Messgroessen' ], init: function() { console.log('Initialising the Messungen controller');
--- a/app/view/messungen/CreateForm.js Thu Jul 04 12:21:51 2013 +0200 +++ b/app/view/messungen/CreateForm.js Thu Jul 04 15:11:01 2013 +0200 @@ -3,7 +3,10 @@ model: 'Lada.model.Messung', requires: [ 'Lada.view.widgets.Messmethode', - 'Lada.view.mkommentare.List' + 'Lada.view.widgets.Testdatensatz', + 'Lada.view.mkommentare.List', + 'Lada.view.status.List', + 'Lada.view.messwerte.List' ], initComponent: function() { this.items = [ @@ -28,15 +31,43 @@ fieldLabel: 'Messdauer' }, { - xtype: 'textfield', + xtype: 'testdatensatz', name: 'fertig', fieldLabel: 'Fertig' }, { - xtype: 'textfield', + xtype: 'testdatensatz', name: 'geplant', fieldLabel: 'Geplant' }, + // Messwerte + { + xtype: 'fieldset', + title: 'Messwerte', + collapsible: true, + collapsed: false, + padding: '10 10', + items: [ + { + xtype: 'messwertelist', + parentId: this.modelId + } + ] + }, + // Status + { + xtype: 'fieldset', + title: 'Messungsstatus', + collapsible: true, + collapsed: false, + padding: '10 10', + items: [ + { + xtype: 'statuslist', + parentId: this.modelId + } + ] + }, // Messungskommentare { xtype: 'fieldset',