#153 add option to indicate mandatory/optional in admin panel and val…

…idate on ticket reservation page
alfio-event · Sep 5, 2016 · bf0636a · bf0636a
1 parent c18dea1
commit bf0636a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/src/main/webapp/WEB-INF/templates/event/assign-ticket-form.ms b/src/main/webapp/WEB-INF/templates/event/assign-ticket-form.ms
@@ -85,32 +85,40 @@
     <div {{#displayAssignForm}}class="collapsible"{{/displayAssignForm}}>
         {{#ticketFieldConfiguration}}
             <div class="form-group">
-                 <label class="col-sm-3 control-label" for="{{key.name}}-title-{{uuid}}">{{key.labelDescription}}</label>
+                 <label class="col-sm-3 control-label" for="{{key.name}}-title-{{uuid}}">{{key.labelDescription}}
+                 {{#key.isRequired}}*{{/key.isRequired}}
+                 </label>
                  <div class="col-sm-9">
                     {{#key.inputField}}
                         <input type="{{key.inputType}}" name="additional['{{key.name}}']" value="{{value}}" id="{{key.name}}-title-{{uuid}}" class="form-control"
                             {{#key.placeholderDescriptionDefined}}placeholder="{{key.placeholderDescription}}"{{/key.placeholderDescriptionDefined}}
                             {{#key.maxLengthDefined}}maxlength="{{key.maxLength}}"{{/key.maxLengthDefined}}
                             {{#key.minLengthDefined}}minlength="{{key.minLength}}"{{/key.minLengthDefined}}
+                            {{#key.isRequired}}required{{/key.isRequired}}
                         >
                     {{/key.inputField}}
                     {{#key.textareaField}}
                         <textarea name="additional['{{key.name}}']" id="{{key.name}}-{{uuid}}" class="form-control"
                             {{#key.placeholderDescriptionDefined}}placeholder="{{key.placeholderDescription}}"{{/key.placeholderDescriptionDefined}}
                             {{#key.maxLengthDefined}}maxlength="{{key.maxLength}}"{{/key.maxLengthDefined}}
                             {{#key.minLengthDefined}}minlength="{{key.minLength}}"{{/key.minLengthDefined}}
-                        >{{value}}</textarea>
+                            {{#key.isRequired}}required{{/key.isRequired}}
+                         >{{value}}</textarea>
                     {{/key.textareaField}}
                     {{#key.countryField}}
-                        <select name="additional['{{key.name}}']" value="{{value}}" id="{{key.name}}-{{uuid}}" class="form-control">
+                        <select name="additional['{{key.name}}']" value="{{value}}" id="{{key.name}}-{{uuid}}" class="form-control" 
+                        {{#key.isRequired}}required{{/key.isRequired}}
+                        >
                             <option value=""></option>
                             {{#countries}}
                                 <option value="{{left}}">{{right}}</option>
                             {{/countries}}
                         </select>
                     {{/key.countryField}}
                     {{#key.selectField}}
-                        <select name="additional['{{key.name}}']" value="{{value}}" id="{{key.name}}-{{uuid}}" class="form-control">
+                        <select name="additional['{{key.name}}']" value="{{value}}" id="{{key.name}}-{{uuid}}" class="form-control" 
+                        {{#key.isRequired}}required{{/key.isRequired}}
+                        >
                             <option value=""></option>
                             {{#key.translatedRestrictedValue}}<option value="{{key}}">{{value}}</option>{{/key.translatedRestrictedValue}}
                         </select>

diff --git a/src/main/webapp/resources/angular-templates/admin/partials/event/detail.html b/src/main/webapp/resources/angular-templates/admin/partials/event/detail.html
@@ -289,7 +289,11 @@ <h5 class="text-muted">Here are the additional fields defined</h5>
                                             <div ng-if="!edit">{{field.description[lang.locale].description.placeholder}}</div>
                                             <input ng-if="edit" type="text" class="form-control" ng-model="toEdit.description[lang.locale].description.placeholder">
                                         </div>
-                                    </div>
+										<div class="form-group">
+											<label>Required</label>
+											<div>{{field.required}}</div>
+										</div>
+									</div>
                                 </div>
                             </div>
                         </div>

diff --git a/src/main/webapp/resources/angular-templates/admin/partials/event/edit-event.html b/src/main/webapp/resources/angular-templates/admin/partials/event/edit-event.html
@@ -114,7 +114,11 @@ <h5 class="text-muted">Here you can add/remove additional fields</h5>
                                     <label>Placeholder {{lang.displayLanguage}}</label>
                                     <input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control">
                                 </div>
-                            </div>
+								<div class="form-group">
+									<label>Required</label> 
+									<input type="checkbox" data-ng-model="field.required" name="fieldRequired" id="fieldRequired">
+								</div>
+							</div>
                         </div>
                     </div>
                 </div>

diff --git a/...ain/webapp/resources/angular-templates/admin/partials/event/fragment/add-field-modal.html b/...ain/webapp/resources/angular-templates/admin/partials/event/fragment/add-field-modal.html
@@ -60,6 +60,10 @@ <h3>Add field</h3>
                     <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>