diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index d12c38e4..c4035ead 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -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 ='
' + row ='
' +'
' +'

' +''+data[field]["table_type"]+'- ' diff --git a/app/assets/javascripts/channels/order.js b/app/assets/javascripts/channels/order.js index eb73c5d1..691834e1 100644 --- a/app/assets/javascripts/channels/order.js +++ b/app/assets/javascripts/channels/order.js @@ -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') }, diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js index 9ad1a454..a2da084a 100644 --- a/app/assets/javascripts/channels/order_queue_station.js +++ b/app/assets/javascripts/channels/order_queue_station.js @@ -34,7 +34,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann if (oqs_id == items[field]["order_queue_station_id"]) { - row ='
' + row ='
' +'' +'
' +'

' @@ -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); }, diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2d7cb895..45750d6f 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -62,6 +62,7 @@
<%= table.name %> + new
<% end %> @@ -89,6 +90,7 @@
<%= room.name %> +
<% end %> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 673b733d..1fed161c 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -54,9 +54,10 @@

<% end %> <% else %> -
+
<%= table.name %> +
<% end %> @@ -87,9 +88,10 @@
<% end %> <% else %> -
+
<%= room.name %> +
<% end %>