adding Empty to detail table

2 files changed, 130 insertions, 31 deletions

diff --git a/lib/d2/bin/d2_db_setup.py b/lib/d2/bin/d2_db_setup.py
index 42963cc..511677e 100644
--- a/lib/d2/bin/d2_db_setup.py
+++ b/lib/d2/bin/d2_db_setup.py
@@ -12,6 +12,7 @@ from d2.db import Detail
 from d2.db import OccupantType
 from d2.db import Occupant
 from d2.app.model.static import StaticData
+from d2.app.adapters.detail import DetailAdapter
 
 
 class Args(object):
@@ -238,6 +239,35 @@ class PopulateEmptyOccupant(object):
                       'occupant_type_id=:occupant_type_id').params(
                       occupant_type_id=occupant_type_id_for_empty).first()
 
+
+class PopulateEmptyInDetail(object):
+ 
+    def __init__(self, config):
+        self._log = config.log
+        self._db = config.db
+        self._detail_adapter = DetailAdapter.load(Config.load())
+
+    def __call__(self):
+        s = StaticData.load(self._db)
+        occupant_id_for_empty = s().occupant.empty
+        detail_type_id_for_name = s().detail_type.name
+        if not self._get(occupant_id_for_empty,
+                         detail_type_id_for_name):
+            self._detail_adapter.insert_occupant_detail(
+                                   occupant_id_for_empty, 
+                                 detail_type_id_for_name, 
+                                                 u'Empty')
+            message = "Empty was added to detail"
+            self._log.info(message)
+
+    def _get(self, occupant_id_for_empty,
+                         detail_type_id_for_name):
+        return self._detail_adapter.fetch_occupant_detail(
+                                         occupant_id_for_empty, 
+                                         detail_type_id_for_name)
+
+
+
 class Populate(object):
 
     def __init__(self, config):
@@ -245,7 +275,8 @@ class Populate(object):
         self._tables = [
             PopulateDetailType(self.config),
             PopulateOccupantType(self.config),
-            PopulateEmptyOccupant(self.config)
+            PopulateEmptyOccupant(self.config),
+            PopulateEmptyInDetail(self.config)
         ]
 
     def fill_tables(self, args):
diff --git a/lib/d2/bin/d2_svg_processor.py b/lib/d2/bin/d2_svg_processor.py
index 97c6801..3981ae5 100644
--- a/lib/d2/bin/d2_svg_processor.py
+++ b/lib/d2/bin/d2_svg_processor.py
@@ -44,6 +44,10 @@ NAME_LABEL_ID = {'3D13A1': 'NAME',
                  '3C1': 'NAME-2',
                  '3B1': 'NAME-6'}
 
+CONFERENCE_LABEL_ID = {'3B1': 'AREA_ID-6',
+                       '3C1': 'AREA_ID-0',
+                       '3D13A1': 'AREA_ID'}
+
 MAIN_ROOM_NODES = ['draft', 'draft-3', 'draft-4']
 
 GROUP_ID_ROOM = {'draft': '3D13A1',
@@ -76,26 +80,44 @@ NAME_CORRECTIONS = {u'Deb Smith': u'Deborah Smith',
                     u'Brian Staneck': u'Brian Stanek'}
 
 
+MANUAL_PLOT_COORDINATES = {'ID1': [2, 3],
+                           'ID2': [3, 4],
+                           'ID3': [3, 4],
+                           'ID4': [3, 4],
+                           'ID5': [3, 4],
+                           'ID6': [3, 4],
+                           'ID7': [3, 4],
+                           'ID8': [3, 4],
+                           'ID9': [3, 4],
+                           'ID10': [3, 4]
+                          }
+
 floor_plan_data = {}
 
 ntwk_number_data = {}
 
+manually_added_plot = {}
+
 NTWK_ID_PATTERN = re.compile("([A-Z]+)(\d+)")
 
 class Args(object):
 
     DESCRIPTION = "Process svg for d2"
     DEFAULT_MASTER_SVG = 'combined_master_v6.svg'
-    DEFAULT_MASTER_SPREADSHEET = 'FloorPlan1.xls'
+    DEFAULT_FLOOR_PLAN_XLS = 'FloorPlan1.xls'
+    DEFAULT_CONFERENCE_ROOM_XLS = 'ConferenceWorkroom.xls'
+
+    MASTER_SVG_HELP = "The full path of the master svg. "\
+                      "(default: {default})"
 
-    MASTER_SVG_HELP = "The full path of the master svg file "\
-                      "files: (default: {default})"
+    FLOOR_PLAN_XLS_HELP = "The full path of the floor plan xls. "\
+                      "(default: {default})"
 
-    MASTER_XLS_HELP = "The full path of the master spreadsheet file "\
-                      "files: (default: {default})"
+    CONFERENCE_ROOM_XLS_HELP = "The full path of the conference "\
+                      "room xls. (default: {default})"
 
-    MASTER_OUTPUT_DIR_HELP = "The full path of the output directory "\
-                     ': (default: {default})'
+    MASTER_OUTPUT_DIR_HELP = "The full path of the output directory. "\
+                     '(default: {default})'
 
     def __init__(self, config):
         self._config = config
@@ -114,7 +136,8 @@ class Args(object):
 
     def __call__(self):
         self._master_svg_file()
-        self._spread_sheet_file()
+        self._floor_plan_xls()
+        self._conference_room_xls()
         self._output_directory()
         args = self.parser.parse_args()
         args.config = self._config
@@ -144,15 +167,26 @@ class Args(object):
                 help=self.MASTER_SVG_HELP.format(default=default_path)
         )
 
-    def _spread_sheet_file(self):
+    def _floor_plan_xls(self):
         default_path = os.path.join(
                          self._config.data_directory,
-                         self.DEFAULT_MASTER_SPREADSHEET)
+                         self.DEFAULT_FLOOR_PLAN_XLS)
         self.parser.add_argument(
-                '--master-spreadsheet',
+                '--floor-plan-xls',
                 type=str,
                 default=default_path,
-                help=self.MASTER_XLS_HELP.format(default=default_path)
+                help=self.FLOOR_PLAN_XLS_HELP.format(default=default_path)
+        )
+
+    def _conference_room_xls(self):
+        default_path = os.path.join(
+                         self._config.data_directory,
+                         self.DEFAULT_CONFERENCE_ROOM_XLS)
+        self.parser.add_argument(
+                '--conference-room-xls',
+                type=str,
+                default=default_path,
+                help=self.CONFERENCE_ROOM_XLS_HELP.format(default=default_path)
         )
 
     def _output_directory(self):
@@ -166,13 +200,15 @@ class Args(object):
                 help=self.MASTER_OUTPUT_DIR_HELP.format(default=default_path)
         )
 
-class ParseFloorPlanXLS(object):
+class ParseFloorPlanConferenceRoomXLS(object):
 
-    MULTIPLE_RECORD_ERROR = "Data Error: xls has multiple records for {0} "\
+    MULTIPLE_RECORD_ERROR = "Data Error: floor plan xls has multiple records for {0} "\
                             "in room {1}"
 
     def __init__(self):
+        self._log_obj = None 
         self._make = namedtuple('cubeInfo', 'name net_jack1 net_jack2')
+        self._make_plot = namedtuple('addedPlot', 'abs_x, abs_y')
 
     def _determine_room(self, s):
         """@params s: spread sheet's name, such as "QA 3A1" contains
@@ -185,7 +221,7 @@ class ParseFloorPlanXLS(object):
                 return room
         return ''
 
-    def _process_sheet(self, sh, room_name, log_obj):
+    def _process_floor_plan_sheet(self, sh, room_name):
         for rownum in range(2, sh.nrows):
             name = unicode(sh.cell(rowx=rownum, colx=0).value)
             cube = sh.cell(rowx=rownum, colx=2).value
@@ -195,20 +231,44 @@ class ParseFloorPlanXLS(object):
                 if room_name not in floor_plan_data:
                     floor_plan_data[room_name] = {}
                 if cube in floor_plan_data[room_name]:
-                    log_obj.error(self.MULTIPLE_RECORD_ERROR.format(cube,
+                    self._log_obj.error(self.MULTIPLE_RECORD_ERROR.format(cube,
                                                                room_name))
                 else:
                     floor_plan_data[room_name][cube] = self._make(name,
                                                               net_jack1,
                                                               net_jack2)
 
+    def _process_conference_room_sheet(self, sh, room_name):
+        for rownum in range(2, sh.nrows):
+            name = unicode(sh.cell(rowx=rownum, colx=0).value)
+            cube = sh.cell(rowx=rownum, colx=2).value
+            if name and cube:
+                if room_name not in floor_plan_data:
+                    floor_plan_data[room_name] = {}
+                floor_plan_data[room_name][cube] = self._make(name, "", "")
+                if cube[:2] == 'ID':
+                    if room_name not in manually_added_plot:
+                        manually_added_plot[room_name] = {}
+                    manually_added_plot[room_name][cube] = self._make_plot( 
+                                             MANUAL_PLOT_COORDINATES[cube][0],
+                                             MANUAL_PLOT_COORDINATES[cube][1])
+ 
     def __call__(self, args):
-        wb = xlrd.open_workbook(args.master_spreadsheet)
+        self._log_obj = args.log
+        wb = xlrd.open_workbook(args.floor_plan_xls)
         for sheet_name in wb.sheet_names():
             room_name = self._determine_room(sheet_name)
             if room_name:
-                self._process_sheet(wb.sheet_by_name(sheet_name), 
-                                    room_name, args.log)
+                self._process_floor_plan_sheet(wb.sheet_by_name(sheet_name),
+                                                                  room_name)
+
+        wb = xlrd.open_workbook(args.conference_room_xls)
+        for sheet_name in wb.sheet_names():
+            room_name = self._determine_room(sheet_name)
+            if room_name:
+                self._process_conference_room_sheet(
+                                    wb.sheet_by_name(sheet_name), 
+                                                      room_name)
 
 class CreateStructureSVG(object):
 
@@ -320,7 +380,6 @@ class CreateStructureSVG(object):
 class PopulateTables(object):
 
     OUTPUT_NTWK_ID_FILENAME = 'ntwk_id.svg'
-    OUTPUT_JSON_FILENAME = 'ntwk_number_data.json'
     TABLES = [u'forge', u'label_coordinate', u'plot']
 
     TRANSFORM_MATRIX_ERROR = "Error: transform matrix of {0} not implemented"
@@ -329,7 +388,7 @@ class PopulateTables(object):
     NO_CLOSEBY_NTWK_ID_ERROR = "Data Error: cannot find closest_ntwk_id "\
                "in room_name: {0}, x: {1} y: {2}, current name shown {3}"
     NO_AREA_INFO_ERROR = "Data Error: cannot find area info for {0} {1}"
-    NO_OCCUPANT_DETAIL = "Data Errot: cannot find {0} in occupant_detail"
+    NO_OCCUPANT_DETAIL = "Data Error: cannot find {0} in occupant_detail"
 
 
     def __init__(self):
@@ -423,6 +482,20 @@ class PopulateTables(object):
                                                       ntwk_id,
                                                       plot_id)
 
+        # Process manually added plot identifiers
+        #TODO:  manually added plots need to be in svg as well
+        for (room_name, info) in manually_added_plot.items():
+            for (ntwk_id, xy_info) in info.items():
+                plot_id = self._add_to_tables(xy_info.abs_x, 
+                                              xy_info.abs_y, 
+                                              ntwk_id)
+                self._add_to_ntwk_number_data(xy_info.abs_x, 
+                                              xy_info.abs_y,
+                                              room_name,
+                                              ntwk_id,
+                                              plot_id)
+
+
     def _add_to_tables(self, x, y, ntwk_id):
         """ insert into plot table, 
             add an empty user to the plot in forge table,
@@ -570,8 +643,10 @@ class PopulateTables(object):
                                    id="{0}_NAME_LABEL".format(approx_room_name))
 
         room_name_label_id = NAME_LABEL_ID.get(approx_room_name)
+        room_area_label_id = CONFERENCE_LABEL_ID.get(approx_room_name)
         for el in node:
-            if el.attrib['id'] == room_name_label_id:
+            if el.attrib['id'] == room_name_label_id or \
+               el.attrib['id'] == room_area_label_id:
                 for sub_el in el:
                     if sub_el.tag == '{{{0}}}text'.format(NSMAP['svg']):
                         tspan_elem = sub_el.xpath('./svg:tspan',
@@ -813,13 +888,6 @@ class PopulateTables(object):
                                    output_ntwk_id_fileobj:
             output_ntwk_id_fileobj.write(self._get_ntwk_id_svg())
 
-        output_json_filepath = os.path.join(
-                             args.data_directory,
-                             args.project + '_' + self.OUTPUT_JSON_FILENAME
-                          )
-        with open(output_json_filepath, 'wb') as output_json_fileobj:
-            output_json_fileobj.write(json.dumps(ntwk_number_data))
-
         self._get_name_label_svg()
 
 class Util(object):
@@ -859,7 +927,7 @@ class Process(object):
     def __init__(self):
         self._chain = [
             CreateStructureSVG(),
-            ParseFloorPlanXLS(),
+            ParseFloorPlanConferenceRoomXLS(),
             PopulateTables(),
         ]