Changeset 557

Timestamp:

03/02/11 23:07:39 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-web/trunk/src/main

Files:

• java/uk/ac/cardiff/raptorweb/model/StatisticalUnitInformationView.java (modified) (2 diffs)
• java/uk/ac/cardiff/raptorweb/service/GraphService.java (modified) (1 diff)
• java/uk/ac/cardiff/raptorweb/service/impl/GraphServiceImpl.java (modified) (1 diff)
• webapp/WEB-INF/flows/reports/graphicalReports.xhtml (modified) (2 diffs)
• webapp/WEB-INF/flows/reports/reports-flow.xml (modified) (1 diff)
• webapp/WEB-INF/flows/reports/seriesPanel.xhtml (modified) (5 diffs)

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/StatisticalUnitInformationView.java

@@ -5 +5 @@
 
 import java.io.Serializable;
+import java.util.List;
 
 import uk.ac.cardiff.model.Series;
+import uk.ac.cardiff.model.sql.ComparisonPredicate;
 import uk.ac.cardiff.model.wsmodel.StatisticalUnitInformation;
 
@@ -50 +52 @@
 
     }
+    public void addFilterToSeries(Series selectedSeries) {
+        List<Series> seriesList = statisticalUnitInformation.getStatisticParameters().getSeries();
+        for (Series series: seriesList){
+            if (series == selectedSeries){
+                if (series.getComparisonPredicate()==null)
+                    series.setComparisonPredicate(new ComparisonPredicate());
+            }
+        }
+        
+    }
+    public void removeFilterFromSeries(Series selectedSeries) {
+        List<Series> seriesList = statisticalUnitInformation.getStatisticParameters().getSeries();
+        for (Series series: seriesList){
+            if (series == selectedSeries){
+                series.setComparisonPredicate(null);
+            }
+        }
+        
+    }
 
 }

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/GraphService.java

@@ -42 +42 @@
 
         public void removeSeriesFromSelectedStatistic(WebSession websession);
+        
+        public void removeSelectedFilterFromSelectedStatistic(WebSession websession);
 
         public void addSeriesToSelectedStatistic(WebSession websession);
+        
+        public void addFilterToSelectedSeries(WebSession websession);
 
 }

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/GraphServiceImpl.java

@@ -184 +184 @@
         }
 
+        @Override
+        public void addFilterToSelectedSeries(WebSession websession) {
+            websession.getGraphmodel().getSelectedStatisticalUnit().addFilterToSeries(websession.getGraphmodel().getSelectedSeries());
+            
+        }
+
+        @Override
+        public void removeSelectedFilterFromSelectedStatistic(WebSession websession) {
+            websession.getGraphmodel().getSelectedStatisticalUnit().removeFilterFromSeries(websession.getGraphmodel().getSelectedSeries());
+            
+        }
+
 
 }

raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/graphicalReports.xhtml

@@ -218 +218 @@
                                                                                                                         target="#{flowScope.websession.graphmodel.selectedSeries}" />
                                                                                                         </a4j:commandLink>
-                                                                                                        <!--<a4j:commandLink immediate="true"
-                                                        action="addSeriesToSelectedStatistic"
+                                                                                                        <a4j:commandLink immediate="true" oncomplete="#{rich:component('seriesModalPanel')}.show()"
                                                         id="conditionModalPanelLinkAdd" rendered="#{empty series.comparisonPredicate}"
-                                                        reRender="seriesModalPanel,currentSeriesTable">
+                                                        reRender="seriesModalPanel,seriesTable" action="addFilterToSelectedSeries">
                                                         <h:graphicImage id="conditionImage" style="width:20px; border:0; margin-left: auto;margin-right: auto;"
-                                                            value="/image/icon/onebit_31.png"
-                                                             />
+                                                            value="/image/icon/onebit_31.png"/>
                                                         <f:setPropertyActionListener value="#{series}"
                                                             target="#{flowScope.websession.graphmodel.selectedSeries}" />
                                                     </a4j:commandLink>
 
-                                                                                                --></rich:column>
+                                                                                                </rich:column>
                                                                                                 <rich:column>
                                                                                                         <f:facet name="header">
@@ -235 +233 @@
                                                                                                         </f:facet>
                                                                                                         <a4j:commandLink immediate="true"
-                                                                                                                action="removeSelectedFilterFromSelectedStatistic"
+                                                                                                                action="removeSeriesFromSelectedStatistic"
                                                                                                                 id="removeSeriesLink" reRender="optionsPanelForm">
                                                                                                                 <h:graphicImage style="width:20px; border:0; margin-left: auto;margin-right: auto;"

raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/reports-flow.xml

@@ -69 +69 @@
                 </transition>
 
+                <transition on="removeSeriesFromSelectedStatistic">
+                      <evaluate expression="graphService.removeSeriesFromSelectedStatistic(flowScope.websession)"/>
+                </transition>
+                
                 <transition on="removeSelectedFilterFromSelectedStatistic">
-                      <evaluate expression="graphService.removeSeriesFromSelectedStatistic(flowScope.websession)"/>
+                      <evaluate expression="graphService.removeSelectedFilterFromSelectedStatistic(flowScope.websession)"/>
                 </transition>
 
                 <transition on="addSeriesToSelectedStatistic">
                   <evaluate expression="graphService.addSeriesToSelectedStatistic(flowScope.websession)"></evaluate>
+                </transition>
+                
+                <transition on="addFilterToSelectedSeries">
+                        <evaluate expression="graphService.addFilterToSelectedSeries(flowScope.websession)"></evaluate>
                 </transition>
 

raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/seriesPanel.xhtml

@@ -23 +23 @@
                         </h:panelGroup>
                 </f:facet>
-                <a4j:form>
-                        <rich:dataTable id="currentSeriesTable"
-                                value="#{flowScope.websession.graphmodel.selectedSeries}"
+                <a4j:form id="filterTableForm">
+                        <rich:dataTable id="filterTable"
+                                value="#{flowScope.websession.graphmodel.selectedSeries.comparisonPredicate}"
                                 bandingInterval="2" banding="row" rows="5" var="series" width="100%"
-                                rendered="#{not empty flowScope.websession.graphmodel.selectedSeries}">
+                                rendered="#{not empty flowScope.websession.graphmodel.selectedSeries.comparisonPredicate}">
 
                                 <f:facet name="header">
@@ -37 +37 @@
                                                 <h:outputText value="Field" />
                                         </f:facet>
-                                        <rich:comboBox style="width:100%" value="#{series.comparisonPredicate.fieldName}" suggestionValues="#{series.comparisonPredicate.possibleFieldNameValues}">
-                    </rich:comboBox>
+                                        <rich:comboBox style="width:100%" value="#{series.fieldName}"
+                                                suggestionValues="#{series.possibleFieldNameValues}">
+                                        </rich:comboBox>
                                 </rich:column>
                                 <rich:column>
@@ -44 +45 @@
                                                 <h:outputText value="Operator" />
                                         </f:facet>
-                                        <rich:comboBox value="#{series.comparisonPredicate.compOp}" suggestionValues="#{series.comparisonPredicate.possibleComparisonOperatorValues}">
+                                        <rich:comboBox value="#{series.compOp}"
+                                                suggestionValues="#{series.possibleComparisonOperatorValues}">
                                         </rich:comboBox>
                                 </rich:column>
@@ -51 +53 @@
                                                 <h:outputText value="Value" />
                                         </f:facet>
-                                        <h:inputText style="width:100%" value="#{series.comparisonPredicate.value}" />
+                                        <h:inputText style="width:100%" value="#{series.value}" />
                                 </rich:column>
                                 <!--  can not remove or add filters for the v1.0 so this is redundent -->
@@ -58 +60 @@
                                                 <h:outputText value="Remove" />
                                         </f:facet>
-                                        <h:graphicImage style="width:20px; text-align: center;"
-                                                value="/image/icon/onebit_33.png" />
+
+                                        <a4j:commandLink immediate="true"
+                                                action="removeSelectedFilterFromSelectedStatistic"
+                                                id="removeFilterLink" reRender="filterTableForm,seriesModalPanel,optionsPanelForm"
+                                                oncomplete="#{rich:component('seriesModalPanel')}.hide()" >
+                                                <h:graphicImage
+                                                        style="width:20px; border:0; margin-left: auto;margin-right: auto;"
+                                                        value="/image/icon/onebit_33.png" />
+                                        </a4j:commandLink>
                                 </rich:column>
 
                         </rich:dataTable>
 
-                        <a4j:commandButton value="Save" onclick="#{rich:component('seriesModalPanel')}.hide()"/>
+
+                        <a4j:commandButton value="Save"
+                                onclick="#{rich:component('seriesModalPanel')}.hide()" />
                         <!-- return false, after onclick nothing else is done e.g. a form submit -->
-                        <a4j:commandButton value="Close" onclick="#{rich:component('seriesModalPanel')}.hide(); return false;"/>
+                        <a4j:commandButton value="Close"
+                                onclick="#{rich:component('seriesModalPanel')}.hide(); return false;" />
 
                 </a4j:form>