Author: bleny Date: 2014-06-10 15:14:28 +0200 (Tue, 10 Jun 2014) New Revision: 2015 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2015 Log: refs #4493 add checkbox for estimated vs real Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-06-10 13:14:28 UTC (rev 2015) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.collect.Sets; import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.DataReliability; import fr.ifremer.wao.entity.ObservationType; @@ -36,6 +37,12 @@ private static final long serialVersionUID = 1L; + protected static final Set<Boolean> PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED = Sets.newHashSet(true, null); + + protected static final Set<Boolean> COMPANY_ACCEPTATIONS_FOR_REAL = Sets.newHashSet(true); + + protected static final Set<Boolean> COMPANY_ACCEPTATIONS_FOR_ESTIMATED = Sets.newHashSet(true, null); + protected SampleRowsFilter sampleRowFilter; protected BoatsFilter boatFilter; @@ -369,4 +376,34 @@ return hashCode; } + public void setRealVsEstimated(boolean realVsEstimated) { + setProgramAcceptations(PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED); + if (realVsEstimated) { + setCompanyAcceptations(COMPANY_ACCEPTATIONS_FOR_REAL); + } else { + setCompanyAcceptations(COMPANY_ACCEPTATIONS_FOR_ESTIMATED); + } + } + + public boolean isRealVsEstimated() { + boolean realVsEstimated; + if (WaoUtils.isEqualCollection(PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED, getProgramAcceptations())) { + if (WaoUtils.isEqualCollection(COMPANY_ACCEPTATIONS_FOR_REAL, getCompanyAcceptations())) { + realVsEstimated = true; + } else if (WaoUtils.isEqualCollection(COMPANY_ACCEPTATIONS_FOR_ESTIMATED, getCompanyAcceptations())) { + realVsEstimated = false; + } else { + throw new IllegalStateException(); + } + } else { + if (CollectionUtils.isEmpty(getCompanyAcceptations()) && CollectionUtils.isEmpty(getCompanyAcceptations())) { + // return default value + realVsEstimated = false; + } else { + throw new IllegalArgumentException(); + } + } + return realVsEstimated; + } + } 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-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-10 13:14:28 UTC (rev 2015) @@ -696,7 +696,7 @@ double contactInDays = Math.ceil(actualInMinutes / minutesPerDay); - if (validationCompany != null) { + if (BooleanUtils.isTrue(validationCompany)) { // real observation real += contactInDays; } @@ -784,20 +784,16 @@ for (Contact contact : contacts) { - Boolean validationProgram = contact.getValidationProgram(); - Boolean validationCompany = contact.getValidationCompany(); - - boolean accepted = validationCompany != null || validationProgram != null; - Date observationBeginDate = contact.getObservationBeginDate(); SampleMonth month = sampleRow.getSampleMonth(observationBeginDate); - if (accepted) { + month.setEstimatedTidesValue(month.getEstimatedTidesValue() + 1); + + if (BooleanUtils.isTrue(contact.getValidationCompany())) { month.setRealTidesValue(month.getRealTidesValue() + 1); - } else { - month.setEstimatedTidesValue(month.getEstimatedTidesValue() + 1); } + } } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-10 13:14:28 UTC (rev 2015) @@ -350,6 +350,7 @@ wao.ui.form.program=Program wao.ui.form.programEvaluation=Program evaluation wao.ui.form.readOnly=read-only +wao.ui.form.realTides.description=See the real (not the estimated) wao.ui.form.registrationCode.placeholder=Registration number wao.ui.form.removeRole=remove this role wao.ui.form.repeatPassword=Repeat password Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-10 13:14:28 UTC (rev 2015) @@ -350,6 +350,7 @@ wao.ui.form.program=Programme wao.ui.form.programEvaluation=Évaluation programme wao.ui.form.readOnly=lecture seule +wao.ui.form.realTides.description=Voir le réel (et non l'estimé) wao.ui.form.registrationCode.placeholder=Immatriculation wao.ui.form.removeRole=retirer ce role wao.ui.form.repeatPassword=Répéter le mot de passe Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-10 13:14:28 UTC (rev 2015) @@ -98,16 +98,6 @@ filterName: 'observerIds', filterLabel: "<s:text name="wao.ui.misc.observer"/>", filterValuesField: 'observers' - }, - { - filterName: 'companyAcceptations', - filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>", - filterValuesField: 'companyAcceptations' - }, - { - filterName: 'programAcceptations', - filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>", - filterValuesField: 'programAcceptations' } ]; @@ -166,6 +156,9 @@ <s:checkbox name="filter.commentAdminDefinedOnly" label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> + <s:checkbox name="filter.realVsEstimated" + label="%{getText('wao.ui.form.realTides.description')}"/> + </fieldset> <div class="form-actions">