Merge branch 'master' of github.com:OPORA/publicwhip-drohobych

OPORA · May 30, 2018 · f50ef7d · f50ef7d
2 parents 0a06ad0 + 23c0452
commit f50ef7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
@@ -7,7 +7,7 @@ def init
     end
   end
   def divisions
-    @divisions = Division.all
+    @divisions = Division.all.order(date: :desc)
     div =  @divisions.page(params[:page])
     current = div.current_page
     total = div.total_pages

diff --git a/lib/tasks/deputi_cashe.rake b/lib/tasks/deputi_cashe.rake
@@ -35,14 +35,14 @@ namespace :deputi_cashe do
   end
   desc "Update mp cashe"
   task mp: :environment do
-    @mp = Mp.all
+    @mp = Mp.where(end_date: '9999-12-31')
       @mp.each do |m|
       if Mp.where(faction: m.faction, end_date: '9999-12-31').count >= 5
         rebellions = Division.joins(:whips, :votes).where('votes.deputy_id = ?', m.id ).where('whips.party = ?', m.faction).where("votes.vote != 'absent'").where('votes.vote != whips.whip_guess').count
       else
         rebellions = nil
       end
-      v =  Vote.where(deputy_id: m.id).map {|v| v}
+      v =  Vote.joins(:mp).where("mps.deputy_id = ?", m.deputy_id).map {|v| v}
       hash = {
           not_voted: v.count{|v| v.vote == "not_voted"},
           absent: v.count{|v| v.vote == "absent"},