syncing with upstream

This commit is contained in:
Senad Uka
2018-01-15 13:31:00 +01:00
parent bc646b86c2
commit fe35b0aa91
24 changed files with 325 additions and 149 deletions

View File

@@ -2,21 +2,29 @@
$(document).ready(function () {
$("#sf_msg_container").empty();
$("#sf_msg_container").show();
$('#sf-spinner-panel').css('width', '100%'); // Workaround for Safari issue
$.ajax({
type: 'POST',
url: '/load_dxf/'
}).done(function(r) {
console.log(r)
$("#sf_msg_container").append('<li class="">DXF from Sales Force loaded successfully.</li>');
setTimeout(function() { window.location.reload() }, 500);
}).fail(function(r) {
// console.log(r.status)
r.responseJSON.errors.forEach((msg) => {
$("#sf_msg_container").append('<li class="error_message">' + msg + '</li>');
})
}).always(function() {
}).done(function(data, textStatus, jqXHR) { // 200 or 202
if (data && data.messages) {
data.messages.forEach((msg) => {
$("#sf_msg_container").append('<li class="info_message">' + msg + '</li>');
})
$("#sf_msg_container").show();
}
if (jqXHR.status == 200) {
setTimeout(function() { window.location.reload() }, 1000);
}
}).fail(function(jqXHR, textStatus, errorThrown) { // 400, 404, 5xx
// console.log(jqXHR, textStatus, errorThrown)
if (jqXHR.responseJSON && jqXHR.responseJSON.errors) {
jqXHR.responseJSON.errors.forEach((msg) => {
$("#sf_msg_container").append('<li class="error_message">' + msg + '</li>');
})
$("#sf_msg_container").show();
}
}).always(function(r) {
$('#sf-spinner-panel').css('width', '0%'); // Workaround for Safari issue
});
});

View File

@@ -73,7 +73,7 @@
}
});
inverterStringsPerInverter.val(inverterStringsPerInverterValue);
inverterStringsPerInverterForm.css('display', 'inherit');
inverterStringsPerInverterForm.css('display', 'block');
} else {
inverterStringsPerInverter.append($('<option selected value="0"></option>'));
inverterStringsPerInverterForm.css('display', 'none');
@@ -160,7 +160,8 @@
if (data) {
$('#standalone_inverter_id').val(uuid);
$('#standalone_ac_run_length').val(data['ac_run_length']);
$('#attachment-point').val(data['attachment_point'][0]);
var attach_point = data['attachment_point'][1];
$('#attachment_point option[value=' + attach_point + ']').attr('selected','selected');
fillInverterData(data, '#inverter');