Updated the acl to process level, and vertical datum to elevation datum

Author: Francisco Arrieta

odmtools/controller/logicEditTools.py

@@ -379,7 +379,7 @@ def toggle_record(self, value):
     # Creates
     ###################
     def create_qcl(self, code, definition, explanation):
-        qcl = self._edit_service.create_qcl(code, definition, explanation)
+        qcl = self._edit_service.create_processing_level(code, definition, explanation)
         if self._record:
             self._script('new_qcl = series_service.get_qcl_by_id(%s)\n' % (qcl.id))
             Publisher.sendMessage("scroll")

odmtools/gui/wizSave.py

@@ -380,7 +380,7 @@ def on_wizard_finished(self, event):
                 else:
                     QCL = self.record_service.get_qcl(QCL)
             else:
-                QCL = self.record_service.create_qcl(QCL.code, QCL.definition, QCL.explanation)
+                QCL = self.record_service.create_processing_level(QCL.code, QCL.definition, QCL.explanation)
 
             #if variable exists use its id
             if self.series_service.variable_exists(Variable):

odmtools/odmservices/ReadService.py

@@ -18,8 +18,7 @@ def __init__(self, connection_string="", debug=False):
     # Controlled Vocabulary get methods
     #return a list of all terms in the cv
     def get_vertical_datum_cvs(self):
-        result = self._edit_session.query(VerticalDatumCV).order_by(VerticalDatumCV.term).all()
-        return result
+        return self.read_service.getCVs(type="Elevation Datum")
 
     def get_samples(self):
         return self.read_service.getSamplingFeatures(ids=None, codes=None, uuids=None, type=None, wkt=None)
@@ -47,8 +46,7 @@ def get_data_type_cvs(self):
         return self.read_service.getCVs(type="dataset type")
 
     def get_general_category_cvs(self):
-        result = self._edit_session.query(GeneralCategoryCV).order_by(GeneralCategoryCV.term).all()
-        return result
+        return self.read_service.getAnnotations(type="categoricalresultvalue")
 
     def get_censor_code_cvs(self):
         return self.read_service.getCVs(type="censorcode")

odmtools/odmservices/edit_service.py

@@ -594,7 +594,7 @@ def save_existing(self, var=None, method=None, qcl=None):
             return False
 
     def create_qcl(self, code, definition, explanation):
-        return self.memDB.series_service.create_qcl(code, definition, explanation)
+        return self.memDB.series_service.create_processing_level(code, definition, explanation)
 
     def create_method(self, description, link):
         return self.memDB.series_service.create_method(description, link)

odmtools/odmservices/series_service.py

@@ -7,7 +7,7 @@
 from odmtools.odmdata import SessionFactory
 from odmtools.odmdata import Site
 # from odmtools.odmdata import Variable
-from odm2api.ODM2.models import Variables
+from odm2api.ODM2.models import *
 from odmtools.odmdata import Unit
 from odmtools.odmdata import Series
 from odmtools.odmdata import DataValue
@@ -22,7 +22,7 @@
 import pandas as pd
 from odm2api.ODM2.services.createService import CreateODM2
 from odm2api.ODM2.models import Annotations
-from odm2api.ODM2.services.readService import ReadODM2
+from odm2api.ODM2.services.readService import *
 
 
 # tool = LoggerTool()
@@ -619,26 +619,25 @@ def create_variable(
 
         return self.create_service.createVariable(var=variable)
 
-    def create_qcl(self, code, definition, explanation):
+    def create_processing_level(self, code, definition, explanation):
         """
         qcl -> Processing Level in ODM2
         :param code:
         :param definition:
         :param explanation:
         :return:
         """
-        qcl = QualityControlLevel()
-        qcl.code = code
-        qcl.definition = definition
-        qcl.explanation = explanation
-        return self.create_service.createProcessingLevel(proclevel=qcl)
+        procLevel = ProcessingLevels()
+        procLevel.ProcessingLevelCode = code
+        procLevel.Definition = definition
+        procLevel.Explanation = explanation
+        return self.create_service.createProcessingLevel(proclevel=procLevel)
 
     def create_annotation_by_anno(self, annotation):
         return self.create_service.create(annotation)
 
     def create_annotation(self, code, description):
         """
-
         :param code:
         :param description:
         :return:

tests/test_odmservices/test_series_service.py

@@ -359,7 +359,7 @@ def test_create_variable(self):
         assert variable.variable_unit_id == unit.id
 
     def test_create_qcl(self):
-        qcl = self.series_service.create_qcl("Code", "Definition", "Explanation")
+        qcl = self.series_service.create_processing_level("Code", "Definition", "Explanation")
 
         assert qcl.id != None
         assert qcl.code == "Code"