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!(self.list_opt)
- opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
- opt.merge!({:conditions => 'panels.publish > 0', :order => 'panels.updated_at desc'})
- Panel.find(:all, opt)
+ Panel.where(self.list_where()).includes(Panel.list_opt).order('panels.updated_at desc').offset((page -1) * page_size).limit(page_size)
end
def self.mylist au, page = 1, page_size = Author.default_panel_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 = ?', au.id], :order => 'panels.updated_at desc'})
- Panel.find(:all, opt)
+ Panel.where(self.mylist_where(au)).includes(Panel.list_opt).order('panels.updated_at desc').offset((page -1) * page_size).limit(page_size)
end
def self.himlist au, page = 1, page_size = Author.default_panel_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 => 'panels.updated_at desc'})
- Panel.find(:all, opt)
+ Panel.where(self.himlist_where(au)).includes(Panel.list_opt).order('panels.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(Panel.where(self.list_where()).count, nil)).page(page).per(page_size)
+ end
+
+ def self.mylist_paginate au, page = 1, page_size = Author.default_panel_page_size
+ Kaminari.paginate_array(Array.new(Panel.where(self.mylist_where(au)).count, nil)).page(page).per(page_size)
+ end
+
+ def self.himlist_paginate au, page = 1, page_size = Author.default_panel_page_size
+ Kaminari.paginate_array(Array.new(Panel.where(self.himlist_where(au)).count, nil)).page(page).per(page_size)
end
def self.list_opt
- {:include => {
+ {
:panel_pictures => {
:picture => {:artist => {}, :license => {}}
},
- :speech_balloons => {:balloons => {}, :speeches => {}},
+ :speech_balloons => {:balloon => {}, :speech => {}},
:ground_pictures => {
:picture => {:artist => {}, :license => {}}
},
:ground_colors => {
},
:author => {}
- }}
+ }
end
def self.show rid, roles
:panel_pictures => {
:picture => {:artist => {}, :license => {}}
},
- :speech_balloons => {:balloons => {}, :speeches => {}},
+ :speech_balloons => {:balloon => {}, :speech => {}},
:ground_pictures => {
:picture => {:artist => {}, :license => {}}
},
end
def parts_element
- ((self.panel_pictures || []) + (self.speech_balloons || [])).compact
+ ((self.panel_pictures || []) + (self.speech_balloons || []) + (self.ground_colors || []) + (self.ground_pictures || [])).compact
end
def parts
res
end
- def grounds
- ((self.ground_colors || []) + (self.ground_pictures || [])).compact
- end
-
def panel_elements
- parts + grounds
+ parts
end
@@elm_json_opt = {
'PanelPicture' => {
:picture => {:artist => {}, :license => {}}
},
- 'SpeechBalloon' => {:balloons => {}, :speeches => {}},
+ 'SpeechBalloon' => {:balloon => {}, :speech => {}},
'GroundPicture' => {
:picture => {:artist => {}, :license => {}}
},
'[' + ary.map {|i| i.panel_elements_as_json }.join(',') + ']'
end
+ def new_t
+ self.parts.size
+ end
+
+ def new_z
+ self.parts.size + 1
+ end
+
def scenario
panel_elements.map { |e|
e.scenario
}.flatten
end
- def self.validate_t ary
- i = 0
- ary.compact.sort.each do |t|
- break false unless t == i
+ def self.validate_serial ary, offset = 0
+ i = offset
+ ary.compact.sort.each do |n|
+ break false unless n == i
i += 1
end
- ary.compact.size == i
+ ary.compact.size == i - offset
end
- def self.validate_element_t elements, name
- Panel.validate_t(Panel.collect_element_value(elements, name))
+ def self.validate_element_serial elements, name, offset = 0
+ Panel.validate_serial(Panel.collect_element_value(elements, name), offset)
end
- def self.validate_elements_t c
+ def self.validate_elements_serial c
c.map {|conf|
- Panel.validate_element_t(conf[:elements], conf[:name]) ? nil : false
+ Panel.validate_element_serial(conf[:elements], conf[:name], conf[:offset]) ? nil : false
}.compact.empty?
end
- def validate_t_list
+ def validate_serial_list
[
- {:elements => [self.panel_pictures, self.speech_balloons], :name => :t}
+ {:elements => [self.panel_pictures, self.speech_balloons, self.ground_colors, self.ground_pictures], :name => :t, :offset => 0},
+ {:elements => [self.panel_pictures, self.speech_balloons, self.ground_colors, self.ground_pictures], :name => :z, :offset => 1}
]
end
def validate_child
# r1 = Panel.validate_elements_id validate_id_list
- Panel.validate_elements_t validate_t_list
+ Panel.validate_elements_serial validate_serial_list
end
def store attr, au
def destroy_with_elements
res = false
Panel.transaction do
- self.panel_elements.each do |element|
+ self.parts_element.each do |element|
raise ActiveRecord::Rollback unless element.destroy
end
raise ActiveRecord::Rollback unless self.destroy