Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: edc948a8 by Tony Chemit at 2022-10-17T14:23:45+02:00 Rajouter le bouton de réinitialisation sur le champs heure de début de coulissage - Closes #2467 - - - - - 3f1487c4 by Tony Chemit at 2022-10-17T15:22:02+02:00 Libellés des heures jalon des calées - Closes #2461 - - - - - bbdc8adf by Tony Chemit at 2022-10-17T16:43:40+02:00 update pom - - - - - 891eedfb by Tony Chemit at 2022-10-17T17:26:50+02:00 Mesures sur captures LL observations non affichées dans l'UI - Closes #2469 - - - - - 301bdea8 by Tony Chemit at 2022-10-17T18:09:34+02:00 Ajout d'une information sur la syntaxe des templates LL - Closes #2466 - - - - - 16 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/i18n/getters/eugene.getter - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties - pom.xml Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -342,7 +342,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { ui.getFoodAndSexualTab().setEnabled(newValue); ui.getSizeMeasuresTab().setEnabled(newValue); ui.getWeightMeasuresTab().setEnabled(newValue); - boolean enableInlineModels = newValue && ui.getModel().getStates().isEditing(); + boolean enableInlineModels = newValue && (ui.getModel().getStates().isReadingMode() || ui.getModel().getStates().isEditing()); getTableModel().inlineModels().keySet().forEach(i -> { i.setEditable(enableInlineModels); if (!enableInlineModels) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -134,13 +134,13 @@ <Table id='generateTabForm' fill='both' insets='1'> <!-- canGenerate --> <row> - <cell anchor='west' fill="both"> + <cell anchor='west'> <BeanCheckBox id='canGenerate' beanScope="states"/> </cell> </row> <row> - <cell fill="both"> - <JTextPane id='templateInformation' styleClass="italic"/> + <cell anchor='west' fill="both"> + <JLabel id='templateInformation' styleClass="information"/> </cell> </row> <!-- sectionTemplates --> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -41,13 +41,6 @@ selected:{states.isCanGenerate()}; } -#templateInformation { - editable:false; - focusable:false; - contentType:"text/html"; - font-size:11; -} - #sectionTemplatesTableModel { editable: {states.isCanGenerate()}; } ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -211,6 +211,9 @@ observe.data.ps.observation.SchoolEstimate.meanWeight observe.data.ps.observation.SchoolEstimate.species observe.data.ps.observation.SchoolEstimate.totalWeight observe.data.ps.observation.Set.currentMeasureDepth +observe.data.ps.observation.Set.endTimeStamp +observe.data.ps.observation.Set.haulingEndTimeStamp +observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.measurementsTab observe.data.ps.observation.Set.message.information.schoolType @@ -218,6 +221,7 @@ observe.data.ps.observation.Set.schoolMeanDepth observe.data.ps.observation.Set.schoolThickness observe.data.ps.observation.Set.schoolTopDepth observe.data.ps.observation.Set.sonarUsedAvantSet +observe.data.ps.observation.Set.startTime observe.data.ps.observation.TransmittingBuoy.code observe.referential.ps.common.AcquisitionStatus.advancedSampling observe.referential.ps.common.AcquisitionStatus.atLeastOneSelected ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss ===================================== @@ -34,6 +34,7 @@ #haulingStartTimeStamp { propertyDayDate: {SetDto.PROPERTY_HAULING_START_DATE}; propertyTimeDate: {SetDto.PROPERTY_HAULING_START_TIME}; + showReset:true; } #haulingEndTimeStamp { ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Data of type <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing Port observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id observe.data.ll.common.Trip.startEndDate=Start / end date -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Templates must conform to syntax 'L1/L2/L3/Ln\:u' where <p/><ul><li>L1..Ln are floatlines length</li><li>u the selected length unit (among values\: m km nm or fmt)</li></ul> +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul> observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells observe.data.message.will.delete.sub.data=If you confirm save, some data could be deleted\!\n\nFollowing data need to be removed\: observe.data.message.will.delete.sub.data.type=Object %1$s (id %2$s) ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Dato de tipo <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing harbour observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id observe.data.ll.common.Trip.startEndDate=Date de début / fin -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Templates must conform to syntax 'L1/L2/L3/Ln\:u' where <p/><ul><li>L1..Ln are floatlines length</li><li>u the selected length unit (among values\: m km nm or fmt)</li></ul>\#TODO +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul>\#TODO observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells observe.data.message.will.delete.sub.data=If you confirm save, following data will be deleted\!\: observe.data.message.will.delete.sub.data.type=Objet %1$s (identifiant %2$s) ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -229,7 +229,7 @@ observe.data.Data.type=<html><body>Donnée de type <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Port de départ / d'arrivée observe.data.ll.common.Trip.homeIdErsId=Identifiant / Id ERS observe.data.ll.common.Trip.startEndDate=Date de début / fin -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body><p>Les patrons doivent se conformer à la syntaxe 'L1/L2/L3/Ln\:u' où </p><ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> l'unité de longueur sélectionée (valeurs possibles \: m km nm ou fmt) +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Les patrons doivent se conformer à la syntaxe <strong><code>L1/L2/L3/Ln\:u</code></strong> où <ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> est l'unité de longueur sélectionnée (valeurs possibles \: <code>m km nm</code> ou <code>fmt</code>) observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Les templates ne sont pas valides, passer en revue les cellules en erreur observe.data.message.will.delete.sub.data=En confirmant la sauvegarde les données suivantes seront supprimées \: observe.data.message.will.delete.sub.data.type=Objet %1$s (identifiant %2$s) ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -1146,6 +1146,9 @@ observe.data.ps.observation.SchoolEstimate.type observe.data.ps.observation.Set.action.add observe.data.ps.observation.Set.action.add.tip observe.data.ps.observation.Set.currentMeasureDepth +observe.data.ps.observation.Set.endTimeStamp +observe.data.ps.observation.Set.haulingEndTimeStamp +observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.measurementsTab observe.data.ps.observation.Set.message.information.schoolType @@ -1155,6 +1158,7 @@ observe.data.ps.observation.Set.schoolThickness observe.data.ps.observation.Set.schoolTopDepth observe.data.ps.observation.Set.schoolType.not.fill observe.data.ps.observation.Set.sonarUsedAvantSet +observe.data.ps.observation.Set.startTime observe.data.ps.observation.Set.title observe.data.ps.observation.Set.type observe.data.ps.observation.SetCatch.type ===================================== core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Wed Sep 07 13:23:50 CEST 2022 +#Mon Oct 17 14:55:03 CEST 2022 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1742,17 +1742,13 @@ observe.data.ps.observation.Set.currentDirection=observe.Common.currentDirection observe.data.ps.observation.Set.currentSpeed=observe.Common.currentSpeed observe.data.ps.observation.Set.endDate=observe.Common.endDate observe.data.ps.observation.Set.endTime=observe.Common.endTime -observe.data.ps.observation.Set.endTimeStamp=observe.Common.endTimeStamp observe.data.ps.observation.Set.generalTab=observe.Common.generalTab -observe.data.ps.observation.Set.haulingEndTimeStamp=observe.Common.haulingEndTimeStamp -observe.data.ps.observation.Set.haulingStartTimeStamp=observe.Common.haulingStartTimeStamp observe.data.ps.observation.Set.homeId=observe.Common.homeId observe.data.ps.observation.Set.id=observe.Common.id observe.data.ps.observation.Set.label=observe.Common.label observe.data.ps.observation.Set.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.observation.Set.reasonForNullSet=observe.Common.reasonForNullSet observe.data.ps.observation.Set.schoolType=observe.Common.schoolType -observe.data.ps.observation.Set.startTime=observe.Common.startTime observe.data.ps.observation.Set.supportVesselName=observe.Common.supportVesselName observe.data.ps.observation.Set.version=observe.Common.version observe.data.ps.observation.SetCatch.comment=observe.Common.comment ===================================== core/api/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -327,10 +327,12 @@ observe.data.ps.observation.SchoolEstimate.totalWeight observe.data.ps.observation.Set.currentMeasureDepth observe.data.ps.observation.Set.haulingEndDate observe.data.ps.observation.Set.haulingEndTime +observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.schoolMeanDepth observe.data.ps.observation.Set.schoolThickness observe.data.ps.observation.Set.schoolTopDepth +observe.data.ps.observation.Set.startTime observe.data.ps.observation.SetCatch.catches observe.data.ps.observation.SetSchoolEstimate.schoolEstimate observe.data.ps.observation.TransmittingBuoy.code ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Add a Set observe.data.ps.observation.Set.action.add.tip=Add the set to the activity observe.data.ps.observation.Set.catchesStat=Count of catches observe.data.ps.observation.Set.currentMeasureDepth=Current measure depth (m) +observe.data.ps.observation.Set.endTimeStamp=Set end observe.data.ps.observation.Set.haulingEndDate=Hauling end date observe.data.ps.observation.Set.haulingEndTime=Hauling end time +observe.data.ps.observation.Set.haulingEndTimeStamp=Hauling end +observe.data.ps.observation.Set.haulingStartTimeStamp=Hauling start observe.data.ps.observation.Set.maxGearDepth=Max gear depth (m) observe.data.ps.observation.Set.measurementsTab=Measurements observe.data.ps.observation.Set.message.information.schoolType=School type @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=School thickness (m) observe.data.ps.observation.Set.schoolTopDepth=School top depth (m) observe.data.ps.observation.Set.schoolType.not.fill=Not filled observe.data.ps.observation.Set.sonarUsedAvantSet=Usage of sonar +observe.data.ps.observation.Set.startTime=Set start observe.data.ps.observation.Set.title=Set observe.data.ps.observation.Set.type=Set observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=End date (%2$s) must be after pursing date (%1$s). ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Añadir un lance observe.data.ps.observation.Set.action.add.tip=Añadir el lance de la actividad observe.data.ps.observation.Set.catchesStat=Count of catches observe.data.ps.observation.Set.currentMeasureDepth=Profundidad de corriente (m) +observe.data.ps.observation.Set.endTimeStamp=Set end observe.data.ps.observation.Set.haulingEndDate=Fecha de fin de calado de la red observe.data.ps.observation.Set.haulingEndTime=Hora de fin de calado de la red +observe.data.ps.observation.Set.haulingEndTimeStamp=Hauling end +observe.data.ps.observation.Set.haulingStartTimeStamp=Hauling start observe.data.ps.observation.Set.maxGearDepth=Profundidad de cierre del arte (m) observe.data.ps.observation.Set.measurementsTab=Parámetros observe.data.ps.observation.Set.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad. @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=Esperor del banco (m) observe.data.ps.observation.Set.schoolTopDepth=Profundidad comienzo (m) observe.data.ps.observation.Set.schoolType.not.fill=vacío observe.data.ps.observation.Set.sonarUsedAvantSet=Utilización del sonar antes del lance +observe.data.ps.observation.Set.startTime=Set start observe.data.ps.observation.Set.title=Lance observe.data.ps.observation.Set.type=Lance observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=El día de fin (%2$s) debe ser superior o igual a la dia de final de recogida de la jareta (%1$s). ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1372,8 +1372,11 @@ observe.data.ps.observation.Set.action.add=Ajouter la calée observe.data.ps.observation.Set.action.add.tip=Ajouter la calée de l'activité observe.data.ps.observation.Set.catchesStat=Nombre de captures observe.data.ps.observation.Set.currentMeasureDepth=Profondeur de mesure du courant (m) +observe.data.ps.observation.Set.endTimeStamp=Fin de calée observe.data.ps.observation.Set.haulingEndDate=Date de fin coulissage observe.data.ps.observation.Set.haulingEndTime=Heure de fin coulissage +observe.data.ps.observation.Set.haulingEndTimeStamp=Fin de coulissage +observe.data.ps.observation.Set.haulingStartTimeStamp=Début de coulissage observe.data.ps.observation.Set.maxGearDepth=Profondeur maximum (m) observe.data.ps.observation.Set.measurementsTab=Mesures observe.data.ps.observation.Set.message.information.schoolType=Type de banc @@ -1386,6 +1389,7 @@ observe.data.ps.observation.Set.schoolThickness=Épaisseur du banc (m) observe.data.ps.observation.Set.schoolTopDepth=Profondeur sommet (m) observe.data.ps.observation.Set.schoolType.not.fill=Non renseigné observe.data.ps.observation.Set.sonarUsedAvantSet=Utilisation du sonar +observe.data.ps.observation.Set.startTime=Début de calée observe.data.ps.observation.Set.title=Calée observe.data.ps.observation.Set.type=Calée observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate=La date de fin (%2$s) doit être supérieure ou égal à la date de fin de coulissage (%1$s). ===================================== model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties ===================================== @@ -24,4 +24,5 @@ data.ll.landing.Landing=vessel data.ps.localmarket.Sample=well data.ps.logbook.Catch=weightMeasureMethod.validation.required data.ps.observation.SchoolEstimate=species +data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp referential.common.Species=codeAndHomeId ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.90</version> + <version>2022.91</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae528a494d77b7382a6393603... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae528a494d77b7382a6393603... You're receiving this email because of your account on gitlab.com.