diff --git a/dist/js/dataModelController.js b/dist/js/dataModelController.js index 057070f78744845bccdff85ba0ced228ed4ba05d..d822d7a1355efbd227fecb3df055216e83d59d10 100644 --- a/dist/js/dataModelController.js +++ b/dist/js/dataModelController.js @@ -2,51 +2,75 @@ app.controller('dataModelController', ['$scope', function ($scope) { $scope.datapoints = [ { "key": "educationMax", - "description": "Highest level of education completed" + "description": "Highest level of education completed", + "detailsVisible" : false, + "type": "discrete" }, { "key": "personalIncomeLevel", - "description": "Individual's average income per year" + "description": "Individual's average income per year", + "detailsVisible" : false, + "type": "number" }, { "key": "householdIncomeLevel", - "description": "Household average income per year" + "description": "Household average income per year", + "detailsVisible" : false, + "type": "number" }, { "key": "race", - "description" : "The race the individual identifies with" + "description" : "The race the individual identifies with", + "detailsVisible" : false, + "type": "discrete" }, { "key": "sex", - "description" : "Self-identified sex of the individual" + "description" : "Self-identified sex of the individual", + "detailsVisible" : false, + "type": "discrete" }, { "key": "politicalParty", - "description": "Registered political party affiliation" + "description": "Registered political party affiliation", + "detailsVisible" : false, + "type": "discrete" }, { "key": "birthYear", - "description": "The year the individual was born" + "description": "The year the individual was born", + "detailsVisible" : false, + "type": "number" }, { "key": "profession", - "description": "Primary field of employment" + "description": "Primary field of employment", + "detailsVisible" : false, + "type": "discrete" }, { "key": "countryOfResidency", - "description": "Country the individual spends most of their time per year" + "description": "Country the individual spends most of their time per year", + "detailsVisible" : false, + "type": "discrete" }, { "key": "childrenCount", - "description": "Number of children the individual has as a dependency" + "description": "Number of children the individual has as a dependency", + "detailsVisible" : false, + "type": "number" }, { "key": "maritalStatus", - "description": "The individuals current relationship status" + "description": "The individuals current relationship status", + "detailsVisible" : false, + "type": "discrete" }, { "key": "citizenship", - "description": "Indicates the individuals citizenship status" + "description": "Indicates the individuals citizenship status", + "detailsVisible" : false, + "type": "discrete" } ]; }]); diff --git a/dist/views/dataModelView.html b/dist/views/dataModelView.html index 32748d9a061e18c3f9f8a842ee98b0e18739c05c..ed5f8d9a9bc8faba1ec0afeccd6215dcae62d329 100644 --- a/dist/views/dataModelView.html +++ b/dist/views/dataModelView.html @@ -32,7 +32,20 @@ <td>{{datapoint.description}}</td> </tr> <tr class="data-model-table-details-row" ng-repeat-end> - <td colspan="3">This is just a test</td> + <td colspan="3"> + <table> + <tbody> + <tr class="data-model-details-text"> + <td>Description:</td> + <td>{{datapoint.description}}</td> + </tr> + <tr class="data-model-details-text"> + <td>Type:</td> + <td>{{datapoint.type}}</td> + </tr> + </tbody> + </table> + </td> </tr> </tbody> </table> diff --git a/scss/main.scss b/scss/main.scss index 78f59b1a355de9a64f23ab2d6d6a4080cfb344f6..4f7215a681b370dbedc71e6ca3baf001218ebefd 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -389,3 +389,18 @@ footer div { padding-bottom: 10px; background-color: #ffffff; } + +.data-model-details-text td:first-child { + text-align: right; + border: none; + padding-top: 0; + padding-bottom: 0; + padding-left: 0; + padding-right: 5px; +} + +.data-model-details-text td:last-child { + text-align: left; + border: none; + padding: 0; +}