Fixed the existing series not getting the selected series. Resolved some of the todos in the finished method in wizSave.py

Author: Francisco Arrieta

odmtools/controller/pageExisting.py

@@ -19,6 +19,8 @@ def __init__(self, parent, title, series_service , site):
         sizer = wx.BoxSizer(wx.VERTICAL)
         self.sizer = sizer
         self.SetSizer(sizer)
+        self.site = site
+        self.series_service = series_service
         #self.series_service = series_service
 
         title = wx.StaticText(self, -1, title)
@@ -66,9 +68,10 @@ def enableButtons(self, isEnabled):
         self.pnlExisting.rbOriginal.Enable(isEnabled)
         self.pnlExisting.lblOverlap.Enable(isEnabled)
 
-    def getSeries(self):
+    def get_selected_series(self):
         selectedObject = self.pnlExisting.olvSeriesList.GetSelectedObject()
-        return selectedObject.method, selectedObject.quality_control_level, selectedObject.variable
+        result = self.series_service.get_series(selectedObject.ResultID)
+        return result.FeatureActionObj.ActionObj.MethodObj, result.ProcessingLevelObj, result.VariableObj
 
     def initTable(self, dbservice, site_id):
         """Set up columns and objects to be used in the objectlistview to be visible in the series_service selector"""

odmtools/gui/wizSave.py

@@ -262,7 +262,7 @@ def get_metadata(self):
 
         elif self.pgIntro.pnlIntroduction.rbSaveExisting.GetValue():
             # selected an existing series
-            method, processing_level, variable = self.pgExisting.getSeries()
+            method, processing_level, variable = self.pgExisting.get_selected_series()
 
         # Create action
         action = Actions()
@@ -451,42 +451,34 @@ def on_wizard_finished(self, event):
             else:
                 result = self.record_service.saveAs(Variable, Method, QCL, True)
             '''
-
-
-            #TODO: move all of this stuff into the edit_service file
-            # Create action
-            new_result = self.series_service.getResult(var=variable, meth=method, proc=proc_level)
-
-            # action = self.series_service.create.createAction(action)
-
             affiliation = self.action_page.get_affiliation()
 
-            new_action_by = ActionBy()
-            new_action_by.ActionID = action.ActionID
-            new_action_by.RoleDescription = self.action_page.action_view.role_description_text_box.GetValue()
-            new_action_by.AffiliationID = affiliation.AffiliationID
-            new_action_by.AffiliationObj = affiliation
+            action_by = ActionBy()
+            action_by.ActionID = action.ActionID
+            action_by.RoleDescription = self.action_page.action_view.role_description_text_box.GetValue()
+            action_by.AffiliationID = affiliation.AffiliationID
+            action_by.AffiliationObj = affiliation
 
-            #TODO end
+            # result = self.series_service.getResult(var=variable, meth=method, proc=proc_level, action=action, actionby=action_by)
+            result = self.record_service._edit_service.getResult(var=variable, meth=method, proc=proc_level, action=action, actionby=action_by)
 
             try:
                 if rbSave:
                     result = self.record_service.save()
                 elif rbSaveAsNew:
-                    #TODO send in Action, and Actionby
-                    result = self.record_service.save_as(variable, method, proc_level)
+                    result = self.record_service.saveAs(variable=variable, method=method, proc_level=proc_level,
+                                                        action=action, action_by=action_by)
                 elif rbSaveAsExisting:
                     if overwrite:
-                        #TODO send in just the result
-                        result = self.record_service.save_existing(variable, method, proc_level)
+                        result = self.record_service.saveExisting(result=result)
                     elif append:
                         #TODO send in just the result
                         #def save_appending(self, var = None, method =None, qcl = None, overwrite = False):
                         #TODO if i require that original or new is selected I can call once with overwrite = original
                         if original:
-                            result = self.record_service.save_appending(variable, method, proc_level, overwrite = False)
+                            result = self.record_service.saveAppend(result=result, overwrite=False)
                         elif new:
-                            result = self.record_service.save_appending(variable, method, proc_level, overwrite = True)
+                            result = self.record_service.saveAppend(result=result, overwrite=True)
 
                 Publisher.sendMessage("refreshSeries")
 

odmtools/odmservices/edit_service.py

@@ -9,6 +9,7 @@
 import pandas as pd
 import datetime
 import numpy as np
+from odm2api.ODM2.models import *
 
 import logging
 from odmtools.common.logger import LoggerTool
@@ -549,28 +550,38 @@ def saveExisting(self, result):
         self.add_annotations(self.memDB.annotation_list)
         return result
 
-
     def getResult(self, var, meth, proc, action, actionby):
 
         # copy old
         result = self.memDB.series_service.get_series(self.memDB.df["resultid"][0])
-        self.memDB.series_service._session.expunge(result)
+        sampling_feature = result.FeatureActionObj.SamplingFeatureObj
+        # self.memDB.series_service._session.expunge(result)
 
         # change var, meth proc, in df #intend ts, agg stat
+        if var:
+            result.VariableID = var.VariableID
+            result.VariableObj = var
 
-        result.VariableID = var.VariableID
-        result.VariableObj = var
-        result.ProcessingLevelID = proc.ProcessingLevelID
-        result.ProcessingLevelObj = proc
+        if proc:
+            result.ProcessingLevelID = proc.ProcessingLevelID
+            result.ProcessingLevelObj = proc
 
-        #if result does not exist
+        if meth:
+            result.FeatureActionObj.ActionObj.MethodID = meth.MethodID
+            result.FeatureActionObj.ActionObj.MethodObj = meth
 
+        #if result does not exist
         if self.memDB.series_service.resultExists(result):
-            pass
-            #create Action : of type "derivation"
-            #create Actionby
-            #create FeatureAction( using current sampling feature id
-            #create TimeSeriesResult- this should also contain all of the stuff for the Result
+            action.ActionTypeCV = "derivation"
+            # create Actionby done
+
+            # create FeatureAction (using current sampling feature id)
+            feature_action = FeatureActions()
+            feature_action.SamplingFeatureID = sampling_feature.SamplingFeatureID
+            feature_action.SamplingFeatureObj = sampling_feature
+
+            # create TimeSeriesResult - this should also contain all of the stuff for the Result
+            series = TimeSeriesResults()
 
 
 

odmtools/odmservices/series_service.py

@@ -88,7 +88,7 @@ def get_series(self, series_id=None):
         #     print e
         #     return None
         setSchema(self._session_factory.engine)
-        return self.read.getResults(ids=[series_id])[0]
+        return self.read.getResults(ids=[str(series_id)])[0]
 
     # Query result objects for data purposes
     def get_result_dates(self, result_id):