# HG changeset patch # User Raimund Renkert # Date 1426150062 -3600 # Node ID a81dafe06d1d18884cb961e1f2015bb09f75c9a2 # Parent 89b337cbfb5d78474757be518e587d37122d5046 Add status to messung edit window. diff -r 89b337cbfb5d -r a81dafe06d1d app.js --- a/app.js Thu Mar 12 09:46:17 2015 +0100 +++ b/app.js Thu Mar 12 09:47:42 2015 +0100 @@ -108,6 +108,7 @@ 'Lada.controller.grid.Probenzusatzwert', 'Lada.controller.grid.PKommentar', 'Lada.controller.grid.Messung', - 'Lada.controller.grid.Messwert' + 'Lada.controller.grid.Messwert', + 'Lada.controller.grid.Status' ] }); diff -r 89b337cbfb5d -r a81dafe06d1d app/view/window/MessungEdit.js --- a/app/view/window/MessungEdit.js Thu Mar 12 09:46:17 2015 +0100 +++ b/app/view/window/MessungEdit.js Thu Mar 12 09:47:42 2015 +0100 @@ -15,9 +15,9 @@ requires: [ 'Lada.view.form.Messung', - 'Lada.view.grid.Messwert' - // 'Lada.view.grid.Messstatus', // 'Lada.view.grid.MKommentar' + 'Lada.view.grid.Messwert', + 'Lada.view.grid.Status', ], collapsible: true, @@ -59,12 +59,16 @@ xtype: 'messwertgrid', recordId: this.record.get('id') }] - // TODO }, { xtype: 'fset', name: 'messungstatus', - title: 'Messungstatus - Stub' - // TODO + title: 'Status', + padding: '5, 5', + margin: 5, + items: [{ + xtype: 'statusgrid', + recordId: this.record.get('id') + }] }, { xtype: 'fset', name: 'messungskommentare',