#161 hotfixed by removing spring form dependency from print overview

ESPD · May 4, 2017 · 2260943 · 2260943
1 parent ac5c2ea
commit 2260943
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/espd-docs/pom.xml b/espd-docs/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2017.03.01</version>
+        <version>2017.03.02</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/espd-docs/src/main/asciidoc/configuration.adoc b/espd-docs/src/main/asciidoc/configuration.adoc
@@ -2,7 +2,7 @@
 :homepage: https://ec.europa.eu/espd[ESPD]
 :espd: https://ec.europa.eu/espd[ESPD]
 :edm: https://github.com/ESPD/ESPD-EDM[ESPD-EDM]
-:appVersion: 2017.03
+:appVersion: 2017.03.02
 :maven: https://maven.apache.org[Maven]
 :tomcat: https://tomcat.apache.org[Tomcat]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]

diff --git a/espd-docs/src/main/asciidoc/espd.adoc b/espd-docs/src/main/asciidoc/espd.adoc
@@ -3,12 +3,12 @@
 Alexey Lukashov +
 Virgiliu Ratoi
 
-v2017.03.01, 11-04-2017
+v2017.03.02, 04-05-2017
 
 :sourcedir: ../java/eu/europa/ec/grow/espd
 :homepage: https://ec.europa.eu/espd[ESPD]
 :espd: https://ec.europa.eu/espd[ESPD]
-:appVersion: 2017.03
+:appVersion: 2017.03.02
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]

diff --git a/espd-docs/src/main/asciidoc/installation.adoc b/espd-docs/src/main/asciidoc/installation.adoc
@@ -1,7 +1,7 @@
 :sourcedir: ../java/eu/europa/ec/grow/espd
 :homepage: https://ec.europa.eu/espd[ESPD]
 :espd: https://ec.europa.eu/espd[ESPD]
-:appVersion: 2017.03
+:appVersion: 2017.03.02
 :maven: https://maven.apache.org[Maven]
 :tomcat: https://tomcat.apache.org[Tomcat]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]

diff --git a/espd-docs/src/main/asciidoc/releaseNotes.adoc b/espd-docs/src/main/asciidoc/releaseNotes.adoc
@@ -1,5 +1,11 @@
 == Release notes
 
+=== 2017.03.02 (5th of May 2017)
+
+==== Bug
+
+* https://github.com/ESPD/ESPD-Service/issues/161[Error in CA view of ESPD-response, part IV a]
+
 === 2017.03.01 (11th of April 2017)
 
 This release contains a bugfix related to printing issues introduced in version `2017.03`.

diff --git a/espd-web/pom.xml b/espd-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2017.03.01</version>
+        <version>2017.03.02</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>espd-web</artifactId>

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
@@ -6,6 +6,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
 <%--
   ~
@@ -343,9 +344,8 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
             </ul>
         </div>
 
-	<c:set var="usealpha" value="${espd.selectionSatisfiesAll != null && espd.selectionSatisfiesAll.exists}"/>
-
-
+		<c:set var="usealpha" value="${espd.selectionSatisfiesAll != null && espd.selectionSatisfiesAll.exists}"/>
+
         <c:if test="${usealpha}">
 	        <div class="panel panel-espd">
 	            <div class="panel-heading" data-toggle="collapse" data-target="#eo-satisfies-all-section">
@@ -356,7 +356,13 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
                         ${span18n['crit_selection_ca_declares_that']}
                         <div class="checkbox">
 	                        <label>
-	                            <form:checkbox path="selectionSatisfiesAll.exists" class="checktoggle" value="true"/>
+	                        	<c:if test="${espd.selectionSatisfiesAll.exists}">
+									<input type="checkbox" class="checktoggle" checked="checked"/>
+	                        	</c:if>
+	                        	<c:if test="${!espd.selectionSatisfiesAll.exists}">
+									<input type="checkbox" class="checktoggle"/>
+	                        	</c:if>
+
 	                            ${span18n['crit_selection_satisfies_all_criteria']}
 	                        </label>
 	                    </div>
@@ -455,13 +461,14 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
                     <div class="form-group">
                         <label class="control-label col-md-2 small">${span18n['crit_date']}</label>
                         <div class="col-md-4">
-                           <form:input type="text" path="documentDate" cssClass="form-control datepicker" cssStyle="border-radius: 0;"/>
+                        	<fmt:formatDate var="documentDateFormatted" value="${espd.documentDate}" pattern="yyyy-MM-dd"/>
+                        	<input type="text" cssClass="form-control datepicker" cssStyle="border-radius: 0;" value="${documentDateFormatted}"/>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="control-label col-md-2 small">${span18n['place']}</label>
                         <div class="col-md-4">
-                            <form:textarea rows="1" path="location" cssClass="form-control"/>
+                            <textarea rows="1" cssClass="form-control">${espd.location}</textarea>
                         </div>
                     </div>
                     <div class="form-group">

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
     <groupId>eu.europa.ec.grow.espd</groupId>
     <artifactId>espd</artifactId>
     <packaging>pom</packaging>
-    <version>2017.03.01</version>
+    <version>2017.03.02</version>
     <modules>
         <module>espd-web</module>
         <module>espd-docs</module>