Author: fdesbois Date: 2010-01-12 20:18:57 +0000 (Tue, 12 Jan 2010) New Revision: 189 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java Log: Add updateComment for saving SampleRow Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-12 16:58:54 UTC (rev 188) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-12 20:18:57 UTC (rev 189) @@ -83,13 +83,13 @@ } @Override - public void createUpdateSampleRow(SampleRow row, List<Boat> boats) throws SuiviObsmerException { + public void createUpdateSampleRow(SampleRow row, List<Boat> boats, String updateComment) throws SuiviObsmerException { TopiaContext transaction = null; try { transaction = rootContext.beginTransaction(); SampleRowLogDAO logDAO = SuiviObsmerModelDAOHelper.getSampleRowLogDAO(transaction); - SampleRowLog rowLog = logDAO.create(SampleRowLog.COMMENT, row.getComment()); + SampleRowLog rowLog = logDAO.create(SampleRowLog.COMMENT, updateComment); boolean newRow = SuiviObsmerContext.prepareTopiaId(SampleRow.class, row); Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-01-12 16:58:54 UTC (rev 188) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-01-12 20:18:57 UTC (rev 189) @@ -130,7 +130,7 @@ transaction.closeContext(); row.setCompany(company); - serviceSampling.createUpdateSampleRow(row, boats); + serviceSampling.createUpdateSampleRow(row, boats, null); ServiceContact serviceContact = new ServiceContactImpl(); Contact contact1 = serviceContact.getNewContact(user, row, boat); Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2010-01-12 16:58:54 UTC (rev 188) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2010-01-12 20:18:57 UTC (rev 189) @@ -235,10 +235,10 @@ // Set company and elligibleBoats '174592 177474' for row1 List<Boat> boats = service.getBoats("174592 177474"); row1.setCompany(company); - serviceSampling.createUpdateSampleRow(row1, boats); + serviceSampling.createUpdateSampleRow(row1, boats, null); // Set company only for row2 row2.setCompany(company); - serviceSampling.createUpdateSampleRow(row2, new ArrayList<Boat>()); + serviceSampling.createUpdateSampleRow(row2, new ArrayList<Boat>(), null); return Arrays.asList(new SampleRow[] { row1, row2}); } Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-01-12 16:58:54 UTC (rev 188) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-01-12 20:18:57 UTC (rev 189) @@ -160,7 +160,7 @@ /** EXEC CREATE **/ List<Boat> boats = serviceBoat.getBoats("174592 978419 273129"); - service.createUpdateSampleRow(row, boats); + service.createUpdateSampleRow(row, boats, null); assertNotNull(row.getTopiaId()); assertNotNull(row.getProfession().getTopiaId()); @@ -170,7 +170,7 @@ // TEST FOR DELETE ELLIGIBLE BOAT boats.remove(2); - service.createUpdateSampleRow(result, boats); + service.createUpdateSampleRow(result, boats, null); result = service.getSampleRow(row.getTopiaId()); assertEquals(2, result.getElligibleBoat().size()); @@ -423,7 +423,7 @@ serviceBoat.importBoatCsv(input); List<Boat> boats = serviceBoat.getBoats("174592 978419 273129"); - service.createUpdateSampleRow(row, boats); + service.createUpdateSampleRow(row, boats, null); /** EXEC METHOD **/ service.deleteSampleRow(row); Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-12 16:58:54 UTC (rev 188) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-12 20:18:57 UTC (rev 189) @@ -596,7 +596,7 @@ getSampleRow().setSampleMonth(getSampleMonths()); - serviceSampling.createUpdateSampleRow(sampleRow, boats); + serviceSampling.createUpdateSampleRow(sampleRow, boats, updateComment); return SamplingPlan.class; } else {