Bug/vspc 271 - Exhibition Configuration: if not exhibition language should be required

vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionConfigurationController.java

@@ -5,11 +5,14 @@
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 import org.javers.common.collections.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,6 +28,7 @@
 import edu.asu.diging.vspace.core.model.impl.Exhibition;
 import edu.asu.diging.vspace.core.services.IExhibitionManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
+import edu.asu.diging.vspace.web.staff.forms.ExhibitionConfigurationForm;
 
 @Controller
 public class ExhibitionConfigurationController {
@@ -77,19 +81,26 @@ public String showExhibitions(Model model) {
      * @param spaceParam
      * @param attributes
      * @return
-     */
+     */    
     @RequestMapping(value = "/staff/exhibit/config", method = RequestMethod.POST)
     public RedirectView createOrUpdateExhibition(HttpServletRequest request,
             @RequestParam(required = false, name = "exhibitionParam") String exhibitID,
-            @RequestParam("spaceParam") String spaceID, @RequestParam("title") String title,
-            @RequestParam("exhibitMode") ExhibitionModes exhibitMode,
-            @RequestParam(value = "customMessage", required = false, defaultValue = "") String customMessage,
-            @RequestParam("exhibitLanguage") List<String> languages,
-            @RequestParam("defaultExhibitLanguage") String defaultLanguage,
+            @RequestParam("spaceParam") String spaceID,
+            @Valid @ModelAttribute("exhibitionConfigurationForm") ExhibitionConfigurationForm exhibitionConfigForm,
+            BindingResult result,           
             RedirectAttributes attributes) throws IOException {
-
-        ISpace startSpace = spaceManager.getSpace(spaceID);
-
+        if(result.hasErrors()) {
+            attributes.addAttribute("showAlert", true);
+            attributes.addAttribute("alertType", "danger");
+            attributes.addAttribute("message", result.getFieldError().getDefaultMessage());
+            return new RedirectView(request.getContextPath() + "/staff/exhibit/config");
+        }
+        String title = exhibitionConfigForm.getTitle();
+        ExhibitionModes exhibitMode = exhibitionConfigForm.getExhibitMode();
+        List<String> languages = exhibitionConfigForm.getExhibitLanguage();
+        String defaultLanguage = exhibitionConfigForm.getDefaultExhibitLanguage();
+        String customMessage = exhibitionConfigForm.getCustomMessage();
+        ISpace startSpace = spaceManager.getSpace(spaceID);       
         Exhibition exhibition;
         if (exhibitID == null || exhibitID.isEmpty()) {
             exhibition = (Exhibition) exhibitFactory.createExhibition();

vspace/src/main/java/edu/asu/diging/vspace/web/staff/forms/ExhibitionConfigurationForm.java

@@ -0,0 +1,64 @@
+package edu.asu.diging.vspace.web.staff.forms;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import edu.asu.diging.vspace.core.model.ExhibitionModes;
+
+public class ExhibitionConfigurationForm {
+
+    private String customMessage;
+
+    private String defaultExhibitLanguage;
+
+    @NotEmpty(message = "Please select exhibition languages")
+    private List<String> exhibitLanguage;
+
+    @NotNull(message = "Please select exhibit mode")
+    private ExhibitionModes exhibitMode;
+
+    @NotEmpty(message = "Please enter title")
+    private String title;
+
+    public String getCustomMessage() {
+        return customMessage;
+    }
+
+    public void setCustomMessage(String customMessage) {
+        this.customMessage = customMessage;
+    }
+
+    public String getDefaultExhibitLanguage() {
+        return defaultExhibitLanguage;
+    }
+
+    public void setDefaultExhibitLanguage(String defaultExhibitLanguage) {
+        this.defaultExhibitLanguage = defaultExhibitLanguage;
+    }
+
+    public List<String> getExhibitLanguage() {
+        return exhibitLanguage;
+    }
+
+    public void setExhibitLanguage(List<String> exhibitLanguage) {
+        this.exhibitLanguage = exhibitLanguage;
+    }
+
+    public ExhibitionModes getExhibitMode() {
+        return exhibitMode;
+    }
+
+    public void setExhibitMode(ExhibitionModes exhibitMode) {
+        this.exhibitMode = exhibitMode;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}

vspace/src/main/webapp/WEB-INF/views/staff/exhibit/config.html

@@ -1,15 +1,22 @@
 
 <html layout:decorate="~{layouts/main_staff}">
 <head>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
 <script th:inline="javascript">
 		$(document).ready(function() {
+
+		    $(function (){
+		    	$('[data-toggle="tooltip"]').tooltip()
+		    });
+
 		    var offlineMessage = $('#offlineMessage');
 		    if ('[(${exhibition})]' != null && '[(${exhibition.mode})]' == 'OFFLINE') {
 		        offlineMessage.show();
 		    }
 		    else {
 		        offlineMessage.hide();
-		    }
+		    }		    
 		});
 
 		function modeChange(modeChosen) {
@@ -54,7 +61,7 @@ <h2>Exhibition Configuration</h2>
 	     <a style="color:blue;" th:href="@{|/preview/${exhibition.previewId}|}"> [[${#strings.defaultString(@environment.getProperty('baseUrl'),'')}]][[@{|/preview/${exhibition.previewId}|}]]</a></p>
 	    </div>
 		<div style="padding: 30px 0;">
-		    <form th:action="@{/staff/exhibit/config}" method="POST" name="f">
+		    <form th:action="@{/staff/exhibit/config}" method="POST" name="f" modelAttribute="${exhibitionConfigurationForm}">
 		        <input type="hidden"  th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
 		        <input type="hidden" th:value="${exhibition?.id}" name="exhibitionParam"/>
 		        <label for="space">Select the start space of the exhibition:</label>
@@ -76,8 +83,9 @@ <h2>Exhibition Configuration</h2>
 		            </select>
 		        </div>
 		         <div style="padding-top: 20px;">
-		            <label for="title">Exhibition Languages:</label>
-		            <select class="form-control" name="exhibitLanguage" multiple="multiple" >
+		            <label for="title">Exhibition Languages: <span class="fa fa-question-circle secondary" aria-hidden="true" data-toggle="tooltip" data-html="true" data-placement="right" title="To select multiple languages, hold down the shift key when selecting."></span>
+                           </label>
+		            <select class="form-control" name="exhibitLanguage" multiple="multiple" required>
 		                <option th:each="language: ${languageList}" th:id=${language.code} th:value=${language.code} th:selected="${savedExhibitionLanguages!=null && savedExhibitionLanguages.contains(language.label)}">[[${language.label}]]</option>
 		            </select>
 		        </div>