fix banyak
This commit is contained in:
@@ -39,9 +39,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-4">
|
||||
{{-- <div class="col-4">
|
||||
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Hantar">
|
||||
</div>
|
||||
</div> --}}
|
||||
|
||||
</div>
|
||||
|
||||
@@ -144,10 +144,6 @@
|
||||
});
|
||||
}
|
||||
getData();
|
||||
// setInterval(function () {
|
||||
// getData();
|
||||
// }, 10000);
|
||||
|
||||
});
|
||||
|
||||
var tablependahuluan = $('#table-pendahuluan').DataTable({
|
||||
@@ -158,6 +154,74 @@
|
||||
minimumFractionDigits: 2
|
||||
});
|
||||
|
||||
$('#tarikhmula').change(function(){
|
||||
|
||||
var input_date = this.value;
|
||||
var split_date = input_date.split('-');
|
||||
var tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
|
||||
|
||||
let tarikhhingga = $('#tarikhhingga').val();
|
||||
|
||||
if(tarikhhingga == '')
|
||||
{
|
||||
var current = new Date();
|
||||
var current_date = current.getDate();
|
||||
var current_month = current.getMonth()+1;
|
||||
var current_year = current.getFullYear();
|
||||
var today_date = current_year + '-' +current_month+'-'+current_date;
|
||||
|
||||
tarikhhingga = today_date;
|
||||
|
||||
}else{
|
||||
var input_hingga = tarikhhingga;
|
||||
var split_date = input_hingga.split('-');
|
||||
tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api_url + '/api/requestTeller/get/' + kodcaw + '/date',
|
||||
data: {
|
||||
'mula' : tarikhmula,
|
||||
'hingga' : tarikhhingga
|
||||
},
|
||||
success: function(data){
|
||||
gettable(data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('#tarikhhingga').change(function(){
|
||||
|
||||
var input_date = this.value;
|
||||
var split_date = input_date.split('-');
|
||||
var tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
|
||||
|
||||
let tarikhmula = $('#tarikhmula').val();
|
||||
|
||||
if(tarikhmula == '')
|
||||
{
|
||||
tarikhmula = '2018-01-01';
|
||||
}else{
|
||||
var input_mula = tarikhmula;
|
||||
var split_date = input_mula.split('-');
|
||||
tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api_url + '/api/requestTeller/get/' + kodcaw + '/date',
|
||||
data: {
|
||||
'mula' : tarikhmula,
|
||||
'hingga' : tarikhhingga
|
||||
},
|
||||
success: function(data){
|
||||
gettable(data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
function gettable(datala)
|
||||
{
|
||||
var counter = 1;
|
||||
@@ -178,7 +242,7 @@
|
||||
'RM ' + formatter.format(arr['modal']),
|
||||
'RM ' + formatter.format(arr['serahan']),
|
||||
arr['tarikh'],
|
||||
arr['tarikh'],
|
||||
arr['masa'],
|
||||
'<a href='+ urlroute + ' class="btn btn-info"><span class="fas fa-plus"></span></a>'
|
||||
]).draw();
|
||||
counter = counter + 1;
|
||||
|
||||
Reference in New Issue
Block a user