From da6d85eaf57a6216bf119a34a6388202df9370c3 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 25 Oct 2017 14:03:15 +0630 Subject: [PATCH] update report and inventory layout design --- app/assets/stylesheets/reset.css | 15 ++ .../reports/commission_controller.rb | 17 +- .../reports/stock_check_controller.rb | 15 +- .../inventory/_inventory_list.html.erb | 78 +++---- app/views/inventory/inventory/index.html.erb | 57 +++-- .../inventory_definitions/_form.html.erb | 43 ++-- .../inventory_definitions/new.html.erb | 2 +- .../inventory/stock_checks/index.html.erb | 162 +++++++------- .../inventory/stock_checks/show.html.erb | 146 ++++++------ .../_commission_report_filter.html.erb | 74 ++++--- app/views/reports/commission/index.html.erb | 4 +- .../_shift_sale_report_filter.html.erb | 83 +++---- .../reports/credit_payment/index.html.erb | 16 +- .../_shift_sale_report_filter.html.erb | 13 +- app/views/reports/dailysale/index.html.erb | 39 ++-- .../_shift_sale_report_filter.html.erb | 88 ++++---- app/views/reports/receipt_no/index.html.erb | 6 +- .../_shift_sale_report_filter.html.erb | 208 +++++++++--------- app/views/reports/saleitem/index.html.erb | 2 +- .../_shift_sale_report_filter.html.erb | 80 +++---- app/views/reports/shiftsale/index.html.erb | 2 +- .../_stock_check_report_filter.html.erb | 123 ++++++----- app/views/reports/stock_check/index.html.erb | 2 +- .../_shift_sale_report_filter.html.erb | 27 +-- config/locales/en.yml | 2 +- 25 files changed, 693 insertions(+), 611 deletions(-) diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index e79eb0b2..3fe9898f 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -198,5 +198,20 @@ section.content { background-color: #007d72 !important; } +.m-t-1{ + margin-top: 1px; +} +.m-t-2{ + margin-top: 2px; +} +.m-t-3{ + margin-top: 3px; +} +.m-t-4{ + margin-top: 4px; +} +.m-t-7{ + margin-top: 7px; +} /* End Reset Theme */ /* *************************************************** */ \ No newline at end of file diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb index 98f98457..aeaa0a11 100755 --- a/app/controllers/reports/commission_controller.rb +++ b/app/controllers/reports/commission_controller.rb @@ -2,18 +2,21 @@ class Reports::CommissionController < BaseReportController # authorize_resource :class => false def index - from_date = DateTime.now.beginning_of_day.utc.getlocal - to_date = DateTime.now.end_of_day.utc.getlocal - unless params[:daterange].blank? - from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal - to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal - @daterange = params[:daterange] - end + # from_date = DateTime.now.beginning_of_day.utc.getlocal + # to_date = DateTime.now.end_of_day.utc.getlocal + # unless params[:daterange].blank? + # from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal + # to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal + # @daterange = params[:daterange] + # end + from_date, to_date = get_date_range_from_params + commissioner = params[:commissioner].to_i @com_id = commissioner @commissioner = Commissioner.active.all @transaction = ProductCommission.get_transaction(from_date, to_date, commissioner) + @from = from_date @to = to_date diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb index c6799cb1..c9622999 100755 --- a/app/controllers/reports/stock_check_controller.rb +++ b/app/controllers/reports/stock_check_controller.rb @@ -2,13 +2,14 @@ class Reports::StockCheckController < BaseReportController # authorize_resource :class => false def index - from_date = DateTime.now.beginning_of_day.utc.getlocal - to_date = DateTime.now.end_of_day.utc.getlocal - unless params[:daterange].blank? - from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal - to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal - @daterange = params[:daterange] - end + # from_date = DateTime.now.beginning_of_day.utc.getlocal + # to_date = DateTime.now.end_of_day.utc.getlocal + # unless params[:daterange].blank? + # from_date = Date.parse(params[:daterange].split(' - ')[0]).beginning_of_day.utc.getlocal + # to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal + # @daterange = params[:daterange] + # end + from_date, to_date = get_date_range_from_params @item_code = params[:item_code] @inventory_definitions = InventoryDefinition.active.all diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb index 91a4ac94..bd5f5c38 100755 --- a/app/views/inventory/inventory/_inventory_list.html.erb +++ b/app/views/inventory/inventory/_inventory_list.html.erb @@ -1,48 +1,34 @@ -
-

Inventoy Product Lists

-
-
+ + + + + + + + + + <% + count = 0 + @products.each do |item| + count += 1 + %> + + + + + + + + + <% end %> +
#ProductMin OrderMax StockCreated byCreated Time
<%= count %> + <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%> + <% if menu_item.nil? %> + <%= Product.find_by_item_code(item.item_code).name rescue "-" %> + <% else %> + <%= menu_item.menu_item.name rescue "-" %> + - <%= menu_item.item_instance_name rescue "-" %> + <% end %> + <%= item.min_order_level %><%= item.max_stock_level %><%= Employee.find(item.created_by).name rescue '-' %><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %>
-
-
- - - - - - - - - - <% - count = 0 - @products.each do |item| - count += 1 - %> - - - - - - - - - <% end %> -
#ProductMin OrderMax StockCreated byCreated Time
<%= count %> - <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%> - <% if menu_item.nil? %> - <%= Product.find_by_item_code(item.item_code).name rescue "-" %> - <% else %> - <%= menu_item.menu_item.name rescue "-" %> - - <%= menu_item.item_instance_name rescue "-" %> - <% end %> - <%= item.min_order_level %><%= item.max_stock_level %><%= Employee.find(item.created_by).name rescue '-' %><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %>
-
-
- - diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb index 6149198b..ab6b3855 100755 --- a/app/views/inventory/inventory/index.html.erb +++ b/app/views/inventory/inventory/index.html.erb @@ -1,17 +1,48 @@ -
-
-
+
+
    +
  1. Home
    2. +
  2. Inventory
    3. + + <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> + +
+
+ + +
+
+
+ + + +
+
<%= render 'inventory_list' %>
-
- <% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %> - - <% end %> - - -
+
+
+
+
+
list BUTTON LISTS
+

+ 1) <%= t("views.btn.new") + " " + (t :inventory) %> - to create new inventory
+

+

+ 2) New Stock Taking - to create new Stock Taking
+

+

+ 3) Stock Check Report - to go Stock Check Report List
+

+
list LINK LISTS
+

1) Home / Back - go to dashboard

+
+
+ + diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index 7a5f06ff..e7f3198d 100755 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -1,5 +1,5 @@
-
+
<%= simple_form_for([:inventory, @inventory_definition]) do |f| %> <%= f.error_notification %> @@ -10,8 +10,8 @@ <% Product.order("name desc").pluck(:name, :item_code).each do |p| %> <% arr.push(p) %> <% end %> -
- +
+ - - - - - - - - - - - -
- -
- - - -
-
- - -
-
- - -
-

- -
-
+
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
+
+ + +
+ +
+ + + +
+
+ + +
+
+ + +
+

+ +
+
+ <% end %> <% end %> - -<% end %> +