Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe

Commits:

4 changed files:

Changes:

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
    ... ... @@ -22,12 +22,9 @@
    22 22 
     package fr.ird.observe.application.swing.ui.admin.consolidate;
    23 23
    24 24 
     import com.google.common.collect.ImmutableSet;
    25 
    +import fr.ird.observe.application.swing.ObserveRunner;
    25 26 
     import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
    26 
    -import fr.ird.observe.application.swing.ui.admin.AdminStep;
    27 
    -import fr.ird.observe.application.swing.ui.admin.AdminTabUI;
    28 
    -import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
    29 
    -import fr.ird.observe.application.swing.ui.admin.AdminUI;
    30 
    -import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
    27 
    +import fr.ird.observe.application.swing.ui.admin.*;
    31 28 
     import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI;
    32 29 
     import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
    33 30 
     import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel;
    ... ... @@ -41,7 +38,7 @@ import jaxx.runtime.swing.wizard.ext.WizardState;
    41 38 
     import org.apache.commons.logging.Log;
    42 39 
     import org.apache.commons.logging.LogFactory;
    43 40
    44 
    -import javax.swing.JTree;
    41 
    +import javax.swing.*;
    45 42 
     import java.beans.PropertyChangeListener;
    46 43 
     import java.util.Date;
    47 44 
     import java.util.Set;
    ... ... @@ -131,35 +128,50 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
    131 128
    132 129 
                 ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService();
    133 130
    134 
    -            ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest();
    135 
    -            request.setTripSeineIds(tripIds);
    136 
    -            request.setFailIfLenghtWeightParameterNotFound(false);
    131 
    +            int nbResults = 0;
    132 
    +            int index=0;
    133 
    +            int nbTrips = tripIds.size();
    137 134
    138 
    -            ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request);
    135 
    +            for (String tripId : tripIds) {
    139 136
    140 
    -            if (results.isEmpty()) {
    137 
    +                ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest();
    138 
    +                request.setTripSeineIds(ImmutableSet.of(tripId));
    139 
    +                request.setFailIfLenghtWeightParameterNotFound(false);
    141 140
    142 
    -                sendMessage(t("observe.actions.consolidate.message.noChanges"));
    141 
    +                sendMessage(t("observe.actions.consolidate.start.trip", ++index, nbTrips, tripId));
    143 142
    144 
    -            } else {
    143 
    +                ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request);
    145 144
    146 
    -                for (ConsolidateTripSeineDataResult tripSeineDataResult : results) {
    145 
    +                ObserveRunner.cleanMemory();
    147 146
    148 
    -                    String tripSeineLabel = tripSeineDataResult.getTripSeineLabel();
    147 
    +                nbResults+=results.size();
    149 148
    150 
    -                    sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel));
    149 
    +                if (results.isEmpty()) {
    151 150
    152 
    -                    for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) {
    151 
    +                    sendMessage(t("observe.actions.consolidate.message.noChanges"));
    153 152
    154 
    -                        sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel()));
    153 
    +                }
    154 
    +                 else {
    155 
    +                    for (ConsolidateTripSeineDataResult tripSeineDataResult : results) {
    155 156
    156 
    -                    }
    157 
    +                        String tripSeineLabel = tripSeineDataResult.getTripSeineLabel();
    158 
    +
    159 
    +                        sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel));
    160 
    +
    161 
    +                        for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) {
    162 
    +
    163 
    +                            sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel()));
    157 164
    165 
    +                        }
    166 
    +
    167 
    +                    }
    158 168 
                     }
    159 169
    160 
    -                sendMessage(t("observe.actions.consolidate.message.save.changes", results.size()));
    161 170 
                 }
    162 171
    172 
    +            sendMessage(t("observe.actions.consolidate.message.save.changes", nbResults));
    173 
    +
    174 
    +
    163 175 
                 sendMessage(t("observe.actions.consolidate.message.operation.done", new Date()));
    164 176
    165 177 
             }

  • application-swing/src/main/resources/i18n/application-swing_en_GB.properties
    ... ... @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No data modified.
    143 143 
     observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s.
    144 144 
     observe.actions.consolidate.message.save.changes=Save modified  %1$s trip(s).
    145 145 
     observe.actions.consolidate.message.trip=Data consolidate for trip %1$s
    146 
    +observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s)
    146 147 
     observe.actions.consolidate.title=Consolidate data
    147 148 
     observe.actions.consolidate.title.tip=Consolidate observed data
    148 149 
     observe.actions.exportData=Export data

  • application-swing/src/main/resources/i18n/application-swing_es_ES.properties
    ... ... @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No modificación de datos.
    143 143 
     observe.actions.consolidate.message.operation.done=Operación de calculo de datos terminada en %1$s.
    144 144 
     observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s).
    145 145 
     observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s
    146 
    +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) \#TODO
    146 147 
     observe.actions.consolidate.title=Consolidar los datos observados
    147 148 
     observe.actions.consolidate.title.tip=Consolidar los datos observados
    148 149 
     observe.actions.exportData=Exportar los datos observados

  • application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
    ... ... @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=Aucune donnée modifiée.
    143 143 
     observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s.
    144 144 
     observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s).
    145 145 
     observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s
    146 
    +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s)
    146 147 
     observe.actions.consolidate.title=Consolider les données observateur
    147 148 
     observe.actions.consolidate.title.tip=Consolider les données observateur
    148 149 
     observe.actions.exportData=Exporter les données observateurs

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.