Fixed bugs when sorting columns and in series service

In series_service.py add try except to some methods to prevent errors. Next, when clicking on a column the data was not being sorted correctly because of the previous changes. Last, optimized the merge_annotation method

Author: Francisco Arrieta

odmtools/controller/olvDataTable.py

@@ -21,7 +21,7 @@ def __init__(self, parent, **kwargs):
         self.currentItem = None
         self.dataframe = None
         self.annotations = None
-        self.data = None
+        self.annotations_grouped = {}
 
     def init(self, memDB):
         self.memDB = memDB
@@ -31,17 +31,15 @@ def init(self, memDB):
 
         self.dataframe = self.memDB.getDataValuesDF()
         self.annotations = self.memDB.get_annotations()
-        # sort_by_index = list(self.dataframe.columns).index("valuedatetime")
-        # columns = self.memDB.get_columns_with_annotations()
-        # self.dataframe.sort_values(self.dataframe.columns[sort_by_index], inplace=True)
-        # self.dataObjects = self.dataframe.values.tolist()
+
+        sort_by_index = self.dataframe.columns.tolist().index("valuedatetime")
+        self.dataframe.sort_values(self.dataframe.columns[sort_by_index], inplace=True)
+
+        self.annotations_grouped = self.__group_annotations()
         self.dataObjects = self.__merge_dataframe_with_annotations()
+
         col = self.memDB.get_columns_with_annotations()
 
-        # columns = \
-        #     [ColumnDefn(x.strip(), align="left", valueGetter=i, minimumWidth=125, width=125,
-        #                       stringConverter='%Y-%m-%d %H:%M:%S' if "valuedatetime" == x.lower() else '%s')
-        #            for x, i in self.memDB.getEditColumns()]
         columns = \
             [ColumnDefn(x.strip(), align="left", valueGetter=i, minimumWidth=125, width=125,
                         stringConverter='%Y-%m-%d %H:%M:%S' if "valuedatetime" == x.lower() else '%s')
@@ -51,16 +49,27 @@ def init(self, memDB):
 
 
         self.SetObjectGetter(self.ObjectGetter)
-        self.SetItemCount(len(self.dataframe))
+        self.SetItemCount(len(self.dataObjects))
 
     def __merge_dataframe_with_annotations(self):
-        sort_by_index = self.dataframe.columns.tolist().index("valuedatetime")
-        self.dataframe.sort_values(self.dataframe.columns[sort_by_index], inplace=True)
-
         data_list = self.dataframe.values.tolist()
-        anno_list = self.annotations.values.tolist()
         data = data_list
 
+        for key, value in self.annotations_grouped.iteritems():
+            for i in range(0, len(data_list)):
+                if key in data[i]:
+                    data[i].append(value)
+                    break
+
+        return data
+
+    def __group_annotations(self):
+        """
+        Ideally, this method should only be called once. Use self.grouped_annotations after calling this method
+        :return:
+        """
+        anno_list = self.annotations.values.tolist()
+
         anno = {}
         for i in range(0, len(anno_list)):
             value_id = anno_list[i][1]
@@ -70,16 +79,10 @@ def __merge_dataframe_with_annotations(self):
             else:
                 anno[value_id] = [annotation_code]
 
-        for key, value in anno.iteritems():
-            for i in range(0, len(data_list)):
-                if key in data_list[i]:
-                    data_list[i].append(value)
-                    break
-
-        return data
+        return anno
 
     def EnableSorting(self):
-        self.Bind(wx.EVT_LIST_COL_CLICK, self.onColSelected)
+        self.Bind(wx.EVT_LIST_COL_CLICK, self.on_column_selected)
         if not self.smallImageList:
             self.SetImageLists()
         if (not self.smallImageList.HasName(ObjectListView.NAME_DOWN_IMAGE) and
@@ -93,35 +96,34 @@ def ObjectGetter(self, index):
         """
         return self.dataObjects[index % len(self.dataObjects)]
 
-    def onColSelected(self, evt):
+    def on_column_selected(self, event):
         """
         Allows users to sort by clicking on columns
         """
-        if isinstance(self.dataframe, pd.DataFrame):
-           if self.dataframe.empty:
-               return
-        else:
-            if not self.dataframe:
-                return
+        if not isinstance(self.dataframe, pd.DataFrame):
+            return
+
+        if self.dataframe.empty:
+            return
 
-        logger.debug("Column: %s" % evt.m_col)
-        self.sortColumn(evt.m_col)
+        if not len(self.dataObjects):
+            return
+
+        self.sortColumn(event.Column)
 
     def sortColumn(self, selected_column):
         oldSortColumnIndex = self.sortedColumnIndex
         self.sortedColumnIndex = selected_column
-        ascending = self.sortAscending
-        if ascending:
-            self.dataframe.sort_values(self.dataframe.columns[selected_column], inplace=True)
-            self.sortAscending = False
-        elif not ascending:
-            self.dataframe.sort_values(self.dataframe.columns[selected_column], ascending=False, inplace=True)
-            self.sortAscending = True
+
+        self.sortAscending = not self.sortAscending
+        self.dataframe.sort_values(self.dataframe.columns[selected_column], ascending=self.sortAscending, inplace=True)
 
         self._UpdateColumnSortIndicators(selected_column, oldSortColumnIndex)
 
-        self.dataObjects = self.dataframe.values.tolist()
-        if self.GetItemCount:
+        # self.dataObjects = self.dataframe.values.tolist()
+        self.dataObjects = self.__merge_dataframe_with_annotations()
+
+        if self.GetItemCount():
             itemFrom = self.GetTopItem()
             itemTo = self.GetTopItem() + 1 + self.GetCountPerPage()
             itemTo = min(itemTo, self.GetItemCount() - 1)

odmtools/odmservices/series_service.py

@@ -378,16 +378,6 @@ def get_values(self, series_id=None):
     # newdf.drop(['_merge'], axis=1, inplace=True)
     # return df[df['valuedatetime'].isin(newdf['valuedatetime'])]
 
-    # def merge_annotation_with_timeseries_result(self, x):
-    #     print x
-    #
-    #     # return x
-    #     return 123
-    def merge_annotation_with_timeseries_result(self, data, anno):
-
-        print 123
-        return
-
     def get_all_values_df(self):
 
         """
@@ -863,20 +853,24 @@ def get_quality_code(self):
         return self.read.getCVs(type="Quality Code")
 
     def get_annotation_by_code(self, code):
-        return self.read.getAnnotations(codes=[code])[0]
+        try:
+            return self.read.getAnnotations(codes=[code])[0]
+        except:
+            return None
+
     def get_annotation_by_id(self, id):
-        return self.read.getAnnotations(ids=[id])[0]
+        try:
+            return self.read.getAnnotations(ids=[id])[0]
+        except:
+            return None
+
     def get_all_annotations(self):
-        return self.read.getAnnotations(type=None)
+        try:
+            return self.read.getAnnotations(type=None)
+        except:
+            return None
 
     def get_annotations_by_result(self, resultid):
-        # setSchema(self._session_factory.engine)
-
-        # ids = [x[0] for x in self.read._session.query(TimeSeriesResultValues.ValueID)\
-        #         .filter(TimeSeriesResultValues.ResultID == resultid).all()]
-        # q = self.read._session.query(TimeSeriesResultValueAnnotations)\
-        #     .filter(TimeSeriesResultValueAnnotations.ValueID.in_(ids)).all()
-
         resultid = int(resultid)
 
         q = self.read._session.query(TimeSeriesResultValueAnnotations.AnnotationID, TimeSeriesResultValueAnnotations.ValueID,