Merge branch 'use_api2' of https://github.com/ODM2/ODMToolsPython into use_api2

Author: kwuz

odmtools/controller/pageExisting.py

@@ -72,12 +72,14 @@ def getSeries(self):
 
     def initTable(self, dbservice, site_id):
         """Set up columns and objects to be used in the objectlistview to be visible in the series_service selector"""
-
-        seriesColumns = [clsExisting.ColumnDefn(key, align="left",
-                                                minimumWidth=-1, valueGetter=value,
-                                                stringConverter= '%Y-%m-%d %H:%M:%S' if 'date' in key.lower() else '%s')
-                         for key, value in returnDict().iteritems()]
+        objects = dbservice.get_all_series(siteid=site_id)
+        seriesColumns = [
+            clsExisting.ColumnDefn(key, align="left", minimumWidth=100, valueGetter=key,
+                       # stringConverter = '%s')
+                       stringConverter='%Y-%m-%d %H:%M:%S' if "date" in key.lower() else '%s')
+            for key in objects[0].__dict__.keys()]
 
         self.pnlExisting.olvSeriesList.SetColumns(seriesColumns)
-        objects = dbservice.get_series_by_site(site_id=site_id)
+        # objects = dbservice.get_series_by_site(site_id=site_id)
+
         self.pnlExisting.olvSeriesList.SetObjects(objects)

odmtools/gui/wizSave.py

@@ -9,7 +9,7 @@
 import pageQCL
 import pageVariable
 import pageSummary
-from odm2api.ODM2.models import Actions
+from odm2api.ODM2.models import *
 
 [wxID_PNLINTRO, wxID_PNLVARIABLE, wxID_PNLMETHOD, wxID_PNLQCL,
  wxID_PNLSUMMARY, wxID_WIZSAVE, wxID_PNLEXISTING,
@@ -226,7 +226,7 @@ def _init_ctrls(self, prnt):
 
     def get_metadata(self):
         # method = self.currSeries.FeatureActionObj.ActionObj.MethodObj
-        # processing_level = self.currSeries.quality_control_level
+        # processing_level = self.currSeriefs.quality_control_level
         # variable = self.currSeries.variable
         # action =
 
@@ -267,9 +267,11 @@ def get_metadata(self):
         # Create action
         action = Actions()
         action.MethodObj = method
+        action.MethodID = method.MethodID
         action.ActionDescription = self.action_page.action_view.description_text_box.GetValue()
         action.ActionFileLink = self.action_page.action_view.action_file_link_text_box.GetValue()
         action.MethodObj.OrganizationObj = affiliation.OrganizationObj
+        action.BeginDateTime = self.currSeries.ResultDateTime
 
         return site, variable, method, action, processing_level
 
@@ -442,8 +444,6 @@ def on_wizard_finished(self, event):
             else:
                 method = self.series_service.get_method_by_code(method.MethodCode)
 
-
-
             # initiate either "Save as" or "Save"
             '''
             if self.page1.pnlIntroduction.rbSave.GetValue():
@@ -452,19 +452,35 @@ def on_wizard_finished(self, event):
                 result = self.record_service.saveAs(Variable, Method, QCL, True)
             '''
 
+
+            #TODO: move all of this stuff into the edit_service file
             # Create action
-            new_result = self.series_service.createResult(var=variable, meth=method, proc=proc_level)
+            new_result = self.series_service.getResult(var=variable, meth=method, proc=proc_level)
+
             # action = self.series_service.create.createAction(action)
 
+            affiliation = self.action_page.get_affiliation()
+
+            new_action_by = ActionBy()
+            new_action_by.ActionID = action.ActionID
+            new_action_by.RoleDescription = self.action_page.action_view.role_description_text_box.GetValue()
+            new_action_by.AffiliationID = affiliation.AffiliationID
+            new_action_by.AffiliationObj = affiliation
+
+            #TODO end
+
             try:
                 if rbSave:
                     result = self.record_service.save()
                 elif rbSaveAsNew:
+                    #TODO send in Action, and Actionby
                     result = self.record_service.save_as(variable, method, proc_level)
                 elif rbSaveAsExisting:
                     if overwrite:
+                        #TODO send in just the result
                         result = self.record_service.save_existing(variable, method, proc_level)
                     elif append:
+                        #TODO send in just the result
                         #def save_appending(self, var = None, method =None, qcl = None, overwrite = False):
                         #TODO if i require that original or new is selected I can call once with overwrite = original
                         if original:

odmtools/odmdata/memory_database.py

@@ -29,6 +29,7 @@ def __init__(self, taskserver=None):
         # Memory_service handles in memory database
         sm = ServiceManager()
         self.mem_service = sm.get_series_service(conn_string="sqlite:///:memory:")
+
         setSchema(self.mem_service._session_factory.engine)
 
         # TODO clean up closing of program
@@ -68,13 +69,17 @@ def getDataValuesDF(self):
         #else:
         #    self.updateDF()
         '''
+        # TODO: fix me! this commit location is only temoporarily. should be flushing so that we can restore
+        self.mem_service._session.commit()
         setSchema(self.mem_service._session_factory.engine)
         self.updateDF()
         # pick up thread here before it is needed
         logging.debug("done updating memory dataframe")
         return self.df
 
     def getDataValues(self):
+        # TODO: fix me! this commit location is only temoporarily. should be flushing so that we can restore
+        self.mem_service._session.commit()
         setSchema(self.mem_service._session_factory.engine)
         return self.mem_service.get_all_values()
 
@@ -97,6 +102,7 @@ def getEditDataValuesforGraph(self):
 
     def commit(self):
         self.mem_service._session.commit()
+        # self.mem_service._session.commit()
 
     def rollback(self):
         self.mem_service._session.rollback()
@@ -143,6 +149,7 @@ def updateValue(self, ids, operator, value):
             q=self.mem_service._session.query(TSRV).filter(TSRV.ValueDateTime.in_(c))
             q.update({TSRV.DataValue: query}, False)
 
+
         #self.updateDF()
 
     def chunking(self, data):
@@ -175,6 +182,7 @@ def updateFlag(self, ids, value):
         frames = [self.annotation_list, flags]
         self.annotation_list=pd.concat(frames)
         print self.annotation_list
+        #todo: remove duplicates before saving
 
 
 
@@ -199,9 +207,12 @@ def addPoints(self, points):
             vals = {"datavalue": point[0], "valuedatetime": point[1],
                     "valuedatetimeutcoffset": point[3],
                     "censorcodecv": point[4], "qualitycodecv": point[5],
-                    "timeaggregationinterval": point[6], "timeaggregationintervalunitsid": point[7]
+                    "timeaggregationinterval": point[6], "timeaggregationintervalunitsid": point[7],
+                    "resultid":self.df["resultid"][0]
                     # todo: Add annotations
                     }
+            if point[8]:
+                self.updateFlag(point[1], self.series_service.get_annotation_by_code(point[8].split(':')[0]).AnnotationID)
 
             setSchema(self.mem_service._session_factory.engine)
             self.mem_service._session.execute(stmt, vals)