oship-dev team mailing list archive
-
oship-dev team
-
Mailing list archive
-
Message #01562
[Branch ~oship-dev/oship/devel] Rev 502: Merged last code changes.
Merge authors:
Eduardo César edu@starforge>
Tim Cook <tim@mlhim-dell-laptop>
------------------------------------------------------------
revno: 502 [merge]
committer: Diego Manhães Pinheiro <dmpinheiro@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-10-09 21:55:08 -0300
message:
Merged last code changes.
modified:
src/oship/app_templates/oshipmanage.pt
src/oship/openehr/rm/data_structures/history/__init__.py
src/oship/openehr/rm/data_structures/history/interfaces.py
src/oship/openehr/rm/data_structures/history/tests/history.txt
--
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/oship/app_templates/oshipmanage.pt'
--- src/oship/app_templates/oshipmanage.pt 2010-06-17 03:30:56 +0000
+++ src/oship/app_templates/oshipmanage.pt 2010-10-07 14:40:40 +0000
@@ -87,9 +87,7 @@
license allowing for both open source and proprietary applications to be
developed and share semantically complete information. For more
information please join the OSHIP developer mailing list on <a
-href="https://launchpad.net/oship/">Launchpad</a> by joining the OSHIP Developers Group
- and/or contact the lead developer <a
-href="mailto:timothywayne.cook@xxxxxxxxx">Tim Cook</a>. </p>
+href="https://launchpad.net/oship/">Launchpad</a> by joining the OSHIP Developers Group. </p>
<p align="center">OSHIP is based on <a href="http://grok.zope.org">Grok
1.1</a></p>
=== modified file 'src/oship/openehr/rm/data_structures/history/__init__.py'
--- src/oship/openehr/rm/data_structures/history/__init__.py 2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/data_structures/history/__init__.py 2010-10-08 19:46:53 +0000
@@ -136,8 +136,8 @@
events = FieldProperty(IHistory['events'])
- def __init__(self, origin, klass_structure, events=None,
- period=None, duration=None, summary=None):
+ def __init__(self, origin, klass_structure, events=None, period=None, duration=None, summary=None):
+ DataStructure.__init__(self, uid=None, atnodeid=None, name=None, atdetails=None, fdraudit=None, links=None, parent=None)
self.origin=origin
self.events = EventContainer(self,klass_structure,events)
@@ -189,7 +189,10 @@
def isPeriodic(self):
u"""Indicates whether history is periodic. Returns Boolean"""
- pass
+ if self.period is not None:
+ return True
+ else:
+ return False
class PointEvent(Event):
=== modified file 'src/oship/openehr/rm/data_structures/history/interfaces.py'
--- src/oship/openehr/rm/data_structures/history/interfaces.py 2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/data_structures/history/interfaces.py 2010-10-08 17:43:46 +0000
@@ -105,16 +105,6 @@
" which summarises entire History."),
required=False)
- def isPeriodic():
- u"""Indicates whether history is periodic. Returns Boolean"""
-
- def asHierarchy():
- u"""
- Returns CLUSTER. Generate a CEN EN13606-compatible hierarchy of the
- physical representation.
-
- """
-
class IEventContained(IContained):
containers(IEventContainer)
=== modified file 'src/oship/openehr/rm/data_structures/history/tests/history.txt'
--- src/oship/openehr/rm/data_structures/history/tests/history.txt 2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/data_structures/history/tests/history.txt 2010-10-08 19:46:53 +0000
@@ -175,6 +175,11 @@
>>> myhistory["2"] # doctest: +ELLIPSIS
<...PointEvent object at...>
+
+>>> h = History(origin_date, WeightStructure, event_list)
+>>> h.isPeriodic()
+False
+
Let's remove the third event from the weight measurement included::
>>> del myhistory["3"]
@@ -209,6 +214,8 @@
>>> weight_measurement_series["4"] = a_alone_event
+
+
>>> a_alone_event.parent() == weight_measurement_series
True
@@ -242,3 +249,6 @@
True
>>> other_alone_event.parent() # doctest : +ELIPSIS
<...History object at...>
+
+
+