Add Fieldset Highlight when !isValid

This commit is contained in:
Kevin Giszewski
2014-01-15 19:44:27 -05:00
parent 8fb49fab56
commit b07d2c03ec
3 changed files with 12 additions and 4 deletions
+7 -3
View File
@@ -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);
}
}
+4
View File
@@ -173,4 +173,8 @@
.archetypeConfig .archetypePropertyCollapser{
margin-top: 10px;
}
.archetypeEditor .archetypeFieldsetError{
border: 1px solid red;
}
+1 -1
View File
@@ -10,7 +10,7 @@
</div>
<ul ui-sortable="sortableOptions" ng-model="archetypeRenderModel.fieldsets">
<li ng-repeat="fieldset in archetypeRenderModel.fieldsets" ng-hide="fieldset.remove">
<fieldset ng-class="fieldset.alias" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
<fieldset ng-class="{archetypeFieldsetError: !fieldset.isValid}" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
<label ng-hide="model.config.hideFieldsetLabels == '1'" ng-click="focusFieldset(fieldset)">
<img ng-src='{{fieldsetConfigModel.icon}}' title="{{fieldsetConfigModel.tooltip}}"/>
<span ng-bind="$parent.$eval(getFieldsetTitle(fieldsetConfigModel.labelExpression, $index))"></span>