modifying create and read service methods.

Author: denvaar

src/api/ODM2/services/createService.py

@@ -151,7 +151,7 @@ def createSamplingFeature(self, uuid, code, vType, name=None, description=None,
         return sf
 
 
-    def createUnit(self, type, abbrev, name):
+    def createUnit(self, type, abbrev, name, link=None):
         """Create Unit table
 
         :param code:
@@ -166,6 +166,7 @@ def createUnit(self, type, abbrev, name):
         unit.UnitsTypeCV = type
         unit.UnitsAbbreviation = abbrev
         unit.UnitsName = name
+        unit.UnitsLink = link
 
         self._session.add(unit)
         self._session.commit()

src/api/ODM2/services/readService.py

@@ -28,7 +28,8 @@ def __init__(self, result,
         self.processingLevelDef = processingLevel.Definition
 
 class DetailedAffiliation:
-    def __init__(self, person, org):
+    def __init__(self, affiliation, person, org):
+        self.affiliationID = affiliation.AffiliationID
         self.name = person.PersonFirstName + \
                     " " + \
                     person.PersonLastName
@@ -167,7 +168,7 @@ def getDetailedAffiliationInfo(self):
             .filter(Affiliations.OrganizationID==Organizations.OrganizationID)
         affiliationList = []
         for a,p,o in q.all():
-            detailedAffiliation = DetailedAffiliation(p,o)
+            detailedAffiliation = DetailedAffiliation(a,p,o)
             affiliationList.append(detailedAffiliation)
         return affiliationList