X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fpanel_picture.rb;h=b28a0fcf0eb73c9715e3934edbf3be6984b36e17;hb=d5826180e2306c25db9c3714299ca26abff0ed8e;hp=3334405f774bb7d3ae8631f5afaed01b7b3f33b5;hpb=c3657f326edd98cafdb015ec62eef32851e1d129;p=pettanr%2Fpettanr.git

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index 3334405f..b28a0fcf 100644
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -32,15 +32,20 @@ class PanelPicture < ActiveRecord::Base
   end
   
   def supply_default
-    self.x = 0 if self.x.blank?
-    self.y = 0 if self.y.blank?
-    self.width = self.picture.width if self.width.blank? and self.picture
-    self.height = self.picture.height if self.height.blank? and self.picture
-    self.t = self.new_t if self.t.blank?
-    self.z = self.new_z if self.z.blank?
+    self.x = 0
+    self.y = 0
+    if self.picture
+      self.width = self.picture.width 
+      self.height = self.picture.height 
+    end
+    if self.panel
+      self.t = self.panel.new_t 
+      self.z = self.panel.new_z 
+    end
   end
   
-  def overwrite 
+  def overwrite  pid
+    self.panel_id = pid
   end
   
   def flip
@@ -57,9 +62,16 @@ class PanelPicture < ActiveRecord::Base
     '/pictures/' + self.filename
   end
   
-  def opt_img_tag opacity = nil
-    o = opacity ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
-    {:src => self.url, :vPicture => self.id, :width => self.width.abs, :height => self.height.abs, :alt => self.caption, :style => "top:#{self.y}px; left:#{self.x}px; z-index:#{self.z}; #{o}"}
+  def opt_div_style
+    "z-index:#{self.z}; "
+  end
+  
+  def opt_img_tag spot = nil, opacity = 20
+    o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
+    {:id => self.tag_id(:img), :panel_id => self.tag_panel_id, :element_id => self.tag_element_id, :element_type => self.tag_element_type,
+    :class => "panel-picture", :vPicture => self.id, 
+    :src => self.url, :width => self.width.abs, :height => self.height.abs, :picture_id => self.picture_id, :ext => self.picture.ext, :alt => self.caption, 
+    :style => "top:#{self.y}px; left:#{self.x}px; z-index:#{self.z}; #{o}"}
   end
   
   def tmb_opt_img_tag
@@ -67,12 +79,28 @@ class PanelPicture < ActiveRecord::Base
     {:src => self.url, :width => tw, :height => th, :alt => self.caption}
   end
   
-  def new_t
-    self.panel.parts.size
+  def tag_id c = nil
+    'panel' + tag_panel_id + 'panel_picture' + tag_element_id + c.to_s
+  end
+  
+  def field_tag_id f
+    self.tag_id + f.to_s
+  end
+  
+  def tag_panel_id
+    self.panel.new_record? ? '0' : self.panel.id.to_s
   end
   
-  def new_z
-    self.panel.panel_elements.size + 1
+  def tag_element_id
+    self.new_record? ? '0' : self.id.to_s
+  end
+  
+  def tag_element_type
+    'panel_picture'
+  end
+  
+  def field_tree f
+    'panels-' + self.tag_panel_id + '-panel_pictures_attributes-' + self.tag_element_id + '-' + f.to_s
   end
   
   def self.default_page_size
@@ -96,32 +124,44 @@ class PanelPicture < ActiveRecord::Base
     page_size
   end
   
+  def self.list_where
+    'panels.publish > 0'
+  end
+  
+  def self.mylist_where au
+    ['panels.author_id = ?', au.id]
+  end
+  
+  def self.himlist_where au
+    ['panels.author_id = ? and panels.publish > 0', au.id]
+  end
+  
   def self.list page = 1, page_size = self.default_page_size
-    opt = {}
-    opt.merge!(PanelPicture.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => 'panels.publish > 0', :order => 'panel_pictures.updated_at desc'})
-    PanelPicture.find(:all, opt)
+    PanelPicture.where(self.list_where()).includes(PanelPicture.list_opt).order('panel_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.mylist au, page = 1, page_size = Author.default_panel_picture_page_size
-    opt = {}
-    opt.merge!(PanelPicture.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => ['panels.author_id = ?', au.id], :order => 'panel_pictures.updated_at desc'})
-    PanelPicture.find(:all, opt)
+    PanelPicture.where(self.mylist_where(au)).includes(PanelPicture.list_opt).order('panel_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.himlist au, page = 1, page_size = Author.default_panel_picture_page_size
-    opt = {}
-    opt.merge!(self.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => ['panels.author_id = ? and panels.publish > 0', au.id], :order => 'panel_pictures.updated_at desc'})
-    PanelPicture.find(:all, opt)
+    PanelPicture.where(self.himlist_where(au)).includes(PanelPicture.list_opt).order('panel_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.list_paginate page = 1, page_size = self.default_page_size
+    Kaminari.paginate_array(Array.new(PanelPicture.where(self.list_where()).includes(PanelPicture.list_opt).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.mylist_paginate au, page = 1, page_size = Author.default_panel_picture_page_size
+    Kaminari.paginate_array(Array.new(PanelPicture.where(self.mylist_where(au)).includes(PanelPicture.list_opt).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.himlist_paginate au, page = 1, page_size = Author.default_panel_picture_page_size
+    Kaminari.paginate_array(Array.new(PanelPicture.where(self.himlist_where(au)).includes(PanelPicture.list_opt).count, nil)).page(page).per(page_size)
   end
   
   def self.list_opt
-    {:include => {:panel => {:author => {}}, :picture => {:artist => {}, :license => {}}}}
+    {:panel => {:author => {}}, :picture => {:artist => {}, :license => {}} }
   end
   
   def self.list_json_opt
@@ -160,25 +200,22 @@ class PanelPicture < ActiveRecord::Base
   end
   
   def remove au
-    PanelPicture.transaction do
-      d = false
-      panel_pictures_attributes = {}
-      
-      self.panel.panel_pictures.each do |panel_picture|
-        attr = panel_picture.attributes
-        if panel_picture == self
-          attr['_destroy'] = true
-          d = true
-        else
-          if d
-            attr['t']  -= 1 
-          end
+    d = false
+    panel_pictures_attributes = {}
+    self.panel.panel_pictures.each do |panel_picture|
+      attr = panel_picture.attributes
+      if panel_picture == self
+        attr['_destroy'] = true
+        d = true
+      else
+        if d
+          attr['t']  -= 1 
         end
-        panel_pictures_attributes[panel_picture.id] = attr
       end
-      self.panel.attributes = {:panel_pictures_attributes => panel_pictures_attributes}
-      self.panel.store({}, au)
+      panel_pictures_attributes[panel_picture.id] = attr
     end
+    self.panel.attributes = {:panel_pictures_attributes => panel_pictures_attributes}
+    self.panel.store({}, au)
   end
   
   def scenario