From b07d2c03ecb3f68a8a3cc4c85680e56b609ff536 Mon Sep 17 00:00:00 2001 From: Kevin Giszewski Date: Wed, 15 Jan 2014 19:44:27 -0500 Subject: [PATCH] Add Fieldset Highlight when !isValid --- app/controllers/controller.js | 10 +++++++--- app/less/archetype.less | 4 ++++ app/views/archetype.html | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/controller.js b/app/controllers/controller.js index 438ced0..c8241cd 100644 --- a/app/controllers/controller.js +++ b/app/controllers/controller.js @@ -101,6 +101,7 @@ { $scope.archetypeRenderModel.fieldsets[i].remove = false; $scope.archetypeRenderModel.fieldsets[i].collapse = true; + $scope.archetypeRenderModel.fieldsets[i].isValid = true; } } @@ -222,7 +223,7 @@ function getValidation() { var validation = {} - validation.isValid = false; + validation.isValid = true; validation.requiredAliases = []; //determine which fields are required @@ -233,7 +234,6 @@ if($scope.model.config.fieldsets[i].properties[j].required) { validation.requiredAliases.push($scope.model.config.fieldsets[i].properties[j].alias); - validation.requiredLabels.push($scope.model.config.fieldsets[i].properties[j].label); } } } @@ -241,7 +241,6 @@ //if nothing required; let's go if(validation.requiredAliases.length == 0) { - validation.isValid = true; return validation; } @@ -255,6 +254,11 @@ console.log("checking: " + i + " " + j + " " + $scope.archetypeRenderModel.fieldsets[i].properties[j].alias) var value = $scope.archetypeRenderModel.fieldsets[i].properties[j].value; //TODO: do the value test and highlight the fieldset/property + //if not valie + if(true){ + $scope.archetypeRenderModel.fieldsets[i].isValid = false; + validation.isValid = false; + } console.log(value); } } diff --git a/app/less/archetype.less b/app/less/archetype.less index 6bed910..bedb5fa 100644 --- a/app/less/archetype.less +++ b/app/less/archetype.less @@ -173,4 +173,8 @@ .archetypeConfig .archetypePropertyCollapser{ margin-top: 10px; +} + +.archetypeEditor .archetypeFieldsetError{ + border: 1px solid red; } \ No newline at end of file diff --git a/app/views/archetype.html b/app/views/archetype.html index 35a7231..8a0c352 100644 --- a/app/views/archetype.html +++ b/app/views/archetype.html @@ -10,7 +10,7 @@