[Lada-commits] [PATCH 2 of 2] Fixed some js related issues (unused vars, arrays, etc.) and code style
Wald Commits
scm-commit at wald.intevation.org
Thu Nov 6 10:37:54 CET 2014
# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1415266697 -3600
# Node ID 7c0653e8d9f7a3d78c2e4786d259f2383f0ca550
# Parent d07e5086a64b969609d3ee5b3cb262caa46ea54b
Fixed some js related issues (unused vars, arrays, etc.) and code style.
diff -r d07e5086a64b -r 7c0653e8d9f7 app.js
--- a/app.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app.js Thu Nov 06 10:38:17 2014 +0100
@@ -1,11 +1,11 @@
-/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz
+/**
+ * Copyright (C) 2013 by Bundesamt fuer Strahlenschutz
* Software engineering by Intevation GmbH
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
* the documentation coming with IMIS-Labordaten-Application for details.
*/
-
Ext.Loader.setConfig({
enabled: true,
paths: {
@@ -113,25 +113,23 @@
});
Ext.data.writer.Json.override({
- getRecordData: function(record, getEverything) {
- if(this.writeEverything || record.writeEverything){
- console.log('getRecordData', this,arguments);
+ getRecordData: function(record) {
+ if (this.writeEverything || record.writeEverything) {
+ console.log('getRecordData', arguments);
return record.getAllData();
}
- else {
- return this.callOverridden(arguments);
- }
+ return this.callOverridden(arguments);
}
});
Ext.data.Model.addMembers({
getAllData: function() {
var data1 = this.getData();
- var data2 = this.getAssociatedData( );
+ var data2 = this.getAssociatedData();
var dataMerged = Ext.Object.merge(data1, data2);
return dataMerged;
},
getEidi: function() {
- return "/" + this.getId();
+ return '/' + this.getId();
}
});
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Base.js
--- a/app/controller/Base.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Base.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -31,9 +31,10 @@
this.addListeners();
},
/**
- * Function to add listeners for various events in UI items. The UI Items are selected
- * with a CSS like selector.See ComponentQuery documentation for more
- * details. The function is called while initializing the controller.
+ * Function to add listeners for various events in UI items. The UI Items
+ * are selected with a CSS like selector.See ComponentQuery documentation
+ * for more details.
+ * The function is called while initializing the controller.
*
* The function should be overwritten by a specfic implementation.
*/
@@ -54,13 +55,17 @@
* The method is called when the user clicks on the "Add" button in the
* grid toolbar.
*/
- addItem: function(button) {},
+ addItem: function() {
+ return;
+ },
/**
* Method to open a window to edit the values for an existing kommentar.
* The method is called when the user doubleclicks on the item in the
* grid.
*/
- editItem: function(grid, record) {},
+ editItem: function() {
+ return;
+ },
/**
* Method to delete a kommentar. This will trigger the display of a
* Confirmation dialog. After the deletion the related store will be
@@ -78,12 +83,13 @@
Ext.Ajax.request({
url: deleteUrl,
method: 'DELETE',
- success: function(response, opts) {
+ success: function() {
store.reload();
}
});
console.log('Deleting ' + selection);
- } else {
+ }
+ else {
console.log('Cancel Deleting ' + selection);
}
});
@@ -92,12 +98,14 @@
* Method to trigger the action after successfull save (create).
* In this case the related store is refreshed and the window is closed.
*/
- createSuccess: function(form, record, operation) {},
+ createSuccess: function() {
+ return;
+ },
/**
* Method to trigger the action after save (create) fails.
* In this case a Message Boss with a general error is shown.
*/
- createFailure: function(form, record, operation) {
+ createFailure: function(form) {
Ext.MessageBox.show({
title: 'Fehler beim Speichern',
msg: form.message,
@@ -109,12 +117,14 @@
* Method to trigger the action after successfull save (edit).
* In this case the related store is refreshed and the window is closed.
*/
- editSuccess: function(form, record, operation) {},
+ editSuccess: function() {
+ return;
+ },
/**
* Method to trigger the action after save ( edit) fails.
* In this case a Message Boss with a general error is shown.
*/
- editFailure: function(form, record, operation) {
+ editFailure: function(form) {
Ext.MessageBox.show({
title: 'Fehler beim Speichern',
msg: form.message,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Kommentare.js
--- a/app/controller/Kommentare.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Kommentare.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -54,29 +54,29 @@
console.log('Adding new Kommentar for Probe ' + button.probeId);
var kommentar = Ext.create('Lada.model.KommentarP');
kommentar.set('probeId', button.probeId);
- var view = Ext.widget('kommentarecreate', {
+ Ext.widget('kommentarecreate', {
model: kommentar
});
},
editItem: function(grid, record) {
console.log('Editing Kommentar');
- record.getAuthInfo(this.initEditWindow)
- console.log("Loaded Kommentar with ID " + record.getId()); //outputs ID
+ record.getAuthInfo(this.initEditWindow);
+ console.log('Loaded Kommentar with ID ' + record.getId());
},
- initEditWindow: function(record, readonly, owner) {
+ initEditWindow: function(record, readonly) {
var view = Ext.widget('kommentarecreate', {
model: record
});
- var ignore = Array();
+ var ignore = [];
if (readonly) {
var form = view.down('form');
form.setReadOnly(true, ignore);
}
},
- createSuccess: function(form, record, operation) {
+ createSuccess: function(form) {
var store = this.getKommentarePStore();
store.reload();
var win = form.up('window');
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/MKommentare.js
--- a/app/controller/MKommentare.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/MKommentare.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -54,29 +54,31 @@
var kommentar = Ext.create('Lada.model.KommentarM');
kommentar.set('probeId', button.probeId);
kommentar.set('messungsId', button.parentId);
- var view = Ext.widget('mkommentarecreate', {model: kommentar});
+ Ext.widget('mkommentarecreate', {
+ model: kommentar
+ });
},
editItem: function(grid, record) {
console.log('Editing Kommentar');
var mstore = Ext.data.StoreManager.get('Messungen');
var messung = mstore.getById(record.get('messungsId'));
- record.getAuthInfo(this.initEditWindow, messung.get('probeId'))
- console.log("Loaded MKommentar with ID " + record.getId()); //outputs ID
+ record.getAuthInfo(this.initEditWindow, messung.get('probeId'));
+ console.log('Loaded MKommentar with ID ' + record.getId());
},
- initEditWindow: function(record, readonly, owner) {
+ initEditWindow: function(record, readonly) {
var view = Ext.widget('mkommentarecreate', {
model: record
});
- var ignore = Array();
+ var ignore = [];
if (readonly) {
var form = view.down('form');
form.setReadOnly(true, ignore);
}
},
- createSuccess: function(form, record, operation) {
+ createSuccess: function(form) {
// Reload store
var store = this.getKommentareMStore();
store.reload();
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Messungen.js
--- a/app/controller/Messungen.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Messungen.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -68,7 +68,9 @@
console.log('Adding new Messung for Probe ' + button.probeId);
var messung = Ext.create('Lada.model.Messung');
messung.set('probeId', button.probeId);
- var view = Ext.widget('messungencreate', {model: messung});
+ Ext.widget('messungencreate', {
+ model: messung
+ });
},
editItem: function(grid, record) {
@@ -95,16 +97,16 @@
}
});
record.getAuthInfo(this.initEditWindow);
- console.log("Loaded Messung with ID " + record.getId()); //outputs ID
+ console.log('Loaded Messung with ID ' + record.getId());
},
initEditWindow: function(record, readonly, owner) {
var view = Ext.widget('messungenedit', {
model: record
});
- var ignore = Array();
+ var ignore = [];
if (owner) {
- ignore.push('fertig');
+ ignore.push('fertig');
}
if (readonly) {
var form = view.down('form');
@@ -123,25 +125,26 @@
Ext.Ajax.request({
url: deleteUrl,
method: 'DELETE',
- success: function(response, opts) {
+ success: function() {
store.reload();
}
});
console.log('Deleting Messung');
- } else {
+ }
+ else {
console.log('Cancel Deleting Messung');
}
});
},
- createSuccess: function(form, record, operation) {
+ createSuccess: function(form) {
var store = this.getMessungenStore();
store.reload();
var win = form.up('window');
win.close();
},
- createFailure: function(form, record, operation) {
+ createFailure: function(form) {
Ext.MessageBox.show({
title: 'Fehler beim Speichern',
msg: form.message,
@@ -150,14 +153,14 @@
});
},
- editSuccess: function(form, record, operation) {
+ editSuccess: function(form) {
var store = this.getMessungenStore();
store.reload();
var win = form.up('window');
win.close();
},
- editFailure: function(form, record, operation) {
+ editFailure: function(form) {
Ext.MessageBox.show({
title: 'Fehler beim Speichern',
msg: form.message,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Messwert.js
--- a/app/controller/Messwert.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Messwert.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -58,23 +58,24 @@
var messung = Ext.create('Lada.model.Messwert');
messung.set('probeId', button.probeId);
messung.set('messungsId', button.parentId);
- var view = Ext.widget('messwertecreate', {model: messung});
+ Ext.widget('messwertecreate', {
+ model: messung
+ });
},
editItem: function(grid, record) {
console.log('Editing Messwert');
var mstore = Ext.data.StoreManager.get('Messungen');
- var pstore = Ext.data.StoreManager.get('Proben');
- var messung = mstore.getById(record.get('messungsId'))
+ var messung = mstore.getById(record.get('messungsId'));
record.getAuthInfo(this.initEditWindow, messung.get('probeId'));
- console.log("Loaded Messwert with ID " + record.getId()); //outputs ID
+ console.log('Loaded Messwert with ID ' + record.getId());
},
- initEditWindow: function(record, readonly, owner) {
+ initEditWindow: function(record, readonly) {
var view = Ext.widget('messwertecreate', {
model: record
});
- var ignore = Array();
+ var ignore = [];
if (readonly) {
var form = view.down('form');
form.setReadOnly(true, ignore);
@@ -91,18 +92,19 @@
Ext.Ajax.request({
url: deleteUrl,
method: 'DELETE',
- success: function(response, opts) {
+ success: function() {
store.reload();
}
});
console.log('Deleting Messwert');
- } else {
+ }
+ else {
console.log('Cancel Deleting Messwert');
}
});
},
- createSuccess: function(form, record, operation) {
+ createSuccess: function(form) {
// Reload store
var store = this.getMesswerteStore();
store.reload();
@@ -110,7 +112,7 @@
win.close();
},
- createFailure: function(form, record, operation) {
+ createFailure: function(form) {
Ext.MessageBox.show({
title: 'Fehler beim Speichern',
msg: form.message,
@@ -119,7 +121,7 @@
});
},
- editSuccess: function(form, record, operation) {
+ editSuccess: function(form) {
// Reload store
var store = this.getMesswerteStore();
store.reload();
@@ -127,7 +129,7 @@
win.close();
},
- editFailure: function(form, record, operation) {
+ editFailure: function(form) {
Ext.MessageBox.show({
title: 'Fehler beim Speichern',
msg: form.message,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Orte.js
--- a/app/controller/Orte.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Orte.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -62,9 +62,9 @@
});
},
- createOrt: function(button) {
+ createOrt: function() {
console.log('button clicked');
- var win = Ext.create('Lada.view.orte.CreateOrt',{});
+ var win = Ext.create('Lada.view.orte.CreateOrt', {});
win.show();
},
@@ -76,17 +76,18 @@
var ortdetail = Ext.create('Lada.model.Ortdetail');
var fields = ['beschreibung', 'hoeheLand',
'latitude', 'longitude', 'staatId', 'gemId'];
- for (var i = fields.length - 1; i >= 0; i--) {
- var ffield = form.findField("ort_"+fields[i]);
+ var i = 0;
+ var ffield;
+ for (i = fields.length - 1; i >= 0; i++) {
+ ffield = form.findField('ort_' + fields[i]);
ortdetail.set(fields[i], ffield.getValue());
}
ortdetailstore.add(ortdetail);
ortdetailstore.sync({
- success: function(batch, options) {
+ success: function(batch) {
console.log(batch);
var od = Ext.ComponentQuery.query('ortdetail');
console.log(od);
- batch.operations[0].resultSet.records[0].data;
var response = batch.operations[0].resultSet.records[0].data;
od[0].setValue(response.ortId);
console.log('id:' + response.ortId);
@@ -115,15 +116,18 @@
ortdetail = Ext.create('Lada.model.Ortdetail');
ortdetailstore.add(ortdetail);
newortdetail = true;
- } else {
+ }
+ else {
console.log('Editing Ortdetail');
ortdetail = ortdetailstore.getById(ortid);
}
var fields = ['beschreibung', 'bezeichnung', 'hoeheLand',
'latitude', 'longitude', 'staatId', 'gemId'];
- for (var i = fields.length - 1; i >= 0; i--){
- ffield = fform.findField("ort_"+fields[i]);
+ var i = 0;
+ var ffield;
+ for (i = fields.length - 1; i >= 0; i--) {
+ ffield = fform.findField('ort_' + fields[i]);
ortdetail.set(fields[i], ffield.getValue());
}
// Create a new Ortedetail if nessecary
@@ -132,7 +136,8 @@
if (newortdetail) {
// Get ID from new created ortdetail and set it to the ort
var response =
- options.operations.create[0].store.proxy.reader.jsonData;
+ options.operations.create[0]
+ .store.proxy.reader.jsonData;
form.model.set('ortId', response.ortId);
}
ortidfield.setValue(ortid);
@@ -148,30 +153,30 @@
console.log('Adding new Ort for Probe ' + button.probeId);
var ort = Ext.create('Lada.model.Ort');
ort.set('probeId', button.probeId);
- var view = Ext.widget('ortecreate', {
+ Ext.widget('ortecreate', {
model: ort
});
},
editItem: function(grid, record) {
console.log('Editing Ort');
- record.getAuthInfo(this.initEditWindow)
- console.log("Loaded Ort with ID " + record.getId()); //outputs ID
+ record.getAuthInfo(this.initEditWindow);
+ console.log('Loaded Ort with ID ' + record.getId());
},
- initEditWindow: function(record, readonly, owner) {
+ initEditWindow: function(record, readonly) {
var view = Ext.widget('ortecreate', {
model: record,
edit: true
});
- var ignore = Array();
+ var ignore = [];
if (readonly) {
var form = view.down('form');
form.setReadOnly(true, ignore);
}
},
- createSuccess: function(form, record, operation) {
+ createSuccess: function(form) {
// Reload store
var store = this.getOrteStore();
store.reload();
@@ -179,7 +184,7 @@
win.close();
},
- editSuccess: function(form, record, operation) {
+ editSuccess: function(form) {
// Reload store
var store = this.getOrteStore();
store.reload();
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Proben.js
--- a/app/controller/Proben.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Proben.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -21,60 +21,73 @@
}
function buildImportReport(filename, msg, errors, warnings) {
- var out = Array();
+ var out = [];
// There is a entry for each imported proben in the errors dict (might be
// empty)
- var num_proben = (Object.keys(errors).length > 0);
- var num_errors = (numOfErrors(errors));
- var has_warnings = (Object.keys(warnings).length > 0);
- if (msg != 200) {
- out.push("Der Import der Datei " + filename + " war nicht erfolgreich. Der Importvorgang konnte aufgrund eines Fehlers im Server nicht beendet werden.");
- } else {
- if (num_errors == num_proben) {
- out.push("Der Import der Datei " + filename + " war nicht erfolgreich.");
+ var numProben = (Object.keys(errors).length > 0);
+ var numErrors = (numOfErrors(errors));
+ var hasWarnings = (Object.keys(warnings).length > 0);
+ if (msg !== 200) {
+ out.push('Der Import der Datei ' +
+ filename +
+ ' war nicht erfolgreich. Der Importvorgang konnte aufgrund' +
+ 'eines Fehlers im Server nicht beendet werden.');
+ }
+ else {
+ if (numErrors === numProben) {
+ out.push('Der Import der Datei '
+ + filename + ' war nicht erfolgreich.');
}
- else if (num_errors == 0) {
- out.push("Der Import der Datei " + filename + " war erfolgreich.");
- } else {
- out.push("Der Import der Datei " + filename + " war nicht oder nur teilweise erfolgreich.");
+ else if (numErrors === 0) {
+ out.push('Der Import der Datei ' + filename + ' war erfolgreich.');
}
- out.push(" Bei dem Import sind folgende Fehler und Warnungen aufgetreten:");
- out.push("<br/>");
- if (num_errors) {
- out.push("<strong>Fehler:</strong>");
- out.push("<br/>");
- out.push("<ol>");
- for (var key in errors) {
- out.push("<li>Probe: "+key)
- var msgs = errors[key];
- out.push("<ol>");
- for (var i = msgs.length - 1; i >= 0; i--){
- out.push("<li>"+msgs[i].key+" ("+Lada.getApplication().bundle.getMsg(msgs[i].code.toString())+"): "+msgs[i].value+"</li>")
- };
- out.push("</ol>");
- out.push("</li>");
+ else {
+ out.push('Der Import der Datei '
+ + filename + ' war nicht oder nur teilweise erfolgreich.');
+ }
+ out.push(' Bei dem Import sind folgende Fehler und Warnungen ' +
+ 'aufgetreten:');
+ out.push('<br/>');
+ var key;
+ var msgs;
+ if (numErrors) {
+ out.push('<strong>Fehler:</strong>');
+ out.push('<br/>');
+ out.push('<ol>');
+ for (key in errors) {
+ out.push('<li>Probe: ' + key);
+ msgs = errors[key];
+ out.push('<ol>');
+ for (var i = msgs.length - 1; i >= 0; i--) {
+ out.push('<li>' + msgs[i].key +
+ ' (' + Lada.getApplication().bundle.getMsg(
+ msgs[i].code.toString()) +
+ '): ' + msgs[i].value + '</li>');
+ }
+ out.push('</ol>');
+ out.push('</li>');
}
- out.push("</ol>");
- out.push("<br/>");
+ out.push('</ol>');
+ out.push('<br/>');
}
- if (has_warnings) {
- out.push("<strong>Warnungen:</strong>");
- out.push("<br/>");
- out.push("<ol>");
- for (var key in warnings) {
- out.push("<li>"+key)
- var msgs = warnings[key];
- out.push("<ol>");
- for (var i = msgs.length - 1; i >= 0; i--){
- out.push("<li>"+msgs[i].key+" ("+Lada.getApplication().bundle.getMsg(msgs[i].code.toString())+"): "+msgs[i].value+"</li>")
- };
- out.push("</ol>");
- out.push("</li>");
+ if (hasWarnings) {
+ out.push('<strong>Warnungen:</strong>');
+ out.push('<br/>');
+ out.push('<ol>');
+ for (key in warnings) {
+ out.push('<li>' + key);
+ msgs = warnings[key];
+ out.push('<ol>');
+ for (var i = msgs.length - 1; i >= 0; i--) {
+ out.push('<li>' + msgs[i].key + ' (' + Lada.getApplication().bundle.getMsg(msgs[i].code.toString())+'): '+msgs[i].value+'</li>')
+ }
+ out.push('</ol>');
+ out.push('</li>');
}
- out.push("</ol>");
+ out.push('</ol>');
}
}
- return out.join("");
+ return out.join('');
}
Ext.define('Lada.controller.Proben', {
@@ -133,18 +146,18 @@
});
},
- addItem: function(button) {
+ addItem: function() {
console.log('Adding new Probe');
- var view = Ext.widget('probencreate');
+ Ext.widget('probencreate');
},
/**
* Opens a window with a file chooser to select the file to upload
* @private
*/
- selectUploadFile: function(button) {
+ selectUploadFile: function() {
console.log('Importing');
- var view = Ext.widget('probenimport');
+ Ext.widget('probenimport');
},
/** Uploads the selected file the the server
@@ -164,8 +177,8 @@
var warnings = resp.result.data.warnings;
var filename = resp.result.data.filename;
var message = resp.result.message;
- var dialogbody = buildImportReport(filename, message, errors, warnings)
- var filename = resp.result.data.filename;
+ var dialogbody =
+ buildImportReport(filename, message, errors, warnings);
Ext.Msg.alert('Erfolg', dialogbody);
win.close();
},
@@ -174,7 +187,8 @@
var warnings = resp.result.data.warnings;
var filename = resp.result.data.filename;
var message = resp.result.message;
- var dialogbody = buildImportReport(filename, message, errors, warnings)
+ var dialogbody =
+ buildImportReport(filename, message, errors, warnings);
Ext.Msg.alert('Fehler', dialogbody);
win.close();
}
@@ -248,7 +262,7 @@
modelId: id
});
view.show();
- console.log("Loaded Probe with ID " + record.getId()); //outputs ID
+ console.log('Loaded Probe with ID ' + record.getId());
},
createSuccess: function(form, record, response) {
@@ -256,17 +270,17 @@
var win = form.up('window');
win.close();
var store = this.getProbenStore();
- //Load or reload the probenstore.
+ // Load or reload the probenstore.
if (store.getCount() === 0) {
store.load({
scope: this,
- callback: function(records, operation, success) {
+ callback: function() {
console.log('Loaded store');
// Open Editdialog
var json = Ext.decode(response.responseText);
if (json) {
var probeId = json.data.probeId;
- var probe = store.findRecord("probeId", probeId);
+ var probe = store.findRecord('probeId', probeId);
this.editItem(null, probe);
}
}
@@ -275,13 +289,13 @@
else {
store.reload({
scope: this,
- callback: function(records, operation, success) {
+ callback: function() {
console.log('Reloaded store');
// Open Editdialog
var json = Ext.decode(response.responseText);
if (json) {
var probeId = json.data.probeId;
- var probe = store.findRecord("probeId", probeId);
+ var probe = store.findRecord('probeId', probeId);
this.editItem(null, probe);
}
}
@@ -289,7 +303,7 @@
}
},
- editSuccess: function(form, record, response) {
+ editSuccess: function(form) {
// Reload store
var store = this.getProbenStore();
store.reload();
diff -r d07e5086a64b -r 7c0653e8d9f7 app/controller/Zusatzwerte.js
--- a/app/controller/Zusatzwerte.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/controller/Zusatzwerte.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
Ext.define('Lada.controller.Zusatzwerte', {
@@ -56,31 +56,30 @@
console.log('Adding new Zusatzwert for Probe' + button.probeId);
var zusatzwert = Ext.create('Lada.model.Zusatzwert');
zusatzwert.set('probeId', button.probeId);
- var view = Ext.widget('zusatzwertecreate', {
+ Ext.widget('zusatzwertecreate', {
model: zusatzwert
});
},
editItem: function(grid, record) {
console.log('Editing Zusatzwert');
- record.getAuthInfo(this.initEditWindow)
- console.log("Loaded Zusatzwert with ID " + record.getId()); //outputs ID
+ record.getAuthInfo(this.initEditWindow);
},
- initEditWindow: function(record, readonly, owner) {
+ initEditWindow: function(record, readonly) {
var view = Ext.widget('zusatzwertecreate', {
model: record
});
// Mark PZW Selection readonly.
view.down('probenzusatzwert').disabled = true;
- var ignore = Array();
+ var ignore = [];
if (readonly) {
var form = view.down('form');
form.setReadOnly(true, ignore);
}
},
- createSuccess: function(form, record, operation) {
+ createSuccess: function(form) {
// Reload store
var store = this.getZusatzwerteStore();
store.reload();
@@ -88,7 +87,7 @@
win.close();
},
- editSuccess: function(form, record, operation) {
+ editSuccess: function(form) {
// Reload store
var store = this.getZusatzwerteStore();
store.reload();
diff -r d07e5086a64b -r 7c0653e8d9f7 app/model/Zusatzwert.js
--- a/app/model/Zusatzwert.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/model/Zusatzwert.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -13,28 +13,28 @@
extend: 'Lada.model.Base',
fields: [{
- name: "id"
+ name: 'id'
}, {
- name: "probeId"
+ name: 'probeId'
}, {
- name: "pzsId"
+ name: 'pzsId'
}, {
- name: "nwgZuMesswert",
+ name: 'nwgZuMesswert',
type: 'float'
}, {
- name: "messwertPzs",
+ name: 'messwertPzs',
type: 'float'
}, {
- name: "messfehler",
+ name: 'messfehler',
type: 'float'
}, {
- name: "letzteAenderung",
+ name: 'letzteAenderung',
type: 'date',
convert: Lada.lib.Helpers.ts2date,
defaultValue: new Date()
}],
- idProperty: "id",
+ idProperty: 'id',
proxy: {
type: 'rest',
@@ -46,8 +46,8 @@
writer: {
type: 'json',
// TODO: Check if this function is really needed (torsten)
- // <2013-09-18 15:58>
- writeEverything : true
+ // <2013-09-18 15:58>
+ writeEverything: true
}
},
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/About.js
--- a/app/view/About.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/About.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -21,21 +21,20 @@
autoShow: true,
autoScroll: true,
modal: true,
- layout: "fit",
+ layout: 'fit',
initComponent: function() {
- var sver = "1.0";
- var cver = "1.0";
+ var sver = '1.0';
+ var cver = '1.0';
this.buttons = [{
text: 'Abbrechen',
scope: this,
handler: this.close
}];
this.items = [{
- html: "<h1>Lada</h1>Server version: " +
- sver + "<br>Client version: " +cver }
- ];
+ html: '<h1>Lada</h1>Server version: ' +
+ sver + '<br>Client version: ' + cver
+ }];
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/Viewport.js
--- a/app/view/Viewport.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/Viewport.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -13,7 +13,7 @@
* debugging it is possible to initialize other components directly see the
* initComponent function.
*/
-Ext.define('Lada.view.Viewport' ,{
+Ext.define('Lada.view.Viewport', {
extend: 'Ext.container.Viewport',
requires: [
'Lada.store.Info',
@@ -25,14 +25,14 @@
console.log('Setting up Viewport');
this.initSearch();
- // Development related:
+ // Development related:
// Disable "initSearch" call and enable one of the following init
// methods to get a dialog directly without the need to click through
// the whole application.
- //this.initProbe();
- //this.initOrt();
- //this.initMessung();
- //this.initMesswert();
+ // this.initProbe();
+ // this.initOrt();
+ // this.initMessung();
+ // this.initMesswert();
this.setInfo();
this.callParent(arguments);
@@ -44,9 +44,8 @@
setInfo: function() {
var store = Ext.create('Lada.store.Info');
store.load({
- callback: function(a,b,c) {
+ callback: function() {
var info = store.data.items[0];
- var clientVersion = "r261 (2013-07-26)";
var user = info.get('user');
var groups = info.get('groups');
var groupinfo = Ext.getCmp('groupinfo');
@@ -65,17 +64,19 @@
var store = Ext.getStore('Proben');
store.load({
params: {
- probeId: "000007575943X"
+ probeId: '000007575943X'
},
callback: function() {
var mstore = Ext.getStore('Messungen');
mstore.load({
params: {
- probeId: "000007575943X"
+ probeId: '000007575943X'
}
});
var model = store.data.items[0];
- var win = Ext.create('Lada.view.proben.Edit', {model: model});
+ Ext.create('Lada.view.proben.Edit', {
+ model: model
+ });
}
});
},
@@ -87,12 +88,12 @@
var store = Ext.getStore('Messwerte');
store.load({
params: {
- probeId: "000007575853X",
- messungsId: "1"
+ probeId: '000007575853X',
+ messungsId: '1'
},
callback: function() {
var model = store.data.items[0];
- var win = Ext.create('Lada.view.messwerte.Create', {
+ Ext.create('Lada.view.messwerte.Create', {
model: model
});
}
@@ -104,7 +105,7 @@
*/
initOrt: function() {
var ort = Ext.create('Lada.model.Ort');
- var win = Ext.create('Lada.view.orte.Create', {
+ Ext.create('Lada.view.orte.Create', {
model: ort
});
},
@@ -117,12 +118,12 @@
var kstore = Ext.getStore('KommentareM');
var mstore = Ext.getStore('Messwerte');
var sstore = Ext.getStore('Status');
- probeId = "000007578314X";
+ var probeId = '000007578314X';
store.load({
params: {
probeId: probeId
},
- callback: function () {
+ callback: function() {
console.log(store);
var messung = store.data.items[0];
console.log(store.data.items[0]);
@@ -145,14 +146,17 @@
}
});
console.log('Creating Messung window');
- //var messung = Ext.create('Lada.model.Messung');
- var win = Ext.create('Lada.view.messungen.Create', {model: messung});
+ // var messung = Ext.create('Lada.model.Messung');
+ Ext.create('Lada.view.messungen.Create', {
+ model: messung
+ });
}
});
},
/**
* Function to initialize the search window. This is the default method
- * called by the {@link Lada.view.Viewport#initComponent initComponent} method.
+ * called by the {@link Lada.view.Viewport#initComponent initComponent}
+ * method.
* @private
*/
initSearch: function() {
@@ -165,37 +169,37 @@
align: 'stretch'
},
dockedItems: [{
- xtype: "toolbar",
- dock: "top",
+ xtype: 'toolbar',
+ dock: 'top',
items: [{
- xtype: "splitbutton",
- text: "Info",
+ xtype: 'splitbutton',
+ text: 'Info',
menu: {
items: [{
id: 'AboutBtn',
- text: "About"
+ text: 'About'
}]
}
- }, "->", {
+ }, '->', {
xtype: 'box',
autoEl: {
tag: 'img',
- src:'gfx/user-identity.png'
+ src: 'gfx/user-identity.png'
}
}, {
- xtype: "tbtext",
- id:"userinfo",
- text:""
+ xtype: 'tbtext',
+ id: 'userinfo',
+ text: ''
}, {
xtype: 'box',
autoEl: {
tag: 'img',
- src:'gfx/network-workgroup.png'
+ src: 'gfx/network-workgroup.png'
}
}, {
- xtype: "tbtext",
- id:"groupinfo",
- text:""
+ xtype: 'tbtext',
+ id: 'groupinfo',
+ text: ''
}]
}],
items: [{
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/kommentare/Create.js
--- a/app/view/kommentare/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/kommentare/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -24,6 +24,8 @@
modal: true,
initComponent: function() {
+ var form = Ext.create('Lada.view.kommentare.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -33,8 +35,6 @@
scope: this,
handler: this.close
}];
- var form = Ext.create('Lada.view.kommentare.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent(arguments);
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/kommentare/CreateForm.js
--- a/app/view/kommentare/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/kommentare/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/kommentare/List.js
--- a/app/view/kommentare/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/kommentare/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,13 +3,13 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list Kommentare
*/
-Ext.define('Lada.view.kommentare.List' ,{
+Ext.define('Lada.view.kommentare.List', {
extend: 'Ext.grid.Panel',
alias: 'widget.kommentarelist',
@@ -44,13 +44,12 @@
dataIndex: 'erzeuger'
}, {
header: 'Datum',
- dataIndex: 'kdatum'
+ dataIndex: 'datum'
}, {
header: 'Text',
- dataIndex: 'ktext',
+ dataIndex: 'text',
flex: 1
}];
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messungen/Create.js
--- a/app/view/messungen/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messungen/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -22,6 +22,8 @@
modal: true,
initComponent: function() {
+ var form = Ext.create('Lada.view.messungen.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -33,8 +35,6 @@
}];
this.width = Ext.getBody().getViewSize().width - 30;
this.height = Ext.getBody().getViewSize().height - 30;
- var form = Ext.create('Lada.view.messungen.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent(arguments);
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messungen/CreateForm.js
--- a/app/view/messungen/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messungen/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messungen/Edit.js
--- a/app/view/messungen/Edit.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messungen/Edit.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -22,6 +22,8 @@
modal: true,
initComponent: function() {
+ var form = Ext.create('Lada.view.messungen.EditForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -33,8 +35,6 @@
}];
this.width = Ext.getBody().getViewSize().width - 30;
this.height = Ext.getBody().getViewSize().height - 30;
- var form = Ext.create('Lada.view.messungen.EditForm',
- this.initialConfig);
this.items = [form];
this.callParent();
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messungen/EditForm.js
--- a/app/view/messungen/EditForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messungen/EditForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messwerte/Create.js
--- a/app/view/messwerte/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messwerte/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -19,6 +19,8 @@
modal: true,
initComponent: function() {
+ var form = Ext.create('Lada.view.messwerte.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -28,8 +30,6 @@
scope: this,
handler: this.close
}];
- var form = Ext.create('Lada.view.messwerte.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent(arguments);
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messwerte/CreateForm.js
--- a/app/view/messwerte/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messwerte/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/messwerte/List.js
--- a/app/view/messwerte/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/messwerte/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,13 +3,13 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list Messwerte
*/
-Ext.define('Lada.view.messwerte.List' ,{
+Ext.define('Lada.view.messwerte.List', {
extend: 'Ext.grid.Panel',
require: ['Lada.store.StaMesseinheit'],
alias: 'widget.messwertelist',
@@ -73,13 +73,11 @@
flex: 1,
renderer: function(value) {
if (value === true) {
- return "Ja";
- } else {
- return "Nein";
+ return 'Ja';
}
+ return 'Nein';
}
}];
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/mkommentare/Create.js
--- a/app/view/mkommentare/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/mkommentare/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -24,6 +24,8 @@
'Lada.view.mkommentare.CreateForm'
],
initComponent: function() {
+ var form = Ext.create('Lada.view.mkommentare.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -33,8 +35,6 @@
scope: this,
handler: this.close
}];
- var form = Ext.create('Lada.view.mkommentare.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent();
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/mkommentare/CreateForm.js
--- a/app/view/mkommentare/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/mkommentare/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -11,7 +11,9 @@
*/
Ext.define('Lada.view.mkommentare.CreateForm', {
extend: 'Lada.view.widgets.LadaForm',
+
model: 'Lada.model.KommentarM',
+
initComponent: function() {
this.items = [{
xtype: 'mst',
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/mkommentare/List.js
--- a/app/view/mkommentare/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/mkommentare/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,13 +3,13 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list Kommentare for Messunge
*/
-Ext.define('Lada.view.mkommentare.List' ,{
+Ext.define('Lada.view.mkommentare.List', {
extend: 'Ext.grid.Panel',
alias: 'widget.mkommentarelist',
@@ -56,4 +56,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/orte/Create.js
--- a/app/view/orte/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/orte/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -12,16 +12,18 @@
Ext.define('Lada.view.orte.Create', {
extend: 'Ext.window.Window',
alias: 'widget.ortecreate',
+ requires: [
+ 'Lada.view.orte.CreateForm'
+ ],
title: 'Maske für Orte',
autoShow: true,
autoScroll: true,
modal: true,
- requires: [
- 'Lada.view.orte.CreateForm'
- ],
initComponent: function() {
+ var form = Ext.create('Lada.view.orte.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -31,8 +33,6 @@
scope: this,
handler: this.close
}];
- var form = Ext.create('Lada.view.orte.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent();
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/orte/CreateForm.js
--- a/app/view/orte/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/orte/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -11,14 +11,16 @@
*/
Ext.define('Lada.view.orte.CreateForm', {
extend: 'Lada.view.widgets.LadaForm',
- model: 'Lada.model.Ort',
requires: [
'Lada.view.widgets.Ortdetail',
'Lada.view.widgets.Staat',
'Lada.view.widgets.Verwaltungseinheit',
'Lada.view.orte.CreateOrt'
],
+
+ model: 'Lada.model.Ort',
edit: false,
+
initComponent: function() {
this.items = [{
xtype: 'ortdetail',
@@ -26,7 +28,7 @@
fieldLabel: 'Ort',
listeners: {
scope: this,
- 'change': function (field, newv, oldv, opts) {
+ 'change': function(field, newv) {
if (field.up('window')) {
field.up('window').down('fieldset').show();
}
@@ -54,10 +56,12 @@
});
}
+ console.log('found verw');
var form = this.getForm();
- if ( ort != undefined ) {
- for (var i = fields.length - 1; i >= 0; i--){
- ffield = form.findField("ort_"+fields[i]);
+ var ffield = null;
+ if (ort) {
+ for (var i = fields.length - 1; i >= 0; i--) {
+ ffield = form.findField('ort_' + fields[i]);
ffield.setValue(ort.get(fields[i]));
}
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/orte/CreateOrt.js
--- a/app/view/orte/CreateOrt.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/orte/CreateOrt.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -12,6 +12,7 @@
Ext.define('Lada.view.orte.CreateOrt', {
extend: 'Ext.window.Window',
alias: 'widget.createortdetail',
+
title: 'Neuer Ort',
/**
@@ -38,7 +39,7 @@
listeners: {
'select': {
scope: me,
- fn: function(field, newValue, oldValue) {
+ fn: function(field, newValue) {
var lon = field.up('window').down(
'numberfield[name=ort_longitude]');
var lat = field.up('window').down(
@@ -76,4 +77,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/orte/List.js
--- a/app/view/orte/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/orte/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,13 +3,13 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list Orte
*/
-Ext.define('Lada.view.orte.List' ,{
+Ext.define('Lada.view.orte.List', {
extend: 'Ext.grid.Panel',
alias: 'widget.ortelist',
@@ -90,4 +90,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/proben/Create.js
--- a/app/view/proben/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/proben/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -19,6 +19,7 @@
autoShow: true,
autoScroll: true,
modal: true,
+
initComponent: function() {
this.buttons = [{
text: 'Speichern',
@@ -32,6 +33,6 @@
this.height = Ext.getBody().getViewSize().height - 30;
var form = Ext.create('Lada.view.proben.CreateForm');
this.items = [form];
- this.callParent();
+ this.callParent(arguments);
}
});
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/proben/CreateForm.js
--- a/app/view/proben/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/proben/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -19,9 +19,11 @@
'Lada.view.widgets.Probenart',
'Lada.view.widgets.Uwb'
],
+
model: 'Lada.model.Probe',
+
initComponent: function() {
- this.items = [{
+ this.items = [{
xtype: 'fieldset',
title: 'Probenangaben',
defaults: {
@@ -133,9 +135,11 @@
},
buildDescriptors: function() {
- var fields = new Array();
- for ($i=0; $i<12; $i++) {
- fields[$i] = {fieldLabel: 'S'+$i, name: 's'+$i};
+ var fields = [];
+ for (var i = 0; i < 12; i++) {
+ fields[i] = {
+ fieldLabel: 'S' + i, name: 's' + i
+ };
}
return fields;
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/proben/Edit.js
--- a/app/view/proben/Edit.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/proben/Edit.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -42,4 +42,3 @@
this.callParent();
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/proben/EditForm.js
--- a/app/view/proben/EditForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/proben/EditForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -11,6 +11,7 @@
*/
Ext.define('Lada.view.proben.EditForm', {
extend: 'Lada.view.widgets.LadaForm',
+ alias: 'widget.probeneditform',
requires: [
'Lada.view.widgets.Datenbasis',
'Lada.view.widgets.Netzbetreiber',
@@ -23,11 +24,11 @@
'Lada.view.orte.List',
'Lada.view.messungen.List'
],
+
model: 'Lada.model.Probe',
- alias: 'widget.probeneditform',
initComponent: function() {
- this.items = [{
+ this.items = [{
xtype: 'fieldset',
title: 'Probenangaben',
defaults: {
@@ -183,9 +184,11 @@
},
buildDescriptors: function() {
- var fields = new Array();
- for ($i=0; $i<12; $i++) {
- fields[$i] = {fieldLabel: 'S'+$i, name: 's'+$i};
+ var fields = [];
+ for (var i = 0; i < 12; i++) {
+ fields[i] = {
+ fieldLabel: 'S' + i, name: 's' + i
+ };
}
return fields;
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/proben/Import.js
--- a/app/view/proben/Import.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/proben/Import.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/proben/ImportForm.js
--- a/app/view/proben/ImportForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/proben/ImportForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -11,8 +11,9 @@
*/
Ext.define('Lada.view.proben.ImportForm', {
extend: 'Ext.form.Panel',
+
initComponent: function() {
- this.items = [{
+ this.items = [{
xtype: 'fileuploadfield',
title: 'Importdate'
}];
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/search/List.js
--- a/app/view/search/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/search/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,27 +3,27 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list available search queryies
*/
-Ext.define('Lada.view.search.List' ,{
+Ext.define('Lada.view.search.List', {
extend: 'Ext.form.FieldSet',
- title: 'SQL-Auswahl',
alias: 'widget.queryselector',
require: ['Ext.layout.container.Column'],
+ title: 'SQL-Auswahl',
initComponent: function() {
- this.layout = 'column',
+ this.layout = 'column';
this.items = [{
id: 'search',
xtype: 'combobox',
editable: false,
store: 'Queries',
- displayField:'name',
- valueField:'id',
- emptyText:'Wählen Sie eine Abfrage'
+ displayField: 'name',
+ valueField: 'id',
+ emptyText: 'Wählen Sie eine Abfrage'
}, {
xtype: 'panel',
maxWidth: '500',
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/status/Create.js
--- a/app/view/status/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/status/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -19,6 +19,8 @@
modal: true,
initComponent: function() {
+ var form = Ext.create('Lada.view.status.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -28,8 +30,6 @@
scope: this,
handler: this.close
}];
- var form = Ext.create('Lada.view.status.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent(arguments);
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/status/CreateForm.js
--- a/app/view/status/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/status/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -11,7 +11,7 @@
*/
Ext.define('Lada.view.status.CreateForm', {
extend: 'Lada.view.widgets.LadaForm',
- requires : [
+ requires: [
'Lada.view.widgets.Mst',
'Lada.view.widgets.Statuswert'
],
@@ -39,4 +39,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/status/List.js
--- a/app/view/status/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/status/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,13 +3,13 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list Status
*/
-Ext.define('Lada.view.status.List' ,{
+Ext.define('Lada.view.status.List', {
extend: 'Ext.grid.Panel',
alias: 'widget.statuslist',
@@ -59,4 +59,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Betriebsart.js
--- a/app/view/widgets/Betriebsart.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Betriebsart.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,28 +3,31 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
var betriebsartStore = Ext.create('Ext.data.Store', {
fields: ['betriebsartId', 'betriebsart'],
- data: [
- {"betriebsartId":"1", "betriebsart":"Normal-/Routinebtrieb"},
- {"betriebsartId":"2", "betriebsart":"Störfall/Intensivbetrieb"}
- ]
+ data: [{
+ 'betriebsartId': '1',
+ 'betriebsart': 'Normal-/Routinebtrieb'
+ }, {
+ 'betriebsartId': '2',
+ 'betriebsart': 'Störfall/Intensivbetrieb'
+ }]
});
/**
* Combobox for Betriebsart
*/
-Ext.define('Lada.view.widgets.Betriebsart' ,{
+Ext.define('Lada.view.widgets.Betriebsart', {
extend: 'Ext.form.ComboBox',
alias: 'widget.betriebsart',
store: betriebsartStore,
queryMode: 'local',
- displayField:'betriebsart',
+ displayField: 'betriebsart',
valueField: 'betriebsartId',
- emptyText:'Wählen Sie eine Betriebsart',
+ emptyText: 'Wählen Sie eine Betriebsart',
initComponent: function() {
this.callParent(arguments);
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Datenbasis.js
--- a/app/view/widgets/Datenbasis.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Datenbasis.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,24 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Datenbasis
*/
-Ext.define('Lada.view.widgets.Datenbasis' ,{
+Ext.define('Lada.view.widgets.Datenbasis', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaDatenbasen'],
alias: 'widget.datenbasis',
store: 'StaDatenbasen',
- displayField:'datenbasis',
+ displayField: 'datenbasis',
valueField: 'id',
- emptyText:'Wählen Sie eine Datenbasis',
+ emptyText: 'Wählen Sie eine Datenbasis',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Datetime.js
--- a/app/view/widgets/Datetime.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Datetime.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,17 +3,17 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Datetimepicker with german date format.
*/
-Ext.define('Lada.view.widgets.Datetime' ,{
+Ext.define('Lada.view.widgets.Datetime', {
extend: 'Ext.ux.form.DateTimeField',
alias: 'widget.datetime',
format: 'd.m.Y',
- emptyText:'Wählen Sie einen Zeitpunkt',
+ emptyText: 'Wählen Sie einen Zeitpunkt',
initComponent: function() {
this.callParent(arguments);
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/LadaForm.js
--- a/app/view/widgets/LadaForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/LadaForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -29,19 +29,23 @@
*/
modelId: null,
/**
- * List of errors in the form. Typically set after the server validates the form submission
+ * List of errors in the form.
+ * Typically set after the server validates the form submission
*/
errors: null,
/**
- * List of warnings in the form. Typically set after the server validates the form submission
+ * List of warnings in the form.
+ * Typically set after the server validates the form submission
*/
warnings: null,
/**
- * The generic (error) message for the form. Typically set after the server validates the form submission
+ * The generic (error) message for the form.
+ * Typically set after the server validates the form submission
*/
message: null,
/**
- * Flag to indicate if the validation succeeds. Typically set after the server validates the form submission
+ * Flag to indicate if the validation succeeds.
+ * Typically set after the server validates the form submission
*/
success: null,
/**
@@ -53,27 +57,25 @@
initComponent: function() {
this.callParent(arguments);
- this.getForm().trackResetOnLoad = true; //Workaround
+ this.getForm().trackResetOnLoad = true; // Workaround
if (Ext.isString(this.model)) {
- //Load a model to be updated
+ // Load a model to be updated
if (this.modelId) {
Ext.ClassManager.get(this.model).load(this.modelId, {
failure: this.onModelLoadFailure,
success: this.onModelLoadSuccess,
scope: this
});
- //Load an empty record to be inserted
+ // Load an empty record to be inserted
}
else {
this.bindModel(Ext.create(this.model, {}));
}
}
else {
-
- //Bind the provided model to be updated
+ // Bind the provided model to be updated
this.bindModel(this.model);
-
}
this.addEvents(
'loadsuccess',
@@ -92,17 +94,17 @@
}
},
- commit: function(callback, scope) {
+ commit: function() {
if (this.form.isDirty() && this.form.isValid()) {
this.form.updateRecord(this.model);
var data = this.model.getAllData();
var baseUrl = this.model.getProxy().url;
var url = baseUrl;
- var method = "POST";
+ var method = 'POST';
if (this.model.getId()) {
url += this.model.getId();
- method = "PUT";
+ method = 'PUT';
}
Ext.Ajax.request({
@@ -113,12 +115,20 @@
this.parseResponse(response);
if (this.success) {
console.log('Save was successfull');
- this.fireEvent('savesuccess', this, this.model, response);
+ this.fireEvent(
+ 'savesuccess',
+ this,
+ this.model,
+ response);
}
else {
console.log('Save was not successfull');
this.form.markInvalid(this.errors);
- this.fireEvent('savefailure', this, this.model, response);
+ this.fireEvent(
+ 'savefailure',
+ this,
+ this.model,
+ response);
}
},
scope: this
@@ -151,21 +161,22 @@
* @param {Array} [ignoreFields="[]"] A list of fieldnames to ignore.
*/
setReadOnly: function (bReadOnly, ignoreFields) {
- if(typeof(ignoreFields)==='undefined') {
- ignoreFields = Array();
+ if (typeof (ignoreFields) === 'undefined') {
+ ignoreFields = [];
}
/* Iterate over all fields and set them readonly */
if (bReadOnly) {
- this.getForm().getFields().each (function (field) {
+ this.getForm().getFields().each(function (field) {
// Check if the field name is in the list of fields to ignore
var ignore = false;
- for (var i = ignoreFields.length - 1; i >= 0; i--) {
- console.log(ignoreFields[i] + "===" + field.getName());
- if (ignoreFields[i] === field.getName(true)) {
+ var k;
+ for (k = ignoreFields.length - 1; k >= 0; k--) {
+ console.log(ignoreFields[k] + '===' + field.getName());
+ if (ignoreFields[k] === field.getName(true)) {
ignore = true;
- };
- };
- //field.setDisabled(bReadOnly);
+ }
+ }
+ // field.setDisabled(bReadOnly);
if (!ignore) {
field.setReadOnly(true);
}
@@ -179,14 +190,14 @@
* Find Save-Button and hide it. Only hide it if there are not
* fields left in the form which are editable
* */
- if (ignoreFields.length == 0) {
+ if (ignoreFields.length === 0) {
var win = this.up('window');
var buttons = win.query('.button');
for (var j = buttons.length - 1; j >= 0; j--) {
if (buttons[j].text === 'Speichern') {
buttons[j].setVisible(false);
- };
- };
+ }
+ }
}
}
},
@@ -198,7 +209,6 @@
this.errors = this.translateReturnCodes(json.errors);
this.warnings = this.translateReturnCodes(json.warnings);
this.message = Lada.getApplication().bundle.getMsg(json.message);
- var e = Ext.Object.isEmpty(this.warnings);
if (!Ext.Object.isEmpty(this.warnings) ||
!Ext.Object.isEmpty(this.errors)) {
this.createMessages();
@@ -213,8 +223,10 @@
var messages = Ext.create('Ext.form.Panel', {
bodyPadding: '5 5 5 5'
});
- for (var key in this.warnings) {
- var label = Ext.create('Ext.container.Container', {
+ var key;
+ var label;
+ for (key in this.warnings) {
+ label = Ext.create('Ext.container.Container', {
layout: 'hbox',
bodyPadding: '5 5 5 5',
items: [{
@@ -224,14 +236,14 @@
height: 18
}, {
xtype: 'label',
- text: key + ": " + this.warnings[key],
+ text: key + ': ' + this.warnings[key],
margin: '4 0 0 5'
}]
});
messages.insert(0, label);
}
- for (var key in this.errors) {
- var label = Ext.create('Ext.container.Container', {
+ for (key in this.errors) {
+ label = Ext.create('Ext.container.Container', {
layout: 'hbox',
bodyPadding: '5 5 5 5',
items: [{
@@ -241,7 +253,7 @@
height: 18
}, {
xtype: 'label',
- text: key + ": " + this.errors[key],
+ text: key + ': ' + this.errors[key],
margin: '4 0 0 5'
}]
});
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Messeinheit.js
--- a/app/view/widgets/Messeinheit.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Messeinheit.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,24 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Messeinheit
*/
-Ext.define('Lada.view.widgets.Messeinheit' ,{
+Ext.define('Lada.view.widgets.Messeinheit', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaMesseinheiten'],
alias: 'widget.messeinheit',
store: 'StaMesseinheiten',
displayField: 'einheit',
valueField: 'id',
- emptyText:'Wählen Sie eine Messeinheit',
+ emptyText: 'Wählen Sie eine Messeinheit',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Messgroesse.js
--- a/app/view/widgets/Messgroesse.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Messgroesse.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,24 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Messgroesse
*/
-Ext.define('Lada.view.widgets.Messgroesse' ,{
+Ext.define('Lada.view.widgets.Messgroesse', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaMessgroessen'],
alias: 'widget.messgroesse',
store: 'StaMessgroessen',
displayField: 'messgroesse',
valueField: 'id',
- emptyText:'Wählen Sie eine Messgröße',
+ emptyText: 'Wählen Sie eine Messgröße',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Messmethode.js
--- a/app/view/widgets/Messmethode.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Messmethode.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,27 +3,28 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Messmethode
*/
-Ext.define('Lada.view.widgets.Messmethode' ,{
+Ext.define('Lada.view.widgets.Messmethode', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaMessmethoden'],
alias: 'widget.messmethode',
store: 'StaMessmethoden',
- displayField:'messmethode',
+ displayField: 'messmethode',
valueField: 'id',
- emptyText:'Wählen Sie eine Messmethode',
+ emptyText: 'Wählen Sie eine Messmethode',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
- tpl: '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >{id} - {messmethode}</div></tpl>',
+ tpl: '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >' +
+ '{id} - {messmethode}</div></tpl>',
initComponent: function() {
this.store = Ext.data.StoreManager.get('staMessmethoden');
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Mst.js
--- a/app/view/widgets/Mst.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Mst.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,25 +3,24 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Messstelle
*/
-Ext.define('Lada.view.widgets.Mst' ,{
+Ext.define('Lada.view.widgets.Mst', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaMessstellen'],
alias: 'widget.mst',
store: 'StaMessstellen',
- displayField:'messStelle',
+ displayField: 'messStelle',
valueField: 'id',
- typeAhead: false,
- emptyText:'Wählen Sie eine Messstelle',
+ emptyText: 'Wählen Sie eine Messstelle',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Netzbetreiber.js
--- a/app/view/widgets/Netzbetreiber.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Netzbetreiber.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,24 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Netzbetreiber
*/
-Ext.define('Lada.view.widgets.Netzbetreiber' ,{
+Ext.define('Lada.view.widgets.Netzbetreiber', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaNetzbetreiber'],
alias: 'widget.netzbetreiber',
store: 'StaNetzbetreiber',
- displayField:'netzbetreiber',
+ displayField: 'netzbetreiber',
valueField: 'id',
- emptyText:'Wählen Sie einen Netzbetreiber',
+ emptyText: 'Wählen Sie einen Netzbetreiber',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
@@ -32,4 +32,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Nwg.js
--- a/app/view/widgets/Nwg.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Nwg.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,29 +3,32 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
var nwgStore = Ext.create('Ext.data.Store', {
fields: ['nwgId', 'nwg'],
- data: [
- {"nwgId":"", "nwg":">="},
- {"nwgId":"<", "nwg":"<"}
- ]
+ data: [{
+ 'nwgId': '',
+ 'nwg': '>='
+ }, {
+ 'nwgId': '<',
+ 'nwg': '<'
+ }]
});
/**
* Combobox for Nachweisgrenze.
*/
-Ext.define('Lada.view.widgets.Nwg' ,{
+Ext.define('Lada.view.widgets.Nwg', {
extend: 'Ext.form.ComboBox',
editable: false,
alias: 'widget.nwg',
store: nwgStore,
queryMode: 'local',
- displayField:'nwg',
+ displayField: 'nwg',
valueField: 'nwgId',
- emptyText:'Messwert kleiner als Nachweisgrenze?',
+ emptyText: 'Messwert kleiner als Nachweisgrenze?',
initComponent: function() {
this.callParent(arguments);
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Ortdetail.js
--- a/app/view/widgets/Ortdetail.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Ortdetail.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,22 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Ortdetails
*/
-Ext.define('Lada.view.widgets.Ortdetail' ,{
+Ext.define('Lada.view.widgets.Ortdetail', {
extend: 'Ext.form.ComboBox',
- require: ['Lada.store.StaOrte'],
alias: 'widget.ortdetail',
- store: 'StaOrte',
displayField: 'bezeichnung',
valueField: 'id',
- emptyText:'Wählen Sie einen Ort',
+ emptyText: 'Wählen Sie einen Ort',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Probenart.js
--- a/app/view/widgets/Probenart.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Probenart.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,23 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Probenart
*/
-Ext.define('Lada.view.widgets.Probenart' ,{
+Ext.define('Lada.view.widgets.Probenart', {
extend: 'Ext.form.ComboBox',
- require: ['Lada.store.StaProbenarten'],
alias: 'widget.probenart',
store: 'StaProbenarten',
- displayField:'probenart',
+ displayField: 'probenart',
valueField: 'id',
- emptyText:'Wählen Sie eine Probenart',
+ emptyText: 'Wählen Sie eine Probenart',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Probenzusatzwert.js
--- a/app/view/widgets/Probenzusatzwert.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Probenzusatzwert.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,24 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Zusatzwert
*/
-Ext.define('Lada.view.widgets.Probenzusatzwert' ,{
+Ext.define('Lada.view.widgets.Probenzusatzwert', {
extend: 'Ext.form.ComboBox',
require: ['Lada.store.StaProbenzusaetze'],
alias: 'widget.probenzusatzwert',
store: 'StaProbenzusaetze',
displayField: 'beschreibung',
valueField: 'id',
- emptyText:'Wählen Sie einen Zusatzwert',
+ emptyText: 'Wählen Sie einen Zusatzwert',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Staat.js
--- a/app/view/widgets/Staat.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Staat.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,24 +3,23 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Staat
*/
-Ext.define('Lada.view.widgets.Staat' ,{
+Ext.define('Lada.view.widgets.Staat', {
extend: 'Ext.form.ComboBox',
- require: ['Lada.store.StaStaaten'],
alias: 'widget.staat',
store: 'StaStaaten',
displayField: 'staat',
valueField: 'id',
- emptyText:'Wählen Sie einen Staat',
+ emptyText: 'Wählen Sie einen Staat',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Statuswert.js
--- a/app/view/widgets/Statuswert.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Statuswert.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,34 +3,40 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
var statuswerteStore = Ext.create('Ext.data.Store', {
fields: ['id', 'status'],
- data: [
- {"id":1, "status":"nicht vergeben"},
- {"id":2, "status":"plausibel"},
- {"id":3, "status":"nicht repräsentativ"},
- {"id":4, "status":"nicht plausibel"}
- ]
+ data: [{
+ 'id': 1,
+ 'status': 'nicht vergeben'
+ }, {
+ 'id': 2,
+ 'status': 'plausibel'
+ }, {
+ 'id': 3,
+ 'status': 'nicht repräsentativ'
+ }, {
+ 'id': 4,
+ 'status': 'nicht plausibel'
+ }]
});
/**
* Combobox for Statuswert
*/
-Ext.define('Lada.view.widgets.Statuswert' ,{
+Ext.define('Lada.view.widgets.Statuswert', {
extend: 'Ext.form.ComboBox',
alias: 'widget.statuswert',
store: statuswerteStore,
- displayField:'status',
+ displayField: 'status',
valueField: 'id',
- typeAhead: false,
- emptyText:'Wählen Sie eine Status',
+ emptyText: 'Wählen Sie eine Status',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Testdatensatz.js
--- a/app/view/widgets/Testdatensatz.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Testdatensatz.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,30 +3,33 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
var testdatensatzStore = Ext.create('Ext.data.Store', {
fields: ['testdatensatzId', 'testdatensatz'],
- data: [
- {"testdatensatzId":true, "testdatensatz":"Ja"},
- {"testdatensatzId":false, "testdatensatz":"Nein"}
- ]
+ data: [{
+ 'testdatensatzId': true,
+ 'testdatensatz': 'Ja'
+ }, {
+ 'testdatensatzId': false,
+ 'testdatensatz': 'Nein'
+ }]
});
/**
* Combobox for Testdatensatz.
* This widget is also used a generic "Ja/Nein" combobox.
*/
-Ext.define('Lada.view.widgets.Testdatensatz' ,{
+Ext.define('Lada.view.widgets.Testdatensatz', {
extend: 'Ext.form.ComboBox',
editable: false,
alias: 'widget.testdatensatz',
store: testdatensatzStore,
queryMode: 'local',
- displayField:'testdatensatz',
+ displayField: 'testdatensatz',
valueField: 'testdatensatzId',
- emptyText:'Testdatensatz?',
+ emptyText: 'Testdatensatz?',
initComponent: function() {
this.callParent(arguments);
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Uwb.js
--- a/app/view/widgets/Uwb.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Uwb.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
@@ -14,29 +14,31 @@
require: ['Lada.store.StaUmwelt'],
alias: 'widget.uwb',
store: 'StaUmwelt',
- displayField:'id',
+ displayField: 'id',
valueField: 'id',
- emptyText:'Wählen Sie einen Umweltbereich',
+ emptyText: 'Wählen Sie einen Umweltbereich',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
- triggerAction : 'all',
+ triggerAction: 'all',
typeAhead: false,
minChars: 0,
- tpl: '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >{id} - {umweltBereich}</div></tpl>',
+ tpl: '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >' +
+ '{id} - {umweltBereich}</div></tpl>',
// TODO: Set value in disply after selection. Can not figure out why
- // accessing the recored.data attribute fails here (ti) <2013-08-06 16:52>
- //listeners: {
- // select: function(combo, record, index) {
- // console.log("1");
- // console.log(record);
- // console.log("2");
- // var text = record.data['umwId'] + " - " + record.data['umweltBereich'];
- // console.log("3");
- // Ext.form.ComboBox.superclass.setValue.call(this, text);
- // combo.value = record.id;
- // }
- //},
+ // accessing the recored.data attribute fails here (ti) <2013-08-06 16:52>
+ // listeners: {
+ // select: function(combo, record, index) {
+ // console.log("1");
+ // console.log(record);
+ // console.log("2");
+ // var text = record.data['umwId'] +
+ // " - " + record.data['umweltBereich'];
+ // console.log("3");
+ // Ext.form.ComboBox.superclass.setValue.call(this, text);
+ // combo.value = record.id;
+ // }
+ // },
initComponent: function() {
this.store = Ext.data.StoreManager.get('staUmwelt');
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/widgets/Verwaltungseinheit.js
--- a/app/view/widgets/Verwaltungseinheit.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/widgets/Verwaltungseinheit.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,25 +3,25 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/**
* Combobox for Verwaltungseinheit
*/
-Ext.define('Lada.view.widgets.Verwaltungseinheit' ,{
+Ext.define('Lada.view.widgets.Verwaltungseinheit', {
extend: 'Ext.form.field.ComboBox',
require: ['Lada.store.StaVerwaltungseinheiten'],
alias: 'widget.verwaltungseinheiten',
store: 'StaVerwaltungseinheiten',
displayField: 'bezeichnung',
valueField: 'id',
- emptyText:'Wählen Sie eine Verwaltungseinheit',
+ emptyText: 'Wählen Sie eine Verwaltungseinheit',
hideTrigger: true,
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'remote',
- triggerAction : 'type',
+ triggerAction: 'type',
typeAhead: false,
minChars: 2,
@@ -36,7 +36,7 @@
// This is needed as without having this record the field would only
// display the raw value (id) of the verwaltungseinheit.
listeners: {
- render: function(combo, eOpts) {
+ render: function(combo) {
combo.store.load({
id: this.getValue()
});
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/zusatzwerte/Create.js
--- a/app/view/zusatzwerte/Create.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/zusatzwerte/Create.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -19,6 +19,8 @@
modal: true,
initComponent: function() {
+ var form = Ext.create('Lada.view.zusatzwerte.CreateForm',
+ this.initialConfig);
this.buttons = [{
text: 'Speichern',
scope: form,
@@ -28,8 +30,6 @@
scope: this,
handler: this.close
}];
- var form = Ext.create('Lada.view.zusatzwerte.CreateForm',
- this.initialConfig);
this.items = [form];
this.callParent();
}
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/zusatzwerte/CreateForm.js
--- a/app/view/zusatzwerte/CreateForm.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/zusatzwerte/CreateForm.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,7 +3,7 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
@@ -11,7 +11,7 @@
*/
Ext.define('Lada.view.zusatzwerte.CreateForm', {
extend: 'Lada.view.widgets.LadaForm',
- requires : [
+ requires: [
'Lada.view.widgets.Probenzusatzwert',
'Ext.layout.container.Column'
],
@@ -25,18 +25,18 @@
fieldLabel: 'PZW-Größe',
listeners: {
scope: this,
- 'change': function (field, newv, oldv, opts) {
+ 'change': function(field, newv, oldv, opts) {
console.log(field, oldv, newv, opts);
- var ffield = this.getForm().findField("messeinheit");
- pzsId = newv;
- if (pzsId == undefined) {
+ var ffield = this.getForm().findField('messeinheit');
+ var pzsId = newv;
+ if (!pzsId) {
pzsId = oldv;
}
ffield.setValue(this.model.getMesseinheit(pzsId));
}
}
}, {
- layout: "column",
+ layout: 'column',
border: 0,
items: [{
xtype: 'numberfield',
@@ -58,4 +58,3 @@
this.callParent(arguments);
}
});
-
diff -r d07e5086a64b -r 7c0653e8d9f7 app/view/zusatzwerte/List.js
--- a/app/view/zusatzwerte/List.js Thu Nov 06 10:35:35 2014 +0100
+++ b/app/view/zusatzwerte/List.js Thu Nov 06 10:38:17 2014 +0100
@@ -3,13 +3,13 @@
*
* This file is Free Software under the GNU GPL (v>=3)
* and comes with ABSOLUTELY NO WARRANTY! Check out
- * the documentation coming with IMIS-Labordaten-Application for details.
+ * the documentation coming with IMIS-Labordaten-Application for details.
*/
/*
* Grid to list Probenzusatzwerte
*/
-Ext.define('Lada.view.zusatzwerte.List' ,{
+Ext.define('Lada.view.zusatzwerte.List', {
extend: 'Ext.grid.Panel',
alias: 'widget.zusatzwertelist',
@@ -60,11 +60,10 @@
var record = store.getById(value);
var messwert = record.get('messwertPzs');
var nwg = record.get('nwgZuMesswert');
- if (messwert < nwg ) {
- return "<"+messwert;
- } else {
- return messwert;
+ if (messwert < nwg) {
+ return '<' + messwert;
}
+ return messwert;
}
}, {
header: 'rel. Unsich.[%]',
More information about the Lada-commits
mailing list