inventorymaster 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38cef96881f6e5f5a3407320fa7ec173c0d7d354
-  data.tar.gz: d66dcadeb286a402c53dca160c2c3ee7051cb71a
+  metadata.gz: 40cccffa7646893ddd398a1afaa35a7456d8c08e
+  data.tar.gz: 22043dec86c0c22a835d646d0cd2d7132b5f9237
 SHA512:
-  metadata.gz: ea869c869534088586755b527d5d1f17b62316f9de55a1903fda79b555e90e64d311b86862fef500c1dc43d4bcfda74ce3d74157d2ea7e0dcb7b82bdc103f283
-  data.tar.gz: c7f5facbd6795c5d179fa3e5388432dff77395968f7475677a6182785803df97fa979a8922742221170dc150921a73c4ada5efa3e69df593bd973e8b10de6660
+  metadata.gz: 559902a0fa2b2e43b5390b6fd69129d7b6cb93973d3edec959d72affd9ce3481443aa8274cfd25a59620fc262073edd50b656912bbbb6dbaec61fbba33cb1479
+  data.tar.gz: b1016ab24d98624094a5e7c607e2ad3a3d4645d6fe95c6c7dbe99478da64f4ddbe70a9fecc003e17ed30633182860ff32b78836a35b7199092214ea8216d3cc6

data/app/assets/javascripts/inventorymaster/products.js

@@ -1,2 +1,6 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
+$ ->
+  $('#product_search').typeahead
+    name: "product"
+    remote: "/products/autocomplete?query=%QUERY"

data/app/controllers/inventorymaster/products_controller.rb

@@ -5,10 +5,18 @@ module Inventorymaster
     before_action :set_product, only: [:show, :edit, :update, :destroy]
     #autocomplete Inventorymaster::Product, :name
     # GET /products
-    def index
-      @products = Product.all.page(params[:page]).order(:name)
-      @product = Product.new
+    #def index
+      #@products = Product.all.page(params[:page]).order(:name)
+     # @product = Product.new
+   # end
+
+  def index
+    if params[:query].present?
+      @products = Product.search(params[:query], page: params[:page])
+    else
+      @products = Product.all.page params[:page]
     end
+  end
 
     # GET /products/1
     def show
@@ -69,6 +77,10 @@ module Inventorymaster
       redirect_to products_url, notice: 'Product was successfully destroyed.'
     end
 
+    def autocomplete
+      render json: Product.search(params[:query], autocomplete: true, limit: 10).map(&:name)
+    end
+
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_product

data/app/models/inventorymaster/product.rb

@@ -1,5 +1,6 @@
 module Inventorymaster
   class Product < ActiveRecord::Base
+      searchkick autocomplete: ['name']
   	belongs_to :location
   	belongs_to :area
   	belongs_to :manufacturer

data/app/views/inventorymaster/products/index.html.erb

@@ -1,6 +1,33 @@
- <div class="page-header">
-  <h3><span class="glyphicon glyphicon-users"></span> Produtos</h3>
+
+<div class="container">
+  <div class="row">
+    <%= form_tag products_path, :class=> "form-inline", method: :get do%>
+    <div class="col-md-12">
+            <div class="input-group" id="adv-search">
+               <div class="input-group-btn">
+                    <div class="btn-group" role="group">
+                       <% if params[:query].present?%>
+                          <%= link_to "limpar", products_path, :class=> "btn btn-default"%>
+                      <%end%>
+                    </div>
+                </div>
+                <%= text_field_tag :query, params[:query], :class=> "form-control", :id=> "product_search", :autocomplete=> "off"%>
+                <div class="input-group-btn">
+                    <div class="btn-group" role="group">
+                       <%= submit_tag "Pesquisar", :class=> "btn btn-primary"%>
+                    </div>
+                </div>
+            </div>
+          </div>
+        </div>
+  </div>
 </div>
+<%end%>
+
+
+
+
+
 
 
 
@@ -13,10 +40,10 @@
     <tr>
       <th>Nome</th>
       <th>SKU</th>
-      <th>UPC</th>
-      <th>Area</th>
+      <th>Área</th>
       <th>Fabricante</th>
-      <th>Estoque Minimo</th>
+      <th>EM</th>
+      <th>EA</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -38,11 +65,11 @@
         <%end%>
 
         <td><%= product.name %></td>
-        <td><%= product.sku %></td>
-        <td><%if product.upc.present?%><%= product.upc %><%else%>-<%end%></td>
+        <td><%if product.sku.present?%><%= product.sku %><%else%>-<%end%></td>
         <td><%= product.area.name unless product.area.nil? %></td>
         <td><%= product.manufacturer.name unless product.manufacturer.nil?%></td>
-        <td><%= product.minimum_stock_count %></td>
+        <td><span class="label label-warning"><%= product.minimum_stock_count %></span></td>
+        <td><span class="label label-primary"><%= product.ammount %></span></td>
         <td><%= link_to 'Detalhar', product ,:class=>"btn btn-xs btn-default"%></td>
         <td><%= link_to 'Editar', edit_product_path(product) ,:class=>"btn btn-xs btn-warning"%></td>
         <td><%= link_to 'Deletar', product, method: :delete, data: { confirm: 'Voce tem Certeza?' },:class=>"btn btn-xs btn-danger" %></td>
@@ -53,3 +80,5 @@
 <br>
 <center><%= paginate @products %></center>
 
+<span class="label label-warning">EM - Estoque Mínimo</span>
+<span class="label label-primary">EA - Estoque Atual</span>

data/app/views/inventorymaster/products/show.html.erb

@@ -3,16 +3,16 @@
     <%= hidden_field_tag 'product_id',nil,:value => @product.id%>
     <%= hidden_field_tag 'kind',nil,:value => "Entrada"%>
     <%= submit_tag("+ Entrada", :class => 'btn btn-small btn-success') %>
-  <% end %> 
+  <% end %>
 
   <%= form_tag({:controller=>'transactions',:action=>'new'}, {:method => :get}) do %>
     <%= hidden_field_tag 'product_id',nil,:value => @product.id%>
     <%= hidden_field_tag 'kind',nil,:value => "Saida"%>
     <%= submit_tag("+ Saida", :class => 'btn btn-small btn-danger') %>
-  <% end %> 
+  <% end %>
 <p>
   <strong>Quantidade em Estoque:</strong>
-  <%= @product.ammount %>
+  <span class="label label-primary"><%= @product.ammount %></span>
 </p>
 <p>
   <strong>Nome:</strong>
@@ -61,7 +61,6 @@
 <tr>
   <td>Tipo</td>
   <td>Data</td>
-  <td>Localização</td>
   <td>Usuário</td>
   <td>UPC</td>
   <td>Custo Unitario</td>
@@ -82,7 +81,7 @@
     <td><%=transaction.average_cost%></td>
     <td><%=transaction.reason%></td>
   </tr>
-  
+
 <%end%>
 </table>
 

data/config/routes.rb

@@ -4,9 +4,9 @@ Inventorymaster::Engine.routes.draw do
   get ':transactions/:id', to: 'transactions#new', on: :member
 end
 
-  resources :products do
-  get :autocomplete_product_name, :on => :collection
-end
+  #resources :products do
+  #get :autocomplete_product_name, :on => :collection
+#end
   resources :settings
   resources :manufacturers
   resources :areas
@@ -15,4 +15,12 @@ end
 	#get '/transactions/new/:id' =>'transactions#new'
 
 
+
+resources :products do
+    collection do
+      post :import
+      get :autocomplete # <= add this line
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventorymaster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - jcottobboni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails4-autocomplete
+  name: searchkick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -226,7 +226,7 @@ files:
 - test/models/inventorymaster/transaction_test.rb
 - test/models/inventorymaster/transaction_type_test.rb
 - test/test_helper.rb
-homepage: 
+homepage: https://github.com/jcottobboni/inventorymaster
 licenses:
 - MIT
 metadata: {}