profile_item.rb in Floppy-amee-0.4.14

- old
+ new

@@ -4,24 +4,27 @@
 
       def initialize(data = {})
         @values = data ? data[:values] : []
         @total_amount_per_month = data[:total_amount_per_month]
         @valid_from = data[:valid_from]
+        @data_item_uid = data[:data_item_uid]
         @end = data[:end]
         super
       end
 
       attr_reader :values
       attr_reader :total_amount_per_month
       attr_reader :valid_from
       attr_reader :end
+      attr_reader :data_item_uid
 
       def self.from_json(json)
         # Parse json
         doc = JSON.parse(json)
         data = {}
         data[:profile_uid] = doc['profile']['uid']
+        data[:data_item_uid] = doc['profileItem']['dataItem']['uid']
         data[:uid] = doc['profileItem']['uid']
         data[:name] = doc['profileItem']['name']
         data[:path] = doc['path']
         data[:total_amount_per_month] = doc['profileItem']['amountPerMonth']
         data[:valid_from] = DateTime.strptime(doc['profileItem']['validFrom'], "%Y%m%d")
@@ -46,9 +49,10 @@
       def self.from_xml(xml)
         # Parse XML
         doc = REXML::Document.new(xml)
         data = {}
         data[:profile_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/Profile/@uid").to_s
+        data[:data_item_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/DataItem/@uid").to_s
         data[:uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/@uid").to_s
         data[:name] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Name').text
         data[:path] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/Path').text || ""
         data[:total_amount_per_month] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/AmountPerMonth').text.to_f rescue nil
         data[:valid_from] = DateTime.strptime(REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/ValidFrom").text, "%Y%m%d")