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

general layout fixing

Browse Source
This commit is contained in:
Claudio
2024-10-08 16:17:47 +02:00
parent 836eb5881f
commit c3ddf47a7e
6 changed files with 302 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/userarea/importify/history_importify.php
+240 -219
View File
@@ -84,7 +84,11 @@ $arr_his = $importify_his->Results;
font-size: 12px; font-size: 12px;
} }
table.table-bordered.dataTable tbody th, table.table-bordered.dataTable thead td, table.table-bordered.dataTable tbody td, table.table-bordered.dataTable th, table.table-bordered.dataTable td { table.table-bordered.dataTable tbody th,
table.table-bordered.dataTable thead td,
table.table-bordered.dataTable tbody td,
table.table-bordered.dataTable th,
table.table-bordered.dataTable td {
text-align: center !important; text-align: center !important;
} }
@@ -97,250 +101,267 @@ $arr_his = $importify_his->Results;
<body class="fixed-left"> <body class="fixed-left">
<!-- Loader --> <!-- Loader -->
<div id="preloader"> <div id="preloader">
<div id="status"> <div id="status">
<div class="spinner"></div> <div class="spinner"></div>
</div>
</div> </div>
</div>
<div id="ajax_preloader"> <div id="ajax_preloader">
<div id="status"> <div id="status">
<div class="spinner"></div> <div class="spinner"></div>
</div>
</div> </div>
</div>
<!-- Begin page --> <!-- Begin page -->
<div id="wrapper"> <div id="wrapper">
<?php include('../include/navigationbar.php'); ?> <?php include('../include/navigationbar.php'); ?>
<!-- Start right Content here --> <!-- Start right Content here -->
<div class="content-page"> <div class="content-page">
<!-- Start content --> <!-- Start content -->
<div class="content"> <div class="content">
<?php include('../include/topbar.php'); ?> <?php include('../include/topbar.php'); ?>
<div class="page-content-wrapper "> <div class="page-content-wrapper ">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="page-title-box"> <div class="page-title-box">
<div class="btn-group float-right"> <div class="btn-group float-right">
<ol class="breadcrumb hide-phone p-0 m-0"> <ol class="breadcrumb hide-phone p-0 m-0">
<li class="breadcrumb-item"><a href="#">Reportify</a></li> <li class="breadcrumb-item"><a href="#">Reportify</a></li>
<li class="breadcrumb-item active">Importify</li> <li class="breadcrumb-item active">Importify</li>
</ol> </ol>
</div> </div>
<h4 class="page-title">Importify</h4> <h4 class="page-title">Importify</h4>
</div>
</div>
</div>
<!-- end page title end breadcrumb -->
<div class="row">
<div class="col-xl-12">
<div class="card">
<div class="card-body">
<h5 class="header-title pb-3 mt-0">Importify: History Import</h5>
<br><br>
<div class="table-responsive">
<table id="tbl_his" class="table table-bordered dt-responsive nowrap">
<thead>
<tr>
<th width="60px">No</th>
<th width="120px">Date/Time</th>
<th>ImportCode</th>
<th width="80px">Status</th>
<th width="80px">Action</th>
</tr>
</thead>
<tbody>
<?php
for($i=0; $i< count($arr_his); $i++) {
$item = $arr_his[$i];
?>
<tr>
<td><?=$i + 1?></td>
<td><?=date("Y-m-d H:i:s", strtotime($item['created_at']))?></td>
<td><?=$item['importcode']?></td>
<td class="no_padding">
<?php
if($item['f_status'] == 0) {
?>
<button class="btn btn-sm btn-round btn-secondary">Progressing</button>
<?php
} else if($item['f_status'] == 1) {
?>
<button class="btn btn-sm btn-round btn-success">Complete</button>
<?php
}
?>
</td>
<td class="no_padding">
<?php
if($item['f_status'] == 1) {
?>
<button onclick="onCancelHis(<?=$item['idImportHis']?>)" type="button" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button>
<?php
}
?>
</td>
</tr>
<?php
}
?>
</tbody>
</table>
</div><!--end table-responsive-->
</div> </div>
</div> </div>
</div> </div>
</div> <!-- end page title end breadcrumb -->
<!-- end row -->
<div class="row">
<div class="col-xl-12">
<div class="card">
<div class="card-body">
<h5 class="header-title pb-3 mt-0">Importify: History Import</h5>
<a href="importifydashboard.php"><button type="button" class="btn btn-pink w-md waves-effect waves-light">Importify Dasboard</button></a>
<a href="../index.php"><button type="button" class="btn btn-danger w-md waves-effect waves-light">Reportify Dasboard</button></a>
<br><br>
<div class="table-responsive">
<table id="tbl_his" class="table table-bordered dt-responsive nowrap">
<thead>
<tr>
<th width="60px">No</th>
<th width="120px">Date/Time</th>
<th>ImportCode</th>
<th width="80px">Status</th>
<th width="80px">Action</th>
</tr>
</thead>
<tbody>
<?php
for ($i = 0; $i < count($arr_his); $i++) {
$item = $arr_his[$i];
?>
<tr>
<td><?= $i + 1 ?></td>
<td><?= date("Y-m-d H:i:s", strtotime($item['created_at'])) ?></td>
<td><?= $item['importcode'] ?></td>
<td class="no_padding">
<?php
if ($item['f_status'] == 0) {
?>
<button class="btn btn-sm btn-round btn-secondary">Progressing</button>
<?php
} else if ($item['f_status'] == 1) {
?>
<button class="btn btn-sm btn-round btn-success">Complete</button>
<?php
}
?>
</td>
<td class="no_padding">
<?php
if ($item['f_status'] == 1) {
?>
<button onclick="onCancelHis(<?= $item['idImportHis'] ?>)" type="button" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button>
<?php
}
?>
</td>
</tr>
<?php
}
?>
</tbody>
</table>
</div><!--end table-responsive-->
</div>
</div>
</div>
</div>
<!-- end row -->
</div><!-- container --> </div><!-- container -->
</div> <!-- Page content Wrapper --> </div> <!-- Page content Wrapper -->
</div> <!-- content --> </div> <!-- content -->
<?php include('../include/footer.php'); ?> <?php include('../include/footer.php'); ?>
</div>
<!-- End Right content here -->
</div> </div>
<!-- End Right content here --> <!-- plugin JS -->
<script src="../assets/js/popper.min.js"></script>
<script src="../assets/js/bootstrap.min.js"></script>
<script src="../assets/js/modernizr.min.js"></script>
<script src="../assets/js/detect.js"></script>
<script src="../assets/js/fastclick.js"></script>
<script src="../assets/js/jquery.slimscroll.js"></script>
<script src="../assets/js/jquery.blockUI.js"></script>
<script src="../assets/js/waves.js"></script>
<script src="../assets/js/jquery.nicescroll.js"></script>
<script src="../assets/js/jquery.scrollTo.min.js"></script>
<script src="../assets/js/common_helper.js"></script>
</div> <script src="../assets/plugins/chart.js/chart.min.js"></script>
<!-- plugin JS --> <script src="../assets/pages/dashboard.js"></script>
<script src="../assets/js/popper.min.js"></script>
<script src="../assets/js/bootstrap.min.js"></script>
<script src="../assets/js/modernizr.min.js"></script>
<script src="../assets/js/detect.js"></script>
<script src="../assets/js/fastclick.js"></script>
<script src="../assets/js/jquery.slimscroll.js"></script>
<script src="../assets/js/jquery.blockUI.js"></script>
<script src="../assets/js/waves.js"></script>
<script src="../assets/js/jquery.nicescroll.js"></script>
<script src="../assets/js/jquery.scrollTo.min.js"></script>
<script src="../assets/js/common_helper.js"></script>
<script src="../assets/plugins/chart.js/chart.min.js"></script> <!-- App js -->
<script src="../assets/pages/dashboard.js"></script> <script src="../assets/js/app.js"></script>
<script src="../assets/plugins/alertify/js/alertify.js"></script>
<!-- App js --> <!-- Required datatable js -->
<script src="../assets/js/app.js"></script> <script src="../assets/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="../assets/plugins/alertify/js/alertify.js"></script> <script src="../assets/plugins/datatables/dataTables.bootstrap4.min.js"></script>
<!-- Required datatable js -->
<script src="../assets/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="../assets/plugins/datatables/dataTables.bootstrap4.min.js"></script>
<!-- END wrapper --> <!-- END wrapper -->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip();
$('#ajax_preloader').fadeOut(); $('#ajax_preloader').fadeOut();
});
$('#tbl_his').DataTable({
"processing": true,
"serverSide": false,
"lengthChange": true,
"lengthMenu": [10, 20, 50, 100],
"pageLength": 10,
"columns": [
{"orderable": true},
{"orderable": true},
{"orderable": true},
{"orderable": true},
{"orderable": false},
],
oLanguage: {
oAria: {
sSortAscending: ": activate to sort column ascending",
sSortDescending: ": activate to sort column descending"
},
oPaginate: {sFirst: "First", sLast: "Last", sNext: "Next", sPrevious: "Previous"},
sEmptyTable: "No data available in table",
sInfo: "Showing _START_ to _END_ of _TOTAL_ entries",
sInfoEmpty: "Showing 0 to 0 of 0 entries",
sInfoFiltered: "(filtered from _MAX_ total entries)",
sInfoPostFix: "",
sDecimal: "",
sThousands: ",",
sLengthMenu: "_MENU_",
sLoadingRecords: "Loading...",
sProcessing: "Processing...",
sSearch: "Search:",
sSearchPlaceholder: "",
sUrl: "",
sZeroRecords: "No matching records found"
},
// "ajax": {
// "url": "/loadGoodsDestroyed",
// "type": "POST",
// "dataType": "json",
// "dataSrc": "data",
// "data": {start_date: start_date, end_date: end_date}
// },
// "columns": [
// {"data": "name"},
// {"data": "status"},
// {"data": "count"},
// {"data": "price"},
// {"data": "consumer"},
// {"data": "date"}
// ]
});
function onCancelHis(id) {
Swal.fire({
title: 'Cancel Confirm!',
text: "Do you want to cancel import his?",
icon: 'warning',
showCancelButton: true,
confirmButtonText: 'Confirm',
cancelButtonText: 'Cancel',
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
url: 'cancel_import_his.php',
type: 'POST',
data: {
his_id: id
},
beforeSend: function() {
$('#ajax_preloader').fadeIn();
},
error: function() {
$('#ajax_preloader').fadeOut();
showWarningAlert("Server Error");
},
success: function(data) {
$('#ajax_preloader').fadeOut();
if(data.indexOf("success") > -1) {
showSuccessPopup("Your operation successed!", function() {
location.reload();
});
} else {
showWarningAlert("Server Error.")
}
}
})
}
}); });
}
</script> $('#tbl_his').DataTable({
"processing": true,
"serverSide": false,
"lengthChange": true,
"lengthMenu": [10, 20, 50, 100],
"pageLength": 10,
"columns": [{
"orderable": true
},
{
"orderable": true
},
{
"orderable": true
},
{
"orderable": true
},
{
"orderable": false
},
],
oLanguage: {
oAria: {
sSortAscending: ": activate to sort column ascending",
sSortDescending: ": activate to sort column descending"
},
oPaginate: {
sFirst: "First",
sLast: "Last",
sNext: "Next",
sPrevious: "Previous"
},
sEmptyTable: "No data available in table",
sInfo: "Showing _START_ to _END_ of _TOTAL_ entries",
sInfoEmpty: "Showing 0 to 0 of 0 entries",
sInfoFiltered: "(filtered from _MAX_ total entries)",
sInfoPostFix: "",
sDecimal: "",
sThousands: ",",
sLengthMenu: "_MENU_",
sLoadingRecords: "Loading...",
sProcessing: "Processing...",
sSearch: "Search:",
sSearchPlaceholder: "",
sUrl: "",
sZeroRecords: "No matching records found"
},
// "ajax": {
// "url": "/loadGoodsDestroyed",
// "type": "POST",
// "dataType": "json",
// "dataSrc": "data",
// "data": {start_date: start_date, end_date: end_date}
// },
// "columns": [
// {"data": "name"},
// {"data": "status"},
// {"data": "count"},
// {"data": "price"},
// {"data": "consumer"},
// {"data": "date"}
// ]
});
function onCancelHis(id) {
Swal.fire({
title: 'Cancel Confirm!',
text: "Do you want to cancel import his?",
icon: 'warning',
showCancelButton: true,
confirmButtonText: 'Confirm',
cancelButtonText: 'Cancel',
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
url: 'cancel_import_his.php',
type: 'POST',
data: {
his_id: id
},
beforeSend: function() {
$('#ajax_preloader').fadeIn();
},
error: function() {
$('#ajax_preloader').fadeOut();
showWarningAlert("Server Error");
},
success: function(data) {
$('#ajax_preloader').fadeOut();
if (data.indexOf("success") > -1) {
showSuccessPopup("Your operation successed!", function() {
location.reload();
});
} else {
showWarningAlert("Server Error.")
}
}
})
}
});
}
</script>
</body> </body>
</html>
</html>
public/userarea/importify/importifydashboard.php
+36 -35
View File
@@ -158,10 +158,8 @@
<div class="card-body"> <div class="card-body">
<h5 class="header-title pb-3 mt-0">Importify: <?php echo $dashboard; ?></h5> <h5 class="header-title pb-3 mt-0">Importify: <?php echo $dashboard; ?></h5>
<a class="btn btn-primary" href="insert-importifytemplate.php" role="button">Insert new template</a> <a class="btn btn-primary" href="insert-importifytemplate.php" role="button">Insert new template</a>
<a class="btn btn-success" href="rsl-category.php" role="button">Import File</a>
<a href="history_importify.php"><button type="button" class="btn btn-info w-md waves-effect waves-light">Hystory Import</button></a> <a href="history_importify.php"><button type="button" class="btn btn-info w-md waves-effect waves-light">Hystory Import</button></a>
<a href="importifydashboard.php"><button type="button" class="btn btn-pink w-md waves-effect waves-light">Importify Dasboard</button></a> <a href="../index.php"><button type="button" class="btn btn-danger w-md waves-effect waves-light">Reportify Dasboard</button></a>
<a href="dashboard.php"><button type="button" class="btn btn-danger w-md waves-effect waves-light">Reportify Dasboard</button></a>
<br><br> <br><br>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sm sm-0"> <table class="table table-striped table-sm sm-0">
@@ -256,19 +254,19 @@
function onRunImport(id_template_importify) { function onRunImport(id_template_importify) {
tmp_id_template_importify = id_template_importify; tmp_id_template_importify = id_template_importify;
$('#f_csv').trigger("click"); $('#f_csv').trigger("click");
} }
$('#f_csv').change(function(){ $('#f_csv').change(function() {
let formdata = new FormData(); let formdata = new FormData();
if($(this).prop('files').length > 0) { if ($(this).prop('files').length > 0) {
formdata.append("f_csv", $(this).prop('files')[0]); formdata.append("f_csv", $(this).prop('files')[0]);
formdata.append("template_id", tmp_id_template_importify); formdata.append("template_id", tmp_id_template_importify);
// ask user to choose which lab wants to associate from get_laboratories.php // ask user to choose which lab wants to associate from get_laboratories.php
$.ajax({ $.ajax({
url: 'get_laboratories.php', url: 'get_laboratories.php',
type: 'POST', type: 'POST',
processData: false, processData: false,
contentType: false, contentType: false,
beforeSend: function() { beforeSend: function() {
@@ -281,11 +279,11 @@
}, },
success: function(data) { success: function(data) {
$('#ajax_preloader').fadeOut(); $('#ajax_preloader').fadeOut();
if(data.indexOf("success") > -1) { if (data.indexOf("success") > -1) {
let arr_labs = JSON.parse(data); let arr_labs = JSON.parse(data);
let str_arr_option = ''; let str_arr_option = '';
for(let i=0; i<arr_labs['laboratories'].length; i++) { for (let i = 0; i < arr_labs['laboratories'].length; i++) {
str_arr_option += '<option value="' + arr_labs['laboratories'][i]['idlab'] + '">' + arr_labs['laboratories'][i]['name'] +' - '+arr_labs['laboratories'][i]['description'] + '</option>'; str_arr_option += '<option value="' + arr_labs['laboratories'][i]['idlab'] + '">' + arr_labs['laboratories'][i]['name'] + ' - ' + arr_labs['laboratories'][i]['description'] + '</option>';
} }
Swal.fire({ Swal.fire({
@@ -297,9 +295,9 @@
confirmButtonText: 'Confirm', confirmButtonText: 'Confirm',
allowOutsideClick: false, allowOutsideClick: false,
}).then((result) => { }).then((result) => {
if(result.isConfirmed) { if (result.isConfirmed) {
let lab_id = $('#sel_lab').val(); let lab_id = $('#sel_lab').val();
formdata.append("lab_id", lab_id); formdata.append("lab_id", lab_id);
$("#labor_id").val(lab_id); $("#labor_id").val(lab_id);
$.ajax({ $.ajax({
@@ -318,7 +316,7 @@
}, },
success: function(data) { success: function(data) {
$('#ajax_preloader').fadeOut(); $('#ajax_preloader').fadeOut();
if(data.indexOf("success") > -1) { if (data.indexOf("success") > -1) {
let arr_data = JSON.parse(data); let arr_data = JSON.parse(data);
let arr_analysisvoc = arr_data['arr_analysis_data']; let arr_analysisvoc = arr_data['arr_analysis_data'];
console.log(arr_analysisvoc); console.log(arr_analysisvoc);
@@ -333,10 +331,10 @@
tmp_str_arr_kind_option = ''; tmp_str_arr_kind_option = '';
show_analysis_add_pop(); show_analysis_add_pop();
}else if(data.indexOf("none_define_column_error") > -1) { } else if (data.indexOf("none_define_column_error") > -1) {
$('#f_csv').val(""); $('#f_csv').val("");
showWarningPopup("The Associate Columns did not define yet!"); showWarningPopup("The Associate Columns did not define yet!");
} else if(data.indexOf("invalid_excel_data_format_error") > -1) { } else if (data.indexOf("invalid_excel_data_format_error") > -1) {
$('#f_csv').val(""); $('#f_csv').val("");
showWarningPopup("Excel data format is not valid!") showWarningPopup("Excel data format is not valid!")
} else { } else {
@@ -352,16 +350,17 @@
showWarningAlert("Server Error.") showWarningAlert("Server Error.")
} }
} }
}) })
} }
}); });
let arr_total_analysisvoc = Array(); let arr_total_analysisvoc = Array();
let tmp_analyvoc_idx = 0; let tmp_analyvoc_idx = 0;
let arr_total_compundsvoc = Array(); let arr_total_compundsvoc = Array();
let tmp_compundsvoc_idx = 0; let tmp_compundsvoc_idx = 0;
function show_analysis_add_pop() { function show_analysis_add_pop() {
if(tmp_analyvoc_idx < arr_total_analysisvoc.length) { if (tmp_analyvoc_idx < arr_total_analysisvoc.length) {
show_analysis_add_popup(arr_total_analysisvoc[tmp_analyvoc_idx], function() { show_analysis_add_popup(arr_total_analysisvoc[tmp_analyvoc_idx], function() {
tmp_analyvoc_idx++; tmp_analyvoc_idx++;
show_analysis_add_pop(); show_analysis_add_pop();
@@ -372,7 +371,7 @@
} }
function show_compunds_add_pop() { function show_compunds_add_pop() {
if(tmp_compundsvoc_idx < arr_total_compundsvoc.length) { if (tmp_compundsvoc_idx < arr_total_compundsvoc.length) {
show_compunds_add_popup(arr_total_compundsvoc[tmp_compundsvoc_idx], function() { show_compunds_add_popup(arr_total_compundsvoc[tmp_compundsvoc_idx], function() {
tmp_compundsvoc_idx++; tmp_compundsvoc_idx++;
show_compunds_add_pop(); show_compunds_add_pop();
@@ -383,12 +382,13 @@
} }
let tmp_str_arr_kind_option = ''; let tmp_str_arr_kind_option = '';
function show_analysis_add_popup(voc_info, callback) { function show_analysis_add_popup(voc_info, callback) {
let str_word = voc_info['word']; let str_word = voc_info['word'];
let arr_similary = voc_info['arr_similary']; let arr_similary = voc_info['arr_similary'];
let str_arr_option = ''; let str_arr_option = '';
for(let i=0; i<arr_similary.length; i++) { for (let i = 0; i < arr_similary.length; i++) {
str_arr_option += '<option value="' + arr_similary[i]['refid'] + '">' + arr_similary[i]['nameanalysisvoc'] + '</option>'; str_arr_option += '<option value="' + arr_similary[i]['refid'] + '">' + arr_similary[i]['nameanalysisvoc'] + '</option>';
} }
str_arr_option += tmp_str_arr_kind_option; str_arr_option += tmp_str_arr_kind_option;
@@ -421,7 +421,7 @@
didOpen: () => { didOpen: () => {
$('.swal2-popup .ipt_type').select2(); $('.swal2-popup .ipt_type').select2();
$('.swal2-popup .ipt_type').bind("change", function() { $('.swal2-popup .ipt_type').bind("change", function() {
if($(this).val() == 0) { if ($(this).val() == 0) {
$('.div_input').removeClass("hidden"); $('.div_input').removeClass("hidden");
$('.ipt_val').val(""); $('.ipt_val').val("");
$('.swal2-popup .ipt_name').val(str_word); $('.swal2-popup .ipt_name').val(str_word);
@@ -455,13 +455,13 @@
}, },
success: function(data) { success: function(data) {
$('#ajax_preloader').fadeOut(); $('#ajax_preloader').fadeOut();
if(data.indexOf("success") > -1) { if (data.indexOf("success") > -1) {
if(type == 0) { if (type == 0) {
let inserted_info = JSON.parse(data)['info']; let inserted_info = JSON.parse(data)['info'];
tmp_str_arr_kind_option += '<option value="' + inserted_info['ref_id'] + '">' + inserted_info['name'] + '</option>'; tmp_str_arr_kind_option += '<option value="' + inserted_info['ref_id'] + '">' + inserted_info['name'] + '</option>';
} }
showSuccessAlert("Successfully added!"); showSuccessAlert("Successfully added!");
if(callback) { if (callback) {
callback(); callback();
} }
} else { } else {
@@ -473,13 +473,14 @@
} }
let tmp_str_arr_compunds_kind_option = ''; let tmp_str_arr_compunds_kind_option = '';
function show_compunds_add_popup(voc_info, callback) { function show_compunds_add_popup(voc_info, callback) {
let str_word = voc_info['word']; let str_word = voc_info['word'];
let str_analysis_word = voc_info['anaysis_word']; let str_analysis_word = voc_info['anaysis_word'];
let arr_similary = voc_info['arr_similary']; let arr_similary = voc_info['arr_similary'];
let str_arr_option = ''; let str_arr_option = '';
for(let i=0; i<arr_similary.length; i++) { for (let i = 0; i < arr_similary.length; i++) {
str_arr_option += '<option value="' + arr_similary[i]['refid'] + '">' + arr_similary[i]['namecompoundsvocabulary'] + '</option>'; str_arr_option += '<option value="' + arr_similary[i]['refid'] + '">' + arr_similary[i]['namecompoundsvocabulary'] + '</option>';
} }
str_arr_option += tmp_str_arr_compunds_kind_option; str_arr_option += tmp_str_arr_compunds_kind_option;
@@ -512,7 +513,7 @@
didOpen: () => { didOpen: () => {
$('.swal2-popup .ipt_type').select2(); $('.swal2-popup .ipt_type').select2();
$('.swal2-popup .ipt_type').bind("change", function() { $('.swal2-popup .ipt_type').bind("change", function() {
if($(this).val() == 0) { if ($(this).val() == 0) {
$('.div_input').removeClass("hidden"); $('.div_input').removeClass("hidden");
$('.ipt_val').val(""); $('.ipt_val').val("");
$('.swal2-popup .ipt_name').val(str_word); $('.swal2-popup .ipt_name').val(str_word);
@@ -547,13 +548,13 @@
}, },
success: function(data) { success: function(data) {
$('#ajax_preloader').fadeOut(); $('#ajax_preloader').fadeOut();
if(data.indexOf("success") > -1) { if (data.indexOf("success") > -1) {
if(type == 0) { if (type == 0) {
let inserted_info = JSON.parse(data)['info']; let inserted_info = JSON.parse(data)['info'];
tmp_str_arr_compunds_kind_option += '<option value="' + inserted_info['ref_id'] + '">' + inserted_info['name'] + '</option>'; tmp_str_arr_compunds_kind_option += '<option value="' + inserted_info['ref_id'] + '">' + inserted_info['name'] + '</option>';
} }
showSuccessAlert("Successfully added!"); showSuccessAlert("Successfully added!");
if(callback) { if (callback) {
callback(); callback();
} }
} else { } else {
@@ -566,7 +567,7 @@
function import_auto_script() { function import_auto_script() {
let formdata = new FormData(); let formdata = new FormData();
if($('#f_csv').prop('files').length > 0) { if ($('#f_csv').prop('files').length > 0) {
formdata.append("f_csv", $('#f_csv').prop('files')[0]); formdata.append("f_csv", $('#f_csv').prop('files')[0]);
formdata.append("template_id", tmp_id_template_importify); formdata.append("template_id", tmp_id_template_importify);
formdata.append("lab_id", $('#labor_id').val()); formdata.append("lab_id", $('#labor_id').val());
@@ -587,11 +588,11 @@
}, },
success: function(data) { success: function(data) {
$('#ajax_preloader').fadeOut(); $('#ajax_preloader').fadeOut();
if(data.indexOf("success") > -1) { if (data.indexOf("success") > -1) {
showSuccessPopup("Your operation requested!"); showSuccessPopup("Your operation requested!");
}else if(data.indexOf("none_define_column_error") > -1) { } else if (data.indexOf("none_define_column_error") > -1) {
showWarningPopup("The Associate Columns did not define yet!"); showWarningPopup("The Associate Columns did not define yet!");
} else if(data.indexOf("invalid_excel_data_format_error") > -1) { } else if (data.indexOf("invalid_excel_data_format_error") > -1) {
showWarningPopup("Excel data format is not valid!") showWarningPopup("Excel data format is not valid!")
} else { } else {
showWarningAlert("Server Error.") showWarningAlert("Server Error.")
@@ -652,4 +653,4 @@
</body> </body>
</html> </html>
public/userarea/include/footer.php
+1 -1
View File
@@ -1,3 +1,3 @@
<footer class="footer"> <footer class="footer">
© 2020 Reportify by CEsoft. © 2024 Reportify by CEsoft.
</footer> </footer>
public/userarea/include/navigationbar.php
+23 -26
View File
@@ -41,7 +41,7 @@
</a> </a>
</li> </li>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="mdi mdi-bag-checked"></i> <span> <?php echo $mycompany; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="far fa-building"></i> <span> <?php echo $mycompany; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="<?php echo USERAREA_PATH; ?>general/mycompany.php"><?php echo $mycompany; ?></a></li> <li><a href="<?php echo USERAREA_PATH; ?>general/mycompany.php"><?php echo $mycompany; ?></a></li>
<li><a href="<?php echo USERAREA_PATH; ?>general/department.php"><?php echo $department; ?></a></li> <li><a href="<?php echo USERAREA_PATH; ?>general/department.php"><?php echo $department; ?></a></li>
@@ -76,30 +76,29 @@
<?php if (in_array(6, $activemod)) { ?> <?php if (in_array(6, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="bx bxl-product-hunt"></i> <span> Importify </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-upload"></i> <span> Importify </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="<?php echo USERAREA_PATH; ?>importify/importifydashboard.php">Importify Dashboard</a></li> <li><a href="<?php echo USERAREA_PATH; ?>importify/importifydashboard.php">Importify Dashboard</a></li>
<li><a href="<?php echo USERAREA_PATH; ?>importify/insert-importifytemplate.php">New Import Templates</a></li> <li><a href="<?php echo USERAREA_PATH; ?>importify/insert-importifytemplate.php">New Import Templates</a></li>
<li><a href="">Import files</a></li> <li><a href="<?php echo USERAREA_PATH; ?>importify/history_importify.php">Import History</a></li>
<li><a href="">Import History</a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<?php if (in_array(4, $activemod)) { ?> <?php if (in_array(4, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="bx bxl-product-hunt"></i> <span> <?php echo $products; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-tshirt"></i> <span> <?php echo $products; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="<?php echo USERAREA_PATH; ?>products/products.php"><?php echo $products; ?></a></li> <li><a href="<?php echo USERAREA_PATH; ?>products/products.php"><?php echo $products; ?></a></li>
<li><a href="email-read.html"><?php echo $bom; ?></a></li> <!-- <li><a href="email-read.html"><?php echo $bom; ?></a></li>
<li><a href="email-read.html"><?php echo $metadata; ?></a></li> <li><a href="email-read.html"><?php echo $metadata; ?></a></li> -->
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<?php if (in_array(5, $activemod)) { ?> <?php if (in_array(5, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="mdi mdi-human-queue"></i> <span> <?php echo $extcompanies; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-building"></i> <span> <?php echo $extcompanies; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="email-inbox.html"><?php echo $extcompanies; ?></a></li> <li><a href="email-inbox.html"><?php echo $extcompanies; ?></a></li>
<li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li> <li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li>
@@ -110,32 +109,30 @@
<?php if (in_array(2, $activemod)) { ?> <?php if (in_array(2, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="fas fa-chart-bar"></i> <span> <?php echo $statistictitle; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-chart-bar"></i> <span> StatKPI </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="stats-levelone.php">StatKPI</a></li> <li><a href="<?php echo USERAREA_PATH; ?>statkpi/statkpi.php">StatKPI</a></li>
<li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li>
<li><a href="email-read.html"><?php echo $categorycompanies; ?></a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<?php if (in_array(1, $activemod)) { ?> <?php if (in_array(1, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="fas fa-chart-bar"></i> <span> Rate&Go </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="far fa-star"></i></i> <span> Rate&Go </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="stats-ratego.php">Rate&GO</a></li> <li><a href="stats-ratego.php">Rate&GO</a></li>
<li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li>
<li><a href="email-read.html"><?php echo $categorycompanies; ?></a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<li class="has_sub"> <li class="has_sub">
<a href="tables-basic.html" class="waves-effect"><i class="dripicons-copy"></i><span> <?php echo $contactus; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="tables-basic.html" class="waves-effect"><i class="far fa-question-circle"></i><span> <?php echo $contactus; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="pages-blank.html"><?php echo $contactusform; ?></a></li> <li><a href="https://cesoft.io/contactus"><?php echo $contactusform; ?></a></li>
<li><a href="pages-blank.html"><?php echo $supportticket; ?></a></li> <li><a href="https://support.cesoft.io/login"><?php echo $supportticket; ?></a></li>
</ul> </ul>
</li> </li>
@@ -143,16 +140,16 @@
<li class="menu-title">Extra</li> <li class="menu-title">Extra</li>
<?php if ((Auth::user()->hasRole('Admin'))) : ?>
<li class="has_sub">
<a href="tables-basic.html" class="waves-effect"><i class="dripicons-copy"></i><span> Template </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled">
<li class="has_sub"> <li><a href="pages-blank.html">Blank Page</a></li>
<a href="tables-basic.html" class="waves-effect"><i class="dripicons-copy"></i><span> Template </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled">
<li><a href="pages-blank.html">Blank Page</a></li>
</ul>
</li>
</ul>
</li>
<?php endif; ?>
</ul> </ul>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
public/userarea/include/topbar.php
+2 -2
View File
@@ -29,7 +29,7 @@ $conn->close();
<ul class="list-inline float-right mb-0"> <ul class="list-inline float-right mb-0">
<!-- language--> <!-- language-->
<li class="list-inline-item dropdown notification-list hide-phone"> <!-- <li class="list-inline-item dropdown notification-list hide-phone">
<a class="nav-link dropdown-toggle arrow-none waves-effect text-white" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle arrow-none waves-effect text-white" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
English <img src="<?php echo USERAREA_PATH; ?>assets/images/flags/us_flag.jpg" class="ml-2" height="16" alt="" /> English <img src="<?php echo USERAREA_PATH; ?>assets/images/flags/us_flag.jpg" class="ml-2" height="16" alt="" />
</a> </a>
@@ -39,7 +39,7 @@ $conn->close();
<a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/spain_flag.jpg" alt="" height="16" /><span> Spanish </span></a> <a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/spain_flag.jpg" alt="" height="16" /><span> Spanish </span></a>
<a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/russia_flag.jpg" alt="" height="16" /><span> Russian </span></a> <a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/russia_flag.jpg" alt="" height="16" /><span> Russian </span></a>
</div> </div>
</li> </li> -->
<li class="list-inline-item dropdown notification-list"> <li class="list-inline-item dropdown notification-list">
<a class="nav-link dropdown-toggle arrow-none waves-effect" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle arrow-none waves-effect" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<i class="dripicons-mail noti-icon"></i> <i class="dripicons-mail noti-icon"></i>
public/userarea/index.php
-12
View File
@@ -267,19 +267,7 @@ while ($row = $result->fetch_assoc()) {
</div> </div>
<div class="row">
<div class="col-xl-12">
<div class="card">
<div class="card-body">
<h5 class="header-title pb-3 mt-0"><?php echo $dashboard; ?></h5>
<div class="table-responsive">
</div><!--end table-responsive-->
</div>
</div>
</div>
</div>
<!-- end row --> <!-- end row -->
</div><!-- container --> </div><!-- container -->