fi affiliation issue

Author: stephanie

Examples/Sample.py

@@ -20,7 +20,7 @@
 # session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
 # session_factory= dbconnection.createConnection('mssql', "(local)", "LBRODM2", "ODM", "odm")#win MSSQL
 session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
-# session_factory = dbconnection.createConnection('sqlite', '/Users/Stephanie/Desktop/TestODM2.db', 2.0)
+# session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/ODM2/usecases/WOF_to_ODM2/ODM2.sqlite', 2.0)
 
 
 

odm2api/ODM2/models.py

@@ -1,6 +1,7 @@
 from sqlalchemy import BigInteger, Column, Date, DateTime, Float, ForeignKey, Integer, String, Boolean, BLOB, case
 from sqlalchemy.orm import relationship
 from sqlalchemy.dialects import postgresql, mysql, sqlite
+# from sqlalchemy.dialects.sqlite import BIT
 
 
 from geoalchemy import GeometryDDL, GeometryColumn
@@ -17,6 +18,9 @@
 BigIntegerType = BigIntegerType.with_variant(postgresql.BIGINT(), 'postgresql')
 BigIntegerType = BigIntegerType.with_variant(mysql.BIGINT(), 'mysql')
 
+# BooleanType = Boolean()
+# BooleanType =BooleanType.with_variant(sqlite.BIT(), 'sqlite')
+
 
 def is_hex(s):
     try:

odm2api/ODM2/services/readService.py

@@ -412,10 +412,14 @@ def getAffiliations(self, ids=None, personfirst=None, personlast=None, orgcode=N
         * Pass an OrganizationCode - returns a Affiliation object
         """
         q = self._session.query(Affiliations)
-        if ids: q = q.filter(Affiliations.AffiliationID.in_(ids))
-        if orgcode: q = q.filter(Organizations.OrganizationCode.ilike(orgcode))
-        if personfirst: q = q.filter(People.PersonFirstName.ilike(personfirst))
-        if personlast: q = q.filter(People.PersonLastName.ilike(personlast)).first()
+        if ids:
+            q = q.filter(Affiliations.AffiliationID.in_(ids))
+        if orgcode:
+            q = q.filter(Organizations.OrganizationCode.ilike(orgcode))
+        if personfirst:
+            q = q.filter(People.PersonFirstName.ilike(personfirst))
+        if personlast:
+            q = q.filter(People.PersonLastName.ilike(personlast))
         try:
             return q.all()
         except:
@@ -801,8 +805,6 @@ def getRelatedModels(self, id=None, code=None):
         # if id: m = m.filter(RelatedModels.ModelID == id)
         # if code: m = m.filter(RelatedModels.ModelCode == code)
 
-
-
         try:
             return m.all()
         except Exception as e:

odm2api/base.py

@@ -45,6 +45,9 @@ def __tablename__(cls):
     def __init__(self, *args, **kwargs):
         for name, value in kwargs.items(): setattr(self, name, value)
 
+    def __eq__(self, other) :
+        return self.__dict__ == other.__dict__
+
 from sqlalchemy.ext.declarative import declarative_base