update oqs action cable sorting
This commit is contained in:
@@ -65,7 +65,7 @@ $(document).ready(function(){
|
|||||||
var date = new Date(data[field]["created_at"]);
|
var date = new Date(data[field]["created_at"]);
|
||||||
var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
|
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">'
|
+'<div class="card-block">'
|
||||||
+'<h4 class="card-title">'
|
+'<h4 class="card-title">'
|
||||||
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
|
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ App.order = App.cable.subscriptions.create('OrderChannel', {
|
|||||||
|
|
||||||
$('.table_'+data.table.id).removeClass('green');
|
$('.table_'+data.table.id).removeClass('green');
|
||||||
$('.table_'+data.table.id).addClass('blue');
|
$('.table_'+data.table.id).addClass('blue');
|
||||||
|
$('.new_text_'+data.table.id).removeClass('hide')
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
|
|||||||
|
|
||||||
if (oqs_id == items[field]["order_queue_station_id"]) {
|
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>'
|
+'<strong class="hidden">'+items[field]["order_id"]+'</strong>'
|
||||||
+'<div class="card-block">'
|
+'<div class="card-block">'
|
||||||
+'<h4 class="card-title">'
|
+'<h4 class="card-title">'
|
||||||
@@ -75,8 +75,12 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
|
|||||||
var SortListDivs = $divs.sort(function (a, b) {
|
var SortListDivs = $divs.sort(function (a, b) {
|
||||||
first = $(a).attr('data-date');
|
first = $(a).attr('data-date');
|
||||||
next = $(b).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);
|
$("#oqs_container").html(SortListDivs);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -62,6 +62,7 @@
|
|||||||
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<%= table.name %>
|
<%= table.name %>
|
||||||
|
<span class="pull-right font-12 new_text_<%= table.id %> hide"> new</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -89,6 +90,7 @@
|
|||||||
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<%= room.name %>
|
<%= room.name %>
|
||||||
|
<span class="pull-right font-12 new_text_<%= room.id %> hide">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -54,9 +54,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% 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">
|
<div class="card-block">
|
||||||
<%= table.name %>
|
<%= table.name %>
|
||||||
|
<span class="pull-right font-12 new_text_<%= table.id %> hide">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -87,9 +88,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% 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">
|
<div class="card-block">
|
||||||
<%= room.name %>
|
<%= room.name %>
|
||||||
|
<span class="pull-right font-12 new_text_<%= room.id %> hide">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user