Added loading indicator on show button.
Datatable added to the table, and included Datatable-files everywhere, since Datatable will be implemented several places.
这个提交包含在:
父节点
dd200871cc
当前提交
f3f09503fc
共有 3 个文件被更改,包括 17 次插入 和 8 次删除
|
|
@ -83,7 +83,7 @@
|
||||||
<!-- Button (Double) -->
|
<!-- Button (Double) -->
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-md-10">
|
<div class="col-md-10">
|
||||||
<button id="button1id" type="button" name="button1id" class="btn btn-success btn-primary" onclick="accumulatePlot(this.form)">Show</button>
|
<button id="button1id" type="button" name="button1id" class="btn btn-success btn-primary ld-ext-right" onclick="accumulatePlot(this.form)">Show<div class="ld ld-ring ld-spin"></div></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,7 @@
|
||||||
<script src="<?php echo base_url() ;?>assets/js/sections/notes.js"></script>
|
<script src="<?php echo base_url() ;?>assets/js/sections/notes.js"></script>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<?php if ($this->uri->segment(1) == "awards") { ?>
|
|
||||||
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datatables.min.js"></script>
|
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datatables.min.js"></script>
|
||||||
<?php } ?>
|
|
||||||
|
|
||||||
<?php if ($this->uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?>
|
<?php if ($this->uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?>
|
||||||
|
|
||||||
|
|
@ -1794,6 +1792,9 @@ $(document).ready(function(){
|
||||||
<script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
|
<script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
|
||||||
<script>
|
<script>
|
||||||
function accumulatePlot(form) {
|
function accumulatePlot(form) {
|
||||||
|
$(".ld-ext-right").addClass('running');
|
||||||
|
$(".ld-ext-right").prop('disabled', true);
|
||||||
|
|
||||||
// using this to change color of legend and label according to background color
|
// using this to change color of legend and label according to background color
|
||||||
var background = $('body').css( "background-color");
|
var background = $('body').css( "background-color");
|
||||||
var color = 'grey';
|
var color = 'grey';
|
||||||
|
|
@ -1827,7 +1828,7 @@ $(document).ready(function(){
|
||||||
$("#accumulateContainer").append("<canvas id=\"myChartAccumulate\" width=\"400\" height=\"150\"></canvas><div id=\"accumulateTable\"></div>");
|
$("#accumulateContainer").append("<canvas id=\"myChartAccumulate\" width=\"400\" height=\"150\"></canvas><div id=\"accumulateTable\"></div>");
|
||||||
|
|
||||||
// appending table to hold the data
|
// appending table to hold the data
|
||||||
$("#accumulateTable").append('<table class="accutable table table-sm table-bordered table-hover table-striped table-condensed text-center"><thead>' +
|
$("#accumulateTable").append('<table style="width:100%" class="accutable table table-sm table-bordered table-hover table-striped table-condensed text-center"><thead>' +
|
||||||
'<tr>' +
|
'<tr>' +
|
||||||
'<td>#</td>' +
|
'<td>#</td>' +
|
||||||
'<td>' + periodtext + '</td>' +
|
'<td>' + periodtext + '</td>' +
|
||||||
|
|
@ -1897,6 +1898,16 @@ $(document).ready(function(){
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
$(".ld-ext-right").removeClass('running');
|
||||||
|
$(".ld-ext-right").prop('disabled', false);
|
||||||
|
$('.accutable').DataTable({
|
||||||
|
responsive: false,
|
||||||
|
ordering: false,
|
||||||
|
"scrollY": "400px",
|
||||||
|
"scrollCollapse": true,
|
||||||
|
"paging": false,
|
||||||
|
"scrollX": true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,16 +28,14 @@
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/plugins/quill/quill.snow.css" />
|
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/plugins/quill/quill.snow.css" />
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<?php if ($this->uri->segment(1) == "qrz") { ?>
|
<?php if ($this->uri->segment(1) == "qrz" || $this->uri->segment(1) == "accumulated") { ?>
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/loading.min.css" />
|
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/loading.min.css" />
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/ldbtn.min.css" />
|
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/ldbtn.min.css" />
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/bootstrapdialog/css/bootstrap-dialog.min.css" />
|
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/bootstrapdialog/css/bootstrap-dialog.min.css" />
|
||||||
|
|
||||||
<?php if ($this->uri->segment(1) == "awards") { ?>
|
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/datatables.min.css"/>
|
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/datatables.min.css"/>
|
||||||
<?php } ?>
|
|
||||||
|
|
||||||
<?php if ($this->uri->segment(1) == "adif") { ?>
|
<?php if ($this->uri->segment(1) == "adif") { ?>
|
||||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
|
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用