Merge branch 'setup' of https://github.com/ODM2/ODM2PythonAPI into setup

Author: sreeder

src/api/ODM2/models.py

@@ -2040,4 +2040,4 @@ def change_schema(schema):
     clsmembers = inspect.getmembers(sys.modules[__name__], lambda member: inspect.isclass(member) and member.__module__ == __name__)
 
     for name, Tbl in clsmembers:
-        Tbl.__table__.schema = schema
+        Tbl.__table__.schema = schema

src/api/ODM2/services/readService.py

@@ -27,6 +27,16 @@ def __init__(self, result,
         self.variableNameCV = variable.VariableNameCV
         self.processingLevelDef = processingLevel.Definition
 
+class DetailedAffiliation:
+    def __init__(self, person, org):
+        self.name = person.PersonFirstName + \
+                    " " + \
+                    person.PersonLastName
+        self.organization = "(" + org.OrganizationCode + ") " +\
+                            org.OrganizationName
+
+    #def __repr__(self):
+    #    return str(self.name) + " " + str(self.organization)
 
 class ReadODM2( serviceBase   ):
     '''
@@ -117,10 +127,31 @@ def getCVUnitsTypes(self):
         """
         return self._session.query(CVUnitsType).all()
 
+    def getCVActionTypes(self):
+        """
+        Select all on CVActionType
+        """
+        return self._session.query(CVActionType).all()
+    
+    def getCVMethodTypes(self):
+        """
+        Select all on CVMethodType
+        """
+        return self._session.query(CVMethodType).all()
+
 # ################################################################################
 # Core
 # ################################################################################
-
+    
+    def getDetailedAffiliationInfo(self):
+        q = self._session.query(Affiliations, People, Organizations)\
+            .filter(Affiliations.PersonID==People.PersonID)\
+            .filter(Affiliations.OrganizationID==Organizations.OrganizationID)
+        affiliationList = []
+        for a,p,o in q.all():
+            detailedAffiliation = DetailedAffiliation(p,o)
+            affiliationList.append(detailedAffiliation)
+        return affiliationList
 
     def getDetailedResultInfo(self, resultTypeCV):
         q = self._session.query(Results, SamplingFeatures, Methods, Variables,
@@ -226,6 +257,9 @@ def getMethodByCode(self, methodCode):
             return self._session.query(Methods).filter_by(MethodCode=methodCode).first()
         except:
             return None
+    
+    def getMethodsByType(self, methodTypeCV):
+        return self._session.query(Methods).filter_by(MethodTypeCV=methodTypeCV).all()
 
     """
     ProcessingLevel
@@ -347,7 +381,6 @@ def getActions(self):
         """
         Select all on Action
         """
-        print self._session.query(Actions).all()
         return self._session.query(Actions).all()
 
     def getActionById(self, actionId):
@@ -358,7 +391,7 @@ def getActionById(self, actionId):
             return self._session.query(Actions).filter_by(ActionID=actionId).first()
         except:
             return None
-
+    
 
     """
     Unit
@@ -487,6 +520,9 @@ def getAffiliationByPersonAndOrg(self, personfirst, personlast, orgcode):
                 .filter(People.PersonLastName.ilike(personlast)).first()
         except:
             return None
+    
+    def getAffiliations(self):
+        return self._session.query(Affiliations).all()
 
     def getAffiliationsByPerson(self, personfirst, personlast):
         """