Merge pull request #299 from ODM2/simplefilter

update simple filter

Author: Stephanie Reeder

ODMTools.py

@@ -20,7 +20,7 @@
 
 import pyodbc
 import pymysql
-import psycopg2
+#import psycopg2
 
 tool = LoggerTool()
 logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.INFO)

odmtools/controller/frmSeriesSelector.py

@@ -459,13 +459,13 @@ def setFilter(self, site_code='', var_code='', advfilter=''):
         :return:
         """
         if site_code and var_code:
-            self.siteFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns[3:4],text=site_code)
-            self.variableFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns[6:7],text=var_code)
+            self.siteFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns[2:6],text=site_code)
+            self.variableFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns[3:8],text=var_code)
             self.tblSeries.SetFilter(Chain(self.siteFilter, self.variableFilter))
         elif site_code:
-            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[3:4], text=site_code))
+            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[2:6], text=site_code))
         elif var_code:
-            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[6:7], text=var_code))
+            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[3:8], text=var_code))
         elif advfilter:
             self.tblSeries.SetFilter(advfilter)
         else: