update detailed result obj

Author: stephanie

odm2api/ODM2/services/readService.py

@@ -178,7 +178,7 @@ def getDetailedAffiliationInfo(self):
             affiliationList.append(detailedAffiliation)
         return affiliationList
 
-    def getDetailedResultInfo(self, resultTypeCV=None, resultID=None):
+    def getDetailedResultInfo(self, resultTypeCV=None, resultID=None, sfID=None):
         q = self._session.query(Actions, Results, SamplingFeatures.SamplingFeatureCode, SamplingFeatures.SamplingFeatureName, Methods, Variables,
                                 ProcessingLevels, Units).filter(Results.VariableID == Variables.VariableID) \
             .filter(Results.UnitsID == Units.UnitsID) \
@@ -190,16 +190,15 @@ def getDetailedResultInfo(self, resultTypeCV=None, resultID=None):
             .filter(Results.ResultTypeCV == resultTypeCV) \
             .order_by(Results.ResultID)
         resultList = []
+        if sfID:
+                q= q.filter(SamplingFeatures.SamplingFeatureID == sfID)
         if resultID:
-            for a, r, sc, sn, m, v, p, u in q.filter_by(ResultID=resultID).all():
-                detailedResult = DetailedResult( \
-                    a, r, sc, sn, m, v, p, u)
-                resultList.append(detailedResult)
-        else:
-            for a, r, sc, sn, m, v, p, u in q.all():
-                detailedResult = DetailedResult( \
-                    a, r, sc, sn, m, v, p, u)
-                resultList.append(detailedResult)
+            q= q.q.filter_by(ResultID=resultID)
+
+        for a, r, sc, sn, m, v, p, u in q.all():
+            detailedResult = DetailedResult( \
+                a, r, sc, sn, m, v, p, u)
+            resultList.append(detailedResult)
         return resultList
 
     """

odm2api/ODMconnection.py

@@ -28,7 +28,7 @@ def __init__(self, connection_string, echo=True, version = 2.0):
             self.test_engine = create_engine(connection_string, encoding='utf-8', echo=echo, pool_recycle=3600, pool_timeout=5, max_overflow=0, connect_args={'connect_timeout': 1})
 
         # Create session maker
-        self.Session = sessionmaker(bind=self.engine)
+        self.Session = sessionmaker(bind=self.engine, autoflush=True)
         self.test_Session = sessionmaker(bind=self.test_engine)
         setSchema(self.engine)
         self.version=version

odm2api/base.py

@@ -23,6 +23,7 @@ def __init__(self,  session_factory, debug=False):
         self._session = self._session_factory.getSession()
         self._version = session_factory.version
         self._debug = debug
+
         #self._sessiona
 
     #self._session_factory=""