From 95fd260c76ddcd1389be888196fd3bfbd0bc41c7 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 2 Jun 2017 11:28:07 +0630
Subject: [PATCH] updated ui

---
 app/assets/javascripts/OQS.js          | 54 ++++++++++++++------------
 app/controllers/oqs/home_controller.rb | 11 +++++-
 app/views/oqs/home/index.html.erb      |  1 +
 config/routes.rb                       |  2 +
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index eb2bc9cb..04b81bea 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -17,32 +17,38 @@
 //= require cable
 
 $(document).ready(function(){
-	$('.queue_station').on('click',function(){		
-		var orderZone=$(this).children().children().children('.order-zone').text();
-		var orderItem=$(this).children().children().children('.order-item').text();
-		var orderQty=$(this).children().children().children('.order-qty').text();		
-		var orderBy=$(this).children().children().children().children('.order-by').text();
-		var orderAt=$(this).children().children().children().children('.order-at').text();
-		var orderCustomer=$(this).children().children('.order-customer').text();
+	$('.queue_station').on('click',function(){    
+	    var orderZone=$(this).children().children().children('.order-zone').text();
+	    var orderItem=$(this).children().children().children('.order-item').text();
+	    var orderQty=$(this).children().children().children('.order-qty').text();   
+	    var orderBy=$(this).children().children().children().children('.order-by').text();
+	    var orderAt=$(this).children().children().children().children('.order-at').text();
+	    var orderCustomer=$(this).children().children('.order-customer').text();
 
-		$('#order-title').text("ORDER DETAILS - " + orderZone);
-		$('#order-by').text(orderBy);
-		$('#order-at').text(orderAt);
-		$('#order-customer').text(orderCustomer);
-		$('#order-from').text(orderZone);
+	    $('#order-title').text("ORDER DETAILS - " + orderZone);
+	    $('#order-by').text(orderBy);
+	    $('#order-at').text(orderAt);
+	    $('#order-customer').text(orderCustomer);
+	    $('#order-from').text(orderZone);
 
-		$('#order-items').text(orderItem);
-		$('#order-qty').text(orderQty);
+	    $('#order-items').text(orderItem);
+	    $('#order-qty').text(orderQty);
 	});
 
-	// complete for queue item
-	$('.order-complete').on('click',function(){
-		var assigned_item_id=$(this).attr('id').substr(15);		
-		$.ajax({
-			url: "",
-			data: ""
-		}).done(function(){
-
-		});
-	});
+  	// complete for queue item
+  	$('.order-complete').on('click',function(){  		
+	    var assigned_item_id=$(this).attr('id').substr(15); 
+	    var params = { 'id':assigned_item_id };
+	    // $(this).parent().parent(".queue_station").remove();	      
+	    $.ajax({
+	      type: 'POST',
+	      url: '/oqs/update_delivery',
+	      data: params,
+	      dataType: 'json',
+	      success: function(data){	      	
+	      	$('.order-complete').parent().parent(".queue_station").remove();
+	      	alert('updated!');
+	      }
+	    });   
+  	});
 });
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index f59f2f18..e448ff23 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -26,8 +26,17 @@ class Oqs::HomeController < BaseOqsController
   def show
   end
 
+  # update delivery status when complete click
   def update_delivery_status
-
+    puts "WWWW" + params[:id]
+    assigned_item_id = params[:id]
+    assigned_item=AssignedOrderItem.find(assigned_item_id)
+    assigned_item.delivery_status=true
+    assigned_item.save
+    # respond_to do |format|
+    #   format.json { render json: "updated" }
+    # end 
+    flash[:success] = "updated!"
   end
 
   # Query for OQS with status
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 4e0b16ad..7982e00d 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -200,3 +200,4 @@
 
   </div>
 </div>
+
diff --git a/config/routes.rb b/config/routes.rb
index 7b9dd91d..54cc4d7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -92,6 +92,8 @@ Rails.application.routes.draw do
   #--------- Order Queue Station ------------#
   namespace :oqs do
     root "home#index"
+
+    post 'update_delivery', to: "home#update_delivery_status"
     #dashboard
     #
   end