# HG changeset patch # User Torsten Irländer # Date 1371635005 -7200 # Node ID 84f32c62670f3e4cd815391140644e31d86d12ae # Parent b91d5376db1930e869d3305dd34f0712faa7755e Added form to create kommentare diff -r b91d5376db19 -r 84f32c62670f app/controller/Kommentare.js --- a/app/controller/Kommentare.js Tue Jun 18 14:02:48 2013 +0200 +++ b/app/controller/Kommentare.js Wed Jun 19 11:43:25 2013 +0200 @@ -2,7 +2,8 @@ extend: 'Ext.app.Controller', views: [ 'kommentare.List', - 'kommentare.Edit' + 'kommentare.Edit', + 'kommentare.Create' ], stores: [ 'Kommentare' @@ -32,11 +33,13 @@ }, addKommentar: function(button) { console.log('Adding new Kommentar'); - var view = Ext.widget('kommentaredit'); + var view = Ext.create('Lada.view.kommentare.Create'); var form = view.down('form'); - // Create a new Kommentar - var record = Ext.create('Lada.model.Kommentar'); - form.loadRecord(record); + // Set probeId + var probenform = button.up('form'); + var probe = probenform.getRecord(); + var probeId = probe.get('probeId'); + form.model.set('probeId', probeId); }, deleteKommentar: function(button) { // Get selected item in grid diff -r b91d5376db19 -r 84f32c62670f app/model/Kommentar.js --- a/app/model/Kommentar.js Tue Jun 18 14:02:48 2013 +0200 +++ b/app/model/Kommentar.js Wed Jun 19 11:43:25 2013 +0200 @@ -6,7 +6,7 @@ {name: "convertedId", convert:buildId}, {name: "probeId"}, {name: "erzeuger"}, - {name: "kdatum"}, + {name: "kdatum", type: 'date', convert: ts2date, defaultValue: new Date()}, {name: "ktext"} ], idProperty: "convertedId", @@ -24,3 +24,8 @@ function buildId(v, record){ return record.get('probeId') + record.get('kid'); } + +function ts2date(v, record){ + // Converts a timestamp into a date object. + return new Date(v); +} diff -r b91d5376db19 -r 84f32c62670f app/view/kommentare/Edit.js --- a/app/view/kommentare/Edit.js Tue Jun 18 14:02:48 2013 +0200 +++ b/app/view/kommentare/Edit.js Wed Jun 19 11:43:25 2013 +0200 @@ -29,7 +29,7 @@ fieldLabel: 'Erzeuger' }, { - xtype: 'textfield', + xtype: 'datefield', name: 'kdatum', fieldLabel: 'Datum' }, diff -r b91d5376db19 -r 84f32c62670f app/view/widgets/Mst.js --- a/app/view/widgets/Mst.js Tue Jun 18 14:02:48 2013 +0200 +++ b/app/view/widgets/Mst.js Wed Jun 19 11:43:25 2013 +0200 @@ -4,7 +4,8 @@ alias: 'widget.mst', store: 'Mst', displayField:'mstId', - valueField: 'mstId' , + valueField: 'mstId', + typeAhead: true, emptyText:'Wählen Sie eine Messstelle', initComponent: function() { this.callParent(arguments);