update series selector order

Author: stephanie

odmtools/controller/frmSeriesSelector.py

@@ -9,6 +9,7 @@
 
 from odmtools.common.logger import LoggerTool
 from odmtools.odmdata import MemoryDatabase
+from odmtools.odmdata import returnDict
 from odmtools.view import clsSeriesSelector
 
 # tool = LoggerTool()
@@ -71,7 +72,8 @@ def initTableSeries(self):
             self.memDB.set_series_service(self.series_service)
 
             object = self.series_service.get_all_series()
-            cols = object[0].__dict__.keys()
+            #cols = object[0].__dict__.keys()
+            cols = returnDict()
             self.tblSeries._buildColumns(cols)
             if object:
                 self.tblSeries.SetObjects(object)
@@ -94,6 +96,7 @@ def refreshTableSeries(self, db):
         self.memDB.set_series_service(db)
         object = self.series_service.get_all_series()
         #checkedObjs = self.tblSeries.GetCheckedObjects()
+
         idList = [x.id for x in self.tblSeries.modelObjects]
 
         for x in object:

odmtools/controller/olvSeriesSelector.py

@@ -14,26 +14,9 @@
 logger =logging.getLogger('main')
 
 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():
+
+
+#
 
 class clsSeriesTable(FastObjectListView):
     def __init__(self, *args, **kwargs):

odmtools/controller/pageExisting.py

@@ -77,9 +77,8 @@ def initTable(self, dbservice, site_id):
             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()]
+            # for key in objects[0].__dict__.keys()]
+            for key in returnDict()]
 
         self.pnlExisting.olvSeriesList.SetColumns(seriesColumns)
-        # objects = dbservice.get_series_by_site(site_id=site_id)
-
         self.pnlExisting.olvSeriesList.SetObjects(objects)

odmtools/odmdata/__init__.py

@@ -8,25 +8,26 @@
 
 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))
+    keys = ['ResultID', 'SamplingFeatureCode', 'SamplingFeatureName', 'MethodCode', 'MethodName', 'VariableCode', 'VariableNameCV', 'ProcessingLevelCode','ProcessingLevelDefinition', 'UnitsName', 'ValueCount', 'BeginDateTime', 'EndDateTime']
+    # 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, keys))
 __all__=[
         #'SessionFactory',
         'refreshDB',
         'change_schema',
-        'returnDict',
+        #'returnDict',
         #'ODM',
         'MemoryDatabase',
         'returnDict'