merging upsert

Author: stephanie

odmtools/controller/frmSeriesSelector.py

@@ -462,17 +462,17 @@ def setFilter(self, site_code='', var_code='', advfilter=''):
         :return:
         """
         if site_code and var_code:
-            self.siteFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns[0:10],text=site_code)
-            self.variableFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns[0:10],text=var_code)
+            self.siteFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns,text=site_code)
+            self.variableFilter = TextSearch(self.tblSeries, columns=self.tblSeries.columns,text=var_code)
             self.tblSeries.SetFilter(Chain(self.siteFilter, self.variableFilter))
         elif site_code:
-            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[0:10], text=site_code))
+            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns, text=site_code))
         elif var_code:
-            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[0:10], text=var_code))
+            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns, text=var_code))
         elif advfilter:
             self.tblSeries.SetFilter(advfilter)
         else:
-            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns[0:10]))
+            self.tblSeries.SetFilter(TextSearch(self.tblSeries, columns=self.tblSeries.columns))
         self.tblSeries.RepopulateList()
 
 

odmtools/lib/ObjectListView/CellEditor.py

@@ -489,12 +489,12 @@ def MakeAutoCompleteComboBox(olv, columnIndex, maxObjectsToConsider=10000):
     maxObjectsToConsider = min(maxObjectsToConsider, olv.GetItemCount())
     options = set(col.GetStringValue(olv.GetObjectAt(i)) for i in range(maxObjectsToConsider))
     cb = wx.ComboBox(olv, choices=list(options),
-                     style=wx.CB_DROPDOWN|wx.CB_SORT|wx.TE_PROCESS_ENTER)
+                     style=wx.CB_DROPDOWN|wx.TE_PROCESS_ENTER)#|wx.CB_SORT)
     AutoCompleteHelper(cb)
     return cb
 
 
-#-------------------------------------------------------------------------
+#  -------------------------------------------------------------------------
 
 class AutoCompleteHelper(object):
     """

odmtools/odmdata/memory_database.py

@@ -169,7 +169,7 @@ def updateFlag(self, ids, value):
         #     # add entry in the Timeseriesresultvalueannotations table
         #     self.mem_service._session.query(TSRV).filter(TSRV.ValueDateTime.in_(c))\
         #         .update({TSRV.qualifier_id: value}, False)
-        
+
         frames = [self.annotation_list, flags]
         self.annotation_list=pd.concat(frames)
         print self.annotation_list
@@ -207,6 +207,7 @@ def addPoints(self, points):
             self.mem_service._session.execute(stmt, vals)
 
 
+
     def stopEdit(self):
         self.editLoaded = False
         self.df = None
@@ -260,29 +261,3 @@ def initEditValues(self, seriesID):
                 logger.debug("done loading database")
 
 
-    def changeSeriesIDs(self, result):
-        """
-
-        :param var:
-        :param qcl:
-        :param method:
-        :return:
-        """
-
-        query = self.mem_service._session.query(TSRV)
-        # if var is not None:
-        #     logger.debug(var)
-        #     query.update({DataValue.variable_id: var})
-        #
-        # if method is not None:
-        #     logger.debug(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({DataValue.quality_control_level_id: qcl})
-        logger.debug(result)
-        query.update({TSRV.ResultID:result})
-
-

odmtools/odmservices/edit_service.py

@@ -493,7 +493,7 @@ def updateSeries(self, result = None, is_new_series=False, overwrite = True, app
 
         result_id = result.ResultID if result is not None else None
 
-        #self.memDB.changeSeriesIDs(var_id, method_id, qcl_id)
+
         dvs = self.memDB.getDataValuesDF()
         if result_id is not None:
             dvs["ResultID"] = result_id