Author: echatellier Date: 2013-06-21 11:30:49 +0200 (Fri, 21 Jun 2013) New Revision: 246 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/246 Log: fixes #2741: La recherche de resultats de test bio ne doit afficher que les type de r?\195?\169sultat 'Produit' Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-21 09:08:32 UTC (rev 245) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-21 09:30:49 UTC (rev 246) @@ -22,6 +22,7 @@ */ package nc.ird.cantharella.web.pages.domain.search; +import java.util.Iterator; import java.util.List; import nc.ird.cantharella.data.model.Extraction; @@ -29,6 +30,7 @@ import nc.ird.cantharella.data.model.Molecule; import nc.ird.cantharella.data.model.Purification; import nc.ird.cantharella.data.model.ResultatTestBio; +import nc.ird.cantharella.data.model.ResultatTestBio.TypeResultat; import nc.ird.cantharella.data.model.Specimen; import nc.ird.cantharella.data.model.Station; import nc.ird.cantharella.data.model.Utilisateur; @@ -176,6 +178,14 @@ add(purificationsDataTable); // test bio table + // fix, resultat test bio page must only display produit type (excluding Temoin, Blanc...) + Iterator<ResultatTestBio> itResultatTestBios = searchResult.getResultatTestBios().iterator(); + while (itResultatTestBios.hasNext()) { + ResultatTestBio resultatTestBio = itResultatTestBios.next(); + if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT) { + itResultatTestBios.remove(); + } + } DataTable<ResultatTestBio, String> testBiosDataTable = ListTestsBioPage.initTestsBioDataTable(this, "SearchPage.ResultatTestBios.Results", currentPage, searchResult.getResultatTestBios(), testBioService); add(testBiosDataTable);