suite
This commit is contained in:
parent
f89badcd12
commit
d55a993cfd
@ -20,7 +20,7 @@
|
|||||||
%tr
|
%tr
|
||||||
%th
|
%th
|
||||||
%th{:rowspan => 2} Nombre de participation
|
%th{:rowspan => 2} Nombre de participation
|
||||||
-@m_odr_reps.group(:state).each do |state|
|
-@m_odr_reps.group(:state).where(:state => ["Virement envoyé", "Demande validée"]).each do |state|
|
||||||
%th{:style => "font-weight:normal", :colspan => 5+(@m_odr.m_odr_brands.count*2)+(@m_odr.m_odr_products.count*2)}
|
%th{:style => "font-weight:normal", :colspan => 5+(@m_odr.m_odr_brands.count*2)+(@m_odr.m_odr_products.count*2)}
|
||||||
Etat :
|
Etat :
|
||||||
=state_helper state.state
|
=state_helper state.state
|
||||||
@ -28,7 +28,7 @@
|
|||||||
%tr
|
%tr
|
||||||
%th
|
%th
|
||||||
|
|
||||||
-@m_odr_reps.group(:state).each do |state|
|
-@m_odr_reps.group(:state).where(:state => ["Virement envoyé", "Demande validée"]).each do |state|
|
||||||
%th Nbr participation
|
%th Nbr participation
|
||||||
%th Nbr pneus
|
%th Nbr pneus
|
||||||
|
|
||||||
@ -62,7 +62,7 @@
|
|||||||
%tr
|
%tr
|
||||||
%td Général
|
%td Général
|
||||||
%td=m_odr_reps.count
|
%td=m_odr_reps.count
|
||||||
-@m_odr_reps.group(:state).each do |state|
|
-@m_odr_reps.group(:state).where(:state => ["Virement envoyé", "Demande validée"]).each do |state|
|
||||||
%td
|
%td
|
||||||
=m_odr_reps.where(:state => state.state).count
|
=m_odr_reps.where(:state => state.state).count
|
||||||
%td
|
%td
|
||||||
@ -93,7 +93,7 @@
|
|||||||
%tr
|
%tr
|
||||||
%td=place.m_odr_place.name
|
%td=place.m_odr_place.name
|
||||||
%td=m_odr_reps.count
|
%td=m_odr_reps.count
|
||||||
-@m_odr_reps.group(:state).each do |state|
|
-@m_odr_reps.group(:state).where(:state => ["Virement envoyé", "Demande validée"]).each do |state|
|
||||||
%td
|
%td
|
||||||
=p = m_odr_reps.where(:state => state.state).count
|
=p = m_odr_reps.where(:state => state.state).count
|
||||||
-nbr_participations_for_places << p if p > 0
|
-nbr_participations_for_places << p if p > 0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user