Author: bleny Date: 2011-03-21 23:17:41 +0000 (Mon, 21 Mar 2011) New Revision: 1080 Log: fix sampling filter componant reset Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 22:44:39 UTC (rev 1079) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 23:17:41 UTC (rev 1080) @@ -28,7 +28,7 @@ private Logger log; @Inject - private ComponentResources ressources; + private ComponentResources resources; @Inject private ServiceSampling serviceSampling; @@ -124,10 +124,14 @@ private boolean reset; private boolean refresh; - void onSelectedFromReset() { + public void onSelectedFromReset() { reset = true; } + public void onSelectedFromRefresh() { + refresh = true; + } + /** * Do filtering * @@ -135,88 +139,19 @@ */ Object onSuccessFromFiltersForm() { if (refresh) { - return filtersZone.getBody(); + getModelFactory().updateSearchFields(); + return filtersForm; } if (reset) { // Don't reset period in filters PeriodDates period = getFilter().getPeriod(); - getModelFactory().resetFilter(); getModelFactory().resetModels(); + getModelFactory().updateSearchFields(); getFilter().setPeriod(period); } // Return owner - return ressources.getContainer(); + return resources.getContainer(); } - - /* - * Refresh search field - * TODO sletellier 20110318 : refresh dont work :( - */ - - public void onSelectedFromRefresh() { - updateSearchFields(); - refresh = true; - } - - protected Form updateSearchFields() { - getModelFactory().updateSearchFields(); - return filtersForm; - } - - public Form onValueChangedFromPeriodBegin() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromPeriodEnd() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromCompany() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromProgramName() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromFacadeName() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChanged(String sector) { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromTerrestrialDistrict(TerrestrialLocation location) { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromSampleRow() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromFishingGearDCF() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromTargetSpeciesDCF() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } - - public Form onValueChangedFromSamplingStrategy() { - log.info("onValueChanged !!!!!!!!!!!!!!!!!!!"); - return updateSearchFields(); - } }