solved conflict for member_new_ui
This commit is contained in:
Spen authored and 
saurabhbhatia committed
1 parent
9c7558847a
commit
6c514770bc
92 files changed
+3204
-2102
No files matched your search
@@ -8,6 +8,8 @@ module AttributeFieldsHelper
|
||||
include ActionView::Context
|
||||
include OrbitBasis::RenderAnywhere
|
||||
|
||||
include OrbitFormHelper
|
||||
|
||||
def block_helper(user,index,disable = false)
|
||||
unless self.disabled
|
||||
@index = index
|
||||
@@ -49,24 +51,82 @@ module AttributeFieldsHelper
|
||||
@prefiled_value ||=[]
|
||||
control_group_wrapper do
|
||||
a = self[:option_list].collect do |key,value|
|
||||
label_tag(key,check_box_tag(get_field_name_base+"[#{key}]", true , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
|
||||
label_tag(key,check_box_tag(get_field_name_base+"[#{key}]", true , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"checkbox inline"))
|
||||
end.join rescue ""
|
||||
end
|
||||
end
|
||||
|
||||
def render_date
|
||||
|
||||
d = DateTime.now()
|
||||
|
||||
if date_is_range?
|
||||
fill_from = @attribute_value.get_date(:from) rescue nil
|
||||
fill_to = @attribute_value.get_date(:to) rescue nil
|
||||
# fill_from = @attribute_value.get_date(:from) rescue nil
|
||||
# fill_to = @attribute_value.get_date(:to) rescue nil
|
||||
control_group_wrapper do
|
||||
buf = date_select(get_field_name_base+'[from]',nil,@markup_options.merge(:default=>fill_from),:class=>"input-small")
|
||||
buf << ' ~ '
|
||||
buf << date_select(get_field_name_base+'[to]',nil,@markup_options.merge(:default=>fill_to),:class=>"input-small")
|
||||
|
||||
case self.typeC['format']
|
||||
when 'format1'
|
||||
fill_from = (@prefiled_value && @prefiled_value["from"] ) ? @prefiled_value["from"] : d.strftime("%Y/%m/%d %H:%M")
|
||||
fill_to = (@prefiled_value && @prefiled_value["to"] ) ? @prefiled_value["to"] : d.strftime("%Y/%m/%d %H:%M")
|
||||
buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy/MM/dd hh:mm', true)
|
||||
buf << ' ~ '
|
||||
buf << datetime_picker(get_field_name_base+'[to]', fill_to, 'yyyy/MM/dd hh:mm', true)
|
||||
when 'format2'
|
||||
fill_from = (@prefiled_value && @prefiled_value["from"] ) ? @prefiled_value["from"] : d.strftime("%Y/%m/%d")
|
||||
fill_to = (@prefiled_value && @prefiled_value["to"] ) ? @prefiled_value["to"] : d.strftime("%Y/%m/%d")
|
||||
buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy/MM/dd')
|
||||
buf << ' ~ '
|
||||
buf << datetime_picker(get_field_name_base+'[to]', fill_to, 'yyyy/MM/dd')
|
||||
when 'format3'
|
||||
fill_from = (@prefiled_value && @prefiled_value["from"] ) ? @prefiled_value["from"] : d.strftime("%Y/%m")
|
||||
fill_to = (@prefiled_value && @prefiled_value["to"] ) ? @prefiled_value["to"] : d.strftime("%Y/%m/")
|
||||
buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy/MM')
|
||||
buf << ' ~ '
|
||||
buf << datetime_picker(get_field_name_base+'[to]', fill_to, 'yyyy/MM')
|
||||
when 'format4'
|
||||
fill_from = (@prefiled_value && @prefiled_value["from"] ) ? @prefiled_value["from"] : d.strftime("%Y")
|
||||
fill_to = (@prefiled_value && @prefiled_value["to"] ) ? @prefiled_value["to"] : d.strftime("%Y")
|
||||
buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy')
|
||||
buf << ' ~ '
|
||||
buf << datetime_picker(get_field_name_base+'[to]', fill_to, 'yyyy')
|
||||
end
|
||||
|
||||
# buf = date_select(get_field_name_base+'[from]',nil,@markup_options.merge(:default=>fill_from),:class=>"input-small")
|
||||
# buf << ' ~ '
|
||||
# buf << date_select(get_field_name_base+'[to]',nil,@markup_options.merge(:default=>fill_to),:class=>"input-small")
|
||||
buf
|
||||
end
|
||||
else
|
||||
@prefiled_value = @attribute_value.get_date
|
||||
control_group_wrapper{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
|
||||
# @prefiled_value = @attribute_value.get_date
|
||||
# @prefiled_value = @attribute_value.get_date
|
||||
|
||||
case self.typeC['format']
|
||||
when 'format1'
|
||||
tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m/%d %H:%M")), 'yyyy/MM/dd hh:mm', true)
|
||||
when 'format2'
|
||||
tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m/%d")), 'yyyy/MM/dd')
|
||||
when 'format3'
|
||||
tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m")), 'yyyy/MM')
|
||||
when 'format4'
|
||||
tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy')
|
||||
end
|
||||
|
||||
control_group_wrapper{tmp}
|
||||
# control_group_wrapper{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
def datetime_picker(object_name, value, format, time=false)
|
||||
content_tag :div, :class => "input-append datetimepick", "data-date-format"=>format, "data-picktime"=>"#{time}" do
|
||||
concat text_field_tag(object_name, value, :placeholder=>format)
|
||||
concat (content_tag :span, :class => 'add-on clearDate' do
|
||||
content_tag :i, nil, :class => 'icons-cross-3'
|
||||
end)
|
||||
concat (content_tag :span, :class => 'add-on iconbtn' do
|
||||
content_tag :i, nil, 'data-time-icon' => 'icons-clock', 'data-date-icon' => 'icons-calendar', :class=>"icons-calendar"
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -78,7 +138,7 @@ module AttributeFieldsHelper
|
||||
@prefiled_value ||=[]
|
||||
control_group_wrapper do
|
||||
self[:option_list].collect do |key,value|
|
||||
label_tag(key,radio_button_tag(get_field_name_base, key , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>" radio inline"))
|
||||
label_tag(key,radio_button_tag(get_field_name_base, key , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"radio inline"))
|
||||
end.join
|
||||
end
|
||||
end
|
||||
@@ -100,64 +160,134 @@ module AttributeFieldsHelper
|
||||
|
||||
def render_text_field
|
||||
a = control_group_wrapper do |key,value|
|
||||
add_more_blank = can_add_more ? "[]" : ""
|
||||
add_more_blank = can_add_more ? "[]" : ""
|
||||
key_field = can_muti_lang_input? ? "[#{key}]" : ""
|
||||
place_holder= @panel_setting["placeholder"][key] rescue ''
|
||||
text_field_tag([get_field_name_base,add_more_blank,key_field].join, value,@markup_options.merge(:placeholder=>place_holder))
|
||||
end
|
||||
end
|
||||
|
||||
def date_is_range?
|
||||
is_range = "false"
|
||||
data = get_data
|
||||
if !data.nil?
|
||||
is_range = data['is_range'] if data.has_key? "is_range"
|
||||
end
|
||||
is_range == "true"
|
||||
end
|
||||
|
||||
def date_is_range?
|
||||
is_range = "false"
|
||||
data = get_data
|
||||
if !data.nil?
|
||||
is_range = data['is_range'] if data.has_key? "is_range"
|
||||
end
|
||||
is_range == "true"
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def lang_panel_tabbable_wrapper(add_more_params,&block)
|
||||
add_more_counter = ''
|
||||
content_tag :div,:class=>"tabbable" do
|
||||
tmp = content_tag :div,:class=> (add_more || self.markup=='address') ? "tab-content input-append" : "tab-content" do
|
||||
buff = VALID_LOCALES.collect do |key|
|
||||
value = @prefiled_value[key] rescue nil
|
||||
div_class_ary = ["tab-pane" ,"fade",key,get_pairing_tab_class({})]
|
||||
|
||||
if self.markup=='text_area' or self.markup=='address'
|
||||
|
||||
tmp1 = VALID_LOCALES.collect do |key|
|
||||
value = @prefiled_value[key] rescue nil
|
||||
# div_class_ary = ["tab-pane" ,"fade","#{get_pairing_tab_class({})}_#{key}"]
|
||||
div_class_ary = ["tab-pane" ,"fade"]
|
||||
|
||||
div_id = "#{get_pairing_tab_class({})}_#{key}"
|
||||
|
||||
if can_add_more
|
||||
add_more_value = add_more_params[0][:value]
|
||||
add_more_counter = add_more_params[0][:counter]
|
||||
value = add_more_value[key] rescue nil
|
||||
div_class_ary << "add_more_item_#{add_more_counter}"
|
||||
end
|
||||
|
||||
div_class = div_class_ary.join(" ")
|
||||
div_class << (key == I18n.locale.to_s ? " active in" : '')
|
||||
content_tag(:div,yield(key,value), :id=>div_id,:class=>div_class)
|
||||
end# of VALID_LOCALES.collect for tabed input
|
||||
|
||||
|
||||
if can_add_more
|
||||
add_more_value = add_more_params[0][:value]
|
||||
add_more_counter = add_more_params[0][:counter]
|
||||
value = add_more_value[key] rescue nil
|
||||
div_class_ary << "add_more_item_#{add_more_counter}"
|
||||
end
|
||||
|
||||
div_class = div_class_ary.join(" ")
|
||||
div_class << (key == I18n.locale.to_s ? " active in" : '')
|
||||
content_tag(:div,yield(key,value),:class=>div_class)
|
||||
end# of VALID_LOCALES.collect for tabed input
|
||||
buff << link_to((content_tag :i,'',:class=>'icon-edit'),"##{get_pairing_tab_class({})}_m_window",:class=>'btn edit-btn',:type=>'button',:data=>{:toggle=>"modal"}) if self.markup == 'address'
|
||||
buff << link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn removeInput") if self.add_more
|
||||
|
||||
buff.join('').html_safe
|
||||
end
|
||||
tmp << content_tag(:ul,:class=> 'nav nav-pills') do
|
||||
VALID_LOCALES.each.collect do |key|
|
||||
tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do
|
||||
buff2 = VALID_LOCALES.each.collect do |key|
|
||||
# link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
|
||||
link_entry_ary = [".#{get_pairing_tab_class({})}",".#{key}"]
|
||||
link_entry_ary = ["##{get_pairing_tab_class({})}","_#{key}"]
|
||||
link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
|
||||
link_entry = link_entry_ary.join
|
||||
content_tag(:li,link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil),:for=>key)
|
||||
end.join.html_safe # of VALID_LOCALES.collect for tabs
|
||||
end # of content ul
|
||||
link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"},:class=>"btn #{(key == I18n.locale.to_s ? "active" : nil)}",:for=>key)
|
||||
end # of VALID_LOCALES.collect for tabs
|
||||
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-edit'),"##{get_pairing_tab_class({})}_m_window", :role=>"button",:class=>'btn',:data=>{:toggle=>"modal"}) if self.markup == 'address'
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn remove-input") if self.add_more
|
||||
buff2.join.html_safe
|
||||
end # of content ul
|
||||
|
||||
|
||||
tmp = content_tag :div,:class=> "tab-content textarea-lang" do
|
||||
tmp2 << tmp1.join('').html_safe
|
||||
end
|
||||
|
||||
else
|
||||
|
||||
# tmp = content_tag :div,:class=> (add_more || self.markup=='address') ? "input-append" : "tab-content" do
|
||||
tmp1 =
|
||||
content_tag :div,:class=> "tab-content" do
|
||||
|
||||
buff = VALID_LOCALES.collect do |key|
|
||||
value = @prefiled_value[key] rescue nil
|
||||
# div_class_ary = ["tab-pane" ,"fade","#{get_pairing_tab_class({})}_#{key}"]
|
||||
div_class_ary = ["tab-pane" ,"fade"]
|
||||
|
||||
div_id = "#{get_pairing_tab_class({})}_#{key}"
|
||||
|
||||
|
||||
if can_add_more
|
||||
add_more_value = add_more_params[0][:value]
|
||||
add_more_counter = add_more_params[0][:counter]
|
||||
value = add_more_value[key] rescue nil
|
||||
div_class_ary << "add_more_item_#{add_more_counter}"
|
||||
end
|
||||
|
||||
div_class = div_class_ary.join(" ")
|
||||
div_class << (key == I18n.locale.to_s ? " active in" : '')
|
||||
content_tag(:div,yield(key,value), :id=>div_id,:class=>div_class)
|
||||
end# of VALID_LOCALES.collect for tabed input
|
||||
|
||||
buff.join('').html_safe
|
||||
|
||||
end
|
||||
|
||||
tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do
|
||||
buff2 = VALID_LOCALES.each.collect do |key|
|
||||
# link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
|
||||
link_entry_ary = ["##{get_pairing_tab_class({})}","_#{key}"]
|
||||
link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
|
||||
link_entry = link_entry_ary.join
|
||||
link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"},:class=>"btn #{(key == I18n.locale.to_s ? "active" : nil)}",:for=>key)
|
||||
end # of VALID_LOCALES.collect for tabs
|
||||
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-edit'),"##{get_pairing_tab_class({})}_m_window", :role=>"button",:class=>'btn',:data=>{:toggle=>"modal"}) if self.markup == 'address'
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn remove-input") if self.add_more
|
||||
buff2.join.html_safe
|
||||
end # of content ul
|
||||
|
||||
|
||||
|
||||
tmp = content_tag :div,:class=> "input-append" do
|
||||
tmp1 << tmp2
|
||||
end
|
||||
|
||||
# tmp << content_tag(:ul,:class=> 'nav nav-pills') do
|
||||
# VALID_LOCALES.each.collect do |key|
|
||||
# # link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
|
||||
# link_entry_ary = [".#{get_pairing_tab_class({})}",".#{key}"]
|
||||
# link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
|
||||
# link_entry = link_entry_ary.join
|
||||
# content_tag(:li,link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil),:for=>key)
|
||||
# end.join.html_safe # of VALID_LOCALES.collect for tabs
|
||||
# end # of content ul
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
def controls_wrapper(*add_more_params,&block)
|
||||
content_tag :div,:class=>'controls' do
|
||||
result = ''
|
||||
add_more_counter = ""
|
||||
|
||||
@@ -171,12 +301,15 @@ protected
|
||||
if can_muti_lang_input?
|
||||
result << lang_panel_tabbable_wrapper(add_more_params,&block)
|
||||
result << gen_modal_dialog if self.markup == "address"
|
||||
|
||||
# result << add_more_unt if can_add_more
|
||||
else #cross lang field
|
||||
|
||||
case can_add_more
|
||||
when true
|
||||
value = add_more_params[0][:value]
|
||||
result << content_tag(:div,:class=>"input-append"){yield(nil,value) + link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn removeInput") }
|
||||
result << content_tag(:div,:class=>"input-append"){yield(nil,value) + link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn remove-input") }
|
||||
# result << add_more_unt
|
||||
else
|
||||
value = @prefiled_value
|
||||
result << yield(nil,value)
|
||||
@@ -186,54 +319,77 @@ protected
|
||||
end
|
||||
|
||||
result.html_safe
|
||||
end # of controls div
|
||||
|
||||
end # of def controls_wrapper(&block)
|
||||
|
||||
def control_group_wrapper(&block)
|
||||
div_class = can_muti_lang_input? ? "control-group language-swich" : "control-group"
|
||||
div_class = can_muti_lang_input? ? "control-group" : "control-group"
|
||||
# div_class = can_muti_lang_input? ? "control-group language-swich" : "control-group"
|
||||
result =""
|
||||
case self.markup
|
||||
when "text_field"
|
||||
if can_add_more
|
||||
multipleInput_ary = %w{multipleInput}
|
||||
add_more_seri = "add_more_group_#{id}"
|
||||
multipleInputs = content_tag :div,:class=> multipleInput_ary.join(' ') ,:ext_class=>get_pairing_tab_class({}) do
|
||||
@attribute_value.add_more_counter.times.collect do |t|
|
||||
controls_wrapper(:value=>(@prefiled_value[t] rescue nil),:counter=>t,&block)
|
||||
end.join('').html_safe # of add_more fields
|
||||
end # of div multipleInput editMore
|
||||
result = label + multipleInputs + add_more_unt
|
||||
# result = label + 一堆的輸入框(要用 multipleInput editMore 包起來) + add_more btn + hidden_fields
|
||||
else
|
||||
temp = label + controls_wrapper(&block)
|
||||
result = content_tag(:div,temp,:class=>div_class)
|
||||
end
|
||||
when "address"
|
||||
|
||||
address = content_tag :div,:class=>"multipleInput editMore" do
|
||||
controls_wrapper(&block)
|
||||
end # of div multipleInput editMore
|
||||
result = label + address
|
||||
case self.markup
|
||||
|
||||
when "text_field"
|
||||
|
||||
if can_add_more
|
||||
|
||||
multipleInputs =
|
||||
content_tag(:div,:class=>"add-target") do
|
||||
@attribute_value.add_more_counter.times.collect do |t|
|
||||
controls_wrapper(:value=>(@prefiled_value[t] rescue nil),:counter=>t,&block)
|
||||
end.join('').html_safe # of add_more fields
|
||||
end
|
||||
|
||||
|
||||
temp = label + content_tag(:div, multipleInputs + add_more_unt, :class=>'controls add-input')
|
||||
|
||||
result = content_tag(:div,temp,:class=>div_class)
|
||||
|
||||
# result = label + multipleInputs + add_more_unt
|
||||
# result = label + 一堆的輸入框(要用 multipleInput editMore 包起來) + add_more btn + hidden_fields
|
||||
else
|
||||
temp = label + content_tag(:div, controls_wrapper(&block), :class=>'controls')
|
||||
result = content_tag(:div,temp,:class=>div_class)
|
||||
|
||||
end
|
||||
|
||||
when "address"
|
||||
|
||||
# address = content_tag :div,:class=>"multipleInput editMore" do
|
||||
address = content_tag :div,:class=>"control-group" do
|
||||
label + content_tag(:div, controls_wrapper(&block), :class=>'controls')
|
||||
end # of div multipleInput editMore
|
||||
|
||||
result = address
|
||||
|
||||
else
|
||||
temp = label + controls_wrapper(&block)
|
||||
result = content_tag(:div,temp,:class=>div_class)
|
||||
temp = label + content_tag(:div, controls_wrapper(&block), :class=>'controls')
|
||||
result = content_tag(:div,temp,:class=>div_class)
|
||||
|
||||
end
|
||||
|
||||
result << end_block
|
||||
result.html_safe
|
||||
|
||||
end
|
||||
|
||||
|
||||
def add_more_unt
|
||||
def add_more_unt
|
||||
temp_field_name = get_basic_field_name_base + '[temp]'
|
||||
add_more = content_tag :div,:class=> 'controls' do
|
||||
content_tag :span,:class=> 'help-block' do
|
||||
content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus-sign"),"#",:class=>'addinput'
|
||||
add_more = content_tag :p,:class=> 'add-btn' do
|
||||
content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus"),"#","data-roles"=>"role_a",:class=>"trigger #{can_muti_lang_input? ? 'textLengInput' : 'textInput' } btn btn-small btn-primary"
|
||||
content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count")
|
||||
content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name")
|
||||
content
|
||||
end # of span
|
||||
end # of div
|
||||
# add_more = content_tag :div,:class=> 'controls' do
|
||||
# content_tag :span,:class=> 'help-block' do
|
||||
# content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus-sign"),"#",:class=>'addinput'
|
||||
# content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count")
|
||||
# content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name")
|
||||
# content
|
||||
# end # of span
|
||||
# end # of div
|
||||
end
|
||||
|
||||
def end_block
|
||||
@@ -256,7 +412,7 @@ protected
|
||||
def get_pairing_tab_class(opts)
|
||||
prefix = opts[:prefix]
|
||||
suffix = opts[:suffix]
|
||||
str = get_basic_field_name_base.gsub("[","-").gsub("]",'')
|
||||
str = get_basic_field_name_base.gsub("[","_").gsub("]",'')
|
||||
str = prefix.nil? ? str : prefix+ str
|
||||
suffix.nil? ? str : str + suffix
|
||||
end
|
||||
@@ -274,7 +430,7 @@ protected
|
||||
end
|
||||
|
||||
def label
|
||||
label_tag(key,title,:class=>"control-label",:func => "field_label")
|
||||
label_tag(key,title,:class=>"control-label muted",:func => "field_label")
|
||||
end
|
||||
|
||||
def can_muti_lang_input?
|
||||
|
||||
@@ -9,20 +9,21 @@ module AttributeValuesHelper
|
||||
date = get_date
|
||||
end
|
||||
|
||||
case self.attribute_field["typeC"]["format"]
|
||||
when 'format1' # Y/M/D h:m
|
||||
date.strftime("%Y/%m/%d %H:%M")
|
||||
when 'format2' # Y/M/D
|
||||
date.strftime("%Y/%m/%d")
|
||||
when 'format3' # Y/M
|
||||
date.strftime("%Y/%m")
|
||||
when 'format4' # Y
|
||||
date.strftime("%Y")
|
||||
end # of case west cal format
|
||||
# case self.attribute_field["typeC"]["format"]
|
||||
# when 'format1' # Y/M/D h:m
|
||||
# date.strftime("%Y/%m/%d %H:%M")
|
||||
# when 'format2' # Y/M/D
|
||||
# date.strftime("%Y/%m/%d")
|
||||
# when 'format3' # Y/M
|
||||
# date.strftime("%Y/%m")
|
||||
# when 'format4' # Y
|
||||
# date.strftime("%Y")
|
||||
# end # of case west cal format
|
||||
end
|
||||
|
||||
def show_minguo_calendar(from_to=nil)
|
||||
get_minguo
|
||||
|
||||
case from_to
|
||||
when :to
|
||||
date = get_date(:to)
|
||||
@@ -31,37 +32,62 @@ module AttributeValuesHelper
|
||||
when nil
|
||||
date = get_date
|
||||
end
|
||||
|
||||
@date = date.split('/')
|
||||
date_year = @date[0].to_i
|
||||
|
||||
year_str = ""
|
||||
unless date.year == 1912
|
||||
m_year = (date.year - 1912).abs.to_s + I18n.t("date.minguo_calendar.year")
|
||||
unless date_year == 1912
|
||||
m_year = (date_year - 1912).abs.to_s + I18n.t("date.minguo_calendar.year")
|
||||
year_str = minguo_format_year(m_year)
|
||||
end
|
||||
get_minguo_year + minguo_m_y_d_time
|
||||
get_minguo_year(from_to) + minguo_m_y_d_time(from_to)
|
||||
end
|
||||
|
||||
def get_minguo_year
|
||||
date = get_date
|
||||
m_year = (date.year - 1911).abs
|
||||
def get_minguo_year(from_to=nil)
|
||||
case from_to
|
||||
when :to
|
||||
date = get_date(:to)
|
||||
when :from
|
||||
date = get_date(:from)
|
||||
when nil
|
||||
date = get_date
|
||||
end
|
||||
|
||||
@date = date.split('/')
|
||||
date_year = @date[0].to_i
|
||||
|
||||
m_year = (date_year - 1911).abs
|
||||
year_end = I18n.t("date.minguo_calendar.year")
|
||||
case
|
||||
when date.year <1912
|
||||
when date_year <1912
|
||||
I18n.t("date.minguo_calendar.before") + (m_year+1).to_s + year_end
|
||||
when date.year ==1912
|
||||
when date_year ==1912
|
||||
I18n.t("date.minguo_calendar.first_year")
|
||||
when date.year >1912
|
||||
when date_year >1912
|
||||
I18n.t("date.minguo_calendar.after")+ (m_year).to_s + year_end
|
||||
end # of case tw_calendar year
|
||||
end
|
||||
|
||||
def minguo_m_y_d_time
|
||||
date = get_date
|
||||
def minguo_m_y_d_time(from_to=nil)
|
||||
case from_to
|
||||
when :to
|
||||
date = get_date(:to)
|
||||
when :from
|
||||
date = get_date(:from)
|
||||
when nil
|
||||
date = get_date
|
||||
end
|
||||
@date = date.split('/')
|
||||
|
||||
case self.attribute_field["typeC"]["format"]
|
||||
when 'format1' # Y/M/D h:m
|
||||
date.strftime(" %m/%d %H:%M")
|
||||
"/#{@date[1]}/#{@date[2]}"
|
||||
when 'format2' # Y/M/D
|
||||
date.strftime(" %m/%d")
|
||||
"/#{@date[1]}/#{@date[2]}"
|
||||
when 'format3' # Y/M
|
||||
date.strftime(" %m#{I18n.t("date.minguo_calendar.month")}")
|
||||
|
||||
"/#{@date[1]}#{I18n.t("date.minguo_calendar.month")}"\
|
||||
when 'format4' # Y
|
||||
''
|
||||
end # of case
|
||||
|
||||
Reference in new issue
Block a user