Pull from master

This commit is contained in:
San Wai Lwin
2018-06-08 10:31:02 +06:30
parent b3e85ff25e
commit ce3ab0b0eb
8 changed files with 177 additions and 93 deletions

View File

@@ -219,3 +219,13 @@ function export_to(path)
var form_params = $("#frm_report").serialize();
window.location = path+"?"+ form_params;
}
/* chartkick js YAxis value override */
Chart.scaleService.updateScaleDefaults('linear', {
ticks: {
callback: function (value, index, values) {
return value/1000 + 'k';
}
}
});
/* chartkick js YAxis value override */

View File

@@ -13,7 +13,11 @@ App.order = App.cable.subscriptions.create('OrderChannel', {
$('.table_'+data.table.id).removeClass('green');
$('.table_'+data.table.id).addClass('blue');
$('.new_text_'+data.table.id).removeClass('hide')
}else{
}else if(data.type == 'move'){
$('.table_'+data.table).removeClass('blue');
$('.table_'+data.table).addClass('green');
$('.table_'+data.change_to).addClass('blue');
}else{
$('.table_'+data.table.id).removeClass('red');
$('.table_'+data.table.id).addClass('green');
$('.new_text_'+data.table.id).html('');