Changeset 150

Timestamp:

Jul 1, 2009, 1:40:42 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #49

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/quantity/date_time.rb (modified) (3 diffs)
• tests/rm/quantity (added)
• tests/rm/quantity/ts_date_time.rb (added)

ruby/trunk/lib/models/rm/data_types/quantity/date_time.rb

@@ -3 +3 @@
 # Ticket refs #49
 require 'assumed_library_types'
+
 
 module OpenEHR
@@ -54 +55 @@
 
             def magnitude
-              return Date.new(@year, @month, @day)-Date.new(1601,1,1)
+              return Date.new(@year, @month, @day)-Date.new(0000,1,1)
             end
 
@@ -91 +92 @@
           end
           
-          class DV_Time
-            def initialize
+          class DV_Time < DV_Temporal
+            include OpenEHR::Assumed_Library_Types::ISO8601_TIME_MODULE
+            def initialize(value, magnitude_status=nil, accuracy=nil,
+                           normal_range=nil, normal_status=nil,
+                           other_reference_range=nil)
+              super(value, magnitude_status, accuracy, normal_range,
+                    normal_status, other_reference_range)
+            end
+
+            def value=(value)
+              super(value)
+              iso8601_time = Assumed_Library_Types::ISO8601_TIME.new(value)
+              @hour = iso8601_time.hour
+              @minute = iso8601_time.minute
+              @second = iso8601_time.second
+              @fractional_second = iso8601_time.fractional_second
+            end
+
+            def magnitude
+              return @hour * 60 * 60 + @minute * 60 + @second + @fractional_second
+            end
+
+            def diff(other)
+              diff = (other.magnitude - self.magnitude).abs
+              hour = (diff / 60 / 60).to_i
+              minute = ((diff - hour*60*60)/60).to_i
+              second = (diff - hour * 60 *60 - minute * 60).to_i
+              fractional_second = ((diff - diff.to_i)*1000.0).to_i/1000.0
+              return 'P0Y0M0W0DT' + hour.to_s + 'H' + minute.to_s + 'M' +
+                second.to_s + fractional_second.to_s[1..-1] + 'S'
             end
           end
 
-          class DV_Date_Time
+          class DV_Date_Time < DV_Date
+            include OpenEHR::Assumed_Library_Types::ISO8601_TIME_MODULE
+            
             def initialize
             end