Merge branch 'use_api2' of https://github.com/odm2/ODMToolsPython into use_api2

Author: stephanie

odmtools/controller/frmSeriesSelector.py

@@ -309,7 +309,7 @@ def onRightExData(self, event):
             full_path = os.path.join(dlg.GetDirectory(), dlg.GetFilename())
 
             #series_id = self.tableSeries.getColumnText(self.selectedIndex, 1)
-            series_id = self.tblSeries.GetSelectedObject().id
+            series_id = self.tblSeries.GetSelectedObject().ResultID
             self.export_service.export_series_data(series_id, full_path, True, True, True, True, True, True, True)
             self.Close()
 

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/frmDataExport.py

@@ -79,7 +79,7 @@ def __init__(self, parent, series_id):
 		self._init_ctrls(parent)
 
 		sm = ServiceManager()
-		self.export_service = sm.get_export_service()
+		self.export_data = sm.get_export_service()
 
 
 	def OnBtnOKButton(self, event):
@@ -96,7 +96,8 @@ def OnBtnOKButton(self, event):
 			full_path = os.path.join(dlg.GetDirectory(), dlg.GetFilename())
 			print full_path
 
-			self.export_service.export_series_data(self.series_id, full_path, utc, site, var, offset, qual, src, qcl)
+			#self.export_service.export_series_data(self.series_id, full_path, utc, site, var, offset, qual, src, qcl)
+			self.export_data.export_series_data(self.series_id, full_path, utc, site, var, offset, qual, src, qcl)
 			self.Close()
 
 		dlg.Destroy()

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/export_data.py

@@ -0,0 +1,85 @@
+import csv
+import xml.etree.cElementTree as ET
+import datetime
+
+class ExportData():
+
+    def __init__(self, series_service):
+        self._series_service = series_service
+        self.dt_format_str = "%m/%d/%Y %I:%M:%S %p"
+
+    def export_series_data(self, series_id, filename, utc=False, site=False, var=False, offset=False, qual=False,
+                           src=False, qcl=False):
+        #series = self._series_service.get_series_by_id(series_id)
+        series = self._series_service.get_series(series_id)
+
+        if series is None:
+            return False
+
+        writer = csv.writer(open(filename, 'wb'))
+        plainWriter = open(filename, 'w')
+        print "filename: "
+        print filename
+        self.write_data_header(plainWriter, series, utc, site, var, offset, qual, src, qcl)
+        # for dv in series.data_values:
+        #    self.write_data_row(writer, series, dv, utc, site, var, offset, qual, src, qcl)
+
+    def export_data(self, series_ids, filename):
+        if series_ids is None:
+            return
+
+        try:
+            with open(filename):
+                file_exists = True
+        except IOError:
+            file_exists = False
+
+        if file_exists:
+            pass
+
+    def write_data_header(self, plainWriter, series, utc, site, var, offset, qual, src, qcl):
+        self.write_warning_header(plainWriter)
+        self.write_site_information(plainWriter, series, site)
+        self.write_variable_and_method_information(plainWriter, series)
+
+
+    def write_site_information(self, plainWriter, series, site):
+        plainWriter.write('# Site Information\n')
+        plainWriter.write('# ----------------------------------\n')
+        plainWriter.write('# Network: TBD\n')
+        plainWriter.write('# SiteCode: '+str(series.FeatureActionObj.SamplingFeatureObj.SamplingFeatureCode)+'\n')
+        plainWriter.write('# SiteName: ' + str(series.FeatureActionObj.SamplingFeatureObj.SamplingFeatureName) + '\n')
+        plainWriter.write('# Latitude: ' + str(series.FeatureActionObj.SamplingFeatureObj.Latitude) + '\n')
+        plainWriter.write('# Longitude: ' + str(series.FeatureActionObj.SamplingFeatureObj.Longitude) + '\n')
+        plainWriter.write('# LatLonDatum: ' + 'TBD' + '\n') #FIX
+        plainWriter.write('# Elevation_m: ' + str(series.FeatureActionObj.SamplingFeatureObj.Elevation_m) + '\n')
+        plainWriter.write('# ElevationDatum: ' + str(series.FeatureActionObj.SamplingFeatureObj.ElevationDatumCV) + '\n')
+        plainWriter.write('# State: ' + 'TBD' + '\n')  # FIX
+        plainWriter.write('# County: ' + 'TBD' + '\n')  # FIX
+        plainWriter.write('# Comments: ' + 'TBD' + '\n')  # FIX
+        plainWriter.write(
+            '# SiteType: ' + str(series.FeatureActionObj.SamplingFeatureObj.SiteTypeCV) + '\n')
+        plainWriter.write('#\n')
+
+    def write_variable_and_method_information(self, plainWriter, series):
+        plainWriter.write('# Variable and Method Information\n')
+        plainWriter.write('# ----------------------------------\n')
+        plainWriter.write('# VariableCode: ' + str(series.VariableObj.VariableCode) + '\n')
+        plainWriter.write('# VariableName: ' + str(series.VariableObj.VariableName) + '\n')
+
+    def write_warning_header(self, plainWriter):
+        plainWriter.write(
+            '# ------------------------------------------------------------------------------------------\n')
+        plainWriter.write('# WARNING: The data are released on the condition that neither iUTAH nor any of its \n')
+        plainWriter.write('# participants may be held liable for any damages resulting from their use. The following \n')
+        plainWriter.write('# metadata describe the data in this file:\n')
+        plainWriter.write(
+            '# ------------------------------------------------------------------------------------------\n')
+        plainWriter.write('#\n')
+        plainWriter.write('# Quality Control Level Information\n')
+        plainWriter.write('# -----------------------------------------------\n')
+        plainWriter.write('# These data have passed QA/QC procedures such as sensor calibration and\n')
+        plainWriter.write('# visual inspection and removal of obvious errors. These data are approved\n')
+        plainWriter.write('# by Technicians as the best available version of the data. See published\n')
+        plainWriter.write('# script for correction steps specific to this data series.\n')
+        plainWriter.write('#\n')

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):

odmtools/odmservices/service_manager.py

@@ -9,6 +9,7 @@
 from series_service import  SeriesService
 from edit_service import EditService
 from export_service import ExportService
+from export_data import ExportData
 
 
 from odmtools.controller import EditTools
@@ -165,7 +166,7 @@ def get_record_service(self, script, series_id, connection):
 
 
     def get_export_service(self):
-        return ExportService(self.get_series_service())
+        return ExportData(self.get_series_service())
 
     ## ###################
     # private variables