Skip to content

Commit e86eefe

Browse files
author
sreeder
committed
create a full list of annotations
1 parent dc164f1 commit e86eefe

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

odmtools/odmdata/memory_database.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def __init__(self, taskserver=None):
3838
#else:
3939

4040
self.taskserver = taskserver
41-
self.annotation_list = pd.DataFrame[], columns =['ResultID', 'ValueDateTime', 'ValueID', 'AnnotationID']
41+
self.annotation_list = pd.DataFrame()
42+
#self.annotation_list = pd.DataFrame() columns =['ResultID', 'ValueDateTime', 'ValueID', 'AnnotationID')
4243
#send in engine
4344

4445

@@ -154,18 +155,24 @@ def chunking(self, data):
154155

155156
def updateFlag(self, ids, value):
156157

157-
flags = pd.DataFrame()
158-
if "dates" not in flags.columns:
159-
flags.dates = ids
160-
flags.AnnotationID = value
161158

159+
flags = pd.DataFrame(columns = ['AnnotationID', 'DateTime', 'ResultID', 'ValueID'])
160+
flags["DateTime"] = ids
161+
flags["AnnotationID"] = value
162+
flags["ResultID"] = self.series.ResultID
163+
flags["ValueID"] = None
164+
165+
166+
#what if the column already exists
162167
# chunks=self.chunking(ids)
163168
# for c in chunks:
164169
# # add entry in the Timeseriesresultvalueannotations table
165170
# self.mem_service._session.query(TSRV).filter(TSRV.ValueDateTime.in_(c))\
166171
# .update({TSRV.qualifier_id: value}, False)
167-
168-
#self.annotation_list.append(ids)
172+
173+
frames = [self.annotation_list, flags]
174+
self.annotation_list=pd.concat(frames)
175+
print self.annotation_list
169176

170177

171178

0 commit comments

Comments
 (0)