solocla/reportify_mncl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some issues

Browse Source
This commit is contained in:
Lasha Kapanadze
2024-10-28 19:07:15 +04:00
parent 761bc9a441
commit 100397a953
3 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/userarea/importify/interventionlist.php
+24 -12
View File
@@ -171,7 +171,7 @@
tmp_str_arr_compunds_kind_option = '';
tmp_str_arr_kind_option = '';
show_analysis_add_pop();
show_analysis_add_pop(id);
} else if (data.indexOf("none_define_column_error") > -1) {
$('#f_csv').val("");
showWarningPopup("The Associate Columns did not define yet!");
@@ -186,9 +186,10 @@
})
}
function process_import() {
function process_import(id) {
formData = new FormData();
formData.append('method', 'intervention');
formData.append('id', id);
$.ajax({
url: '../apilogic/process_import.php',
type: 'POST',
@@ -206,7 +207,15 @@
$('#ajax_preloader').fadeOut();
if (data.code == "success") {
showSuccessAlert("Successfully imported!");
refresh_table();
swal.fire({
title: 'Successfully imported!',
text: 'The record has been imported successfully.',
icon: 'success',
showCancelButton: false,
confirmButtonText: 'OK',
}).then(() => {
location.reload();
});
} else {
showWarningAlert("Server Error.")
}
@@ -215,29 +224,30 @@
})
}
function show_analysis_add_pop() {
function show_analysis_add_pop(id) {
if (tmp_analyvoc_idx < arr_total_analysisvoc.length) {
show_analysis_add_popup(arr_total_analysisvoc[tmp_analyvoc_idx], function() {
show_analysis_add_popup(id,arr_total_analysisvoc[tmp_analyvoc_idx], function() {
tmp_analyvoc_idx++;
show_analysis_add_pop();
show_analysis_add_pop(id);
})
} else {
show_compunds_add_pop();
show_compunds_add_pop(id);
}
}
function show_compunds_add_pop() {
function show_compunds_add_pop(id) {
if (tmp_compundsvoc_idx < arr_total_compundsvoc.length) {
show_compunds_add_popup(arr_total_compundsvoc[tmp_compundsvoc_idx], function() {
tmp_compundsvoc_idx++;
show_compunds_add_pop();
show_compunds_add_pop(id);
})
} else {
process_import(id);
showSuccessAlert("Successfully added!");
}
}
function show_analysis_add_popup(voc_info, callback) {
function show_analysis_add_popup(id,voc_info, callback) {
let str_word = voc_info['word'];
let arr_similary = voc_info['arr_similary'];
@@ -315,9 +325,10 @@
tmp_str_arr_kind_option += '<option value="' + inserted_info['ref_id'] + '">' + inserted_info['name'] + '</option>';
}
showSuccessAlert("Successfully added!");
process_import();
if (callback) {
callback();
}else{
process_import(id);
}
} else {
showWarningAlert("Server Error.")
@@ -408,9 +419,10 @@
tmp_str_arr_compunds_kind_option += '<option value="' + inserted_info['ref_id'] + '">' + inserted_info['name'] + '</option>';
}
showSuccessAlert("Successfully added!");
process_import();
if (callback) {
callback();
}else{
process_import(id);
}
} else {
showWarningAlert("Server Error.")