X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fsheet_panel.rb;h=591b2596689f4b19c50e6a7e5f63f1ed21dddb04;hb=29654349cc488148f053ec0bc973cd537cd6aaa8;hp=28944840933b84171b7ba3f3163af8c866d19eb1;hpb=a139b5ea7fe0f0cefa75e4fc64d8aa33029dedc4;p=pettanr%2Fpettanr.git

diff --git a/app/models/sheet_panel.rb b/app/models/sheet_panel.rb
index 28944840..591b2596 100644
--- a/app/models/sheet_panel.rb
+++ b/app/models/sheet_panel.rb
@@ -1,18 +1,21 @@
 class SheetPanel < Peta::Element
   load_manifest
-  belongs_to :author
   belongs_to :panel
   belongs_to :sheet
   accepts_nested_attributes_for :panel, :allow_destroy => true
+  #alias_attribute :attr_y, :y
   
   validates :sheet_id, :numericality => {:allow_blank => true}
   validates :panel_id, :numericality => {:allow_blank => true}
-  validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :x, :presence => true, :numericality => true
   validates :y, :presence => true, :numericality => true
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
+  def y
+    self.attributes['y']
+  end
+  
   def supply_default
     self.x = 15
     self.y = 15
@@ -27,63 +30,16 @@ class SheetPanel < Peta::Element
     end
   end
   
-  def overwrite operators
-    return false unless operators.author
-    self.author_id = operators.author.id
-  end
-  
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
-  def self.list_where
-    'sheets.visible > 0'
-  end
-  
-  def self.list_order
-    'sheet_panels.updated_at desc'
-  end
-  
-  def self.play_list_where cid
-    ['sheet_panels.sheet_id = ?', cid]
-  end
-  
-  def self.play_list sheet, author
-    SheetPanel.where(self.play_list_where(sheet.id)).includes(SheetPanel.list_opt).order('sheet_panels.t')
-  end
-  
-  def self.list_opt
+  def self.by_author_list_includes
     {
-      :author => {}, 
       :sheet => {
         :author => {}
-      }, 
-      :panel => {
-        :author => {}, 
-        :panel_pictures => {:picture => {:artist => {}, :license => {}}}, 
-        :speech_balloons =>{:balloon => {}, :speech => {}}
       }
     }
   end
   
-  def self.list_json_opt
-    {:include => {
-      :author => {}, 
-      :sheet => {
-        :author => {}
-      }, 
-      :panel => {
-        :author => {}, 
-        :panel_pictures => {:picture => {:artist => {}, :license => {}}}, 
-        :speech_balloons =>{:balloon => {}, :speech => {}}
-      }
-    }}
-  end
-  
   def self.show_opt
     {:include => {
-      :author => {}, 
       :sheet => {
         :author => {}
       }, 
@@ -101,11 +57,11 @@ class SheetPanel < Peta::Element
   
   def sheet_panel_as_json au
     panel_include = if self.panel and self.panel.visible?(au)
-      {:include => {:author => {}}, :methods => :elements}
+      {:include => {}, :methods => :elements}
     else
-      {:include => {:author => {}}}
+      {:include => {}}
     end
-    self.to_json({:include => {:sheet => {:include => {:author => {}}}, :author => {}, :panel => panel_include}})
+    self.to_json({:include => {:sheet => {:include => {:author => {}}}, :panel => panel_include}})
   end
   
   def self.list_as_json_text ary, au
@@ -163,76 +119,6 @@ class SheetPanel < Peta::Element
     end
   end
   
-  def self.new_t sheet_id
-    r = SheetPanel.max_t(sheet_id)
-    r.blank? ? 0 : r.to_i + 1
-  end
-  
-  def self.max_t sheet_id
-    SheetPanel.maximum(:t, :conditions => ['sheet_id = ?', sheet_id])
-  end
-  
-  def self.find_t sheet_id, t
-    SheetPanel.find(:first, :conditions => ['sheet_id = ? and t = ?', sheet_id, t])
-  end
-  
-  def self.collect_t sheet_panel
-    r = SheetPanel.find(:all, :conditions => ['sheet_id = ?', sheet_panel.sheet_id], :order => 't')
-    r.map {|sp| sp.t}
-  end
-  
-  def self.serial? ary
-    i = 0
-    ary.compact.sort.each do |t|
-      break false unless t == i
-      i += 1
-    end
-    ary.compact.size == i
-  end
-  
-  def self.validate_t sheet_panel
-    SheetPanel.serial?(SheetPanel.collect_t(sheet_panel))
-  end
-  
-  def insert_shift
-    SheetPanel.update_all('t = t + 1', ['sheet_id = ? and t >= ?', self.sheet_id, self.t])
-  end
-  
-  def lesser_shift old_t
-    self.t = 0 if self.t < 0
-    SheetPanel.update_all('t = t + 1', ['sheet_id = ? and (t >= ? and t < ?)', self.sheet_id, self.t, old_t])
-  end
-  
-  def higher_shift old_t
-    nf = SheetPanel.find_t(self.sheet_id, self.t)
-    max_t = SheetPanel.max_t(self.sheet_id).to_i
-    self.t = max_t if self.t > max_t
-    SheetPanel.update_all('t = t - 1', ['sheet_id = ? and (t > ? and t <= ?)', self.sheet_id, old_t, self.t])
-  end
-  
-  def update_shift old_t
-    if self.t > old_t
-      higher_shift old_t
-    else
-      lesser_shift old_t
-    end
-  end
-  
-  def rotate old_t = nil
-    if self.new_record?
-      if self.t.blank?
-        self.t = SheetPanel.new_t self.sheet_id
-      else
-        self.insert_shift
-      end
-    else
-      if self.t.blank?
-      else
-        self.update_shift old_t
-      end
-    end
-  end
-  
   def allow? operators
     return nil if self.sheet_id == nil or self.panel_id == nil
     self.sheet.own?(operators) and self.panel.usable?(operators)
@@ -240,7 +126,7 @@ class SheetPanel < Peta::Element
   
   def store operators, old_t = nil
     res = false
-    SheetPanel.transaction do
+    self.class.transaction do
       case self.allow? operators
       when true
         self.rotate old_t
@@ -250,7 +136,7 @@ class SheetPanel < Peta::Element
       end
       res = self.save
       raise ActiveRecord::Rollback unless res
-      res = SheetPanel.validate_t(self) 
+      res = self.class.validate_t(self.sheet_id) 
       unless res
         self.errors.add :t, 'unserialized'
         raise ActiveRecord::Rollback 
@@ -259,14 +145,4 @@ class SheetPanel < Peta::Element
     res
   end
   
-  def destroy_and_shorten
-    res = false
-    SheetPanel.transaction do
-      SheetPanel.update_all('t = t - 1', ['sheet_id = ? and (t > ?)', self.sheet_id, self.t])
-      raise ActiveRecord::Rollback unless self.destroy
-      res = true
-    end
-    res
-  end
-  
 end