- Timestamp:
- Nov 20, 2009, 3:11:04 PM (14 years ago)
- Location:
- ruby/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
ruby/trunk
- Property svn:mergeinfo changed
/ruby/branches/0.5 merged: 292,296,300-301,305,308-312,322,330-365
- Property svn:mergeinfo changed
-
ruby/trunk/lib/open_ehr/rm/data_types/quantity/date_time.rb
r167 r369 4 4 require 'assumed_library_types' 5 5 require 'date' 6 7 module OpenEhr 6 include OpenEHR::RM::DataTypes::Quantity 7 include OpenEHR::AssumedLibraryTypes 8 9 module OpenEHR 8 10 module RM 9 11 module DataTypes 10 12 module Quantity 11 13 module DateTime 12 class DvTemporal < OpenEhr::RM::DataTypes::Quantity::DvAbsoluteQuantity 13 include Comparable 14 attr_reader :value 15 16 def initialize(value, magnitude_status=nil, accuracy=nil, 17 normal_range=nil, normal_status=nil, 18 other_reference_ranges=nil) 19 self.value = value 20 self.magnitude_status = magnitude_status 21 self.accuracy = accuracy 22 self.normal_range = normal_range 23 self.normal_status = normal_status 24 self.other_reference_ranges = other_reference_ranges 14 class DvTemporal < DvAbsoluteQuantity 15 def initialize(args = {}) 16 self.value = args[:value] 17 self.magnitude_status = args[:magnitude_status] 18 self.accuracy = args[:accuracy] 19 self.normal_range = args[:normal_range] 20 self.normal_status = args[:normal_status] 21 self.other_reference_ranges = args[:other_reference_ranges] 25 22 end 26 23 … … 32 29 end 33 30 34 def <=>(other) 35 self.magnitude <=> other.magnitude 36 end 31 undef magnitude= 37 32 end 38 33 39 34 class DvDate < DvTemporal 40 include OpenEhr::AssumedLibraryTypes::ISO8601_DATE_MODULE35 include ISO8601DateModule 41 36 42 37 DAYS_IN_MONTH = [0,31,28,31,30,31,30,31,31,30,31,30,31] 43 38 44 def initialize(value, magnitude_status=nil, accuracy=nil,45 normal_range=nil, normal_status=nil,46 other_reference_range=nil)47 super(value, magnitude_status, accuracy, normal_range,48 normal_status, other_reference_range)49 end50 51 39 def value=(value) 52 40 super(value) 53 iso8601_date = AssumedLibraryTypes::ISO8601_DATE.new(value)41 iso8601_date = ISO8601Date.new(value) 54 42 @year = iso8601_date.year 55 43 @month = iso8601_date.month … … 57 45 end 58 46 59 undef magnitude=60 61 47 def magnitude 62 48 return Date.new(@year, @month, @day)-Date.new(0000,1,1) … … 73 59 day = future.day - past.day 74 60 else 75 month -=161 month = -1 76 62 previous_month = future.month - 1 77 if previous_month <= 063 if previous_month == 0 78 64 previous_month = 12 79 65 end … … 90 76 month += future.month + 12 - past.month 91 77 end 78 if month < 0 79 year -= 1 80 month += 12 81 end 92 82 year += future.year - past.year 93 return DvDuration.new( 83 return DvDuration.new(:value => 94 84 'P' + year.to_s + 'Y' + month.to_s + 'M' + 95 85 week.to_s + 'W' + day.to_s + 'D') … … 98 88 99 89 class DvTime < DvTemporal 100 include OpenEhr::AssumedLibraryTypes::ISO8601_TIME_MODULE 101 def initialize(value, magnitude_status=nil, accuracy=nil, 102 normal_range=nil, normal_status=nil, 103 other_reference_range=nil) 104 super(value, magnitude_status, accuracy, normal_range, 105 normal_status, other_reference_range) 106 end 90 include ISO8601TimeModule 107 91 108 92 def value=(value) 109 93 super(value) 110 iso8601_time = AssumedLibraryTypes::ISO8601_TIME.new(value)94 iso8601_time = ISO8601Time.new(value) 111 95 @hour = iso8601_time.hour 112 96 @minute = iso8601_time.minute … … 116 100 117 101 def magnitude 118 return @hour * 60 * 60 + @minute * 60 + @second + @fractional_second 102 if @fractional_second.nil? 103 return @hour * 60 * 60 + @minute * 60 + @second 104 else 105 return @hour * 60 * 60 + @minute * 60 + @second + @fractional_second 106 end 119 107 end 120 108 … … 125 113 second = (diff - hour * 60 *60 - minute * 60).to_i 126 114 fractional_second = ((diff - diff.to_i)*1000000.0).to_i/1000000.0 127 return DvDuration.new('P0Y0M0W0DT' + hour.to_s + 'H' + 128 minute.to_s + 'M' + 129 second.to_s + fractional_second.to_s[1..-1] + 'S') 115 str = 'P0Y0M0W0DT' + hour.to_s + 'H' + 116 minute.to_s + 'M' + second.to_s 117 if @fractional_second.nil? 118 str += 'S' 119 else 120 str += fractional_second.to_s[1..-1] + 'S' 121 end 122 return DvDuration.new(:value => str) 130 123 end 131 124 end 132 125 133 126 class DvDateTime < DvTemporal 134 include OpenEhr::AssumedLibraryTypes::ISO8601_DATE_TIME_MODULE 135 attr_reader :value 136 137 def initialize(value, magnitude_status=nil, accuracy=nil, 138 normal_range=nil, normal_status=nil, 139 other_reference_range=nil) 140 super(value, magnitude_status, accuracy, normal_range, 141 normal_status, other_reference_range) 142 end 127 include OpenEHR::AssumedLibraryTypes::ISO8601DateTimeModule 143 128 144 129 def value=(value) 145 130 super(value) 146 iso8601date_time = AssumedLibraryTypes::ISO8601 _DATE_TIME.new(value)131 iso8601date_time = AssumedLibraryTypes::ISO8601DateTime.new(value) 147 132 self.year = iso8601date_time.year 148 133 self.month = iso8601date_time.month … … 156 141 157 142 def magnitude 158 seconds = DateTime.new(@year,@month,@day,@hour,@minute,@second) - 159 DateTime.new(0000,1,1,0,0,0) 143 seconds = (((@year * 365.24 + 144 @month * 30.42 + 145 @day) * 24 + @hour) * 60 + 146 @minute) * 60 + @second 160 147 if @fractional_second.nil? 161 148 return seconds … … 164 151 end 165 152 end 166 167 undef magnitude=168 153 169 154 def diff(other) … … 184 169 minute = ((time_diff - hour*60*60)/60).to_i 185 170 second = (time_diff - hour * 60 *60 - minute * 60).to_i 186 fractional_second = ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0 187 188 return DvDuration.new(date_duration.value + 'T' + 189 hour.to_s + 'H' + 190 minute.to_s + 'M' + 191 second.to_s + fractional_second.to_s[1..-1] + 'S') 192 171 str = date_duration.value + 'T' + hour.to_s + 'H' + 172 minute.to_s + 'M' + second.to_s 173 if @fractional_second.nil? 174 return DvDuration.new(:value => str +'S') 175 else 176 fractional_second = 177 ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0 178 return DvDuration.new(:value => str + 179 fractional_second.to_s[1..-1] + 'S') 180 end 193 181 end 194 182 … … 197 185 def split_date_time(date_time) 198 186 /^(.*)T(.*)$/ =~ date_time.as_string 199 return DvDate.new( $1), DvTime.new($2)187 return DvDate.new(:value => $1), DvTime.new(:value => $2) 200 188 end 201 189 end 202 190 203 191 class DvDuration < DvAmount 204 include AssumedLibraryTypes::ISO8601 _DURATION_MODULE192 include AssumedLibraryTypes::ISO8601DurationModule 205 193 attr_reader :value 206 194 207 def initialize(value, magnitude_status=nil, accuracy=nil, 208 accuracy_percent=nil, normal_range=nil, 209 normal_status = nil, other_reference_ranges=nil) 210 self.value = value 195 def initialize(args = { }) 196 self.value = args[:value] 197 self.magnitude_status = args[:magnitude_status] 198 self.normal_range = args[:normal_range] 199 self.normal_status = args[:normal_status] 200 self.other_reference_ranges = args[:other_reference_ranges] 211 201 end 212 202 … … 214 204 raise ArgumentError, 'value must be not nil' if value.nil? 215 205 @value = value 216 iso8601_duration = AssumedLibraryTypes::ISO8601 _DURATION.new(value)206 iso8601_duration = AssumedLibraryTypes::ISO8601Duration.new(value) 217 207 self.years = iso8601_duration.years 218 208 self.months = iso8601_duration.months
Note:
See TracChangeset
for help on using the changeset viewer.