Created action ,action by, and result when clicking finihsed in save wizard.

Fixed a mistake when calculaing utc offset. Attached ID to results and actions

Author: Francisco Arrieta

odmtools/gui/wizSave.py

@@ -9,7 +9,7 @@
 import pageQCL
 import pageVariable
 import pageSummary
-from odm2api.ODM2.models import Actions
+from odm2api.ODM2.models import *
 
 [wxID_PNLINTRO, wxID_PNLVARIABLE, wxID_PNLMETHOD, wxID_PNLQCL,
  wxID_PNLSUMMARY, wxID_WIZSAVE, wxID_PNLEXISTING,
@@ -267,9 +267,11 @@ def get_metadata(self):
         # Create action
         action = Actions()
         action.MethodObj = method
+        action.MethodID = method.MethodID
         action.ActionDescription = self.action_page.action_view.description_text_box.GetValue()
         action.ActionFileLink = self.action_page.action_view.action_file_link_text_box.GetValue()
         action.MethodObj.OrganizationObj = affiliation.OrganizationObj
+        action.BeginDateTime = self.currSeries.ResultDateTime
 
         return site, variable, method, action, processing_level
 
@@ -442,8 +444,6 @@ def on_wizard_finished(self, event):
             else:
                 method = self.series_service.get_method_by_code(method.MethodCode)
 
-
-
             # initiate either "Save as" or "Save"
             '''
             if self.page1.pnlIntroduction.rbSave.GetValue():
@@ -456,6 +456,14 @@ def on_wizard_finished(self, event):
             new_result = self.series_service.createResult(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
+
             try:
                 if rbSave:
                     result = self.record_service.save()

odmtools/odmservices/series_service.py

@@ -560,10 +560,38 @@ def createResult(self, var, meth, proc):
         #also create an action
         #copy old
         #change var, meth proc, in df #intend ts, agg stat
-        Result = None
+        # Result = None
+        # result = Results()
         result = Results()
 
-        return self.updateResult(Result)
+        if isinstance(var, Variables):
+            result.VariableID = var.VariableID
+            result.VariableObj = var
+
+        if isinstance(meth, Methods):
+            # do something with meth
+            pass
+
+        if isinstance(proc, ProcessingLevels):
+            result.ProcessingLevelID = proc.ProcessingLevelID
+            result.ProcessingLevelObj = proc
+
+        time, offset = self.get_current_time_and_utcoffset()
+        result.ResultDateTime = time
+        result.ResultDateTimeUTCOffset = offset
+
+        self.create.createResult(result=result)
+
+        return self.updateResult(result)
+
+    def get_current_time_and_utcoffset(self):
+        current_time = datetime.datetime.now()
+        utc_time = datetime.datetime.utcnow()
+
+        difference_in_timezone = current_time - utc_time
+        offset_in_hours = difference_in_timezone.total_seconds() / 3600
+
+        return current_time, offset_in_hours
 
     def updateResult(self, Result):
         #get pd
@@ -768,13 +796,11 @@ def create_annotation(self, code, text, link=None):
         annotation.AnnotationCode = code
         annotation.AnnotationText = text
         annotation.AnnotationTypeCV = "Time series result value annotation"
-        current_time = datetime.datetime.now()
-        utc_time = datetime.datetime.utcnow()
-        annotation.AnnotationDateTime = current_time
 
-        difference_in_timezone = utc_time - current_time
-        offset_in_hours = difference_in_timezone.seconds / 3600
-        annotation.AnnotationUTCOffset = offset_in_hours
+        time, offset = self.get_current_time_and_utcoffset()
+        annotation.AnnotationDateTime = time
+        annotation.AnnotationUTCOffset = offset
+
         annotation.AnnotationLink = link
 
         return self.create_annotation_by_anno(annotation)