#91 add template for additiona field, fix order support, remove requi…

…red for placeholder
alfio-event · May 6, 2016 · 24946e0 · 24946e0
1 parent 519a10a
commit 24946e0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/alfio/manager/EventManager.java b/src/main/java/alfio/manager/EventManager.java
@@ -627,8 +627,8 @@ public void updateTicketFieldDescriptions(Map<String, TicketFieldDescriptionModi
     }
 
 	public void addAdditionalField(int eventId, AdditionalField field) {
-		int order = ticketFieldRepository.countAdditionalFieldsForEvent(eventId);
-		insertAdditionalField(eventId, field, order);
+		Integer order = ticketFieldRepository.findMaxOrderValue(eventId);
+		insertAdditionalField(eventId, field, order == null ? 0 : order + 1);
 	}
 
 	public void deleteAdditionalField(int ticketFieldConfigurationId) {

diff --git a/src/main/java/alfio/repository/TicketFieldRepository.java b/src/main/java/alfio/repository/TicketFieldRepository.java
@@ -112,6 +112,9 @@ default boolean hasOptionalData(int ticketId) {
 
     @Query("select count(*) from ticket_field_configuration where event_id_fk = :eventId")
     Integer countAdditionalFieldsForEvent(@Bind("eventId") int eventId);
+
+    @Query("select max(field_order) from ticket_field_configuration where event_id_fk = :eventId")
+    Integer findMaxOrderValue(@Bind("eventId") int eventId);
 
     @Query("select count(*) from ticket_field_configuration where event_id_fk = :eventId and field_required = true")
     Integer countRequiredAdditionalFieldsForEvent(@Bind("eventId") int eventId);

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
@@ -99,7 +99,7 @@ <h5 class="text-muted">Here you can add/remove additional fields</h5>
                                     <input ng-model="field.description[lang.locale].label" type="text" placeholder="label" class="form-control" required></div>
                                 <div class="form-group">
                                     <label>Placeholder {{lang.displayLanguage}}</label>
-                                    <input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control" required>
+                                    <input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control">
                                 </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
@@ -58,11 +58,15 @@ <h3>Add field</h3>
                     <input ng-model="field.description[lang.locale].label" type="text" placeholder="label" class="form-control" required></div>
                 <div class="form-group">
                     <label>Placeholder {{lang.displayLanguage}}</label>
-                    <input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control" required>
+                    <input ng-model="field.description[lang.locale].placeholder" type="text" placeholder="placeholder" class="form-control">
                 </div>
             </div>
         </div>
     </div>
+
+	<div class="col-sm-11">
+		<h4>Add from template <span data-ng-repeat="template in dynamicFieldTemplates" ><a class="btn btn-primary btn-xs" data-ng-click="addFromTemplate(template)">{{template.name}}</a> </span></h4>
+	</div>
 </div>
 
 <div class="modal-footer">

diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
@@ -855,6 +855,20 @@
                 	$scope.field = {};
                 	$scope.fieldTypes = FIELD_TYPES;
 
+
+                	EventService.getDynamicFieldTemplates().success(function(result) {
+                        $scope.dynamicFieldTemplates = result;
+                    });
+
+                	$scope.addFromTemplate = function(template) {
+                		$scope.field.name = template.name;
+                		$scope.field.type = template.type;
+                		$scope.field.restrictedValues = _.map(template.restrictedValues, function(v) {return {value: v}});
+                		$scope.field.description = template.description;
+                		$scope.field.maxLength = template.maxLength;
+                		$scope.field.minLength = template.minLength;
+                	}
+
                 	//
                 	EventService.getSupportedLanguages().success(function(result) {
                         $scope.allLanguages = result;