alfio-event#91 add additional field

javaseth · May 6, 2016 · d2b140f · d2b140f
1 parent 37bc58c
commit d2b140f
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -169,6 +169,7 @@ dependencies {
     compileOnly "javax.servlet:javax.servlet-api:3.1.0"
     testCompile "javax.servlet:javax.servlet-api:3.1.0"
     testRuntime "org.springframework.boot:spring-boot-starter-test"
+    testCompile "net.sourceforge.htmlunit:htmlunit:2.21"
     runtime "org.hsqldb:hsqldb:2.3.3"
     runtime "commons-fileupload:commons-fileupload:1.3.1"
     providedCompile "org.springframework.boot:spring-boot-starter-web@jar"

diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java
@@ -215,7 +215,7 @@ public ValidationResult updateExistingCategory(@PathVariable("eventId") int even
     public ValidationResult createCategory(@PathVariable("eventId") int eventId, @RequestBody TicketCategoryModification category, Errors errors, Principal principal) {
         return validateCategory(category, errors).ifSuccess(() -> eventManager.insertCategory(eventId, category, principal.getName()));
     }
-
+    
     @RequestMapping(value = "/events/reallocate", method = PUT)
     public String reallocateTickets(@RequestBody TicketAllocationModification form) {
         eventManager.reallocateTickets(form.getSrcCategoryId(), form.getTargetCategoryId(), form.getEventId());
@@ -351,6 +351,12 @@ public List<DynamicFieldTemplate> loadTemplates() {
     public void saveAdditionalFieldDescriptions(@RequestBody Map<String, TicketFieldDescriptionModification> descriptions) {
         eventManager.updateTicketFieldDescriptions(descriptions);
     }
+
+    @RequestMapping(value = "/events/{eventName}/additional-field/new", method = POST)
+    public void addAdditionalField(@PathVariable("eventName") String eventName, @RequestBody EventModification.AdditionalField field, Principal principal) {
+    	Event event = eventManager.getSingleEvent(eventName, principal.getName());
+    	eventManager.addAdditionalField(event.getId(), field);
+    }
 
     @RequestMapping(value = "/events/{eventName}/pending-payments")
     public List<SerializablePair<TicketReservation, OrderSummary>> getPendingPayments(@PathVariable("eventName") String eventName, Principal principal) {

diff --git a/src/main/java/alfio/manager/EventManager.java b/src/main/java/alfio/manager/EventManager.java
@@ -25,6 +25,7 @@
 import alfio.model.PromoCodeDiscount.DiscountType;
 import alfio.model.Ticket.TicketStatus;
 import alfio.model.modification.*;
+import alfio.model.modification.EventModification.AdditionalField;
 import alfio.model.system.Configuration;
 import alfio.model.system.ConfigurationKeys;
 import alfio.model.transaction.PaymentProxy;
@@ -187,16 +188,20 @@ private void createOrUpdateEventDescription(int eventId, EventModification em) {
     private void createAdditionalFields(int eventId, EventModification em) {
         if (!CollectionUtils.isEmpty(em.getTicketFields())) {
            em.getTicketFields().forEach(f -> {
-               List<String> restrictedValues = Optional.ofNullable(f.getRestrictedValues()).orElseGet(Collections::emptyList).stream().map(EventModification.RestrictedValue::getValue).collect(Collectors.toList());
-               String serializedRestrictedValues = "select".equals(f.getType()) ? Json.GSON.toJson(restrictedValues) : null;
-               int configurationId = ticketFieldRepository.insertConfiguration(eventId, f.getName(), f.getOrder(), f.getType(), serializedRestrictedValues, f.getMaxLength(), f.getMinLength(), f.isRequired()).getKey();
-               f.getDescription().forEach((locale, value) -> {
-                   ticketFieldRepository.insertDescription(configurationId, locale, Json.GSON.toJson(value));
-               });
+               insertAdditionalField(eventId, f, f.getOrder());
            });
         }
     }
 
+	private void insertAdditionalField(int eventId, AdditionalField f, int order) {
+		List<String> restrictedValues = Optional.ofNullable(f.getRestrictedValues()).orElseGet(Collections::emptyList).stream().map(EventModification.RestrictedValue::getValue).collect(Collectors.toList());
+		   String serializedRestrictedValues = "select".equals(f.getType()) ? Json.GSON.toJson(restrictedValues) : null;
+		   int configurationId = ticketFieldRepository.insertConfiguration(eventId, f.getName(), order, f.getType(), serializedRestrictedValues, f.getMaxLength(), f.getMinLength(), f.isRequired()).getKey();
+		   f.getDescription().forEach((locale, value) -> {
+		       ticketFieldRepository.insertDescription(configurationId, locale, Json.GSON.toJson(value));
+		   });
+	}
+
     public void updateEventHeader(Event original, EventModification em, String username) {
         checkOwnership(original, username, em.getOrganizationId());
         int eventId = original.getId();
@@ -619,6 +624,11 @@ public void updateTicketFieldDescriptions(Map<String, TicketFieldDescriptionModi
             }
         });
     }
+
+	public void addAdditionalField(int eventId, AdditionalField field) {
+		int order = ticketFieldRepository.countAdditionalFieldsForEvent(eventId);
+		insertAdditionalField(eventId, field, order);
+	}
 
     @Data
     private static final class GeolocationResult {
@@ -641,4 +651,6 @@ public ZoneId getZoneId() {
             return tz.toZoneId();
         }
     }
+
+
 }
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
@@ -3,7 +3,7 @@ <h3>Add field</h3>
 </div>
 <div class="modal-body">
 
-<form name="addField" ng-submit="addField(field)">
+<form name="addFieldForm" ng-submit="addField(addFieldForm, field)">
 
 <div class="row">
     <div class="col-md-4">
@@ -13,7 +13,9 @@ <h3>Add field</h3>
         </div>
         <div class="form-group">
             <label>Type</label>
-            <select ng-model="field.type" ng-options="option for option in fieldTypes" class="form-control" required></select>
+            <select ng-model="field.type" ng-options="option for option in fieldTypes" class="form-control" required>
+            	<option></option>
+            </select>
         </div>
     </div>
     <div class="col-md-4" ng-if="field.type != 'country'">

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
@@ -839,11 +839,13 @@
                         return (selectedLanguages & lang) > 0;
                     };
 
-                    $scope.addField = function(field) {
-                    	//FIXME;
+                    $scope.addField = function(form, field) {
+                    	EventService.addField($stateParams.eventName, field).then(function(result) {
+                    		return loadData();
+                    	}).then(function() {
+                    		$scope.$close(true);
+                    	});
                     };
-
-
                 }});
         };
 

diff --git a/src/main/webapp/resources/js/admin/service/service.js b/src/main/webapp/resources/js/admin/service/service.js
@@ -116,6 +116,9 @@
             saveFieldDescription: function(eventName, fieldDescription) {
                 return $http.post('/admin/api/events/'+eventName+'/additional-field/descriptions', fieldDescription)
             },
+            addField: function(eventName, field) {
+            	return $http.post('/admin/api/events/'+eventName+'/additional-field/new', field);
+            }
         };
     });