lada/lada-client: app/view/form/Messprogramm.js comparison

comparison app/view/form/Messprogramm.js @ 1108:7baaf2cd3f57

Redesign in Messgrogrammform

author	Evi Huber <ehuber@bfs.de>
date	Fri, 13 May 2016 14:24:07 +0200
parents	414f7c9908d6
children	92c0fa2f29b0

comparison

equal deleted inserted replaced

-:9bcd17f7a0ae
+:7baaf2cd3f57
 maxLength: 20,
 editable: true
 }, {
 xtype: 'betriebsart',
 name: 'baId',
+margin: '0, 5, 5, 5',
 fieldLabel: i18n.getMsg('baId'),
-anchor: '100%',
+//anchor: '100%',
-labelWidth: 105
+width: '35%',
+labelWidth: 80
 }, {
 xtype: 'probenart',
 editable: false,
 name: 'probenartId',
 fieldLabel: i18n.getMsg('probenartId'),
-margin: '0, 15, 5, 5',
+margin: '0, 5, 5, 5',
 width: '20%',
-labelWidth: 65,
+labelWidth: 70,
 allowBlank: false
 }]
 }]
 }, {
 // Zeit
 }, {
 xtype: 'numberfield',
 fieldLabel: i18n.getMsg('teilintervallBis'),
 margin: '0, 15, 5, 5',
 labelWidth: 18,
-width: '12%',
+width: '15%',
 name: 'teilintervallBis',
 period: 'end'
 }, {
 xtype: 'numberfield',
 margin: '0, 10, 5, 5',
 fieldLabel: i18n.getMsg('offset'),
 labelWidth: 45,
-width: '18%',
+width: '17%',
 name: 'intervallOffset'
 }]
 }, {
 xtype: 'probenintervallslider',
 //                        fieldLabel: i18n.getMsg('intervall'),
 i.setMaxValue(max-1);
 },
 setRecord: function(messRecord) {
 this.clearMessages();
 this.getForm().loadRecord(messRecord);
 //Set the intervall numberfields and the slider.
 this.down('probenintervallslider').setValue([
 messRecord.get('teilintervallVon'),
 messRecord.get('teilintervallBis')
 }
 else {
 laborMstId = '';
 }
 var id = this.down('messstellelabor').store.count() + 1;
-var newStore = Ext.create('Ext.data.Store', {
+			if ( messRecord.get('mstId') === messRecord.get('laborMstId') ) {
-model: 'Lada.model.MessstelleLabor',
+				displayCombi = mstId.get('messStelle');
-data: [{
+			} else {
-id: id,
+				displayCombi = mstId.get('messStelle') + '/' + laborMstId
-laborMst: messRecord.get('laborMstId'),
+			}
-messStelle: messRecord.get('mstId'),
+			var newStore = Ext.create('Ext.data.Store', {
-displayCombi: mstId.get('messStelle') +
+				model: 'Lada.model.MessstelleLabor',
-'/' + laborMstId
+				data: [{
-}]
+					id: id,
-});
+					laborMst: messRecord.get('laborMstId'),
+					messStelle: messRecord.get('mstId'),
+					displayCombi: displayCombi
+				}]
+			});
 this.down('messstellelabor').down('combobox').store = newStore;
 this.down('messstellelabor').setValue(id);
 }
 else {
 var mstLaborStore = Ext.data.StoreManager.get('messstellelabor');
 setMediaDesk: function(record) {
 var media = record.get('mediaDesk').split(' ');
 this.setMediaSN(0, media);
 },
-setMediaSN: function(ndx, media) {
+setMediaSN: function(ndx, media, beschreibung) {
+var mediabeschreibung = this.getForm().findField('media');
 if (ndx >= 12) {
+			mediabeschreibung.setValue(beschreibung);
 return;
 }
 var me = this;
 var current = this.down('deskriptor[layer=' + ndx + ']');
 var cbox = current.down('combobox');
 cbox.store.load(function(records, op, success) {
 if (!success) {
 return;
 }
 cbox.select(cbox.store.findRecord('sn', parseInt(media[ndx + 1], 10)));
-me.setMediaSN(++ndx, media);
+			var mediatext = cbox.store.findRecord('sn', parseInt(media[ndx + 1], 10));
+			if (mediatext !== null) {
+				if ( (ndx <= 3) && (media[1] === '01') && (mediatext.data.beschreibung !== "leer") ) {
+					beschreibung = mediatext.data.beschreibung;
+				} else if ( (media[1] !== '01') && (mediatext.data.beschreibung !== "leer") && (ndx <= 1) ) {
+					beschreibung = mediatext.data.beschreibung;
+				}
+			}
+me.setMediaSN(++ndx, media, beschreibung);
 });
 },
 setMessages: function(errors, warnings) {
 var key;

http://lada.wald.intevation.org