From c56fb1b0f4103958652919da7bbd279e3fbf0cfc Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 17 Nov 2017 16:39:37 +0630
Subject: [PATCH] oqs back turbolink control

---
 app/assets/javascripts/OQS.js     | 4 ----
 app/views/oqs/edit/index.html.erb | 3 ++-
 app/views/oqs/home/index.html.erb | 8 ++++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index d2bb42bc..2f670146 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -25,10 +25,6 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
-	$('#back').on('click', function () {
-        window.location.href = '/oqs/';
-    });
-
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 4d018249..0cae40ce 100755
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -115,8 +115,9 @@ $(document).ready(function(){
       }
     });
   });
+
    $('#back').on('click', function () {
-        window.location.href = '/oqs/';
+        window.location.href = '/oqs';
     })
 
    // number key pad
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 39e84227..96074792 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -177,3 +177,11 @@
       <!-- <button type="button" class="" id="print_order_summary">Print <br/>Order<br/>Summary</button> -->
   </div>
 </div>
+
+<script type="text/javascript">
+  $(document).on('turbolinks:load', function() {
+    $('#back').on('click', function () {
+        window.location.href = '/dashboard';
+    });
+  });
+</script>