Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a1972b3f by Tony CHEMIT at 2017-12-21T23:50:56+01:00 use last pom - - - - - 585362bc by Tony CHEMIT at 2017-12-21T23:51:09+01:00 start to clean simple form ui - - - - - 88c02b77 by Tony CHEMIT at 2017-12-22T00:15:43+01:00 use next toolkit - - - - - 6 changed files: - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss - pom.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss @@ -37,75 +37,44 @@ #depthRecorder { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; - selected:{BooleanUtils.isTrue(bean.getDepthRecorder())}; } #hookLost { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_HOOK_LOST}; - selected:{BooleanUtils.isTrue(bean.getHookLost())}; } #traceCutOff { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF}; - selected:{BooleanUtils.isTrue(bean.getTraceCutOff())}; } #timer { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_TIMER}; - selected:{BooleanUtils.isTrue(bean.getTimer())}; } #timeSinceContact { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - propertyTime:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; - time:{model.getTimeSinceContact()}; - bean:{model}; showTimeEditorSlider:false; } #timerTimeOnBoard { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - date:{bean.getTimerTimeOnBoard()}; showTimeEditorSlider:false; - propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; -} - -#topType { - property:{BranchlineDto.PROPERTY_TOP_TYPE}; - selectedItem:{bean.getTopType()}; -} - -#tracelineType { - property:{BranchlineDto.PROPERTY_TRACELINE_TYPE}; - selectedItem:{bean.getTracelineType()}; } #weightedSwivel { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SWIVEL}; - selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; } #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{BranchlineDto.PROPERTY_SWIVEL_WEIGHT}; - numberValue:{bean.getSwivelWeight()}; } #weightedSnap { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SNAP}; - selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; } #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{BranchlineDto.PROPERTY_SNAP_WEIGHT}; - numberValue:{bean.getSnapWeight()}; } /* ***************************************************************************** */ @@ -115,33 +84,3 @@ #hookAndBaitTab { properties:{BranchlineUIModel.HOOK_AND_BAIT_TAB_PROPERTIES}; } - -#hookType { - property:{BranchlineDto.PROPERTY_HOOK_TYPE}; - selectedItem:{bean.getHookType()}; -} - -#hookSize { - property:{BranchlineDto.PROPERTY_HOOK_SIZE}; - selectedItem:{bean.getHookSize()}; -} - -#hookOffset { - property:{BranchlineDto.PROPERTY_HOOK_OFFSET}; - numberValue:{bean.getHookOffset()}; -} - -#baitSettingStatus { - property:{BranchlineDto.PROPERTY_BAIT_SETTING_STATUS}; - selectedItem:{bean.getBaitSettingStatus()}; -} - -#baitHaulingStatus { - property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS}; - selectedItem:{bean.getBaitHaulingStatus()}; -} - -#baitType { - property:{BranchlineDto.PROPERTY_BAIT_TYPE}; - selectedItem:{bean.getBaitType()}; -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss @@ -44,9 +44,6 @@ } #mitigationType { - bean:{bean}; - property: {SetLonglineGlobalCompositionObsDto.PROPERTY_MITIGATION_TYPE}; - selected:{(Collection)bean.getMitigationType()}; showListLabel: true; universeLabel:{t("observe.common.SetLonglineGlobalCompositionObsDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineGlobalCompositionObsDto.selectedMitigationType")}; ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss @@ -36,43 +36,21 @@ } #homeId { - property: {SetLonglineObsDto.PROPERTY_HOME_ID}; resetTip:"observe.common.SetLonglineObsDto.action.reset.homeId.tip"; } -#number { - property: {SetLonglineObsDto.PROPERTY_NUMBER}; - numberValue:{bean.getNumber()}; -} - -#settingStartTimeStamp { - date:{bean.getSettingStartTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_SETTING_START_TIME_STAMP}; -} - #settingStartCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_SETTING_START_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_SETTING_START_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_SETTING_START_QUADRANT}; - latitude:{bean.getSettingStartLatitude()}; - longitude:{bean.getSettingStartLongitude()}; - quadrant:{bean.getSettingStartQuadrant()}; - _validationContext:{"settingStart"}; -} - -#settingEndTimeStamp { - date:{bean.getSettingEndTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_SETTING_END_TIME_STAMP}; + property:settingStart; } #settingEndCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_SETTING_END_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_SETTING_END_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_SETTING_END_QUADRANT}; - latitude:{bean.getSettingEndLatitude()}; - longitude:{bean.getSettingEndLongitude()}; - quadrant:{bean.getSettingEndQuadrant()}; - _validationContext:{"settingEnd"}; + property:settingEnd; } /* ***************************************************************************** */ @@ -83,115 +61,43 @@ properties:{SetLonglineObsUIModel.SETTING_CARACTERISTIC_TAB_PROPERTIES}; } -#settingVesselSpeed { - property:{SetLonglineObsDto.PROPERTY_SETTING_VESSEL_SPEED}; - numberValue:{bean.getSettingVesselSpeed()}; -} - #shooterUsed { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_SHOOTER_USED}; - selected:{BooleanUtils.isTrue(bean.getShooterUsed())}; } #shooterSpeed { enabled:{BooleanUtils.isTrue(bean.getShooterUsed())}; - property:{SetLonglineObsDto.PROPERTY_SHOOTER_SPEED}; - numberValue:{bean.getShooterSpeed()}; } -#settingShape { - property:{SetLonglineObsDto.PROPERTY_SETTING_SHAPE}; - selectedItem:{bean.getSettingShape()}; -} #weightedSwivel { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_WEIGHTED_SWIVEL}; - selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; } #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{SetLonglineObsDto.PROPERTY_SWIVEL_WEIGHT}; - numberValue:{bean.getSwivelWeight()}; } #weightedSnap { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_WEIGHTED_SNAP}; - selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; } #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{SetLonglineObsDto.PROPERTY_SNAP_WEIGHT}; - numberValue:{bean.getSnapWeight()}; -} - -#lineType { - property:{SetLonglineObsDto.PROPERTY_LINE_TYPE}; - selectedItem:{bean.getLineType()}; -} - -#maxDepthTargeted { - property:{SetLonglineObsDto.PROPERTY_MAX_DEPTH_TARGETED}; - numberValue:{bean.getMaxDepthTargeted()}; } #monitored { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_MONITORED}; - selected:{BooleanUtils.isTrue(bean.getMonitored())}; } #lightsticksType { - property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_TYPE}; - selectedItem:{bean.getLightsticksType()}; enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0}; } #lightsticksColor { - property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_COLOR}; - selectedItem:{bean.getLightsticksColor()}; enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0}; } -#timeBetweenHooks { - property:{SetLonglineObsDto.PROPERTY_TIME_BETWEEN_HOOKS}; - numberValue:{bean.getTimeBetweenHooks()}; -} - -#lightsticksPerBasketCount { - property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; - numberValue:{bean.getLightsticksPerBasketCount()}; -} - -#basketsPerSectionCount { - property:{SetLonglineObsDto.PROPERTY_BASKETS_PER_SECTION_COUNT}; - numberValue:{bean.getBasketsPerSectionCount()}; -} - -#totalBasketsCount { - property:{SetLonglineObsDto.PROPERTY_TOTAL_BASKETS_COUNT}; - numberValue:{bean.getTotalBasketsCount()}; -} - -#branchlinesPerBasketCount { - property:{SetLonglineObsDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT}; - numberValue:{bean.getBranchlinesPerBasketCount()}; -} - -#totalSectionsCount { - property:{SetLonglineObsDto.PROPERTY_TOTAL_SECTIONS_COUNT}; - numberValue:{bean.getTotalSectionsCount()}; -} - -#totalHooksCount { - property:{SetLonglineObsDto.PROPERTY_TOTAL_HOOKS_COUNT}; - numberValue:{bean.getTotalHooksCount()}; -} - /* ***************************************************************************** */ /* HAULING TAB **************************************************************** */ /* ***************************************************************************** */ @@ -200,42 +106,16 @@ properties:{SetLonglineObsUIModel.HAULING_TAB_PROPERTIES}; } -#haulingDirectionSameAsSetting { - booleanValue:{bean.getHaulingDirectionSameAsSetting()}; - _propertyName: {SetLonglineObsDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING}; -} - -#haulingStartTimeStamp { - date:{bean.getHaulingStartTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_HAULING_START_TIME_STAMP}; -} - #haulingStartCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_HAULING_START_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_HAULING_START_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_HAULING_START_QUADRANT}; - latitude:{bean.getHaulingStartLatitude()}; - longitude:{bean.getHaulingStartLongitude()}; - quadrant:{bean.getHaulingStartQuadrant()}; - _validationContext:{"haulingStart"}; -} - -#haulingEndTimeStamp { - date:{bean.getHaulingEndTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_HAULING_END_TIME_STAMP}; + property:haulingStart; } #haulingEndCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_HAULING_END_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_HAULING_END_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_HAULING_END_QUADRANT}; - latitude:{bean.getHaulingEndLatitude()}; - longitude:{bean.getHaulingEndLongitude()}; - quadrant:{bean.getHaulingEndQuadrant()}; - _validationContext:{"haulingEnd"}; -} - -#haulingBreaks { - property:{SetLonglineObsDto.PROPERTY_HAULING_BREAKS}; - numberValue:{bean.getHaulingBreaks()}; + property:haulingEnd; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss @@ -53,8 +53,6 @@ BeanComboBox { } #objectOperation { - property:{FloatingObjectDto.PROPERTY_OBJECT_OPERATION}; - selectedItem:{bean.getObjectOperation()}; enabled:{model.isCreatingMode()}; } @@ -93,7 +91,6 @@ BeanComboBox { } #supportVesselName { - property:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; resetTip:"observe.common.DataDto.action.reset.supportVesselName.tip"; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss @@ -36,8 +36,6 @@ } #startTime { - propertyDate:{SetSeineDto.PROPERTY_START_TIME}; - date:{bean.getStartTime()}; dateEditable:false; } @@ -45,37 +43,18 @@ propertyDate: {SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP}; propertyDayDate: {SetSeineDto.PROPERTY_END_PURSING_DATE}; propertyTimeDate: {SetSeineDto.PROPERTY_END_PURSING_TIME}; - date:{bean.getEndPursingTimeStamp()}; } #endSetTimeStamp { propertyDate: {SetSeineDto.PROPERTY_END_SET_TIME_STAMP}; propertyDayDate: {SetSeineDto.PROPERTY_END_SET_DATE}; propertyTimeDate: {SetSeineDto.PROPERTY_END_SET_TIME}; - date:{bean.getEndSetTimeStamp()}; -} - -#reasonForNullSet { - property:{SetSeineDto.PROPERTY_REASON_FOR_NULL_SET}; - selectedItem:{bean.getReasonForNullSet()}; } #supportVesselName { - _propertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; - property:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; resetTip:"observe.common.DataDto.action.reset.supportVesselName.tip"; } -#targetDiscarded { - _propertyName:{SetSeineDto.PROPERTY_TARGET_DISCARDED}; - booleanValue:{bean.getTargetDiscarded()}; -} - -#nonTargetDiscarded { - _propertyName:{SetSeineDto.PROPERTY_NON_TARGET_DISCARDED}; - booleanValue:{bean.getNonTargetDiscarded()}; -} - #schoolTypeLabel { actionIcon:info; toolTipText:"observe.common.SetSeineDto.message.information.schoolType"; @@ -90,41 +69,6 @@ border:{new TitledBorder(null, t("observe.common.SetSeineDto.sonarUsedAvantSet", 1, 0, getFont()))}; } -#schoolThickness { - property:{SetSeineDto.PROPERTY_SCHOOL_THICKNESS}; - numberValue:{bean.getSchoolThickness()}; -} - -#schoolMeanDepth { - property:{SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH}; - numberValue:{bean.getSchoolMeanDepth()}; -} - -#schoolTopDepth { - property:{SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH}; - numberValue:{bean.getSchoolTopDepth()}; -} - -#currentMeasureDepth { - property:{SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH}; - numberValue:{bean.getCurrentMeasureDepth()}; -} - -#currentSpeed { - property:{SetSeineDto.PROPERTY_CURRENT_SPEED}; - numberValue:{bean.getCurrentSpeed()}; -} - -#currentDirection { - property:{SetSeineDto.PROPERTY_CURRENT_DIRECTION}; - numberValue:{bean.getCurrentDirection()}; -} - -#maxGearDepth { - property:{SetSeineDto.PROPERTY_MAX_GEAR_DEPTH}; - numberValue:{bean.getMaxGearDepth()}; -} - #delete { _toolTipText:{t("observe.action.delete.set.tip")}; } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>2017.9</version> + <version>2017.10</version> </parent> <artifactId>ird-observe</artifactId> @@ -144,8 +144,7 @@ <!--persistence model version--> <observe.model.version>6.904</observe.model.version> - <lib.version.java4all.toolkit>2.0-alpha-2-SNAPSHOT</lib.version.java4all.toolkit> - <lib.version.java4all.jaxx>3.0-alpha-23-SNAPSHOT</lib.version.java4all.jaxx> + <lib.version.java4all.toolkit>2.0-alpha-2</lib.version.java4all.toolkit> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/baec96e5059068c2a48461457ce... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/baec96e5059068c2a48461457ce... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT