added new tables for room and floor

2 files changed, 71 insertions, 2 deletions

diff --git a/lib/d2/app/model/static.py b/lib/d2/app/model/static.py
index 9ba90d4..93c4af2 100644
--- a/lib/d2/app/model/static.py
+++ b/lib/d2/app/model/static.py
@@ -2,6 +2,7 @@ import hashlib
 from d2.db import DetailType
 from d2.db import OccupantType
 from d2.db import Occupant
+from d2.config import Config
 from collections import namedtuple
 
 class StaticData(object):
@@ -15,7 +16,9 @@ class StaticData(object):
         self._occupant = occupant
 
     @classmethod
-    def load(cls, db, detail_type=None, occupant_type=None, occupant=None):
+    def load(cls, db=None, detail_type=None, occupant_type=None,
+             occupant=None):
+        db = db or Config.load().db
         detail_type = detail_type or DetailType
         occupant_type = occupant_type or OccupantType
         occupant = occupant or Occupant
diff --git a/lib/d2/db.py b/lib/d2/db.py
index 73262d3..55d0d47 100644
--- a/lib/d2/db.py
+++ b/lib/d2/db.py
@@ -76,6 +76,72 @@ class Location(Base):
             obj.id = data['id']
         return obj
 
+class Floor(Base):
+    """Database table object for storing different floor names
+    """
+    __tablename__ = PREFIX + "floor"
+    id = Column(Integer, primary_key=True)
+    location_id = Column(Integer, ForeignKey(PREFIX + 'location.id'),
+                         index=True)
+    name = Column(Unicode)
+
+    def __init__(self, name):
+        self.name = name
+
+    def __repr__(self):
+        out = "<Floor("\
+              "name={obj.name!r}, "\
+              ")>"
+        return out.format(obj=self)
+
+    def as_dict(self):
+        out = OrderedDict()
+        out['id'] = self.id
+        out['name'] = self.name
+        out['location_id']= self.location_id
+        return out
+
+    @classmethod
+    def from_dict(cls, data):
+        obj = cls(data['name'])
+        obj.location_id = data['location_id']
+        if 'id' in data:
+            obj.id = data['id']
+        return obj
+
+class Room(Base):
+    """Database table object for storing different room names
+    """
+    __tablename__ = PREFIX + "room"
+    id = Column(Integer, primary_key=True)
+    floor_id = Column(Integer, ForeignKey(PREFIX + 'floor.id'),
+                         index=True)
+    name = Column(Unicode)
+
+    def __init__(self, name):
+        self.name = name
+
+    def __repr__(self):
+        out = "<Room("\
+              "name={obj.name!r}, "\
+              ")>"
+        return out.format(obj=self)
+
+    def as_dict(self):
+        out = OrderedDict()
+        out['id'] = self.id
+        out['name'] = self.namem
+        out['floor_id']= self.location_id
+        return out
+
+    @classmethod
+    def from_dict(cls, data):
+        obj = cls(data['name'])
+        obj.floor_id = data['floor_id']
+        if 'id' in data:
+            obj.id = data['id']
+        return obj
+
 
 class Map(Base):
     """Database table object for storing the different maps used
@@ -140,7 +206,7 @@ class MapLayer(Base):
     id = Column(Integer, primary_key=True)
     map_id = Column(Integer, ForeignKey(PREFIX + 'map.id'),
                          index=True)
-    detail_type_id = Column(Integer, ForeignKey(PREFIX + 'detail_type.id'), 
+    detail_type_id = Column(Integer, ForeignKey(PREFIX + 'detail_type.id'),
                             index=True)
     filename_svg = Column(Unicode)
     width = Column(Integer)