git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update oqs action cable sorting

Browse Source
This commit is contained in:
Aung Myo
2017-09-05 18:06:57 +06:30
parent bb6e938f47
commit d1db57e9b5
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/OQS.js
View File

@@ -65,7 +65,7 @@ $(document).ready(function(){
var date = new Date(data[field]["created_at"]);
var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
row ='<div class="card queue_station" data-order="'+date+'">'
row ='<div class="card queue_station" data-date="'+data[field]["order_id"]+'">'
+'<div class="card-block">'
+'<h4 class="card-title">'
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'

1
app/assets/javascripts/channels/order.js
View File

@@ -9,6 +9,7 @@ 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')
},

8
app/assets/javascripts/channels/order_queue_station.js
View File

@@ -34,7 +34,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
if (oqs_id == items[field]["order_queue_station_id"]) {
row ='<div class="card queue_station queue_station_box" data-date="'+date+'">'
row ='<div class="card queue_station queue_station_box" data-date="'+items[field]["order_id"]+'">'
+'<strong class="hidden">'+items[field]["order_id"]+'</strong>'
+'<div class="card-block">'
+'<h4 class="card-title">'
@@ -75,8 +75,12 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
var SortListDivs = $divs.sort(function (a, b) {
first = $(a).attr('data-date');
next = $(b).attr('data-date');
return new Date(first).getTime() < new Date(next).getTime();
console.log(parseInt(first.substring(4, 16)));
console.log(parseInt(next.substring(4, 16)));
return parseInt(next.substring(4, 16)) - parseInt(first.substring(4, 16));
console.log(parseInt(first.substring(4, 16)) > parseInt(next.substring(4, 16)));
});
console.log(SortListDivs);
$("#oqs_container").html(SortListDivs);
},

2
app/views/origami/home/show.html.erb
View File

@@ -62,6 +62,7 @@
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %> hide"> new</span>
</div>
</div>
<% end %>
@@ -89,6 +90,7 @@
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %> hide">
</div>
</div>
<% end %>

6
app/views/origami/rooms/show.html.erb
View File

@@ -54,9 +54,10 @@
</div>
<% end %>
<% else %>
<div class="card tables green text-white" data-id="<%= table.id %>">
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %> hide">
</div>
</div>
<% end %>
@@ -87,9 +88,10 @@
</div>
<% end %>
<% else %>
<div class="card rooms green text-white" data-id="<%= room.id %>">
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %> hide">
</div>
</div>
<% end %>