oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 533
committer: Tim Cook <timothywayne.cook@xxxxxxxxx>
branch nick: oship
timestamp: Fri 2011-01-28 16:22:22 -0200
message:
  Minor changes to LabRequest and BP TrackDemos.
modified:
  src/bptrack/src/bptrack/app.py
  src/labrequest/src/labrequest/app.py
  src/oship.openehr.rm/src/oship/openehr/rm/common/archetyped/__init__.py


--
lp:oship
https://code.launchpad.net/~oship-dev/oship/devel

Your team OSHIP Development Team is subscribed to branch lp:oship.
To unsubscribe from this branch go to https://code.launchpad.net/~oship-dev/oship/devel/+edit-subscription

=== modified file 'src/bptrack/src/bptrack/app.py'
--- src/bptrack/src/bptrack/app.py	2010-12-16 04:06:52 +0000
+++ src/bptrack/src/bptrack/app.py	2011-01-28 18:22:22 +0000
@@ -23,6 +23,11 @@
 from zope.schema import TextLine,Date
 from zope.interface import Interface
 from oship.app import OSHIP
+from oship.openehr.rm.datatypes.text import DvText 
+from oship.openehr.rm.demographic import Person, PartyIdentity
+from oship.openehr.rm.datatypes.quantity.datetime import DvDate
+from oship.openehr.rm.data_structures.item_structure import ItemTree
+from oship.openehr.rm.data_structures.item_structure.representation import Element
 
 
 _ = MessageFactory('oship')
@@ -183,7 +188,16 @@
         self.context['clinical'][obj.ehrid]['created'] = datetime.now()
         self.context['clinical'][obj.ehrid]['system'] = u'OSHIP'
 
-        self.redirect(self.application_url()+"/bpmain") # now redirect to the main page
+        __name__ = obj.patid
+        name = self.request.form['surName'] + ',' + self.request.form['givenName']
+        identities = PartyIdentity(ItemTree(None,None,None,None,None,None,Element(DvText(name,None,None,None,None,None,None),None,"at0003",None,"Patient Name",None,None,None,None),None),None,"at0002","Patient Identity",None,None,None)
+        details = ItemTree(None,"at0001","",None,None,None,Element(DvDate(self.request.form['dob'],None,None,None,None,None),None,"at0010",None,"Birth Date",None,None,None,None),None)
+        person_obj = Person(None,None,None,identities,None,None,None,details,"at0000","patient demographic data",None,None,None,None)
+        self.context['demographics'][name] = person_obj
+        
+        print self.context['demographics'][name]
+        
+        #self.redirect(self.application_url()+"/bpmain") # now redirect to the main page
 
 class PatientIndex(grok.Indexes):
     grok.site(OSHIP)

=== modified file 'src/labrequest/src/labrequest/app.py'
--- src/labrequest/src/labrequest/app.py	2011-01-28 01:13:23 +0000
+++ src/labrequest/src/labrequest/app.py	2011-01-28 18:22:22 +0000
@@ -141,12 +141,12 @@
     #"""
     
     #def render(self):
-        #patid, __name__ = unicode(uuid.uuid4())
+        #patid = unicode(uuid.uuid4())
+        #__name__ = patid
         #ehrid = unicode(uuid.uuid4())
         #name = rtrim(self.request.form['surName']) + ',' + rtrim(self.request.form['givenName'])
         #person_obj = Person(details=ItemTree(Element(DvDate(self.request.form['dob']))),
-                     #identities=PartyIdentity(details=ItemTree(items=Element(DvText(name)))))
-        
+                            #identities=PartyIdentity(details=ItemTree(items=Element(DvText(name)))))
         #self.context['demographics'][patid] = person_obj
         #self.context['clinical'][ehrid] = Ehr()
         #self.context['clinical'][ehrid]['created'] = datetime.now()

=== modified file 'src/oship.openehr.rm/src/oship/openehr/rm/common/archetyped/__init__.py'
--- src/oship.openehr.rm/src/oship/openehr/rm/common/archetyped/__init__.py	2011-01-28 01:13:23 +0000
+++ src/oship.openehr.rm/src/oship/openehr/rm/common/archetyped/__init__.py	2011-01-28 18:22:22 +0000
@@ -4,6 +4,7 @@
 import persistent
 
 import grok
+
 from interfaces import *