diff options
Diffstat (limited to 'admin/survey/script/means.js')
| -rw-r--r-- | admin/survey/script/means.js | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/admin/survey/script/means.js b/admin/survey/script/means.js index c5326c5..178c0ef 100644 --- a/admin/survey/script/means.js +++ b/admin/survey/script/means.js @@ -68,15 +68,10 @@ function means_add_new_variable(which) { var spr = new Array();
var grid = new Array();
- if (which == '2' ) {
- //$('#crossRightHolder #crosstab_add_new').hide();
- } else {
- //$('#crossLeftHolder #crosstab_add_new').hide();
- }
-
$('select[name=means_variable_'+which+']').each(function(index,el) {
sequence.push($(el).val());
});
+
$('select[name=means_variable_'+which+'] option:selected').each(function(index,el) {
spr.push($(el).attr("spr_id"));
grid.push($(el).attr("grd_id"));
@@ -94,9 +89,9 @@ function means_add_new_variable(which) { function means_remove_variable(what) {
$(what).parent().remove();
- if ( $(what).parent().find('select').val() > 0 ) {
+ //if ( $(what).parent().find('select').val() > 0 ) {
change_means();
- }
+ //}
}
function changeMeansSubSetting() {
var chkMeansSeperate = $("#chkMeansSeperate").is(':checked') ? 1 : 0;
@@ -124,7 +119,7 @@ function doArchiveMeans() { $('#fullscreen').show();
});
} else {
- alert ('Ni podatkov za arhiv! Najprej kreirajte tabele.');
+ genericAlertPopup('alert_no_archive_tables');
}
}
function submitArchiveMeans() {
@@ -141,7 +136,7 @@ function submitArchiveMeans() { $("#fullscreen").show();
});
} else {
- alert ('Ni podatkov za arhiv! Najprej kreirajte tabele.');
+ genericAlertPopup('alert_no_archive_tables');
}
}
@@ -157,9 +152,9 @@ function createArchiveMeansBeforeEmail() { });
} else {
if (parseInt(response) == -1) {
- alert("Nothing to archive!"+response);
+ genericAlertPopup('alert_no_archive_response',response);
} else {
- alert("Error while creating archive!"+response);
+ genericAlertPopup('alert_archive_error_response',response);
}
$('#fullscreen').hide();
$('#fade').fadeOut('slow');
@@ -167,6 +162,6 @@ function createArchiveMeansBeforeEmail() { });
} else {
- alert ('Ni podatkov za arhiv! Najprej kreirajte tabele.');
+ genericAlertPopup('alert_no_archive_tables');
}
};
\ No newline at end of file |