diff --git a/app/helpers/admin/attribute_values_view_helper.rb b/app/helpers/admin/attribute_values_view_helper.rb index 9a724c9..a17f4f7 100644 --- a/app/helpers/admin/attribute_values_view_helper.rb +++ b/app/helpers/admin/attribute_values_view_helper.rb @@ -1,6 +1,5 @@ module Admin::AttributeValuesViewHelper OPT = [ - ["YYYY / MM / DD hh : mm","format1"], ["YYYY / MM / DD","format2"], ["YYYY / MM","format3"], ["YYYY","format4"] diff --git a/app/helpers/attribute_fields_helper.rb b/app/helpers/attribute_fields_helper.rb index c472a26..637a2dc 100644 --- a/app/helpers/attribute_fields_helper.rb +++ b/app/helpers/attribute_fields_helper.rb @@ -20,7 +20,7 @@ module AttributeFieldsHelper @new_attribute = @attribute_value.nil? @attribute_value = @attribute_value || (attribute_type.eql?("role") ? @member.attribute_values.build(attribute_field_id: id) : @member.member_profile_field_values.build(member_profile_field: id)) @prefiled_value = @attribute_value.value rescue nil - return instance_eval("render_#{markup}") rescue "" + return instance_eval("render_#{markup}")# rescue "" end end @@ -101,14 +101,17 @@ module AttributeFieldsHelper # @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 '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 'format1','format2' + # tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m/%d")), 'yyyy/MM/dd') + tmp = very_simple_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m/%d")), self.typeC['format']) when 'format3' - tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m")), 'yyyy/MM') + # tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m")), 'yyyy/MM') + tmp = very_simple_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m")), self.typeC['format']) when 'format4' - tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy') + # tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy') + tmp = very_simple_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), self.typeC['format']) end control_group_wrapper{tmp} @@ -117,6 +120,28 @@ module AttributeFieldsHelper end end + def very_simple_picker(object_name, value, format) + id = object_name.gsub("[","_").gsub("]","") + values = value.split("/") rescue [] + html = "