Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#153 optional/mandatory validation added for additional fields #254

Merged
merged 1 commit into from
Jan 12, 2017
Merged

#153 optional/mandatory validation added for additional fields #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/alfio/util/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,14 @@ public static ValidationResult validateTicketAssignment(UpdateTicketOwnerForm fo
if(!fieldConf.getRestrictedValues().isEmpty()) {
validateRestrictedValue(formValue, "additional['"+fieldConf.getName()+"']", "error."+fieldConf.getName(), fieldConf.getRestrictedValues(), errors);
}

if(fieldConf.isRequired() && StringUtils.isBlank(formValue)){
errors.rejectValue("additional['"+fieldConf.getName()+"']", "error."+fieldConf.getName());
}
});


//TODO: complete checks: min length, mandatory
//TODO: complete checks: min length
}

return evaluateValidationResult(errors);
Expand Down
8 changes: 5 additions & 3 deletions src/main/webapp/WEB-INF/templates/event/attendee-fields.ms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,32 +50,34 @@
{{#ticketFieldConfiguration}}
{{#fields}}
<div class="form-group">
<label class="col-sm-3 control-label" for="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}">{{labelDescription}} {{^-first}}{{fieldCounter}}{{/-first}}</label>
<label class="col-sm-3 control-label" for="{{name}}-title-{{uuid}}">{{labelDescription}}{{#isRequired}}*{{/isRequired}}</label>
<div class="col-sm-9">
{{#inputField}}
<input type="{{inputType}}" name="{{elementNamePrefix}}additional['{{name}}'][{{fieldIndex}}]" value="{{fieldValue}}" id="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}" class="form-control"
{{#placeholderDescriptionDefined}}placeholder="{{placeholderDescription}}"{{/placeholderDescriptionDefined}}
{{#maxLengthDefined}}maxlength="{{maxLength}}"{{/maxLengthDefined}}
{{#minLengthDefined}}minlength="{{minLength}}"{{/minLengthDefined}}
{{#isRequired}}required{{/isRequired}}
>
{{/inputField}}
{{#textareaField}}
<textarea name="{{elementNamePrefix}}additional['{{name}}'][{{fieldIndex}}]" id="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}" class="form-control"
{{#placeholderDescriptionDefined}}placeholder="{{placeholderDescription}}"{{/placeholderDescriptionDefined}}
{{#maxLengthDefined}}maxlength="{{maxLength}}"{{/maxLengthDefined}}
{{#minLengthDefined}}minlength="{{minLength}}"{{/minLengthDefined}}
{{#isRequired}}required{{/isRequired}}
>{{fieldValue}}</textarea>
{{/textareaField}}
{{#countryField}}
<select name="{{elementNamePrefix}}additional['{{name}}'][{{fieldIndex}}]" value="{{fieldValue}}" id="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}" class="form-control">
<select name="{{elementNamePrefix}}additional['{{name}}'][{{fieldIndex}}]" value="{{fieldValue}}" id="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}" class="form-control" {{#isRequired}}required{{/isRequired}}>
<option value=""></option>
{{#countries}}
<option value="{{left}}">{{right}}</option>
{{/countries}}
</select>
{{/countryField}}
{{#selectField}}
<select name="{{elementNamePrefix}}additional['{{name}}'][{{fieldIndex}}]" value="{{fieldValue}}" id="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}" class="form-control">
<select name="{{elementNamePrefix}}additional['{{name}}'][{{fieldIndex}}]" value="{{fieldValue}}" id="{{name}}-title-{{uuid}}{{^-first}}-{{fieldCounter}}{{/-first}}" class="form-control" {{#isRequired}}required{{/isRequired}}>
<option value=""></option>
{{#translatedRestrictedValue}}<option value="{{key}}">{{value}}</option>{{/translatedRestrictedValue}}
</select>
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/resources/angular-templates/admin/partials/event/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ <h5 class="text-muted">The following data will be collected (full name, e-mail a
</span>
</div>
</div>
<div class="row">
<div class="col-sm-4"><strong>Required</strong></div>
<div class="col-sm-8">{{field.required}}</div>
</div>
</div>
</div>
<hr data-ng-if="field.type == 'select'" />
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/resources/angular-templates/admin/partials/event/edit-event.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ <h5 class="text-muted">Attendees' full name, e-mail and language are collected b
<label>Placeholder {{lang.displayLanguage}}</label>
<input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control">
</div>
<div class="form-group">
<label>Required</label>
<input type="checkbox" data-ng-model="field.required" name="fieldRequired" id="fieldRequired">
</div>
</div>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions ...in/webapp/resources/angular-templates/admin/partials/event/fragment/edit-field-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ <h3>Edit field</h3>
<input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control" data-ng-if="addNewField">
<input ng-model="field.description[lang.locale].description.placeholder" type="text" placeholder="placeholder" class="form-control" data-ng-if="!addNewField">
</div>
<div class="form-group">
<label>Required</label>
<input type="checkbox" data-ng-model="field.required" name="fieldRequired" id="fieldRequired" data-ng-if="addNewField">
<pre class="form-control-static" data-ng-if="!addNewField">{{field.required}}</pre>
</div>
</div>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/main/webapp/resources/js/admin/ng-app/admin-application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,14 @@
}
var nameExists = angular.isDefined(_.find(event.ticketFields, function(f) { return f.name === template.name;}));
event.ticketFields.push({
required:false,
name: nameExists ? '' : template.name,
order: event.ticketFields.length+1,
type: template.type,
restrictedValues: _.map(template.restrictedValues, function(v) {return {value: v}}),
description: template.description,
maxLength: template.maxLength,
minLength: template.minLength
minLength: template.minLength,
required: template.required
});
};

Expand Down Expand Up @@ -1037,6 +1037,7 @@
$scope.field.description = template.description;
$scope.field.maxLength = template.maxLength;
$scope.field.minLength = template.minLength;
$scope.field.required = template.required;
}

//
Expand Down