Author: bleny Date: 2014-07-24 14:38:06 +0200 (Thu, 24 Jul 2014) New Revision: 2168 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2168 Log: clean some code Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-24 09:24:17 UTC (rev 2167) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-24 12:38:06 UTC (rev 2168) @@ -866,17 +866,16 @@ contact.setCreationDate(serviceContext.getNow()); } - samplingPlanService.recomputeSampleRowEstimatedAndRealTides(contact.getSampleRow()); - dao.create(contact); } else { - samplingPlanService.recomputeSampleRowEstimatedAndRealTides(contact.getSampleRow()); - dao.update(contact); + } + samplingPlanService.recomputeSampleRowEstimatedAndRealTides(contact.getSampleRow()); + } protected void updateAllegroWalletIfNecessary(UpdateContactCommand updateContactCommand) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-07-24 09:24:17 UTC (rev 2167) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-07-24 12:38:06 UTC (rev 2168) @@ -199,29 +199,21 @@ Collection<Contact> contacts = getContactDao().forFilter(contactFilter, false).findAll(); - final double minutesPerDay = 24 * 60; - // Pour calculer le temps passé, on prend pour chaque observation - // le temps qui a vraiment été passé en mer. - - // temps de mer réalisé par ligne du plan = somme [arrondi-supérieur (nb d'heures total de la marée/ 24)] - long real = 0; long estimated = 0; + for (Contact contact : contacts) { Integer observationTimeInDays = contact.getObservationTimeInDays(); if (observationTimeInDays != null) { - if (BooleanUtils.isTrue(contact.getValidationCompany())) { // real observation real += observationTimeInDays; } // estimated observation estimated += observationTimeInDays; - } - } return Pair.of(real, estimated); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-24 09:24:17 UTC (rev 2167) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-24 12:38:06 UTC (rev 2168) @@ -361,7 +361,7 @@ <th class="date-time"><s:text name="wao.ui.field.Contact.beginDate"/></th> <th class="date-time"><s:text name="wao.ui.field.Contact.endDate"/></th> <s:if test="obsMer"> - <th class="date-time"><s:text name="wao.ui.field.Contact.observationTimeInDays"/></th> + <th><s:text name="wao.ui.field.Contact.observationTimeInDays"/></th> </s:if> <th class="date"><s:text name="wao.ui.field.Contact.dataInputDate"/></th> <s:if test="obsMer"> @@ -482,7 +482,7 @@ </s:if> </td> <s:if test="obsMer"> - <td> + <td class="align-center"> <s:if test="observationTimeInDays != null"> <s:property value="observationTimeInDays"/> </s:if>