X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fspeech.rb;h=7f31064282384f95bc06a8fec7f2e40508eb40fd;hb=fd5eb13471c55b0a27e751c3b28f402d23e5b436;hp=d47fd5f72b86cc76b194208617e1e0b3551f8549;hpb=976ce8a68ee812802120e66fc8e67fb1aba97a35;p=pettanr%2Fpettanr.git

diff --git a/app/models/speech.rb b/app/models/speech.rb
index d47fd5f7..7f310642 100644
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -1,4 +1,5 @@
 class Speech < ActiveRecord::Base
+  include ElementPart
   belongs_to :speech_balloon
   belongs_to :writing_format
   
@@ -25,6 +26,14 @@ class Speech < ActiveRecord::Base
     end
   end
   
+  def self.colum_structures
+    @@colum_structures ||= {
+      :fore_color => {
+        :helper => 'panels/color_helper'
+      }
+    }
+  end
+  
   def supply_default
     self.x = 0
     self.y = 0
@@ -42,67 +51,18 @@ class Speech < ActiveRecord::Base
     self.speech_balloon.panel.visible? roles
   end
   
-  def new_speech_balloon
-    @new_speech_balloon
-  end
-  
-  def new_speech_balloon= v
-    @new_speech_balloon = v
-  end
-  
-  def get_speech_balloon
-    self.speech_balloon || @new_speech_balloon
-  end
-  
-  def get_panel_id
-    if self.get_speech_balloon == nil or self.get_speech_balloon.panel == nil or self.get_speech_balloon.panel.new_record?
-      0
-    else
-      self.get_speech_balloon.panel.id
-    end
-  end
-  
-  def tag_id c = nil
-    'panel' + tag_panel_id + tag_element_type + tag_element_id + tag_element_part_type + tag_element_part_id + c.to_s
-  end
-  
-  def field_tag_id f
-    self.tag_id + f.to_s
-  end
-  
-  def tag_panel_id
-    self.get_panel_id.to_s
-  end
-  
-  def tag_element_id
-    r = if self.get_speech_balloon == nil or self.get_speech_balloon.new_record?
-      0
-    else
-      self.get_speech_balloon.id
-    end
-    r.to_s
+  def symbol_option
+    self.get_parent.speech_balloon_template.symbol_option
   end
   
-  def tag_element_type
-    'speech_balloon'
-  end
-  
-  def tag_element_part_id
-    self.new_record? ? '0' : self.id.to_s
+  def get_parent
+    self.speech_balloon || @new_parent
   end
   
   def tag_element_part_type
     'speech'
   end
   
-  def tag_new_index
-    if self.get_speech_balloon == nil
-      nil
-    else
-      self.get_speech_balloon.tag_new_index
-    end
-  end
-  
   def text_align_text
     @@text_align_texts[self.text_align]
   end
@@ -128,16 +88,36 @@ class Speech < ActiveRecord::Base
     page_size
   end
   
+  def self.list_where
+    'panels.publish > 0'
+  end
+  
   def self.list page = 1, page_size = self.default_page_size
-    opt = {}
-    opt.merge!(Speech.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => 'panels.publish > 0', :order => 'speeches.updated_at desc'})
-    Speech.find(:all, opt)
+    Speech.where(self.list_where()).includes(Speech.list_opt).order('speeches.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(Speech.where(self.list_where()).includes(Speech.list_opt).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.list_by_speech_balloon_where speech_balloon_id
+    ['speeches.speech_balloon_id = ?', speech_balloon_id]
+  end
+  
+  def self.list_by_speech_balloon speech_balloon_id, roles, page = 1, page_size = self.default_page_size
+    self.where(self.list_by_speech_balloon_where(speech_balloon_id)).includes(self.list_opt).order('speeches.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.list_by_writing_format_where writing_format_id
+    ['speeches.writing_format_id = ?', writing_format_id]
+  end
+  
+  def self.list_by_writing_format writing_format_id, roles, page = 1, page_size = self.default_page_size
+    self.where(self.list_by_writing_format_where(writing_format_id)).includes(self.list_opt).order('speeches.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.list_opt
-    {:include => {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {}} }}
+    {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {}} }
   end
   
   def self.list_json_opt