load series selector

Author: stephanie

odmtools/common/taskServer.py

@@ -132,7 +132,7 @@ def worker(cls, dispatcher):
                 connection = SeriesService("sqlite:///:memory:")
                 df = task[1]
                 logger.debug("Load series from db")
-                df.to_sql(name="DataValues", con=connection._session_factory.engine, flavor='sqlite', index = False, chunksize = 10000)
+                df.to_sql(name="DataValues", con=connection._connection.engine, flavor='sqlite', index = False, chunksize = 10000)
                 logger.debug("done loading database")
                 result = connection
             if task_type == "UpdateEditDF":

odmtools/controller/frmSeriesSelector.py

@@ -69,7 +69,8 @@ def initTableSeries(self):
             self.memDB.set_series_service(self.series_service)
 
             object = self.series_service.get_all_series()
-
+            cols = object[0].__dict__.keys()
+            self.tblSeries._buildColumns(cols)
             if object:
                 self.tblSeries.SetObjects(object)
             else:
@@ -140,13 +141,13 @@ def initSVBoxes(self):
         try:
             self.siteList = self.series_service.get_used_sites()
             for site in self.siteList:
-                self.cbSites.Append(site.code + '-' + site.name)
+                self.cbSites.Append("%s-%s"%(site.SamplingFeatureCode, site.SamplingFeatureName))
             self.cbSites.SetSelection(0)
-            self.site_code = self.siteList[0].code
+            self.site_code = self.siteList[0].SamplingFeatureCode
 
             self.varList = self.series_service.get_used_variables()
             for var in self.varList:
-                self.cbVariables.Append(var.code + '-' + var.name)
+                self.cbVariables.Append("%s-%s"%(var.VariableCode, var.VariableNameCV))
             self.cbVariables.SetSelection(0)
         except AttributeError as e:
             logger.error(e)
@@ -340,12 +341,12 @@ def onCbSitesCombobox(self, event):
         """
 
         if self.checkSite.GetValue():
-            self.site_code = self.siteList[event.GetSelection()].code
+            self.site_code = self.siteList[event.GetSelection()].SamplingFeatureCode
             self.varList = self.series_service.get_variables_by_site_code(self.site_code)
 
             self.cbVariables.Clear()
             for var in self.varList:
-                self.cbVariables.Append(var.code + '-' + var.name)
+                self.cbVariables.Append("%s-%s"%(var.VariableCode, var.VariableNameCV))
             self.cbVariables.SetSelection(0)
 
             if (self.checkSite.GetValue() and not self.checkVariable.GetValue()):
@@ -362,7 +363,7 @@ def onCbVariablesCombobox(self, event):
         """
 
         if self.checkVariable.GetValue():
-            self.variable_code = self.varList[event.GetSelection()].code
+            self.variable_code = self.varList[event.GetSelection()].VariableCode
             if (not self.checkSite.GetValue() and self.checkVariable.GetValue()):
                 self.site_code = None
             self.setFilter(site_code=self.site_code, var_code=self.variable_code)
@@ -373,16 +374,16 @@ def siteAndVariables(self):
 
         :return:
         """
-        self.site_code = self.siteList[self.cbSites.Selection].code
+        self.site_code = self.siteList[self.cbSites.Selection].VariableCode
 
         self.cbVariables.Clear()
         self.varList = self.series_service.get_variables_by_site_code(self.site_code)
         for var in self.varList:
-            self.cbVariables.Append(var.code + '-' + var.name)
+            self.cbVariables.Append("%s-%s"%(var.VariableCode, var.VariableNameCV))
         self.cbVariables.SetSelection(0)
 
         try:
-            self.variable_code = self.varList[self.cbVariables.Selection].code
+            self.variable_code = self.varList[self.cbVariables.Selection].VariableCode
             self.setFilter(site_code=self.site_code, var_code=self.variable_code)
             self.cbVariables.Enabled = True
             self.cbSites.Enabled = True
@@ -411,12 +412,12 @@ def variableOnly(self):
         self.cbVariables.Clear()
         self.varList = self.series_service.get_used_variables()
         for var in self.varList:
-            self.cbVariables.Append(var.code + '-' + var.name)
+            self.cbVariables.Append("%s-%s"%(var.VariableCode, var.VariableNameCV))
         self.cbVariables.SetSelection(0)
         self.cbSites.Enabled = False
         self.cbVariables.Enabled = True
 
-        self.variable_code = self.varList[0].code
+        self.variable_code = self.varList[0].VariableCode
 
         self.setFilter(var_code=self.variable_code)
 

odmtools/controller/olvSeriesSelector.py

@@ -7,7 +7,6 @@
 
 
 # from odmtools.common.logger import LoggerTool
-from odmtools.odmdata import series
 
 
 # tool = LoggerTool()
@@ -16,21 +15,25 @@
 
 OvlCheckEvent, EVT_OVL_CHECK_EVENT = wx.lib.newevent.NewEvent()
 from collections import OrderedDict
-def returnDict():
-    keys = ['SeriesID', 'SiteID', 'SiteCode', 'SiteName', 'VariableID', 'VariableCode', 'VariableName', 'Speciation',
-            'VariableUnitsID', 'VariableUnitsName', 'SampleMedium', 'ValueType', 'TimeSupport', 'TimeUnitsID',
-            'TimeUnitsName', 'DataType', 'GeneralCategory', 'MethodID', 'MethodDescription', 'SourceID',
-            'SourceDescription', 'Organization', 'Citation', 'QualityControlLevelID', 'QualityControlLevelCode',
-            'BeginDateTime', 'EndDateTime', 'BeginDateTimeUTC', 'EndDateTimeUTC', 'ValueCount'
-            ]
-    values = ['id', 'site_id', 'site_code', 'site_name', 'variable_id', 'variable_code', 'variable_name', 'speciation',
-              'variable_units_id', 'variable_units_name', 'sample_medium', 'value_type', 'time_support',
-              'time_units_id', 'time_units_name', 'data_type', 'general_category', 'method_id', 'method_description',
-              'source_id', 'source_description', 'organization', 'citation', 'quality_control_level_id',
-              'quality_control_level_code', 'begin_date_time', 'end_date_time', 'begin_date_time_utc',
-              'end_date_time_utc', 'value_count'
-              ]
-    return OrderedDict(zip(keys, values))
+# def returnDict():
+#     keys = ['SeriesID', 'SiteID', 'SiteCode', 'SiteName', 'VariableID', 'VariableCode', 'VariableName', 'Speciation',
+#             'VariableUnitsID', 'VariableUnitsName', 'SampleMedium', 'ValueType', 'TimeSupport', 'TimeUnitsID',
+#             'TimeUnitsName', 'DataType', 'GeneralCategory', 'MethodID', 'MethodDescription', 'SourceID',
+#             'SourceDescription', 'Organization', 'Citation', 'QualityControlLevelID', 'QualityControlLevelCode',
+#             'BeginDateTime', 'EndDateTime', 'BeginDateTimeUTC', 'EndDateTimeUTC', 'ValueCount'
+#             ]
+#     values = ['id', 'site_id', 'site_code', 'site_name', 'variable_id', 'variable_code', 'variable_name', 'speciation',
+#               'variable_units_id', 'variable_units_name', 'sample_medium', 'value_type', 'time_support',
+#               'time_units_id', 'time_units_name', 'data_type', 'general_category', 'method_id', 'method_description',
+#               'source_id', 'source_description', 'organization', 'citation', 'quality_control_level_id',
+#               'quality_control_level_code', 'begin_date_time', 'end_date_time', 'begin_date_time_utc',
+#               'end_date_time_utc', 'value_count'
+#               ]
+#     return OrderedDict(zip(keys, values))
+
+
+
+# def returnDict():
 
 class clsSeriesTable(FastObjectListView):
     def __init__(self, *args, **kwargs):
@@ -47,8 +50,8 @@ def __init__(self, *args, **kwargs):
         """Object being edited"""
         self.editingObject = None
 
-        self._buildColumns()
-        self.CreateCheckStateColumn()
+        #self._buildColumns()
+
 
         def rowFormatter(listItem, point):
             listItem.SetFont(wx.Font(11, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False))
@@ -60,13 +63,16 @@ def onKeyPress(self, evt):
         """Ignores Keypresses"""
         pass
 
-    def _buildColumns(self):
+    def _buildColumns(self, columns):
         seriesColumns = [
-            ColumnDefn(key, align="left", minimumWidth=100, valueGetter=value,
+            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, value in returnDict().iteritems()]
+            for key in columns]
+
+
         self.SetColumns(seriesColumns)
+        self.CreateCheckStateColumn()
 
     """User can select series using the mouse to click on check boxes """
 

odmtools/gui/pageMethod.py

@@ -3,7 +3,8 @@
 import wx
 import wx.grid
 import wx.richtext
-from odmtools.odmdata import ODM
+# from odmtools.odmdata import ODM
+from odm2api.ODM2.models import Methods
 
 
 [wxID_PNLMETHOD, wxID_PNLMETHODSLISTCTRL1, wxID_PNLMETHODSRBCREATENEW,
@@ -119,8 +120,8 @@ def getMethod(self):
             m= self.series_service.get_method_by_description(genmethod)
             if m is None:
                 logger.debug("assigning new method description")
-                m =  ODM.Method()
-                m.description = genmethod
+                m = Methods()
+                m.MethodDescription = genmethod
 
 
         elif self.rbSelect.Value:

odmtools/odmdata/__init__.py

@@ -1,41 +1,12 @@
 
 
 
+#from odm2api.ODM1_1_1.services import SeriesService#, refreshDB
 
-
-
-#from api.versionSwitcher import ODM, refreshDB
-
-
-# DataTypeCV=ODM.DataTypeCV
-# DataValue=ODM.DataValue
-# # GeneralCategoryCV=ODM.GeneralCategoryCV
-# ISOMetadata=ODM.ISOMetadata
-# LabMethod=ODM.LabMethod
-# Method=ODM.Method
-# OffsetType=ODM.OffsetType
-# Qualifier=ODM.Qualifier
-# QualityControlLevel=ODM.QualityControlLevel
-# Sample =ODM.Sample
-# SampledMediumCV= ODM.SampleMediumCV
-# # SampleTypeCV=ODM.SampleTypeCV
-# Series=ODM.Series
-# Site= ODM.Site
-# SiteType=ODM.SiteTypeCV
-# Source =ODM.Source
-# SpatialReferences=ODM.SpatialReference
-# SpeciationCV=ODM.SpeciationCV
-# # TopicCategoryCV=ODM.TopicCategoryCV
-# Unit= ODM.Unit
-# # ValueTypeCV=ODM.ValueTypeCV
-# Variable = ODM.Variable
-# VerticalDatumCV=ODM.VerticalDatumCV
-# returnDict = ODM.returnDict
-from odm2api.ODM1_1_1.services import SeriesService#, refreshDB
 from odm2api.ODMconnection import SessionFactory,  dbconnection
 from odm2api.ODM2.models import _changeSchema as change_schema
 from odmtools.odmdata.memory_database import MemoryDatabase
-ODM = SeriesService.ODM
+#ODM = SeriesService.ODM
 
 from collections import OrderedDict
 def returnDict():
@@ -61,6 +32,7 @@ def returnDict():
         #'ODM',
         'MemoryDatabase',
         'returnDict'
-        'SeriesService'
+        #'SeriesService'
+        'readService', 'createService', 'updateService', 'deleteService'
         'dbconnection'
          ]

odmtools/odmdata/memory_database.py

@@ -4,11 +4,13 @@
 
 from odmtools.common.logger import LoggerTool
 from odmtools.odmservices import SeriesService
-from odmtools.odmservices import ServiceManager
-from odmtools.odmdata import SeriesService#ODM
-ODM = SeriesService.ODM
-# tool = LoggerTool()
-# logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+from odmtools.odmservices import ServiceManager, SeriesService
+
+# from odmtools.odmdata import SeriesService#ODM
+# ODM = SeriesService.ODM
+from odm2api.ODM2.models import TimeSeriesResultValues as DataValue
+
+
 logger =logging.getLogger('main')
 
 class MemoryDatabase(object):
@@ -105,8 +107,8 @@ def update(self, updates):
         updates : list of dictionary that contains 2 items, id and value
         '''
 
-        stmt = (ODM.DataValue.__table__.update().
-                where(ODM.DataValue.local_date_time == bindparam('id')).
+        stmt = (DataValue.__table__.update().
+                where(DataValue.ValueDateTime == bindparam('id')).
                 values(DataValue=bindparam('value'))
         )
 
@@ -118,20 +120,20 @@ def update(self, updates):
     def updateValue(self, ids, operator, value):
         # query = DataValue.data_value+value
         if operator == '+':
-            query = ODM.DataValue.data_value + value
+            query = DataValue.DataValue + value
         elif operator == '-':
-            query = ODM.DataValue.data_value - value
+            query = DataValue.DataValue - value
         elif operator == '*':
-            query = ODM.DataValue.data_value * value
+            query = DataValue.DataValue * value
         elif operator == '=':
             query = value
 
 
         #break into chunks to get around sqlites restriction. allowing user to send in only 999 arguments at once
         chunks=self.chunking(ids)
         for c in chunks:
-            q=self.mem_service._session.query(ODM.DataValue).filter(ODM.DataValue.local_date_time.in_(c))
-            q.update({ODM.DataValue.data_value: query}, False)
+            q=self.mem_service._session.query(DataValue).filter(DataValue.ValueDateTime.in_(c))
+            q.update({DataValue.DataValue: query}, False)
 
         #self.updateDF()
 
@@ -143,11 +145,12 @@ def chunking(self, data):
 
 
     #break into chunks to get around sqlite's restriction. allowing user to send in only 999 arguments at once
+    #TODO update to work with odm2
     def updateFlag(self, ids, value):
         chunks=self.chunking(ids)
         for c in chunks:
-            self.mem_service._session.query(ODM.DataValue).filter(ODM.DataValue.local_date_time.in_(c))\
-                .update({ODM.DataValue.qualifier_id: value}, False)
+            self.mem_service._session.query(DataValue).filter(DataValue.ValueDateTime.in_(c))\
+                .update({DataValue.qualifier_id: value}, False)
 
 
     def delete(self, ids):
@@ -161,7 +164,7 @@ def addPoints(self, points):
         """
         Takes in a list of points and loads each point into the database
         """
-        stmt = ODM.DataValue.__table__.insert()
+        stmt = DataValue.__table__.insert()
 
         if not isinstance(points, list):
             points = [points]
@@ -228,6 +231,8 @@ def initEditValues(self, seriesID):
                                index=False)#,flavor='sqlite', chunksize=10000)
                 logger.debug("done loading database")
 
+
+#TODO: update to work with ODM2
     def changeSeriesIDs(self, var=None, qcl=None, method=None):
         """
 
@@ -237,17 +242,17 @@ def changeSeriesIDs(self, var=None, qcl=None, method=None):
         :return:
         """
 
-        query = self.mem_service._session.query(ODM.DataValue)
+        query = self.mem_service._session.query(DataValue)
         if var is not None:
             logger.debug(var)
-            query.update({ODM.DataValue.variable_id: var})
+            query.update({DataValue.variable_id: var})
 
         if method is not None:
             logger.debug(method)
-            query.update({ODM.DataValue.method_id: method})
+            query.update({DataValue.method_id: method})
         # check that the code is not zero
         # if qcl is not None and qcl.code != 0:
         if qcl is not None:
             logger.debug(qcl)
-            query.update({ODM.DataValue.quality_control_level_id: qcl})
+            query.update({DataValue.quality_control_level_id: qcl})