Added "ordergroups" view to list the ordergroups
* You can search in the name. * You can show only active order groups (order in last 3 months) * Future feature: generate text and pdf files for the box labels
This commit is contained in:
parent
e95cdad5ec
commit
e32e97d178
2 changed files with 21 additions and 12 deletions
|
@ -49,11 +49,19 @@ class FoodcoopController < ApplicationController
|
||||||
@per_page = 20
|
@per_page = 20
|
||||||
end
|
end
|
||||||
|
|
||||||
# if somebody uses the search field:
|
if (params[:only_active].to_i == 1)
|
||||||
conditions = ["name LIKE ?", "%#{params[:query]}%"] unless params[:query].blank?
|
if (! params[:query].blank?)
|
||||||
|
conditions = ["orders.starts >= ? AND name LIKE ?", Time.now.months_ago(3), "%#{params[:query]}%"]
|
||||||
|
else
|
||||||
|
conditions = ["orders.starts >= ?", Time.now.months_ago(3)]
|
||||||
|
end
|
||||||
|
else
|
||||||
|
# if somebody uses the search field:
|
||||||
|
conditions = ["name LIKE ?", "%#{params[:query]}%"] unless params[:query].blank?
|
||||||
|
end
|
||||||
|
|
||||||
@total = Ordergroup.count(:conditions => conditions)
|
@total = Ordergroup.count(:conditions => conditions, :include => "orders")
|
||||||
@order_groups = Ordergroup.paginate(:page => params[:page], :per_page => @per_page, :conditions => conditions, :order => "name")
|
@order_groups = Ordergroup.paginate(:page => params[:page], :per_page => @per_page, :conditions => conditions, :order => "name", :include => "orders")
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html # index.html.erb
|
format.html # index.html.erb
|
||||||
|
|
|
@ -5,17 +5,18 @@
|
||||||
%h2 Übersicht
|
%h2 Übersicht
|
||||||
.column_content
|
.column_content
|
||||||
#user_filter{:style => "margin-right:2em;"}
|
#user_filter{:style => "margin-right:2em;"}
|
||||||
%form{:name=>"sform", :action=>"", :style=>"display:inline;"}
|
%form{:id=>"sform", :action=>"", :style=>"display:inline;"}
|
||||||
%label{:for => 'article_name'} Suche nach Name:
|
%label{:for => 'article_name'} Suche nach Name:
|
||||||
= text_field_tag("query", params['query'], :size => 10 )
|
= text_field_tag("query", params['query'], :size => 10 )
|
||||||
|
%label{:for => 'only_active'} Nur aktive:
|
||||||
|
= check_box_tag('only_active')
|
||||||
|
|
||||||
= observe_field 'query', :frequency => 2, |
|
= observe_form 'sform', :frequency => 2, |
|
||||||
:before => "Element.show('loader')", |
|
:before => "Element.show('loader')", |
|
||||||
:success => "Element.hide('loader')", |
|
:success => "Element.hide('loader')", |
|
||||||
:url => {:action => 'ordergroups'}, |
|
:url => {:action => 'ordergroups'}, |
|
||||||
:update => :order_groups, |
|
:update => :order_groups, |
|
||||||
:with => 'query', |
|
:method => :get |
|
||||||
:method => :get |
|
|
||||||
|
|
||||||
#order_groups
|
#order_groups
|
||||||
= render :partial => "ordergroups"
|
= render :partial => "ordergroups"
|
Loading…
Reference in a new issue