Добавлен твиттер на главную и индек в протокол

app/assets/stylesheets/application.css.scss

@@ -12,6 +12,10 @@ body{
 //  padding-top: 90px;
 }
 
+h1,h2,h3,h4 {
+  padding-top: 0.5em;
+}
+
 .container {
   padding: 0 25px;
 }
@@ -96,4 +100,15 @@ a.brand:hover { text-decoration: underline }
 
 //form .clearfix:before, form .clearfix:after {
 //  display: inline;
-//}
+//}
+
+// Twitter embeded
+
+div.twtr-widget div.twtr-tweet-wrap {
+  padding-left: 0px;
+}
+
+img.twtr-profile-img,.twtr-ft a img, .twtr-widget h3, .twtr-ft div, div.twtr-hd {
+  display:none;
+}
+

app/controllers/home_controller.rb

@@ -6,7 +6,7 @@ def index
     @checked_count_2 = Protocol.where('priority = 1 and commission_id >= 200000').size
     @unchecked_count_2 = Protocol.where('priority > 1 and commission_id >= 200000').size
 #    @protocols_new = Protocol.joins('INNER JOIN commissions c ON c.id = Protocols.commission_id').where("priority = 1 and commission_id >=200000").limit(40).all(:order => "created_at")
-    @protocols_new = Protocol.includes(:commission).where("priority = 1 and commission_id >=200000").limit(20).all(:order => "created_at")
+    @protocols_new = Protocol.includes(:commission).where("priority = 1 and commission_id >=200000").limit(18).all(:order => "created_at")
 
     @users_count = User.count
   end

app/models/commission.rb

@@ -144,7 +144,7 @@ def self.voting_table(commission)
     p.save
     commission.state ||= Hash.new
     commission.state[:uik] = p.votings
-    return commission.save if karik = commission.protocols.find_by_priority(1)
+    return commission.save unless karik = commission.protocols.find_by_priority(1)
     #Обновление кэша
     conflict = false
     karik.votings.each_with_index do |v,i|

app/views/commissions/_commissions_region.html.haml

@@ -11,27 +11,46 @@
   .span9
     %div.navigation-holder
       %a.show-navigation{:href=>"#"}
-        = @commission.name
+        Содержание
+        -#@commission.name
       %div.tree-navigation
-        %br
-    - @commission.subtree.where(:is_uik => false).all.each do |c|
+    - if c = @commission
+      %div.tree-node-holder{"id" => c.id, "class" => "depth-#{c.depth}"}
+        %div.node-name
+          %div.name
+            %h3{"id"=>c.id,"data-depth"=>c.depth}
+              - if c.uik_holder
+                %a.load-new.ajax{ :href => "##{c.id}" }
+                  =raw "#{c.name} "
+                %sup
+                  %small{:title => "собрано протоколов / всего протоколов"}
+                    - if (c_size = c.descendants.where('votes_taken=true').size) > 0
+                      = "#{c_size}/#{c.descendants.size} " 
+              - else
+                =raw "#{c.name} "
+                %sup
+                  %small= link_to('цик', c.url)
+        - if c.uik_holder
+          %div.votings{"data-id"=>c.id, "data-loaded"=>"false", "data-url"=>"/uik/#{c.id}"}
+            %div.loading
+              = image_tag('ajax-loader.gif')
+    - @commission.descendants.where(:is_uik => false).all.each do |c|
       -# if c.depth != @commission.depth
       %div.tree-node-holder{"id" => c.id, "class" => "depth-#{c.depth}"}
         %div.node-name
           %div.name
             %h3{"id"=>c.id,"data-depth"=>c.depth}
               - if c.uik_holder
                 %a.load-new.ajax{ :href => "##{c.id}" }
-                  = c.name
+                  =raw "#{c.name} "
                 %sup
                   %small{:title => "собрано протоколов / всего протоколов"}
                     - if (c_size = c.descendants.where('votes_taken=true').size) > 0
                       = "#{c_size}/#{c.descendants.size}" 
               - else
-                = c.name
+                =raw "#{c.name} "
                 %sup
                   %small= link_to('цик', c.url)
-          .clearfix
         - if c.uik_holder
           %div.votings{"data-id"=>c.id, "data-loaded"=>"false", "data-url"=>"/uik/#{c.id}"}
             %div.loading

app/views/home/index.html.haml

@@ -62,7 +62,40 @@
                 %sup
                   %small.green{:title => "В ожидании проверки"}= "(#{@unchecked_count_2})"
           .span4
-            %h2 Живая лента
+            - if !social_enable
+              %h2
+                %a{:href=>'http://twitter.com/kariksu'} Твиттер
+              %div{:style => "height: 161px"}
+                %script{:charset=>"utf-8", :src=>"http://widgets.twimg.com/j/2/widget.js"}
+                %script(type="text/javascript")
+                  :plain
+                    new TWTR.Widget({
+                      version: 2,
+                      type: 'profile',
+                      rpp: 6,
+                      interval: 30000,
+                      width: 300,
+                      height: 100,
+                      theme: {
+                        shell: {
+                          background: '#ffffff',
+                          color: '#000000'
+                        },
+                        tweets: {
+                          background: '#ffffff',
+                          color: '#4a404a',
+                          links: '#1f3885'
+                        }
+                      },
+                      features: {
+                        scrollbar: true,
+                        loop: false,
+                        live: false,
+                        behavior: "all"
+                      }
+                    }).render().setUser("KarikSu").start();
+
+            %h2 Новые протоколы
             %table.voting-table.table
               %tr
                 %th{:width => "100px"}

console.rb

@@ -54,7 +54,30 @@
   end
 end
 
-
+# загрузка структуры уиков
 Commission.roots.each do |c|
   Commission.get_children(c)
 end
+
+#стягивание всех данных по голосованиям с сайта ЦИК
+cs = Commission.where("voting_table_url IS NOT NULL and election_id=2").size
+Parallel.each(cs, :in_threads => 8){ |c| Commission.voting_table(c) }
+
+#особое обновление, кеширования - разовый случай
+Commission.where("election_id=2 and voting_table_url IS NOT NULL and state NOT LIKE '%:uik%'").each do |commission|
+  if commission.voting_table_url and uik = commission.protocols.find_by_priority(0)
+    commission.state ||= Hash.new
+    commission.state[:uik] = uik.votings
+    if karik = commission.protocols.find_by_priority(1)
+      #Обновление кэша
+      conflict = false
+      karik.votings.each_with_index do |v,i|
+        # karik.size-1 так как неучитываем последгний столбец с кол заявлений
+        conflict = true if commission.state[:checked][i] != commission.state[:uik][i] and i != karik.size-1 
+      end
+      commission.conflict = conflict
+      commission.votes_taken = true
+    end 
+    commission.save
+  end
+end

db/migrate/20120310063911_add_commission_index_to_protocol.rb

@@ -0,0 +1,5 @@
+class AddCommissionIndexToProtocol < ActiveRecord::Migration
+  def change
+    add_index :protocols, :commission_id
+  end
+end