Changeset 309 for ruby/branches

Timestamp:

Sep 29, 2009, 12:10:18 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

rm/common/archetyped completed. date_time test/unit moving to rspec

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (3 diffs)
• spec/lib/open_ehr/rm/common/archetyped/feeder_audit_spec.rb (added)
• spec/lib/open_ehr/rm/data_types/quantity/date_time (added)

ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -5 +5 @@
 require 'date'
 include OpenEHR::RM::DataTypes::Quantity
+include OpenEHR::AssumedLibraryTypes
 
 module OpenEHR
@@ -13 +14 @@
           class DvTemporal < DvAbsoluteQuantity
             include Comparable
+            def initialize(args = {})
+              self.value = args[:value]
+              self.magnitude_status = args[:magnitude_status]
+              self.accuracy = args[:accuracy]
+              self.normal_range = args[:normal_range]
+              self.normal_status = args[:normal_status]
+              self.other_reference_ranges = args[:other_reference_ranges]
+            end
 
             def value=(value)
@@ -23 +32 @@
 
           class DvDate < DvTemporal
-            include OpenEHR::AssumedLibraryTypes::ISO8601DateModule
+            include ISO8601DateModule
 
             DAYS_IN_MONTH = [0,31,28,31,30,31,30,31,31,30,31,30,31]
 
-            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_date = AssumedLibraryTypes::ISO8601_DATE.new(value)
+              iso8601_date = ISO8601Date.new(value)
               @year = iso8601_date.year
               @month = iso8601_date.month