Merge branch 'staging' into state-machine-unit-tests

2020-02-20 10:21:41 -05:00
parent 1f58f40cb0 57ba7d5979
commit be53a1fd1a
32 changed files with 404 additions and 159 deletions
--- a/atst/models/clin.py
+++ b/atst/models/clin.py
@@ -66,12 +66,14 @@ class CLIN(Base, mixins.TimestampsMixin):
        )

    def to_dictionary(self):
-        return {
+        data = {
            c.name: getattr(self, c.name)
            for c in self.__table__.columns
            if c.name not in ["id"]
        }

+        return data
+
    @property
    def is_active(self):
        return (