Changeset 358

Timestamp:

Nov 18, 2009, 8:43:48 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #57 Activity, Action

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/composition/content/entry.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/composition/content/entry/action_spec.rb (added)
• spec/lib/open_ehr/rm/composition/content/entry/activity_spec.rb (added)

ruby/branches/0.5/lib/open_ehr/rm/composition/content/entry.rb

@@ -96 +96 @@
           end
 
+          class Activity < Locatable
+            attr_reader :description, :timing, :action_archetype_id
+
+            def initialize(args = { })
+              super(args)
+              self.description = args[:description]
+              self.timing = args[:timing]
+              self.action_archetype_id = args[:action_archetype_id]
+            end
+
+            def description=(description)
+              if description.nil?
+                raise ArgumentError, 'description is mandatory'
+              end
+              @description = description
+            end
+
+            def timing=(timing)
+              if timing.nil?
+                raise ArgumentError, 'timing is mandatory'
+              end
+              @timing = timing
+            end
+          end
+
+          def action_archetype_id=(action_archetype_id)
+            if action_archetype_id.nil? || action_archetype_id.empty?
+              raise ArgumentError, 'action_archetype_id is mandatory'
+            end
+            @action_archetype_id = action_archetype_id
+          end
+
           class Action < CareEntry
-            attr_accessor :description, :time
-            attr_accessor :ism_transition, :instruction_details
+            attr_reader :time, :description, :ism_transition
+            attr_accessor :instruction_details
             
-            def initialize(description, time, ism_transition, instruction_details)
-              raise Exception.new("invalid argument") if description == nil || time == nil || ism_transition == nil
+            def initialize(args = { })
+              super(args)
+              self.description = args[:description]
+              self.time = args[:time]
+              self.ism_transition = args[:ism_transition]
+              self.instruction_details = args[:instruction_details]
+            end
+
+            def time=(time)
+              if time.nil?
+                raise ArgumentError, 'time is mandatory'
+              end
+              @time = time
+            end
+
+            def description=(description)
+              if description.nil?
+                raise ArgumentError, 'description is mandatory'
+              end
               @description = description
-              @time = time
+            end
+
+            def ism_transition=(ism_transition)
+              if ism_transition.nil?
+                raise ArgumentError
+              end
               @ism_transition = ism_transition
-              @instruction_details = instruction_details if instruction_details != nil
             end
-          end # of Action
+          end
+
+          class InstructionDetails < Pathable
+
+          end
+
+          class IsmTransition < Pathable
+
+          end
         end # of Entry
       end # of Content