diff --git a/dist/js/dataModelController.js b/dist/js/dataModelController.js index c4bbea2c54171832e769e8df81471124de3e311b..0299b29d82f850c661a7a1fdbdb5bd4b19a94884 100644 --- a/dist/js/dataModelController.js +++ b/dist/js/dataModelController.js @@ -4,73 +4,85 @@ app.controller('dataModelController', ['$scope', function ($scope) { "key": "educationMax", "description": "Highest level of education completed", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["none", "High School", "Associates", "Bachlors", "Masters", "PhD"] }, { "key": "personalIncomeLevel", "description": "Individual's average income per year", "detailsVisible" : false, - "type": "number" + "type": "number", + "rangeMin": 0, }, { "key": "householdIncomeLevel", - "description": "Household average income per year", + "description": "Household's average income per year", "detailsVisible" : false, - "type": "number" + "type": "number", + "rangeMin": 0, }, { "key": "race", "description" : "The race the individual identifies with", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["Caucasion", "African", "Hispanic", "Native American", "Other"] }, { "key": "sex", "description" : "Self-identified sex of the individual", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["male", "female", "intersexed"] }, { "key": "politicalParty", "description": "Registered political party affiliation", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["Democrat", "republican", "Libertarian", "Independent", "Other"] }, { "key": "birthYear", "description": "The year the individual was born", "detailsVisible" : false, - "type": "number" + "type": "number", + "rangeMax": 2015 }, { "key": "profession", "description": "Primary field of employment", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["Health Care", "Science", "Information Technology", "Service Industry", "Other"] }, { "key": "countryOfResidency", "description": "Country the individual spends most of their time per year", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["United Stated of America", "Canada", "Mexico", "Other"] }, { "key": "childrenCount", "description": "Number of children the individual has as a dependency", "detailsVisible" : false, - "type": "number" + "type": "number", + "rangeMin": 0, }, { "key": "maritalStatus", "description": "The individuals current relationship status", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["Single", "Married", "Seperated", "Widowed", "In relationship"] }, { "key": "citizenship", "description": "Indicates the individuals citizenship status", "detailsVisible" : false, - "type": "discrete" + "type": "discrete", + "states": ["Citizen", "Green Card Holder", "Visa Holder", "Other"] } ]; diff --git a/dist/views/dataModelView.html b/dist/views/dataModelView.html index 6be46a0fc468dd5291fc5ac3c8fa13f4ac37ef3c..d4fd3f9f1964d7cdf26e89e1c7aaaee39caa3aef 100644 --- a/dist/views/dataModelView.html +++ b/dist/views/dataModelView.html @@ -43,6 +43,14 @@ <td>Type:</td> <td>{{datapoint.type}}</td> </tr> + <tr class="data-model-details-text" ng-if="datapoint.states != null"> + <td>States:</td> + <td>{{datapoint.states}}</td> + </tr> + <tr class="data-model-details-text" ng-if="datapoint.type == 'number'"> + <td>Range:</td> + <td><span ng-if="datapoint.rangeMin != null">{{datapoint.rangeMin}}</span><span ng-if="datapoint.rangeMin == null">-∞</span> to <span ng-if="datapoint.rangeMax != null">{{datapoint.rangeMax}}</span><span ng-if="datapoint.rangeMax == null">∞</span></td> + </tr> </tbody> </table> </td>