From 9db3ec07cc59bd909b411081043ea9c55f792a64 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Mar 2018 10:30:28 +0630
Subject: [PATCH] update menu import/export ui

---
 app/controllers/settings/menus_controller.rb |  7 +++++--
 app/views/settings/menus/index.html.erb      | 15 +++++++++------
 app/views/settings/menus/index.xlsx.axlsx    |  5 +++--
 config/routes.rb                             |  4 +++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 8fed1e97..b7e02fb5 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -72,8 +72,11 @@ class Settings::MenusController < ApplicationController
   end
 
   def import
-    Menu.import(params[:file])
-    redirect_to settings_menus_path, notice: "imported"
+    if params[:file]
+      Menu.import(params[:file])
+      redirect_to settings_menus_path, notice: "Menu was successfully Imported"
+    end
+    
   end
 
   private
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 11ae575f..5fafa5db 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -7,12 +7,6 @@
     </span>
   </ol>
 </div>
-<h4>Import</h4>
-<%= form_tag import_settings_menus_path, multipart:true do%>
-  <%=file_field_tag :file%>
-  <%=submit_tag "Import CSV"%>
-<%end%> 
-<%= link_to "Export users as spreadsheet", settings_menus_path(format: "xlsx") %>
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <br><br>
@@ -30,7 +24,16 @@
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
   <div class="m-b-10 clearfix">
+    <div class="float-left">
+      <%= form_tag import_settings_menus_path,class:"col-md-", multipart:true  do%>
+      <%=file_field_tag :file, :class => "img-thumbnail col-md-7" %>
+      <%=submit_tag "Import",:class => 'btn btn-primary btn-lg waves-effect' %>
+    <%end%> 
+    </div>
     <%= link_to t("views.btn.new"),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+
+    <%= link_to "Export", settings_menus_path(format: "xlsx"),:class => 'btn btn-info btn-lg waves-effect float-right m-r-10' %>
+
   </div>
   <div class="card">
     <table class="table table-striped">
diff --git a/app/views/settings/menus/index.xlsx.axlsx b/app/views/settings/menus/index.xlsx.axlsx
index eccd6d7e..b148931a 100644
--- a/app/views/settings/menus/index.xlsx.axlsx
+++ b/app/views/settings/menus/index.xlsx.axlsx
@@ -1,6 +1,7 @@
 wb = xlsx_package.workbook
 wb.styles do |s|
-    date = s.add_style(:format_code => "yyyy-mm-dd", :border => Axlsx::STYLE_THIN_BORDER)
+    time_format = wb.styles.add_style :format_code => 'hh:mm:ss'
+
     wrap_text = s.add_style :sz => 11,
                             :alignment =>  { :horizontal => :left,:vertical => :center ,
                             :wrap_text => true}
@@ -43,7 +44,7 @@ wb.styles do |s|
 	wb.add_worksheet(name: "Menu") do |sheet|
 	  sheet.add_row %w( id name is_active valid_days valid_time_from valid_time_to created_by ), :style=>header_text
 	  @settings_menus.each do |menu|
-	    sheet.add_row [ menu.id, menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[wrap_text]
+	    sheet.add_row [ menu.id, menu.name, menu.is_active, menu.valid_days, menu.valid_time_from,menu.valid_time_to, menu.created_by], :style=>[wrap_text,time_format]
 	  end
 	end
 
diff --git a/config/routes.rb b/config/routes.rb
index 7234f5a3..c7eff8a7 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -293,7 +293,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :employees
     #menu
     resources :menus do
-      #menu_categories
+      collection do
+        post :import
+      end
       resources :menu_categories, only: [:new, :create, :edit, :delete]
     end