update gap fill values #201

Author: stephanie

odmtools/controller/frmGapFill.py

@@ -14,8 +14,8 @@ def onOKBtn(self, event):
         #TODO add validation
         gapvalue= self.txtGap.Value
         gaptime = self.cbGap.Value
-        fillvalue = self.txtGap.Value
-        filltime= self.cbGap.Value
+        fillvalue = self.txtFill.Value
+        filltime= self.cbFill.Value
 
         self.record_service.fill_gap(gap=[gapvalue, gaptime], fill=[fillvalue, filltime])
         self.Close()

odmtools/controller/olvDataTable.py

@@ -71,10 +71,10 @@ def sortColumn(self, selected_column):
         self.sortedColumnIndex = selected_column
         ascending = self.sortAscending
         if ascending:
-            self.dataframe.sort(by=self.dataframe.columns[selected_column], inplace=True)
+            self.dataframe.sort(self.dataframe.columns[selected_column], inplace=True)
             self.sortAscending = False
         elif not ascending:
-            self.dataframe.sort(by=self.dataframe.columns[selected_column], ascending=False, inplace=True)
+            self.dataframe.sort(self.dataframe.columns[selected_column], ascending=False, inplace=True)
             self.sortAscending = True
 
         self._UpdateColumnSortIndicators(selected_column, oldSortColumnIndex)