Author: bleny Date: 2010-11-12 15:44:23 +0000 (Fri, 12 Nov 2010) New Revision: 768 Log: removed dcf5code field from entity ; impact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 15:44:23 UTC (rev 768) @@ -305,12 +305,6 @@ } } - // CodeDCF5 filter - if (codeDCF5 != null) { - query.addWhere(sampleRowProperty.professionProperty().codeDCF5(), - TopiaQuery.Op.LIKE, "%" + codeDCF5 + "%"); - } - // Program filter if (programName != null) { query.addEquals(sampleRowProperty.programName(), programName); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -45,7 +45,7 @@ @Override public String getCode() { - String code = getCodeDCF5(); + String code = StringUtils.join(getDcf5code(), ", "); if (!StringUtils.isEmpty(getMeshSize())) { code += " " + getMeshSize(); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -464,8 +464,9 @@ // Profession part Profession profession = row.getProfession(); - export.record(SAMPLING.METIER_CODE_DCF5, - profession.getCodeDCF5()); + + // export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); export.record(SAMPLING.METIER_TAILLE, profession.getSize()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -205,19 +205,4 @@ return result; } - @Override - protected List<String> executeGetCodesDCF5Contains(TopiaContext transaction, - String input) throws Exception { - - TopiaQuery query = transaction.createQuery(Profession.class, null). - addDistinct(). - setSelect(Profession.CODE_DCF5). - addWhere(Profession.CODE_DCF5, Op.LIKE, "%" + input + "%"). - addOrder(Profession.CODE_DCF5); - - List<String> results = transaction.findByQuery(query); - - return results; - } - } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-12 15:44:23 UTC (rev 768) @@ -839,7 +839,7 @@ // Profession can't be null Profession profession = row.getProfession(); - export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); + //export.record(SAMPLING.METIER_CODE_DCF5, profession.getCodeDCF5()); export.record(SAMPLING.METIER_MAILLAGE, profession.getMeshSize()); export.record(SAMPLING.METIER_TAILLE, profession.getSize()); export.record(SAMPLING.METIER_AUTRE, profession.getOther()); @@ -1013,7 +1013,7 @@ // Always create a new profession Profession profession = dao.create(); - profession.setCodeDCF5(codeDCF5); + // profession.setCodeDCF5(codeDCF5); profession.setMeshSize(maillage); profession.setSize(taille); profession.setOther(autre); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-12 15:44:23 UTC (rev 768) @@ -102,7 +102,6 @@ // CREATE Profession profession1 = new ProfessionImpl(); - profession1.setCodeDCF5("OORR-BDP"); profession1.setMeshSize(">=18"); profession1.setSize("90-1000"); profession1.setLibelle("Chalutage de poissons tubes"); @@ -433,7 +432,6 @@ ProfessionDAO dao = WaoDAOHelper.getProfessionDAO(transaction); Profession profession = dao.create( - Profession.CODE_DCF5, "OBR", Profession.LIBELLE, "Fileyage en barre", Profession.MESH_SIZE, "< 80", Profession.OTHER, "90mm", @@ -445,7 +443,6 @@ /** EXEC METHOD **/ Profession newProfession = serviceSampling.getNewProfession(profession); Assert.assertNotSame(profession, newProfession); - Assert.assertEquals("OBR", newProfession.getCodeDCF5()); Assert.assertEquals("Fileyage en barre", newProfession.getLibelle()); Assert.assertEquals("< 80", newProfession.getMeshSize()); Assert.assertEquals("90mm", newProfession.getOther()); @@ -577,7 +574,6 @@ Profession profession = row1.getProfession(); assertNotNull(profession); - assertEquals("DB_MOL", profession.getCodeDCF5()); List<SampleMonth> months = row1.getSampleMonth(); assertEquals(11, months.size()); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 15:44:23 UTC (rev 768) @@ -217,12 +217,6 @@ return filtersZone.getBody(); } - public String[] onProvideCompletionsFromCodeDCF5(String input) - throws WaoException { - List<String> results = serviceReferential.getCodesDCF5Contains(input); - return results.toArray(new String[0]); - } - void onSelectedFromReset() { reset = true; } Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 15:14:11 UTC (rev 767) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 15:44:23 UTC (rev 768) @@ -46,7 +46,7 @@ <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> <!-- DISPLAY --> <t:beandisplay t:id="professionDisplay" t:model="professionModel" t:object="sampleRow.profession" - t:include="codeDCF5, meshSize, size, other, libelle, species" /> + t:include="meshSize, size, other, libelle, species" /> <p:else> <!-- EDITION --> <div class="select"> @@ -58,7 +58,7 @@ </div> <div class="t-beaneditor"> <t:beaneditor t:id="professionEditor" t:object="sampleRow.profession" - t:include="codeDCF5, meshSize, size, other, libelle, species" /> + t:include="meshSize, size, other, libelle, species" /> </div> <div class="t-beaneditor acenter"> <div class="t-beaneditor-row">