From d55a993cfdfb6cc20e056b4f691eeb2aa60e264e Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Tue, 29 Sep 2020 12:44:37 +0200 Subject: [PATCH] suite --- app/views/admin/m_odrs/stats.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/m_odrs/stats.html.haml b/app/views/admin/m_odrs/stats.html.haml index 38496eb..910c17c 100644 --- a/app/views/admin/m_odrs/stats.html.haml +++ b/app/views/admin/m_odrs/stats.html.haml @@ -20,7 +20,7 @@ %tr %th %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)} Etat : =state_helper state.state @@ -28,7 +28,7 @@ %tr %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 pneus @@ -62,7 +62,7 @@ %tr %td Général %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 =m_odr_reps.where(:state => state.state).count %td @@ -93,7 +93,7 @@ %tr %td=place.m_odr_place.name %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 =p = m_odr_reps.where(:state => state.state).count -nbr_participations_for_places << p if p > 0