adding ability to filter by result id for getDetailedResultInfo

Author: denvaar

src/api/ODM2/services/createService.py

@@ -469,6 +469,11 @@ def createTimeSeriesResultValues(self, datavalues):
         try:
             #using Pandas built-in  --slow
             #changing way values sent --unknown error on insert
+            #cols = datavalues.columns.tolist()
+            #['ValueDateTime', 'DataValue', 'TimeAggregationInterval', 'TimeAggregationIntervalUnitsID', 'QualityCodeCV', 'CensorCodeCV', 'ResultID', 'ValueDateTimeUTCOffset']
+            cols = ['ResultID','DataValue','ValueDateTime','ValueDateTimeUTCOffset','CensorCodeCV','QualityCodeCV','TimeAggregationInterval','TimeAggregationIntervalUnitsID']
+            datavalues = datavalues[cols]
+            #print datavalues
             datavalues.to_sql(name=TimeSeriesResultValues.__tablename__,
                               schema=TimeSeriesResultValues.__table_args__['schema'],
                               if_exists='append',

src/api/ODM2/services/readService.py

@@ -153,7 +153,7 @@ def getDetailedAffiliationInfo(self):
             affiliationList.append(detailedAffiliation)
         return affiliationList
 
-    def getDetailedResultInfo(self, resultTypeCV):
+    def getDetailedResultInfo(self, resultTypeCV, resultID=None):
         q = self._session.query(Results, SamplingFeatures, Methods, Variables,
             ProcessingLevels, Units).filter(Results.VariableID==Variables.VariableID)\
             .filter(Results.UnitsID==Units.UnitsID)\
@@ -164,10 +164,16 @@ def getDetailedResultInfo(self, resultTypeCV):
             .filter(Results.ProcessingLevelID==ProcessingLevels.ProcessingLevelID)\
             .filter(Results.ResultTypeCV==resultTypeCV)
         resultList = []
-        for r,s,m,v,p,u in q.all():
-            detailedResult = DetailedResult(\
-                r,s,m,v,p,u)
-            resultList.append(detailedResult)
+        if resultID:
+            for r,s,m,v,p,u in q.filter_by(ResultID=resultID).all():
+                detailedResult = DetailedResult(\
+                    r,s,m,v,p,u)
+                resultList.append(detailedResult)
+        else:
+            for r,s,m,v,p,u in q.all():
+                detailedResult = DetailedResult(\
+                    r,s,m,v,p,u)
+                resultList.append(detailedResult)
         return resultList
 
     """