multiple rows for network jacks and misc changes

3 files changed, 60 insertions, 6 deletions

diff --git a/INSTALL b/INSTALL
index 6fe50af..73a1b09 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,14 @@
+D2 Needs the following dependancies installed:
+
+UBUNTU:
+apt-get install libldap2-dev libsasl2-dev libssl-dev libxml2 libxslt1-dev \
+libcurl4-gnutls-dev
+
+
+
+
+THE FOLLOWING IS OPTIONAL:
+
 D2 uses mapnick; which needs a ton of libs installed locally to work
 
 UBUNTU:
@@ -16,3 +27,4 @@ FEDORA:
 
 
 MAC:
+
diff --git a/lib/d2/app/adapters/detail.py b/lib/d2/app/adapters/detail.py
index 33cd9a1..7231faa 100644
--- a/lib/d2/app/adapters/detail.py
+++ b/lib/d2/app/adapters/detail.py
@@ -21,6 +21,7 @@ class DetailAdapter(BaseAdapter):
         self._search_schema_ = None
         self._search_index_ = None
         self._label_detail_type_ids_ = None
+        self._multiple_value_labels_ = None
         self._make = namedtuple('detail', 'name data')
 
     @classmethod
@@ -40,6 +41,14 @@ class DetailAdapter(BaseAdapter):
             ]
         return self._label_detail_type_ids_
 
+    @property
+    def _multiple_value_labels(self):
+        if not self._multiple_value_labels_:
+            self._multiple_value_labels_ = [
+                self._static.detail_type.network_jack,    
+            ]
+        return self._multiple_value_labels_
+
     def fetch_all_occupant_details(self, occupant_id, date_start=None):
         """Fetch all details for the given occupant_id
         """
@@ -81,8 +90,7 @@ class DetailAdapter(BaseAdapter):
         else:
             return obj
 
-    def _fetch_detail(self, plot_id, occupant_id, detail_type_id,
-                              date_start):
+    def _fetch_detail(self, plot_id, occupant_id, detail_type_id, date_start):
         date_start = self.build_date(date_start)
         return self._db.session.query(self._detail
             ).filter(self._detail.plot_id==plot_id
@@ -125,15 +133,40 @@ class DetailAdapter(BaseAdapter):
 
     def _insert_detail(self, plot_id, occupant_id, detail_type_id, data,
                                date_start=None, date_end=None):
+
+        date_start= self.build_date(date_start)
+        data = dict(
+                plot_id=plot_id,
+                occupant_id=occupant_id,
+                detail_type_id=detail_type_id,
+                data=data,
+                date_start=date_start,
+                date_end=date_end,
+                date_created=datetime.now(),
+                date_override=None
+                )
+        obj = self._detail.from_dict(data)
+        self._db.session.add(obj)
+        self._db.session.commit()
+        return obj
+
+    def _change_detail(self, plot_id, occupant_id, detail_type_id, data,
+                       date_start=None, date_end=None):
+        """
+        TODO: FIXME
+        """
         if plot_id:
             previous_record = self.fetch_plot_detail(plot_id, detail_type_id,
                                                      date_start)
         else:
             previous_record = self.fetch_occupant_detail(occupant_id,
                                 detail_type_id, date_start)
+
         if previous_record:
             self._set_override(previous_record)
             self._set_end(previous_record, date_end)
+        else:
+            raise Exception("Missing previous recored.  Unable to change.")
 
         date_start= self.build_date(date_start)
         data = dict(
@@ -227,12 +260,21 @@ class DetailAdapter(BaseAdapter):
                             and detail.data):
                     name = detail.detail_type.name
                     key = name.lower().strip().replace(u' ', u'_')
-                    keys.append(key)
-                    hold[key] = self._make(name, detail.data)
+                    if detail.detail_type_id in self._multiple_value_labels:
+                        if key in hold:
+                            data = hold[key].data
+                            data.append(detail.data)
+                            hold[key] = hold[key]._replace(data=data)
+                        else:
+                            keys.append(key)
+                            data = [detail.data]
+                            hold[key] = self._make(name, data)
+                    else:
+                        keys.append(key)
+                        hold[key] = self._make(name, detail.data)
             keys.sort()
             keys = [u'label', u'id', u'id_type'] + keys
             for key in keys:
                 vals.append(hold[key])
             make = namedtuple('details', keys)
             return make(*vals)
-
diff --git a/lib/d2/bin/d2_db_setup.py b/lib/d2/bin/d2_db_setup.py
index 139f662..42963cc 100644
--- a/lib/d2/bin/d2_db_setup.py
+++ b/lib/d2/bin/d2_db_setup.py
@@ -226,7 +226,7 @@ class PopulateEmptyOccupant(object):
         if not self._get(occupant_type_id_for_empty):
             data = dict(occupant_type_id = occupant_type_id_for_empty,
                         key = self.KEY,
-                        active = 1)
+                        active = True)
             obj = Occupant.from_dict(data)
             self._db.session.add(obj)
             self._db.session.commit()