GUI -- Updated TableService to use d3 table creation methods.

Change-Id: I318ee4e81624118a82c52efe380213c661b743c5

@@ -24,8 +24,8 @@
     var config = {
     var config = {
         colIds: ['_iconid_available', 'id', 'mfr', 'hw', 'sw', 'serial',
         colIds: ['_iconid_available', 'id', 'mfr', 'hw', 'sw', 'serial',
             'annotations'],
             'annotations'],
-        colText: ['Availability', 'URI', 'Vendor', 'Hardware Version', 'Software Version',
-            'Serial Number', 'Protocol']
+        colText: ['Availability', 'URI', 'Vendor', 'Hardware Version',
+            'Software Version', 'Serial Number', 'Protocol']
         },
         },
         deviceData = {
         deviceData = {
             "devices": [{
             "devices": [{
@@ -234,7 +234,7 @@
 
 
         .controller('showTableCtrl', ['$log', 'TableService',
         .controller('showTableCtrl', ['$log', 'TableService',
             function ($log, ts) {
             function ($log, ts) {
-                ts.renderAndLoadTable(d3.select('#tableDiv'), config, deviceData);
+                ts.renderTable(d3.select('#tableDiv'), config, deviceData);
             }])
             }])
 
 
         .directive('fixedHeader', ['$log', '$timeout', function ($log, $timeout) {
         .directive('fixedHeader', ['$log', '$timeout', function ($log, $timeout) {

@@ -22,52 +22,40 @@
 
 
     var $log;
     var $log;
 
 
-    function renderTable(div, config) {
+    function renderTable(div, config, data) {
         var table = div.append('table').attr('fixed-header', ''),
         var table = div.append('table').attr('fixed-header', ''),
-            thead, tr, numTableCols, i;
-        table.append('thead');
-        table.append('tbody');
+            colIds = config.colIds,
+            colText = config.colText,
+            dataObjects = data[Object.keys(data)[0]],
+            thead, tbody, tRows;
 
 
-        thead = table.select('thead');
-        tr = thead.append('tr');
-        numTableCols = config.colIds.length;
+        thead = table.append('thead');
+        tbody = table.append('tbody');
 
 
-        for(i = 0; i < numTableCols; i += 1) {
-            tr.append('th').html(config.colText[i]);
-        }
-
-        return config.colIds;
-    }
+        thead.append('tr').selectAll('th')
+            .data(colText)
+            .enter()
+            .append('th')
+            .text(function(d) { return d });
 
 
-    // I can delete these comments later...
-    // loadTableData needs to know which IDs are used to create the table...
-    // Potentially, there will be some rows in the JSON that the server is
-    // sending back that will be unused. We don't want to create unneeded rows.
-        // For example, in device view, we aren't displaying "role" or
-        // "available" properties, but they would be displayed if we took it
-        // directly from the data being sent in.
-    function loadTableData(data, div, colIds) {
-        // let me know if you have suggestions for this function
+        tRows = tbody.selectAll('tr')
+            .data(dataObjects)
+            .enter()
+            .append('tr');
 
 
-        var numTableCols = colIds.length,
-            tbody, tr, i;
-        tbody = div.select('tbody');
-
-        // get the array associated with the first object, such as "devices"
-        // loop through every object in the array, and every colId in config
-        // put the appropriate property in the td of the table
-        (data[Object.keys(data)[0]]).forEach(function (item) {
-            tr = tbody.append('tr');
-            for(i = 0; i < numTableCols; i += 1) {
-                if(item.hasOwnProperty(colIds[i])) {
-                   tr.append('td').html(item[colIds[i]]);
-                }
-            }
+        tRows.selectAll('td')
+            .data(function(row) {
+                return colIds.map(function(headerId) {
+                    return {
+                        column: headerId, value: row[headerId]
+                    };
                 });
                 });
-    }
+            })
+            .enter()
+            .append('td')
+            .html(function(d) { return d.value });
 
 
-    function renderAndLoadTable(div, config, data) {
-        loadTableData(data, div, (renderTable(div, config)));
+        return table;
     }
     }
 
 
     angular.module('onosWidget')
     angular.module('onosWidget')
@@ -75,9 +63,7 @@
             $log = _$log_;
             $log = _$log_;
 
 
             return {
             return {
-                renderTable: renderTable,
-                loadTableData: loadTableData,
-                renderAndLoadTable: renderAndLoadTable
+                renderTable: renderTable
             };
             };
         }]);
         }]);
 
 

@@ -121,19 +121,12 @@ describe('factory: fw/widget/table.js', function() {
     }
     }
 
 
     it('should create table tags', function () {
     it('should create table tags', function () {
-        ts.renderTable(d3Elem, config);
+        ts.renderTable(d3Elem, config, fakeData);
         verifyTableTags(d3Elem);
         verifyTableTags(d3Elem);
     });
     });
 
 
     it('should load data into table', function () {
     it('should load data into table', function () {
-        var colIds = ts.renderTable(d3Elem, config);
-        ts.loadTableData(fakeData, d3Elem, colIds);
+        ts.renderTable(d3Elem, config, fakeData);
         verifyData(d3Elem);
         verifyData(d3Elem);
     });
     });
-
-    it('should render table and load data', function () {
-        ts.renderAndLoadTable(d3Elem, config, fakeData);
-        verifyData(d3Elem);
-    });
-
 });
 });