From e27b2b42b4e79d6c4442e4a583f99129fee1c11a Mon Sep 17 00:00:00 2001
From: guido <guido@5a08f537-7b09-473d-a1d1-551e4afdb7c2>
Date: Thu, 9 Jun 2011 09:12:05 +0000
Subject: [PATCH] =?UTF-8?q?Gestione=20quantit=C3=A0=20Extra=20Items=20-=20?=
 =?UTF-8?q?rimane=20da=20introdurre=20il=20campo=20maxQuantity=20nel=20mod?=
 =?UTF-8?q?ello.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://93.63.174.84:8080/repos/locanda/trunk@852 5a08f537-7b09-473d-a1d1-551e4afdb7c2
---
 ...t.common.project.facet.core.builder.launch |  7 +++++++
 ...e.wst.jsdt.core.javascriptValidator.launch |  7 +++++++
 ...se.wst.validation.validationbuilder.launch |  7 +++++++
 webroot/WEB-INF/jdbc.properties               |  2 +-
 webroot/js/controllers/booking.js             |  2 +-
 webroot/jsp/contents/booking_form.jsp         | 20 ++++++-------------
 webroot/jsp/contents/extraQuantity_select.jsp | 15 ++++++++------
 7 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 .externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch
 create mode 100644 .externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
 create mode 100644 .externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch

diff --git a/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch b/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch
new file mode 100644
index 00000000..c9bf5a59
--- /dev/null
+++ b/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.common.project.facet.core.builder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch b/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
new file mode 100644
index 00000000..627021fb
--- /dev/null
+++ b/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.jsdt.core.javascriptValidator"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch b/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
new file mode 100644
index 00000000..6ef634c6
--- /dev/null
+++ b/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.validation.validationbuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/webroot/WEB-INF/jdbc.properties b/webroot/WEB-INF/jdbc.properties
index 5a4ef682..6b82737c 100644
--- a/webroot/WEB-INF/jdbc.properties
+++ b/webroot/WEB-INF/jdbc.properties
@@ -1,4 +1,4 @@
 jdbc.url=jdbc:mysql://localhost/locanda
 jdbc.username=root
-jdbc.password=root
+jdbc.password=gu1d0
 jdbc.driverClassName=com.mysql.jdbc.Driver
\ No newline at end of file
diff --git a/webroot/js/controllers/booking.js b/webroot/js/controllers/booking.js
index 584419f3..67cb6cc7 100644
--- a/webroot/js/controllers/booking.js
+++ b/webroot/js/controllers/booking.js
@@ -533,7 +533,7 @@ $(function () {
                 dataType: "html",
                 data: formInput,
                 success: function (data_action) {
-                    $("div.select_container").html(data_action);
+                    $(".type-select.extraCheckList").html(data_action);
 					$('.quantity').change(function () {
          				self.calculatePrice(this);
            			 });
diff --git a/webroot/jsp/contents/booking_form.jsp b/webroot/jsp/contents/booking_form.jsp
index 812ba925..1c6c7577 100644
--- a/webroot/jsp/contents/booking_form.jsp
+++ b/webroot/jsp/contents/booking_form.jsp
@@ -414,6 +414,7 @@ display: none;
               			</div>
                   	  </div>
                   	  </s:iterator>
+                  	  
                   	  <!-- ADD ONE GUEST TEXT FIELDS AS DEFAULT 
                   	  	<s:if test="booking.guests.size() == 0"> 
                   	  <div  class="subcolumns guest_row">
@@ -428,21 +429,12 @@ display: none;
                   	  </div>
                   	  </div>
                   	  <!--  END SECOND ACCORDION -->
-                  	  <div class="type-text"><hr/></div>
-                 	  
-                  <div class="type-select"><label for="">Extras:</label>
-                    <s:iterator value="extras" var="eachExtra" >
-                    
-                      <div class="type-check extraCheckList">
-                    	<s:checkbox id="%{#eachExtra.id}_extraCheckBox" name="bookingExtraIds"  value="bookingExtraIds.contains(#eachExtra.id)" fieldValue="%{#eachExtra.id}" label="%{#eachExtra.name}" />
-                      </div> 
-                      	
-                      </s:iterator>
-                  </div>
-                  <div class="select_container">
-                      	<jsp:include page="extraQuantity_select.jsp" />
+                  	  
+                  <div class="type-text"><hr/></div>	  
+                  <div class="type-select extraCheckList"><label for="">Extras:</label>
+                      	<jsp:include page="extraQuantity_select.jsp" />     	  
                   </div>
-                   
+                  
                   <div class="type-select">
                   	<label for="convention"><s:text name="convention" />: </label> 
                     <select name="booking.convention.id" id="convention" class="required">
diff --git a/webroot/jsp/contents/extraQuantity_select.jsp b/webroot/jsp/contents/extraQuantity_select.jsp
index 513b299f..2880caea 100644
--- a/webroot/jsp/contents/extraQuantity_select.jsp
+++ b/webroot/jsp/contents/extraQuantity_select.jsp
@@ -4,11 +4,14 @@
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 		     	  
-		     	
-		     	<s:iterator value="extras" var="eachExtra" >	  
-		<s:iterator value="booking.extraItems" var="eachExtraItem" status="itemStatus">
+		  <s:iterator value="extras" var="eachExtra" >
+		  
+		     	<div class="type-check ">
+                    <s:checkbox id="%{#eachExtra.id}_extraCheckBox" name="bookingExtraIds"  value="bookingExtraIds.contains(#eachExtra.id)" fieldValue="%{#eachExtra.id}" label="%{#eachExtra.name}" />
+                </div>
+                	  
+					<s:iterator value="booking.extraItems" var="eachExtraItem" status="itemStatus">
                                
-                      	<!--<s:if test="#eachExtraItem.extra == #eachExtra">-->
                       	<div id="<s:property value="#eachExtra.id"/>_extraQuantity" class="type-select ">
                       	  <input type="hidden" class="idExtraItem" name="booking.extraItems[<s:property value="#itemStatus.index"/>].id" value="<s:property value="#eachExtraItem.id"/>"/>
        					  <input type="hidden" class="idExtra" name="booking.extraItems[<s:property value="#itemStatus.index"/>].extra.id" value="<s:property value="#eachExtraItem.extra.id"/>"/>
@@ -30,8 +33,8 @@
                   	  	  <div class="subcl type-text"><span>&euro;: </span><s:property value="#eachExtraItem.unitaryPrice" /></div>
                   	  	</div>
                   	  </div>
-                  	  <!--</s:if>-->
-          </s:iterator>
+                  	  
+          			</s:iterator>
           </s:iterator>