Changeset 359

Timestamp:

Nov 18, 2009, 9:35:55 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #57

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/composition/content/entry.rb (modified) (2 diffs)
• spec/lib/open_ehr/rm/composition/content/entry/instruction_details_spec.rb (added)
• spec/lib/open_ehr/rm/composition/content/entry/instruction_spec.rb (added)
• spec/lib/open_ehr/rm/composition/content/entry/ism_transition_spec.rb (added)

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

@@ -96 +96 @@
           end
 
+          class Instruction < CareEntry
+            attr_reader :narrative, :activities
+            attr_accessor :expiry_time, :wf_definition
+
+            def initialize(args = { })
+              super(args)
+              self.narrative = args[:narrative]
+              self.activities = args[:activities]
+              self.expiry_time = args[:expiry_time]
+              self.wf_definition = args[:wf_definition]
+            end
+
+            def narrative=(narrative)
+              if narrative.nil?
+                raise ArgumentError, 'narrative is mandatory'
+              end
+              @narrative = narrative
+            end
+
+            def activities=(activities)
+              if !activities.nil? && activities.empty?
+                raise ArgumentError, 'activities should not be empty'
+              end
+              @activities = activities
+            end
+          end
+
           class Activity < Locatable
             attr_reader :description, :timing, :action_archetype_id
@@ -163 +190 @@
 
           class InstructionDetails < Pathable
-
+            attr_reader :instruction_id, :activity_id
+            attr_accessor :wf_details
+
+            def initialize(args = { })
+              super(args)
+              self.instruction_id = args[:instruction_id]
+              self.activity_id = args[:activity_id]
+              self.wf_details = args[:wf_details]
+            end
+
+            def instruction_id=(instruction_id)
+              if instruction_id.nil?
+                raise ArgumentError, 'instruction_id is mandatory'
+              end
+              @instruction_id = instruction_id
+            end
+
+            def activity_id=(activity_id)
+              if activity_id.nil? || activity_id.empty?
+                raise ArgumentError, 'activity_id is mandatory'
+              end
+              @activity_id = activity_id
+            end
           end
 
           class IsmTransition < Pathable
-
+            attr_reader :current_state, :transition
+            attr_accessor :careflow_step
+
+            def initialize(args = { })
+              super(args)
+              self.current_state = args[:current_state]
+              self.transition = args[:transition]
+              self.careflow_step = args[:careflow_step]
+            end
+
+            def current_state=(current_state)
+              if current_state.nil?
+                raise ArgumentError, 'current_state is mandatory'
+              end
+              @current_state = current_state
+            end
+
+            def transition=(transition)
+              if transition.nil?
+                raise ArgumentError, 'transition is mandatory'
+              end
+              @transition = transition
+            end
           end
         end # of Entry