Fixed remove content does not work when radio button are present in the sequence for the VME-DB case

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@100295 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.11.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.11.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/reports-4.11.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.11.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.settings/com.google.gdt.eclipse.core.prefs

@@ -2,6 +2,6 @@
 <<<<<<<=.mine
 >>>>>>>=.r71295
 eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.11.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.11.1-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false

distro/changelog.xml

@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.report-generator-portlet.4-11-1"
+		date="2014-09-30">
+		<Change>Fixed remove content does not work when radio button are present in the sequence for the VME-DB case</Change>
+		<Change>Minor UX Restyle for fixing glitches</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.report-generator-portlet.4-11-0"
 		date="2014-09-16">
 		<Change>Fixed security layer issue for the VME-DB case</Change>

pom.xml

@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>reports</artifactId>
 	<packaging>war</packaging>
-	<version>4.11.0-SNAPSHOT</version>
+	<version>4.11.1-SNAPSHOT</version>
 	<name>gCube Reports Manager</name>
 	<description>
 		gCube Reports Portlet.

src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeMultiSelection.java

@@ -175,5 +175,15 @@ public class AttributeMultiSelection extends Composite {
 	public void setMetadata(List<Metadata> metas) {
 		this.metas = metas;
 	}
+	
+	public void reset() {
+		for (CheckBox checkbox : boxes) {
+			if (checkbox.getText().compareTo("Not applicable") == 0) {
+				checkbox.setValue(true);
+			}
+			else
+				checkbox.setValue(false);
+		}
+	}
 }
 

src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeSingleSelection.java

@@ -11,6 +11,7 @@ import org.gcube.portlets.d4sreporting.common.shared.Metadata;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 
 import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
@@ -176,5 +177,15 @@ public class AttributeSingleSelection extends Composite {
 	public void setMetadata(List<Metadata> metas) {
 		this.metas = metas;
 	}
+	
+	public void reset() {
+		for (RadioButton radio : boxes) {
+			if (radio.getText().compareTo("Not applicable") == 0) {
+				radio.setValue(true);
+			}
+			else
+				radio.setValue(false);
+		}
+	}
 }
 

src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java

@@ -305,6 +305,14 @@ public class SequenceWidget extends Composite {
 				ClientImage toClear = (ClientImage) myPanel.getWidget(i);
 				toClear.resetImage();
 			}
+			else if (myPanel.getWidget(i) instanceof AttributeMultiSelection) {
+				AttributeMultiSelection toClear = (AttributeMultiSelection) myPanel.getWidget(i);
+				toClear.reset();
+			}
+			else if (myPanel.getWidget(i) instanceof AttributeSingleSelection) {
+				AttributeSingleSelection toClear = (AttributeSingleSelection) myPanel.getWidget(i);
+				toClear.reset();
+			}
 
 		}
 		
@@ -315,7 +323,7 @@ public class SequenceWidget extends Composite {
 			BasicComponent sComp = repSequence.getGroupedComponents().get(j);
 			//if is not locked and is of type BODY then put fields to blank
 			if ((!sComp.isLocked()) && (sComp.getType() == ComponentType.BODY || sComp.getType() == ComponentType.BODY_NOT_FORMATTED ||  
-					sComp.getType() == ComponentType.DYNA_IMAGE) ) {
+					sComp.getType() == ComponentType.DYNA_IMAGE) || sComp.getType() == ComponentType.ATTRIBUTE_MULTI || sComp.getType() == ComponentType.ATTRIBUTE_UNIQUE) {
 				sComp.setPossibleContent("");
 				sComp.setMetadata(setPropertiesForRSG(sComp.getMetadata()));
 			}

src/main/webapp/ReportGenerator.css

@@ -169,25 +169,26 @@
 .deleteAssociationButton {
 	background-image: none !important;
 	background-repeat: none !important;
-	background-color: #12B0FA !important;
+	background-color: #d9edf7 !important;
-	color: #FFF !important;
+	border-color: #AED3E5 !important;
+	color: #31708f !important;
 }
 
 .deleteAssociationButton:hover {
-	background-image: none !important;
+	background-color: #AED3E5 !important;
-	background-repeat: none !important;
-	background-color: #12B0FA !important;
 	color: #FFF !important;
 }
 
 .addEntryButton {
 	background-image: none !important;
 	background-repeat: none !important;
-	background-color: #02990C !important;
+	border-color: #B5D49B !important;
-	color: #FFF !important;
+	background-color: #d6e9c6 !important;
+	color: #3c763d !important;
 }
 
 .addEntryButton:hover {
+	background-color: #B5D49B !important;
 	color: #FFF !important;
 }
 
@@ -468,6 +469,7 @@ tableBorder td {
 
 .attributeArea {
 	margin-top: 5px;
+	margin-left: 5px;
 	padding-left: 0px;
 	border: none;
 	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
@@ -508,6 +510,7 @@ tableBorder td {
 	border-radius: 5px;
 	background-color: white;
 	margin-top: 5px;
+	margin-left: 5px;
 }
 
 .report-ui-component {