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

Author: kwuz

odmtools/controller/WizardActionController.py

@@ -46,6 +46,8 @@ def get_affiliation(self):
         return self.affiliations[index]
 
 
+
+
 if __name__ == '__main__':
     app = wx.App(False)
     controller = WizardActionController(None, None)

odmtools/controller/frmAddPoints.py

@@ -123,7 +123,7 @@ def onInfoBtn(self, event):
         :return:
         """
         self.checkIfEditing()
-
+        #todo fran: update this for odm2 info.
         message = "DataValue: FLOAT\n" \
                   "Date: YYYY-MM-DD\n" \
                   "Time: HH:MM:SS\n" \
@@ -233,8 +233,9 @@ def parseTable(self):
                 row[4] = point.censorCode
                 row[5] = point.qualityCodeCV
                 row[6] = point.timeAggInterval
-                row[7] = point.timeAggregationUnitID
-                row[8] = point.annotation
+                # row[7] = point.timeAggregationUnitID
+                row[7] = self.olv.cellEdit.timeAggretaionUnitChoices[point.timeAggregationUnitID]
+                row[8] = self.olv.cellEdit.qualifierChoices[ point.annotation] if point.annotation != 'NULL' else point.annotation
 
                 row.extend([site_id, variable_id, method_id, organization_id, process_id])
 

odmtools/controller/frmSeriesSelector.py

@@ -188,8 +188,8 @@ def OnTableRightDown(self, event):
         # TODO @jmeline needs to fix edit, it doesn't unedit when a plot is being edited
         self.Bind(wx.EVT_MENU, self.onRightEdit, editItem)
         # TODO @jmeline will refresh and clear selected as an enhancement
-        #self.Bind(wx.EVT_MENU, self.onRightRefresh, popup_menu.Append(popup_series_refresh, 'Refresh'))
-        #self.Bind(wx.EVT_MENU, self.onRightClearSelected, popup_menu.Append(popup_series_refresh, 'Clear Selected'))
+
+
 
         popup_menu.AppendSeparator()
         self.Bind(wx.EVT_MENU, self.onRightExData, popup_menu.Append(popup_export_data, 'Export Data'))

odmtools/controller/logicCellEdit.py

@@ -30,17 +30,17 @@ def __init__(self, parent, serviceManager, recordService):
             self.annotationChoices = [NULL] + ['SampleAnnotation1'] + ['SampleAnnotation2'] + ['SampleAnnotation3']
 
     def fetch_annotations(self):
-        qualifierChoices = OrderedDict((x.AnnotationCode + ':' + x.AnnotationText, x.AnnotationID)
+        self.qualifierChoices = OrderedDict((x.AnnotationCode + ':' + x.AnnotationText, x.AnnotationID)
                                        for x in self.series_service.get_all_qualifiers() if x.AnnotationCode and x.AnnotationText)
-        qualifierCodeChoices = [NULL] + qualifierChoices.keys() + [NEW]
+        qualifierCodeChoices = [NULL] + self.qualifierChoices.keys() + [NEW]
         return qualifierCodeChoices
 
     def fetchCensorCodeChoices(self):
         if not self.serviceManager:
             return [NULL]
 
         series_service = self.serviceManager.get_series_service()
-        return [NULL] + [x.Term for x in series_service.get_censor_code_cvs()]
+        return [NULL] + [x.Name for x in series_service.get_censor_code_cvs()]
 
     def fetchQualityCodeChoices(self):
         """
@@ -50,13 +50,13 @@ def fetchQualityCodeChoices(self):
             return [NULL]
 
         series_service = self.serviceManager.get_series_service()
-        return [NULL] + [x.Term for x in series_service.get_quality_code()]
+        return [NULL] + [x.Name for x in series_service.get_quality_code()]
 
     def fetchTimeUnitChoices(self):
         if not self.serviceManager:
             return [NULL]
-        units = self.series_service.read.getUnits()
-        return [NULL] + [unit.UnitsName for unit in units]
+        units = self.series_service.read.getUnits(type='time')
+        return  {unit.UnitsName:unit.UnitsID for unit in units}
 
     """
         --------------------
@@ -172,26 +172,7 @@ def imgGetterUTCOFFset(self, point):
 
         return "error"
 
-    def imgGetterValueAcc(self, point):
-        value = point.valueAccuracy
-        point.validValueAcc = False
-        if not value:
-            return "error"
-
-        if value == NULL:
-            point.validValueAcc = True
-            return "check"
 
-        if isinstance(value, basestring):
-            for type in [int, float]:
-                try:
-                    value = type(value)
-                    if isinstance(value, type):
-                        point.validValueAcc = True
-                        return "check"
-                except ValueError:
-                    continue
-        return "error"
 
     def imgGetterOffSetType(self, point):
         point.validOffSetType = False
@@ -336,7 +317,7 @@ def setComboForQualityCodeColumn(self, olv, rowIndex, subItemIndex):
         return odcb
 
     def setComboForTimeAggregationUnitIDCreator(self, olv, rowIndex, subItemIndex):
-        customCombo = CustomComboBox(olv, choices=self.timeAggretaionUnitChoices, style=wx.CB_READONLY)
+        customCombo = CustomComboBox(olv, choices=self.timeAggretaionUnitChoices.keys(), style=wx.CB_READONLY)
         customCombo.Bind(wx.EVT_KEY_DOWN, olv._HandleChar)
         return customCombo
 

odmtools/controller/logicEditTools.py

@@ -222,7 +222,7 @@ def restore(self):
             self._script("edit_service.restore()\n", 'black')
             Publisher.sendMessage("scroll")
 
-    def saveFactory(self, var=None, method=None, qcl=None):
+    def saveFactory(self, var=None, method=None, qcl=None, action= None, actionby= None):
         """
 
         :param var:
@@ -236,7 +236,7 @@ def saveFactory(self, var=None, method=None, qcl=None):
         values['method'] = ("new_method" if method else None)
         values['qcl'] = ("new_qcl" if qcl else None)
         #values['override'] = override
-        return values['var'], values['method'], values['qcl']#, values['isSave']
+        return values['var'], values['method'], values['qcl'], action, actionby#, values['isSave']
 
 
     def save(self, var=None, method=None, qcl=None):
@@ -257,7 +257,7 @@ def save(self, var=None, method=None, qcl=None):
             Publisher.sendMessage("scroll")
         return result
 
-    def save_as(self, var=None, method=None, qcl=None):
+    def save_as(self, variable=None, method=None, proc_level=None, action = None, action_by = None):
         """
 
         :param var:
@@ -266,16 +266,16 @@ def save_as(self, var=None, method=None, qcl=None):
         :param override:
         :return:
         """
-        result = self._edit_service.save_as(var=var, method=method, qcl=qcl)
+        result = self._edit_service.save_as(variable=variable, method=method, proc_level=proc_level, action = action, action_by = action_by)
         if self._record:
             self._script(
-                "edit_service.save_as(%s, %s, %s)\n" % (self.saveFactory(var, method, qcl)),
+                "edit_service.save_as(%s, %s, %s, %s, %s)\n" % (self.saveFactory(variable, method, proc_level, action, action_by)),
                 'black')
             #self._script("edit_service.save(%s, %s, %s, saveAs=%s)\n" % (var, method, qcl, isSave), 'black')
             Publisher.sendMessage("scroll")
         return result
 
-    def save_appending(self, var = None, method =None, qcl = None, overwrite = False):
+    def save_appending(self, result = None, overwrite = False):
         """
 
         :param var:
@@ -284,14 +284,14 @@ def save_appending(self, var = None, method =None, qcl = None, overwrite = False
         :param override:
         :return:
         """
-        result = self._edit_service.save_appending(var=var, method=method, qcl=qcl, overwrite= overwrite)
+        result = self._edit_service.save_appending(result= result,  overwrite= overwrite)
         if result:
             print "Save worked!"
 
             if self._record:
 
                 self._script(
-                    "edit_service.save_appending(%s, %s, %s, " % self.saveFactory(var, method, qcl)+str(overwrite )+")\n",
+                    "edit_service.save_appending(%s, %s)\n" % (result, str(overwrite )),
                     'black')
                 #self._script("edit_service.save(%s, %s, %s, saveAs=%s)\n" % (var, method, qcl, isSave), 'black')
                 Publisher.sendMessage("scroll")
@@ -302,7 +302,7 @@ def save_appending(self, var = None, method =None, qcl = None, overwrite = False
         return result
 
 
-    def save_existing(self, var=None, method=None, qcl=None):
+    def save_existing(self, result=None):
         """
 
         :param var:
@@ -311,14 +311,14 @@ def save_existing(self, var=None, method=None, qcl=None):
         :param override:
         :return:
         """
-        result = self._edit_service.save_existing(var=var, method=method, qcl=qcl)
+        result = self._edit_service.save_existing(result = result)
         if result:
             print "Save worked!"
 
             if self._record:
 
                 self._script(
-                    "edit_service.save_existing(%s, %s, %s)\n" % (self.saveFactory(var, method, qcl)),
+                    "edit_service.save_existing(%s)\n" % (result),
                     'black')
                 #self._script("edit_service.save(%s, %s, %s, saveAs=%s)\n" % (var, method, qcl, isSave), 'black')
                 Publisher.sendMessage("scroll")

odmtools/controller/olvAddPoint.py

@@ -60,41 +60,41 @@ def __init__(self, *args, **kwargs):
 
         FastObjectListView.__init__(self, *args, **kwargs)
 
-        cellEdit = CellEdit(self, self.serviceManager, self.recordService)
+        self.cellEdit = CellEdit(self, self.serviceManager, self.recordService)
 
         self.checkedObjects = []
 
         # # Custom Image Getters
-        self.imgGetterDataValue = cellEdit.imgGetterDataValue
-        self.imgGetterDate = cellEdit.imgGetterDate
-        self.imgGetterTime = cellEdit.imgGetterTime
-        self.imgGetterCensorCode = cellEdit.imgGetterCensorCode
-        self.imgGetterUTCOffset = cellEdit.imgGetterUTCOFFset
-        self.imgGetterQualityCode = cellEdit.imgGetterQualityCode
-        self.imgGetterTimeAggInterval = cellEdit.imgGetterTimeAggregationInterval
-        self.imgGetterTimeAggUnit = cellEdit.imgGetterTimeAggregationUnit
+        self.imgGetterDataValue = self.cellEdit.imgGetterDataValue
+        self.imgGetterDate = self.cellEdit.imgGetterDate
+        self.imgGetterTime = self.cellEdit.imgGetterTime
+        self.imgGetterCensorCode = self.cellEdit.imgGetterCensorCode
+        self.imgGetterUTCOffset = self.cellEdit.imgGetterUTCOFFset
+        self.imgGetterQualityCode = self.cellEdit.imgGetterQualityCode
+        self.imgGetterTimeAggInterval = self.cellEdit.imgGetterTimeAggregationInterval
+        self.imgGetterTimeAggUnit = self.cellEdit.imgGetterTimeAggregationUnit
 
         ## Custom Value Setters
         ## Sets the value, can modify rules for setting value
-        self.valueSetterDataValue = cellEdit.valueSetterDataValue
-        self.valueSetterUTCOffset = cellEdit.valueSetterUTCOffset
+        self.valueSetterDataValue = self.cellEdit.valueSetterDataValue
+        self.valueSetterUTCOffset = self.cellEdit.valueSetterUTCOffset
 
         ## Custom String Converters
         ## Changes how the string will appear in the cell after editing
-        self.localtime2Str = cellEdit.strConverterLocalTime
-        self.str2DataValue = cellEdit.strConverterDataValue
-        self.utcOffSet2Str = cellEdit.strConverterUTCOffset
+        self.localtime2Str = self.cellEdit.strConverterLocalTime
+        self.str2DataValue = self.cellEdit.strConverterDataValue
+        self.utcOffSet2Str = self.cellEdit.strConverterUTCOffset
         # self.offSetValue2Str = cellEdit.strConverterOffSetValue
 
         ## Custom CellEditors
         ## Custom cell editors for each cell
-        self.dateEditor = cellEdit.dateEditor
-        self.timeEditor = cellEdit.localTimeEditor
-        self.censorEditor = cellEdit.censorCodeEditor
-        self.valueDateTimeEditorCreator = cellEdit.valueDateTimeEditor
-        self.qualityCodeCreator = cellEdit.setComboForQualityCodeColumn
-        self.timeAggregationUnitIDCreator = cellEdit.setComboForTimeAggregationUnitIDCreator
-        self.annotationCreator = cellEdit.setComboForAnnotation
+        self.dateEditor = self.cellEdit.dateEditor
+        self.timeEditor = self.cellEdit.localTimeEditor
+        self.censorEditor = self.cellEdit.censorCodeEditor
+        self.valueDateTimeEditorCreator = self.cellEdit.valueDateTimeEditor
+        self.qualityCodeCreator = self.cellEdit.setComboForQualityCodeColumn
+        self.timeAggregationUnitIDCreator = self.cellEdit.setComboForTimeAggregationUnitIDCreator
+        self.annotationCreator = self.cellEdit.setComboForAnnotation
 
         self.SetEmptyListMsg("Add points either by csv or by adding a new row")
         self.AddNamedImages("error", x_mark_16.GetBitmap(), x_mark_32.GetBitmap())

odmtools/controller/pageExisting.py

@@ -70,8 +70,8 @@ def enableButtons(self, isEnabled):
 
     def get_selected_series(self):
         selectedObject = self.pnlExisting.olvSeriesList.GetSelectedObject()
-        result = self.series_service.get_series(selectedObject.ResultID)
-        return result.FeatureActionObj.ActionObj.MethodObj, result.ProcessingLevelObj, result.VariableObj
+        result = selectedObject.ResultObj#self.series_service.get_series(selectedObject.ResultID)
+        return result.FeatureActionObj.ActionObj.MethodObj, result.ProcessingLevelObj, result.VariableObj, result
 
     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.get_selected_series()
+            method, processing_level, variable, result = self.pgExisting.get_selected_series()
 
         # Create action
         action = Actions()
@@ -272,6 +272,7 @@ def get_metadata(self):
         action.ActionFileLink = self.action_page.action_view.action_file_link_text_box.GetValue()
         action.MethodObj.OrganizationObj = affiliation.OrganizationObj
         action.BeginDateTime = self.currSeries.ResultDateTime
+        action.BeginDateTimeUTCOffset = self.currSeries.ResultDateTimeUTCOffset
 
         return site, variable, method, action, processing_level
 
@@ -454,31 +455,33 @@ def on_wizard_finished(self, event):
             affiliation = self.action_page.get_affiliation()
 
             action_by = ActionBy()
-            action_by.ActionID = action.ActionID
+            #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
 
             # 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)
+            result = self.pgExisting.pnlExisting.olvSeriesList.GetSelectedObject().ResultObj
+
+            #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:
-                    result = self.record_service.saveAs(variable=variable, method=method, proc_level=proc_level,
+                    result = self.record_service.save_as(variable=variable, method=method, proc_level=proc_level,
                                                         action=action, action_by=action_by)
                 elif rbSaveAsExisting:
                     if overwrite:
-                        result = self.record_service.saveExisting(result=result)
+                        result = self.record_service.save_existing(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.saveAppend(result=result, overwrite=False)
+                            result = self.record_service.save_appending(result=result, overwrite=False)
                         elif new:
-                            result = self.record_service.saveAppend(result=result, overwrite=True)
+                            result = self.record_service.save_appending(result=result, overwrite=True)
 
                 Publisher.sendMessage("refreshSeries")
 

odmtools/odmdata/memory_database.py

@@ -160,7 +160,7 @@ def chunking(self, data):
 
 
     #break into chunks to get around sqlite's restriction. allowing user to send in only 999 arguments at once
-    #TODO update to work with odm2
+
 
     def updateFlag(self, ids, value):
 
@@ -211,8 +211,9 @@ def addPoints(self, points):
                     "resultid":self.df["resultid"][0]
                     # todo: Add annotations
                     }
-            if point[8]:
-                self.updateFlag(point[1], self.series_service.get_annotation_by_code(point[8].split(':')[0]).AnnotationID)
+            if point[8] != 'NULL':
+                print point[8]
+                self.updateFlag([point[1]], [point[8]])
 
             setSchema(self.mem_service._session_factory.engine)
             self.mem_service._session.execute(stmt, vals)