lada/lada-client: app/controller/Proben.js comparison

comparison app/controller/Proben.js @ 497:7c0653e8d9f7

Fixed some js related issues (unused vars, arrays, etc.) and code style.

author	Raimund Renkert <raimund.renkert@intevation.de>
date	Thu, 06 Nov 2014 10:38:17 +0100
parents	d07e5086a64b
children	8b4ec61c5752

comparison

equal deleted inserted replaced

-:d07e5086a64b
+:7c0653e8d9f7
 /* 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.
 */
 /**
 * Controller for Proben
 */
 }
 return errors;
 }
 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 numProben = (Object.keys(errors).length > 0);
-var num_errors = (numOfErrors(errors));
+var numErrors = (numOfErrors(errors));
-var has_warnings = (Object.keys(warnings).length > 0);
+var hasWarnings = (Object.keys(warnings).length > 0);
-if (msg != 200) {
+if (msg !== 200) {
-out.push("Der Import der Datei " + filename + " war nicht erfolgreich. Der Importvorgang konnte aufgrund eines Fehlers im Server nicht beendet werden.");
+out.push('Der Import der Datei ' +
-} else {
+filename +
-if (num_errors == num_proben) {
+' war nicht erfolgreich. Der Importvorgang konnte aufgrund' +
-out.push("Der Import der Datei " + filename + " war nicht erfolgreich.");
+'eines Fehlers im Server nicht beendet werden.');
-}
-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.");
-}
-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>");
-}
-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>");
-}
-out.push("</ol>");
-}
 }
-return out.join("");
+else {
+if (numErrors === numProben) {
+out.push('Der Import der Datei '
++ filename + ' war nicht erfolgreich.');
+}
+else if (numErrors === 0) {
+out.push('Der Import der Datei ' + filename + ' war erfolgreich.');
+}
+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/>');
+}
+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>');
+}
+}
+return out.join('');
 }
 Ext.define('Lada.controller.Proben', {
 extend: 'Lada.controller.Base',
 savefailure: this.editFailure
 }
 });
 },
-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
 * @private
 */
 success: function(fp, resp) {
 var errors = resp.result.data.errors;
 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 =
-var filename = resp.result.data.filename;
+buildImportReport(filename, message, errors, warnings);
 Ext.Msg.alert('Erfolg', dialogbody);
 win.close();
 },
 failure: function(fp, resp) {
 var errors = resp.result.data.errors;
 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();
 }
 });
 }
 });
 var view = Ext.widget('probenedit', {
 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) {
 // Close Createdialog
 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);
 }
 }
 });
 }
 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);
 }
 }
 });
 }
 },
-editSuccess: function(form, record, response) {
+editSuccess: function(form) {
 // Reload store
 var store = this.getProbenStore();
 store.reload();
 var win = form.up('window');
 win.close();

http://lada.wald.intevation.org