From 6582121a44894349d2b93bc9a0d51288510c8c3d Mon Sep 17 00:00:00 2001 From: nicolas Date: Fri, 30 Jun 2017 16:17:03 +0200 Subject: [PATCH 1/5] improve display of forms fix bug on step by step interface : sometimes autosuggest would not work --- .../queryBuilder/fields/ProxyRangeField.java | 2 +- .../queryBuilder/fields/SuggestionImpl.java | 4 +- .../queryBuilder/forms/CollisionsForm.java | 3 +- .../queryBuilder/formsTree/AtomsTreeForm.java | 12 +--- .../formsTree/CollisionTreeForm.java | 4 +- .../queryBuilder/formsTree/RadiativeForm.java | 10 ++- .../src/main/webapp/img/vamdc_logo_old.png | Bin 0 -> 8175 bytes .../webapp/img/vamdc_partners_footer.jpg_old | Bin 0 -> 67362 bytes .../src/main/webapp/layout/template.xhtml | 3 +- portal.war/src/main/webapp/queryTree.xhtml | 10 +-- .../src/main/webapp/stylesheet/style.css | 21 ++++-- .../xhtml/query/fields/proxyRangeField.xhtml | 1 - .../xhtml/query/fields/rangeField.xhtml | 1 - .../xhtml/query/forms/collisionsForm.xhtml | 3 +- .../xhtml/query/forms/moleculesForm.xhtml | 10 +-- .../xhtml/query/forms/standardForm.xhtml | 16 +++-- .../xhtml/query/queryTree/actionButtons.xhtml | 4 +- .../query/queryTree/allStatesEnergyForm.xhtml | 4 +- .../xhtml/query/queryTree/atomsForm.xhtml | 4 +- .../query/queryTree/collisionTreeForm.xhtml | 26 ++++--- .../xhtml/query/queryTree/moleculesForm.xhtml | 7 +- .../query/queryTree/oneStateEnergyForm.xhtml | 8 +-- .../xhtml/query/queryTree/radiativeForm.xhtml | 8 +-- .../xhtml/query/queryTree/rootForm.xhtml | 8 +-- .../queryTree/sineReactionCollisionForm.xhtml | 61 +++++++++------- .../xhtml/query/queryTree/speciesForm.xhtml | 4 +- .../queryTree/speciesSelectionForm.xhtml | 24 +++---- .../queryTree/withReactionCollisionForm.xhtml | 66 ++++++++++-------- 28 files changed, 173 insertions(+), 151 deletions(-) create mode 100755 portal.war/src/main/webapp/img/vamdc_logo_old.png create mode 100644 portal.war/src/main/webapp/img/vamdc_partners_footer.jpg_old diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/ProxyRangeField.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/ProxyRangeField.java index 1fcc4a4..96a1647 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/ProxyRangeField.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/ProxyRangeField.java @@ -12,7 +12,7 @@ import org.vamdc.portal.session.queryBuilder.unitConv.UnitConverter; /** - * Field that proxies several range fields and does intercorversion into the primary one + * Field that proxies several range fields and does interconversion into the primary one * @author doronin * */ diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/SuggestionImpl.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/SuggestionImpl.java index fca92a9..fd721fa 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/SuggestionImpl.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/fields/SuggestionImpl.java @@ -11,8 +11,8 @@ public abstract class SuggestionImpl implements SuggestionField.Suggestion{ * @return a collection that will be used for suggestion lookup */ protected abstract Collection loadValues(); - - protected final Collection values; + protected Collection values; + public SuggestionImpl(){ this.values= loadValues(); } diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/forms/CollisionsForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/forms/CollisionsForm.java index 9828fcd..7a88895 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/forms/CollisionsForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/forms/CollisionsForm.java @@ -98,8 +98,9 @@ public class ProcessNameSuggest extends SuggestionImpl{ @Override protected Collection loadValues() { Collection result = new ArrayList(); - for (XsamsProcessCode code:XsamsProcessCode.values()) + for (XsamsProcessCode code:XsamsProcessCode.values()){; result.add(code.getProcessName()); + } return result; } diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java index 88826c9..960d815 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java @@ -1,7 +1,6 @@ package org.vamdc.portal.session.queryBuilder.formsTree; import org.vamdc.portal.session.queryBuilder.QueryTreeInterface; -import org.vamdc.portal.session.queryBuilder.fields.AbstractField; import org.vamdc.portal.session.queryBuilder.forms.FormForFields; import org.vamdc.portal.session.queryBuilder.forms.AtomsForm; import org.vamdc.portal.session.queryBuilder.forms.Order; @@ -13,14 +12,13 @@ public class AtomsTreeForm extends AtomsForm implements FormForFields, TreeFormI private static final long serialVersionUID = 5992593235932991330L; protected Integer position; private QueryTreeInterface tree; + public AtomsTreeForm(QueryTreeInterface tree) { - //super(tree); this.tree = tree; position = tree.getFormCount(); } public AtomsTreeForm(QueryTreeInterface tree, String prefix) { - //super(tree); this.tree = tree; this.setPrefix(prefix); position = tree.getFormCount(); @@ -37,25 +35,17 @@ public String getView() { @Override public void validate() { - // TODO Auto-generated method stub tree.addForm(this); } - - @Override - public void fieldUpdated(AbstractField field) { - // TODO Auto-generated method stub - } @Override public Integer getOrder() { - // TODO Auto-generated method stub return Order.Atoms; } @Override public Boolean getQueryable() { - // TODO Auto-generated method stub return true; } diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/CollisionTreeForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/CollisionTreeForm.java index 92239df..cebe06e 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/CollisionTreeForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/CollisionTreeForm.java @@ -36,7 +36,7 @@ public class CollisionTreeForm extends CollisionsForm implements FormForFields, private Boolean queryable = true; private SearchMode selectedMode = SearchMode.withoutReaction; private QueryTreeInterface tree; - private final String defaultSubmitButtonValue = "Select target(s) and collider(s)"; + private String defaultSubmitButtonValue = "Select targets and colliders"; private String submitButtonValue = defaultSubmitButtonValue; @@ -139,7 +139,7 @@ public void changeCollisionType(ValueChangeEvent e){ break; case withReaction: - this.submitButtonValue = "Select reactant(s) and product(s)"; + this.submitButtonValue = "Select reactants and products"; break; } diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RadiativeForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RadiativeForm.java index 6b6b250..3e75533 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RadiativeForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RadiativeForm.java @@ -43,7 +43,6 @@ private enum NextForm{ private static final long serialVersionUID = 1L; { add(new SelectItem(NextForm.upperLowerEnergyRange,"Transition from an energy range to another one")); - //add(new SelectItem(NextForm.stateEnergyRange,"Transition to and from a given energy range")); add(new SelectItem(NextForm.anyEnergyRange,"Any transition")); } }; @@ -67,9 +66,7 @@ public String getView() { public void validate() { if (this.selectedMode == null) return; - - //System.err.println("Adding next form "+selectedMode.name()); - + switch(this.selectedMode){ case upperLowerEnergyRange: tree.addForm(new AllStatesEnergyTreeForm(tree)); @@ -129,12 +126,13 @@ public String getSubmitButtonValue(){ public void changeTransitionType(ValueChangeEvent e){ NextForm value = (NextForm)e.getNewValue(); + String submitButton = "Select range"; switch(value){ case upperLowerEnergyRange: - this.submitButtonValue = "Configure energy range"; + this.submitButtonValue = submitButton; break; case stateEnergyRange: - this.submitButtonValue = "Configure energy range"; + this.submitButtonValue = submitButton; break; case anyEnergyRange: this.submitButtonValue = this.defaultSubmitButtonValue; diff --git a/portal.war/src/main/webapp/img/vamdc_logo_old.png b/portal.war/src/main/webapp/img/vamdc_logo_old.png new file mode 100755 index 0000000000000000000000000000000000000000..b84b9925cabcf8164f2db3ef2e48fa742ed2baf5 GIT binary patch literal 8175 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 VQxL||6M+B#002ovPDHLkV1h=OF(d#0 literal 0 HcmV?d00001 diff --git a/portal.war/src/main/webapp/img/vamdc_partners_footer.jpg_old b/portal.war/src/main/webapp/img/vamdc_partners_footer.jpg_old new file mode 100644 index 0000000000000000000000000000000000000000..26d0a27316ba18fde1533331c51890e612f88c54 GIT binary patch literal 67362 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
0KY6WZ1gHFV( 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 z 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 literal 0 HcmV?d00001 diff --git a/portal.war/src/main/webapp/layout/template.xhtml b/portal.war/src/main/webapp/layout/template.xhtml index c63ab52..58e81cf 100644 --- a/portal.war/src/main/webapp/layout/template.xhtml +++ b/portal.war/src/main/webapp/layout/template.xhtml @@ -4,8 +4,9 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" xmlns:a="http://richfaces.org/a4j" - xmlns:s="http://jboss.com/products/seam/taglib" contentType="text/html"> + contentType="text/html"> diff --git a/portal.war/src/main/webapp/queryTree.xhtml b/portal.war/src/main/webapp/queryTree.xhtml index 72daafa..fac329d 100644 --- a/portal.war/src/main/webapp/queryTree.xhtml +++ b/portal.war/src/main/webapp/queryTree.xhtml @@ -5,9 +5,9 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core" + xmlns:rich="http://richfaces.org/rich" template="/layout/template.xhtml"> @@ -16,20 +16,20 @@ - + - + - + - + diff --git a/portal.war/src/main/webapp/stylesheet/style.css b/portal.war/src/main/webapp/stylesheet/style.css index 7e7eed5..49b7eab 100644 --- a/portal.war/src/main/webapp/stylesheet/style.css +++ b/portal.war/src/main/webapp/stylesheet/style.css @@ -104,7 +104,7 @@ table.radio input[type=radio] { } .content { - padding: 1%; + padding: 0.5em; width : 100%; } @@ -116,7 +116,7 @@ table.radio input[type=radio] { margin-left:5px; } .narrowfield{ - width: 70px; + width: 60px; margin-top:0px; margin-bottom:0px; margin-right:5px; @@ -140,10 +140,10 @@ table.radio input[type=radio] { } .rightColumn { - width: 250px; - align: right; + width: 270px; + /*align: right; text-align: right; - float: right; + float: right;*/ } .queryMenuPanel{ @@ -180,7 +180,7 @@ table.radio input[type=radio] { .queryForms{ height: 100%; vertical-align: top; - width : 410px; + width : 460px; /*max-width : 410px;*/ } @@ -281,8 +281,15 @@ table.radio input[type=radio] { } .largeButton{ - width : 100px; + width : 110px; + font-weight : bold; + padding : 1px; +} + +.largerButton{ + width : 220px; font-weight : bold; + padding : 1px; } .buttonArea .largeButton{ diff --git a/portal.war/src/main/webapp/xhtml/query/fields/proxyRangeField.xhtml b/portal.war/src/main/webapp/xhtml/query/fields/proxyRangeField.xhtml index 18c8dca..683a6b1 100644 --- a/portal.war/src/main/webapp/xhtml/query/fields/proxyRangeField.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/fields/proxyRangeField.xhtml @@ -15,7 +15,6 @@ - diff --git a/portal.war/src/main/webapp/xhtml/query/fields/rangeField.xhtml b/portal.war/src/main/webapp/xhtml/query/fields/rangeField.xhtml index eab8444..a271ce7 100644 --- a/portal.war/src/main/webapp/xhtml/query/fields/rangeField.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/fields/rangeField.xhtml @@ -14,7 +14,6 @@ - diff --git a/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml b/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml index 08b4966..61bf681 100644 --- a/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml @@ -1,4 +1,5 @@ - + - - - - - + + + + + diff --git a/portal.war/src/main/webapp/xhtml/query/forms/standardForm.xhtml b/portal.war/src/main/webapp/xhtml/query/forms/standardForm.xhtml index 312b046..7e9cc51 100644 --- a/portal.war/src/main/webapp/xhtml/query/forms/standardForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/forms/standardForm.xhtml @@ -9,14 +9,16 @@ xmlns:c="http://java.sun.com/jstl/core"> - - - - - + + + + + + - - + + + diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/actionButtons.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/actionButtons.xhtml index 40c1e72..aeb665b 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/actionButtons.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/actionButtons.xhtml @@ -9,9 +9,9 @@ - + styleClass="largeButton" tabindex="21"/> diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/allStatesEnergyForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/allStatesEnergyForm.xhtml index ac37366..9f1cbfd 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/allStatesEnergyForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/allStatesEnergyForm.xhtml @@ -17,8 +17,8 @@ - + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/atomsForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/atomsForm.xhtml index 7ace7ec..ed421fd 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/atomsForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/atomsForm.xhtml @@ -12,7 +12,9 @@ - + + + diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/collisionTreeForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/collisionTreeForm.xhtml index c8b85ae..d9a14ab 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/collisionTreeForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/collisionTreeForm.xhtml @@ -10,16 +10,18 @@ xmlns:c="http://java.sun.com/jstl/core"> - + - - - - - + + + + + @@ -27,11 +29,13 @@ - - + + - + diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/moleculesForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/moleculesForm.xhtml index 32db0b5..4b58deb 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/moleculesForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/moleculesForm.xhtml @@ -9,8 +9,11 @@ xmlns:c="http://java.sun.com/jstl/core"> - - + + + + + diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/oneStateEnergyForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/oneStateEnergyForm.xhtml index ac37366..6365501 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/oneStateEnergyForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/oneStateEnergyForm.xhtml @@ -7,7 +7,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> - + @@ -17,8 +17,8 @@ - + - + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/radiativeForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/radiativeForm.xhtml index f79e7e6..03ab75f 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/radiativeForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/radiativeForm.xhtml @@ -10,7 +10,7 @@ xmlns:c="http://java.sun.com/jstl/core"> - + @@ -31,9 +31,9 @@ - + - + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/rootForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/rootForm.xhtml index 45d39cd..097818a 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/rootForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/rootForm.xhtml @@ -9,7 +9,7 @@ xmlns:a4j="http://richfaces.org/a4j"> - + @@ -25,8 +25,8 @@ layout="pageDirection" tabindex="10"> - + - + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml index 1fe8cc6..80d9b74 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml @@ -10,50 +10,57 @@ xmlns:c="http://java.sun.com/jstl/core"> - + - + - - - - - + cellspacing="1" + columnClasses="simpleColumn,simpleColumn,simpleColumn,simpleColumn,simpleColumn,simpleColumn"> + + + + + + + + - + - + - - - - - + + + + + + + + - + @@ -62,23 +69,25 @@ - + - - - - - + + + - - + + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/speciesForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/speciesForm.xhtml index e725d3c..28132f1 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/speciesForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/speciesForm.xhtml @@ -11,7 +11,7 @@ - + @@ -24,5 +24,5 @@ - + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/speciesSelectionForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/speciesSelectionForm.xhtml index 4fe0694..d6f94b8 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/speciesSelectionForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/speciesSelectionForm.xhtml @@ -10,12 +10,12 @@ xmlns:c="http://java.sun.com/jstl/core"> - + + value="Please, enter the number of species you wish to query" /> - + @@ -38,16 +38,14 @@ - - - - - - - + - + + + \ No newline at end of file diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/withReactionCollisionForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/withReactionCollisionForm.xhtml index 5da1c92..37abe8d 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/withReactionCollisionForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/withReactionCollisionForm.xhtml @@ -10,74 +10,82 @@ xmlns:c="http://java.sun.com/jstl/core"> - + - + - - - - - + cellspacing="1" + columnClasses="simpleColumn,simpleColumn,simpleColumn,simpleColumn,simpleColumn,simpleColumn"> + + + + + + + + - - + + - + - - - - - - + + + + + + + + + - - + + - + - - - - - + + - - + + \ No newline at end of file From 4b9df13698e85a0090f94a21eb5fa80dcdd43b53 Mon Sep 17 00:00:00 2001 From: nicolas Date: Fri, 30 Jun 2017 18:30:07 +0200 Subject: [PATCH 2/5] When converting unit of a wavelength, result is converted to integer if double value is an integer. This prevent display of trailing decimals like 10.000000001 --- .../unitConv/WavelengthUnitConverter.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java index 07b4387..743ceee 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java @@ -15,6 +15,7 @@ public WavelengthUnitConverter() { private static final long serialVersionUID = 3599889437685237848L; enum WavelengthConvert implements AbstractUnitConverter.EnumConverter{ + ANGSTROM("A",NonSI.ANGSTROM.getConverterTo(NonSI.ANGSTROM)), NM("nm",METRE.times(1e-9).getConverterTo(NonSI.ANGSTROM)), UM("um",METRE.times(1e-6).getConverterTo(NonSI.ANGSTROM)), @@ -24,6 +25,7 @@ enum WavelengthConvert implements AbstractUnitConverter.EnumConverter{ WavelengthConvert(String display,javax.measure.converter.UnitConverter converter){ this.display = display; this.convert = converter; + javax.measure.converter.UnitConverter c = METRE.times(1e-3).getConverterTo(NonSI.ANGSTROM); } private javax.measure.converter.UnitConverter convert; @@ -32,7 +34,15 @@ enum WavelengthConvert implements AbstractUnitConverter.EnumConverter{ public String getDisplay() { return display; } @Override - public Double convert(Double value) { return convert.convert(value); } + public Double convert(Double value) { + // return int value of double if value is an integer + // to prevent trailing decimal values (i.e 1.00000000001) + if((value - Math.round(value)) == 0 ){ + return new Double(Math.round(convert.convert(value))); + }else{ + return convert.convert(value); + } + } @Override public EnumConverter[] getValues() { return WavelengthConvert.values(); } From 9fcb42a248cf1abd4f37377df390f01f7194ca58 Mon Sep 17 00:00:00 2001 From: nicolas Date: Mon, 3 Jul 2017 11:40:12 +0200 Subject: [PATCH 3/5] Add unit test for WavelengthUnitConverter --- .../session/queryBuilder/unitConv/WavelengthUnitConverter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java index 743ceee..e20902c 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/unitConv/WavelengthUnitConverter.java @@ -47,7 +47,6 @@ public Double convert(Double value) { @Override public EnumConverter[] getValues() { return WavelengthConvert.values(); } - } } From 0db74fd25832b8fbc62e5a8d1a53266a87d5e2ea Mon Sep 17 00:00:00 2001 From: nicolas Date: Mon, 3 Jul 2017 11:55:56 +0200 Subject: [PATCH 4/5] Search by species is default option in guided query mode --- .../vamdc/portal/session/queryBuilder/formsTree/RootForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RootForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RootForm.java index 34261ef..b6cc9ee 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RootForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RootForm.java @@ -14,7 +14,7 @@ public class RootForm extends AbstractForm implements TreeFormInterface{ * */ private static final long serialVersionUID = 48058013878512872L; - private SearchMode selectedMode; + private SearchMode selectedMode = SearchMode.species; private QueryTreeInterface tree; private Boolean queryable=true; From fb89e3805963ada75c80fec8f4becaae2d233e67 Mon Sep 17 00:00:00 2001 From: nicolas Date: Mon, 3 Jul 2017 16:50:55 +0200 Subject: [PATCH 5/5] Display "number of atoms / molecules" form in columns instead of lines --- .../queryBuilder/QueryTreeController.java | 1 - .../queryBuilder/formsTree/AtomsTreeForm.java | 4 --- .../formsTree/ReactionCollisionForm.java | 1 - .../session/queryLog/QueryStoreProcessor.java | 1 - portal.war/src/main/webapp/queryTree.xhtml | 26 ++++++++----------- .../src/main/webapp/stylesheet/style.css | 11 ++++++-- .../xhtml/query/forms/collisionsForm.xhtml | 2 +- .../queryTree/sineReactionCollisionForm.xhtml | 19 +++++++------- .../queryTree/withReactionCollisionForm.xhtml | 19 ++++++-------- 9 files changed, 38 insertions(+), 46 deletions(-) diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/QueryTreeController.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/QueryTreeController.java index edb38b0..43c15c7 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/QueryTreeController.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/QueryTreeController.java @@ -84,7 +84,6 @@ private Integer requestableFormsCount(){ public List
getForms() { List forms= new ArrayList(); forms = this.getQueryData().getOrderedGuidedForm(); - //return queryData.getUnsortedForms(); return forms; } diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java index 960d815..da1382c 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/AtomsTreeForm.java @@ -28,10 +28,6 @@ public String getObject(){ return this.toString(); } - /*@Override - public String getView() { - return "/xhtml/query/queryTree/atomsForm.xhtml"; - }*/ @Override public void validate() { diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/ReactionCollisionForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/ReactionCollisionForm.java index c1da785..fe07cfb 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/ReactionCollisionForm.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/ReactionCollisionForm.java @@ -23,7 +23,6 @@ public abstract class ReactionCollisionForm extends AbstractForm implements Form private QueryTreeInterface tree; private Boolean queryable = true; - //private Boolean hasHiddenForm = false; private String typeAName; private String typeBName; diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreProcessor.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreProcessor.java index 0b904d4..eeb330b 100644 --- a/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreProcessor.java +++ b/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreProcessor.java @@ -47,7 +47,6 @@ public QueryStoreResponse getResponse() { log.debug(e); result = new QueryStoreResponse(QueryStoreResponse.STATUS_ERROR, "", e.getMessage()); } catch (ExecutionException e) { - System.out.println("### test"); e.printStackTrace(); log.debug(e); result = new QueryStoreResponse(QueryStoreResponse.STATUS_ERROR, "", e.getMessage()); diff --git a/portal.war/src/main/webapp/queryTree.xhtml b/portal.war/src/main/webapp/queryTree.xhtml index fac329d..1fe5254 100644 --- a/portal.war/src/main/webapp/queryTree.xhtml +++ b/portal.war/src/main/webapp/queryTree.xhtml @@ -9,29 +9,25 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" template="/layout/template.xhtml"> - - + + - + - - + + - - + + - - - - - - - + + + + - diff --git a/portal.war/src/main/webapp/stylesheet/style.css b/portal.war/src/main/webapp/stylesheet/style.css index 49b7eab..164c289 100644 --- a/portal.war/src/main/webapp/stylesheet/style.css +++ b/portal.war/src/main/webapp/stylesheet/style.css @@ -270,11 +270,18 @@ table.radio input[type=radio] { background-color: inherit; } -.collisionSpecies{ +.collisionSpeciesText{ text-decoration:none; border-bottom:1px dotted #D4CFC7; } + +.collisionSpeciesSelectionForm{ + width : 49%; + float : left; +} + + .roundButton { -moz-border-radius: 10px; border-radius: 10px; @@ -418,4 +425,4 @@ table.radio input[type=radio] { .important{ text-decoration : underline; font-weight : bold; -} \ No newline at end of file +} diff --git a/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml b/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml index 61bf681..e7c6466 100644 --- a/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/forms/collisionsForm.xhtml @@ -44,7 +44,7 @@ - + diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml index 80d9b74..539b7e1 100644 --- a/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml +++ b/portal.war/src/main/webapp/xhtml/query/queryTree/sineReactionCollisionForm.xhtml @@ -16,16 +16,13 @@ - + styleClass="collisionSpeciesSelectionForm" + columnClasses="simpleColumn,simpleColumn"> - - - - @@ -47,13 +44,14 @@ + + - - - - @@ -77,6 +75,7 @@ + - - + styleClass="collisionSpeciesSelectionForm" + columnClasses="simpleColumn,simpleColumn"> - - - - @@ -47,13 +43,14 @@ + + - - - -