add_more ok

app/models/user/attribute_value.rb

@@ -1,9 +1,8 @@
 class AttributeValue
-  
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
-  
+  include AttributeValuesHelper
   field :key
   
   belongs_to :attribute_field
@@ -14,48 +13,52 @@ class AttributeValue
   # NO_MULTI_TAG = ["select","date","radio_button","checkbox","date_durnation"]
 
 
-  def data_proc
-    # binding.pry
-    # binding.pry if self.attribute_field.markup == 'radio_button'
-    # if self.attribute_field
-        case self.attribute_field.markup
-        when 'text_field','text_area'
-          # binding.pry
-            self[:temp_data].each{|key,val| 
-              self[key] = val
-            }  unless self[:temp_data].nil?
-          when 'select','date','radio_button'
-            self["val"] = self[:temp_data]
-          when 'checkbox'
-            self["val"] = self[:temp_data].keys rescue {}
-        end #end of case
-      else # if not locale
-        case self.attribute_field.markup
-        when 'text_field','text_area'
-              self["val"] = self[:temp_data]
-          when 'select','date','radio_button'
-            self["val"] = self[:temp_data]
-          when 'checkbox'
-            self["val"] = self[:temp_data].keys rescue {}
-        end #end of case
-    # end #of if self.attribute_field
-    self.unset('temp_data')
+  def add_more_counter
+    index_max = self["val"].count rescue 0
+    index_max == 0 ?   1 : index_max
   end
 
-  def value
-    
-    result=""
-    if self.attribute_field.locale && (self.attribute_field.markup == "text_field" || self.attribute_field.markup == "text_area")
-      result= Hash[VALID_LOCALES.collect{|lang|  [lang,self[lang.to_sym]]}]
-    else
-      result = self["val"]  
-    end
-    result
+  def data_proc
+    unless self[:temp_data].nil?
+      case self.attribute_field.markup
+        when 'text_field','text_area'
+          if self.attribute_field.add_more
+            self["val"] = self["temp_data"]
+          else # if not add_more
+             self[:temp_data].each{|key,val| 
+            self[key] = val
+              }  if(!self.attribute_field.get_data[:cross_lang])
+            self["val"] = self[:temp_data] if(self.attribute_field.get_data[:cross_lang])
+          end # of self.attribute_field.add_more
+         
+        when 'select','date','radio_button'
+          self["val"] = self[:temp_data]
+        when 'checkbox'
+          self["val"] = self[:temp_data].keys 
+      end #end of case self.attribute_field.markup  
+    end # of self[:temp_data].nil?
+    self.unset('temp_data')
+    self.unset('temp')
+  end #of data_proc
+
+  def value(index = nil)
+    result = case self.attribute_field.markup
+      when 'text_field','text_area'
+        if self.attribute_field.add_more and (self.attribute_field.markup == "text_field")
+          index.nil? ? self["val"] : self["val"][index]
+          # self.attribute_field.get_data[:cross_lang] ? Hash[VALID_LOCALES.collect{|lang|  [lang,self[lang.to_sym]]}]  : self["val"] #if !self.attribute_field.get_data[:cross_lang]
+        else
+          self.attribute_field.get_data[:cross_lang] ?  self["val"] : Hash[VALID_LOCALES.collect{|lang|  [lang,self[lang.to_sym]]}]
+        end
+      when 'select','date','radio_button'
+        self["val"]
+      when 'checkbox'
+        self["val"]
+    end #end of case self.attribute_field.markup
   end
 
   def value=(value)
     #save everything to temp_data waiting for futher process
-    # binding
     self[:temp_data] = value
   end
 
@@ -70,27 +73,32 @@ class AttributeValue
       self[(field[0].to_s.delete "=")] = field[1]
     end
   end
-  
-  def get_value_by_locale(locale)
+
+  def get_value_by_locale(locale,add_more_index=nil)
 
     case self.attribute_field.markup
       when "text_field"
-        self.attribute_field.locale ? self[locale.to_s]  : self.value
+        case self.attribute_field.add_more
+        when true
+          add_more_index.nil? ? self.value.collect{|t| t[locale]}.join(",") : self.value(add_more_index)[locale]
+        when false
+          self.attribute_field.locale ? self[locale.to_s]  : self.value  
+        end
       when "select"
-        markup_values = self.attribute_field.self_defined_markup_options? ? self.attribute_field.markup_value : eval(self.attribute_field.markup_value)
+        markup_values = self.attribute_field.self_defined_markup_options? ? self.attribute_field.markup_value : self.attribute_field.markup_value
         markup_values[self.value][locale.to_s] rescue 'NoData'
       when "text_area"
         self.attribute_field.locale ? self[locale.to_s]  : self.value
       when "date"
-        Date.new(self[:val]["(1i)"].to_i,self[:val]["(2i)"].to_i,self[:val]["(3i)"].to_i) rescue nil
+        get_date_by_format
       when "addr"
         self.value
       when "radio_button"
-        markup_values = eval(self.attribute_field.markup_value)
-        markup_values[:value][locale.to_s]
+        markup_values = self.attribute_field.markup_value
+        markup_values[self.value][locale.to_s]
       when "checkbox" 
         markup_values = self.attribute_field.markup_value
-        self[:value].keys.collect{|key| markup_values[key][locale.to_s]}.join(",")
+        self.value.collect{|key| markup_values[key][locale.to_s]}.join(",")
       when "date_durnation"
         self.value
       else
@@ -113,5 +121,10 @@ class AttributeValue
   #     end
   #   end
   # end
+  protected
+  
+  def get_date
+    Date.new(self[:val]["(1i)"].to_i,self[:val]["(2i)"].to_i,self[:val]["(3i)"].to_i) rescue nil
+  end
 
 end