Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
a1972b3f
by Tony CHEMIT at 2017-12-21T23:50:56+01:00
-
585362bc
by Tony CHEMIT at 2017-12-21T23:51:09+01:00
-
88c02b77
by Tony CHEMIT at 2017-12-22T00:15:43+01:00
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:
| ... | ... | @@ -37,75 +37,44 @@ |
| 37 | 37 |
|
| 38 | 38 |
#depthRecorder {
|
| 39 | 39 |
horizontalTextPosition:{JLabel.LEFT};
|
| 40 |
- _propertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER};
|
|
| 41 |
- selected:{BooleanUtils.isTrue(bean.getDepthRecorder())};
|
|
| 42 | 40 |
}
|
| 43 | 41 |
|
| 44 | 42 |
#hookLost {
|
| 45 | 43 |
horizontalTextPosition:{JLabel.LEFT};
|
| 46 |
- _propertyName:{BranchlineDto.PROPERTY_HOOK_LOST};
|
|
| 47 |
- selected:{BooleanUtils.isTrue(bean.getHookLost())};
|
|
| 48 | 44 |
}
|
| 49 | 45 |
|
| 50 | 46 |
#traceCutOff {
|
| 51 | 47 |
horizontalTextPosition:{JLabel.LEFT};
|
| 52 |
- _propertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF};
|
|
| 53 |
- selected:{BooleanUtils.isTrue(bean.getTraceCutOff())};
|
|
| 54 | 48 |
}
|
| 55 | 49 |
|
| 56 | 50 |
#timer {
|
| 57 | 51 |
horizontalTextPosition:{JLabel.LEFT};
|
| 58 |
- _propertyName:{BranchlineDto.PROPERTY_TIMER};
|
|
| 59 |
- selected:{BooleanUtils.isTrue(bean.getTimer())};
|
|
| 60 | 52 |
}
|
| 61 | 53 |
|
| 62 | 54 |
#timeSinceContact {
|
| 63 | 55 |
enabled:{BooleanUtils.isTrue(bean.getTimer())};
|
| 64 |
- propertyTime:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT};
|
|
| 65 |
- time:{model.getTimeSinceContact()};
|
|
| 66 |
- bean:{model};
|
|
| 67 | 56 |
showTimeEditorSlider:false;
|
| 68 | 57 |
}
|
| 69 | 58 |
|
| 70 | 59 |
#timerTimeOnBoard {
|
| 71 | 60 |
enabled:{BooleanUtils.isTrue(bean.getTimer())};
|
| 72 |
- date:{bean.getTimerTimeOnBoard()};
|
|
| 73 | 61 |
showTimeEditorSlider:false;
|
| 74 |
- propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD};
|
|
| 75 |
-}
|
|
| 76 |
- |
|
| 77 |
-#topType {
|
|
| 78 |
- property:{BranchlineDto.PROPERTY_TOP_TYPE};
|
|
| 79 |
- selectedItem:{bean.getTopType()};
|
|
| 80 |
-}
|
|
| 81 |
- |
|
| 82 |
-#tracelineType {
|
|
| 83 |
- property:{BranchlineDto.PROPERTY_TRACELINE_TYPE};
|
|
| 84 |
- selectedItem:{bean.getTracelineType()};
|
|
| 85 | 62 |
}
|
| 86 | 63 |
|
| 87 | 64 |
#weightedSwivel {
|
| 88 | 65 |
horizontalTextPosition:{JLabel.LEFT};
|
| 89 |
- _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SWIVEL};
|
|
| 90 |
- selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())};
|
|
| 91 | 66 |
}
|
| 92 | 67 |
|
| 93 | 68 |
#swivelWeight {
|
| 94 | 69 |
enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())};
|
| 95 |
- property:{BranchlineDto.PROPERTY_SWIVEL_WEIGHT};
|
|
| 96 |
- numberValue:{bean.getSwivelWeight()};
|
|
| 97 | 70 |
}
|
| 98 | 71 |
|
| 99 | 72 |
#weightedSnap {
|
| 100 | 73 |
horizontalTextPosition:{JLabel.LEFT};
|
| 101 |
- _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SNAP};
|
|
| 102 |
- selected:{BooleanUtils.isTrue(bean.getWeightedSnap())};
|
|
| 103 | 74 |
}
|
| 104 | 75 |
|
| 105 | 76 |
#snapWeight {
|
| 106 | 77 |
enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())};
|
| 107 |
- property:{BranchlineDto.PROPERTY_SNAP_WEIGHT};
|
|
| 108 |
- numberValue:{bean.getSnapWeight()};
|
|
| 109 | 78 |
}
|
| 110 | 79 |
|
| 111 | 80 |
/* ***************************************************************************** */
|
| ... | ... | @@ -115,33 +84,3 @@ |
| 115 | 84 |
#hookAndBaitTab {
|
| 116 | 85 |
properties:{BranchlineUIModel.HOOK_AND_BAIT_TAB_PROPERTIES};
|
| 117 | 86 |
}
|
| 118 |
- |
|
| 119 |
-#hookType {
|
|
| 120 |
- property:{BranchlineDto.PROPERTY_HOOK_TYPE};
|
|
| 121 |
- selectedItem:{bean.getHookType()};
|
|
| 122 |
-}
|
|
| 123 |
- |
|
| 124 |
-#hookSize {
|
|
| 125 |
- property:{BranchlineDto.PROPERTY_HOOK_SIZE};
|
|
| 126 |
- selectedItem:{bean.getHookSize()};
|
|
| 127 |
-}
|
|
| 128 |
- |
|
| 129 |
-#hookOffset {
|
|
| 130 |
- property:{BranchlineDto.PROPERTY_HOOK_OFFSET};
|
|
| 131 |
- numberValue:{bean.getHookOffset()};
|
|
| 132 |
-}
|
|
| 133 |
- |
|
| 134 |
-#baitSettingStatus {
|
|
| 135 |
- property:{BranchlineDto.PROPERTY_BAIT_SETTING_STATUS};
|
|
| 136 |
- selectedItem:{bean.getBaitSettingStatus()};
|
|
| 137 |
-}
|
|
| 138 |
- |
|
| 139 |
-#baitHaulingStatus {
|
|
| 140 |
- property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS};
|
|
| 141 |
- selectedItem:{bean.getBaitHaulingStatus()};
|
|
| 142 |
-}
|
|
| 143 |
- |
|
| 144 |
-#baitType {
|
|
| 145 |
- property:{BranchlineDto.PROPERTY_BAIT_TYPE};
|
|
| 146 |
- selectedItem:{bean.getBaitType()};
|
|
| 147 |
-}
|
| ... | ... | @@ -44,9 +44,6 @@ |
| 44 | 44 |
}
|
| 45 | 45 |
|
| 46 | 46 |
#mitigationType {
|
| 47 |
- bean:{bean};
|
|
| 48 |
- property: {SetLonglineGlobalCompositionObsDto.PROPERTY_MITIGATION_TYPE};
|
|
| 49 |
- selected:{(Collection)bean.getMitigationType()};
|
|
| 50 | 47 |
showListLabel: true;
|
| 51 | 48 |
universeLabel:{t("observe.common.SetLonglineGlobalCompositionObsDto.availableMitigationType")};
|
| 52 | 49 |
selectedLabel:{t("observe.common.SetLonglineGlobalCompositionObsDto.selectedMitigationType")};
|
| ... | ... | @@ -36,43 +36,21 @@ |
| 36 | 36 |
}
|
| 37 | 37 |
|
| 38 | 38 |
#homeId {
|
| 39 |
- property: {SetLonglineObsDto.PROPERTY_HOME_ID};
|
|
| 40 | 39 |
resetTip:"observe.common.SetLonglineObsDto.action.reset.homeId.tip";
|
| 41 | 40 |
}
|
| 42 | 41 |
|
| 43 |
-#number {
|
|
| 44 |
- property: {SetLonglineObsDto.PROPERTY_NUMBER};
|
|
| 45 |
- numberValue:{bean.getNumber()};
|
|
| 46 |
-}
|
|
| 47 |
- |
|
| 48 |
-#settingStartTimeStamp {
|
|
| 49 |
- date:{bean.getSettingStartTimeStamp()};
|
|
| 50 |
- propertyDate: {SetLonglineObsDto.PROPERTY_SETTING_START_TIME_STAMP};
|
|
| 51 |
-}
|
|
| 52 |
- |
|
| 53 | 42 |
#settingStartCoordinates {
|
| 54 | 43 |
propertyLatitude:{SetLonglineObsDto.PROPERTY_SETTING_START_LATITUDE};
|
| 55 | 44 |
propertyLongitude:{SetLonglineObsDto.PROPERTY_SETTING_START_LONGITUDE};
|
| 56 | 45 |
propertyQuadrant:{SetLonglineObsDto.PROPERTY_SETTING_START_QUADRANT};
|
| 57 |
- latitude:{bean.getSettingStartLatitude()};
|
|
| 58 |
- longitude:{bean.getSettingStartLongitude()};
|
|
| 59 |
- quadrant:{bean.getSettingStartQuadrant()};
|
|
| 60 |
- _validationContext:{"settingStart"};
|
|
| 61 |
-}
|
|
| 62 |
- |
|
| 63 |
-#settingEndTimeStamp {
|
|
| 64 |
- date:{bean.getSettingEndTimeStamp()};
|
|
| 65 |
- propertyDate: {SetLonglineObsDto.PROPERTY_SETTING_END_TIME_STAMP};
|
|
| 46 |
+ property:settingStart;
|
|
| 66 | 47 |
}
|
| 67 | 48 |
|
| 68 | 49 |
#settingEndCoordinates {
|
| 69 | 50 |
propertyLatitude:{SetLonglineObsDto.PROPERTY_SETTING_END_LATITUDE};
|
| 70 | 51 |
propertyLongitude:{SetLonglineObsDto.PROPERTY_SETTING_END_LONGITUDE};
|
| 71 | 52 |
propertyQuadrant:{SetLonglineObsDto.PROPERTY_SETTING_END_QUADRANT};
|
| 72 |
- latitude:{bean.getSettingEndLatitude()};
|
|
| 73 |
- longitude:{bean.getSettingEndLongitude()};
|
|
| 74 |
- quadrant:{bean.getSettingEndQuadrant()};
|
|
| 75 |
- _validationContext:{"settingEnd"};
|
|
| 53 |
+ property:settingEnd;
|
|
| 76 | 54 |
}
|
| 77 | 55 |
|
| 78 | 56 |
/* ***************************************************************************** */
|
| ... | ... | @@ -83,115 +61,43 @@ |
| 83 | 61 |
properties:{SetLonglineObsUIModel.SETTING_CARACTERISTIC_TAB_PROPERTIES};
|
| 84 | 62 |
}
|
| 85 | 63 |
|
| 86 |
-#settingVesselSpeed {
|
|
| 87 |
- property:{SetLonglineObsDto.PROPERTY_SETTING_VESSEL_SPEED};
|
|
| 88 |
- numberValue:{bean.getSettingVesselSpeed()};
|
|
| 89 |
-}
|
|
| 90 |
- |
|
| 91 | 64 |
#shooterUsed {
|
| 92 | 65 |
horizontalTextPosition:{JLabel.LEFT};
|
| 93 |
- _propertyName:{SetLonglineObsDto.PROPERTY_SHOOTER_USED};
|
|
| 94 |
- selected:{BooleanUtils.isTrue(bean.getShooterUsed())};
|
|
| 95 | 66 |
}
|
| 96 | 67 |
|
| 97 | 68 |
#shooterSpeed {
|
| 98 | 69 |
enabled:{BooleanUtils.isTrue(bean.getShooterUsed())};
|
| 99 |
- property:{SetLonglineObsDto.PROPERTY_SHOOTER_SPEED};
|
|
| 100 |
- numberValue:{bean.getShooterSpeed()};
|
|
| 101 | 70 |
}
|
| 102 | 71 |
|
| 103 |
-#settingShape {
|
|
| 104 |
- property:{SetLonglineObsDto.PROPERTY_SETTING_SHAPE};
|
|
| 105 |
- selectedItem:{bean.getSettingShape()};
|
|
| 106 |
-}
|
|
| 107 | 72 |
|
| 108 | 73 |
#weightedSwivel {
|
| 109 | 74 |
horizontalTextPosition:{JLabel.LEFT};
|
| 110 |
- _propertyName:{SetLonglineObsDto.PROPERTY_WEIGHTED_SWIVEL};
|
|
| 111 |
- selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())};
|
|
| 112 | 75 |
}
|
| 113 | 76 |
|
| 114 | 77 |
#swivelWeight {
|
| 115 | 78 |
enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())};
|
| 116 |
- property:{SetLonglineObsDto.PROPERTY_SWIVEL_WEIGHT};
|
|
| 117 |
- numberValue:{bean.getSwivelWeight()};
|
|
| 118 | 79 |
}
|
| 119 | 80 |
|
| 120 | 81 |
#weightedSnap {
|
| 121 | 82 |
horizontalTextPosition:{JLabel.LEFT};
|
| 122 |
- _propertyName:{SetLonglineObsDto.PROPERTY_WEIGHTED_SNAP};
|
|
| 123 |
- selected:{BooleanUtils.isTrue(bean.getWeightedSnap())};
|
|
| 124 | 83 |
}
|
| 125 | 84 |
|
| 126 | 85 |
#snapWeight {
|
| 127 | 86 |
enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())};
|
| 128 |
- property:{SetLonglineObsDto.PROPERTY_SNAP_WEIGHT};
|
|
| 129 |
- numberValue:{bean.getSnapWeight()};
|
|
| 130 |
-}
|
|
| 131 |
- |
|
| 132 |
-#lineType {
|
|
| 133 |
- property:{SetLonglineObsDto.PROPERTY_LINE_TYPE};
|
|
| 134 |
- selectedItem:{bean.getLineType()};
|
|
| 135 |
-}
|
|
| 136 |
- |
|
| 137 |
-#maxDepthTargeted {
|
|
| 138 |
- property:{SetLonglineObsDto.PROPERTY_MAX_DEPTH_TARGETED};
|
|
| 139 |
- numberValue:{bean.getMaxDepthTargeted()};
|
|
| 140 | 87 |
}
|
| 141 | 88 |
|
| 142 | 89 |
#monitored {
|
| 143 | 90 |
horizontalTextPosition:{JLabel.LEFT};
|
| 144 |
- _propertyName:{SetLonglineObsDto.PROPERTY_MONITORED};
|
|
| 145 |
- selected:{BooleanUtils.isTrue(bean.getMonitored())};
|
|
| 146 | 91 |
}
|
| 147 | 92 |
|
| 148 | 93 |
#lightsticksType {
|
| 149 |
- property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_TYPE};
|
|
| 150 |
- selectedItem:{bean.getLightsticksType()};
|
|
| 151 | 94 |
enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0};
|
| 152 | 95 |
}
|
| 153 | 96 |
|
| 154 | 97 |
#lightsticksColor {
|
| 155 |
- property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_COLOR};
|
|
| 156 |
- selectedItem:{bean.getLightsticksColor()};
|
|
| 157 | 98 |
enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0};
|
| 158 | 99 |
}
|
| 159 | 100 |
|
| 160 |
-#timeBetweenHooks {
|
|
| 161 |
- property:{SetLonglineObsDto.PROPERTY_TIME_BETWEEN_HOOKS};
|
|
| 162 |
- numberValue:{bean.getTimeBetweenHooks()};
|
|
| 163 |
-}
|
|
| 164 |
- |
|
| 165 |
-#lightsticksPerBasketCount {
|
|
| 166 |
- property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT};
|
|
| 167 |
- numberValue:{bean.getLightsticksPerBasketCount()};
|
|
| 168 |
-}
|
|
| 169 |
- |
|
| 170 |
-#basketsPerSectionCount {
|
|
| 171 |
- property:{SetLonglineObsDto.PROPERTY_BASKETS_PER_SECTION_COUNT};
|
|
| 172 |
- numberValue:{bean.getBasketsPerSectionCount()};
|
|
| 173 |
-}
|
|
| 174 |
- |
|
| 175 |
-#totalBasketsCount {
|
|
| 176 |
- property:{SetLonglineObsDto.PROPERTY_TOTAL_BASKETS_COUNT};
|
|
| 177 |
- numberValue:{bean.getTotalBasketsCount()};
|
|
| 178 |
-}
|
|
| 179 |
- |
|
| 180 |
-#branchlinesPerBasketCount {
|
|
| 181 |
- property:{SetLonglineObsDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT};
|
|
| 182 |
- numberValue:{bean.getBranchlinesPerBasketCount()};
|
|
| 183 |
-}
|
|
| 184 |
- |
|
| 185 |
-#totalSectionsCount {
|
|
| 186 |
- property:{SetLonglineObsDto.PROPERTY_TOTAL_SECTIONS_COUNT};
|
|
| 187 |
- numberValue:{bean.getTotalSectionsCount()};
|
|
| 188 |
-}
|
|
| 189 |
- |
|
| 190 |
-#totalHooksCount {
|
|
| 191 |
- property:{SetLonglineObsDto.PROPERTY_TOTAL_HOOKS_COUNT};
|
|
| 192 |
- numberValue:{bean.getTotalHooksCount()};
|
|
| 193 |
-}
|
|
| 194 |
- |
|
| 195 | 101 |
/* ***************************************************************************** */
|
| 196 | 102 |
/* HAULING TAB **************************************************************** */
|
| 197 | 103 |
/* ***************************************************************************** */
|
| ... | ... | @@ -200,42 +106,16 @@ |
| 200 | 106 |
properties:{SetLonglineObsUIModel.HAULING_TAB_PROPERTIES};
|
| 201 | 107 |
}
|
| 202 | 108 |
|
| 203 |
-#haulingDirectionSameAsSetting {
|
|
| 204 |
- booleanValue:{bean.getHaulingDirectionSameAsSetting()};
|
|
| 205 |
- _propertyName: {SetLonglineObsDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING};
|
|
| 206 |
-}
|
|
| 207 |
- |
|
| 208 |
-#haulingStartTimeStamp {
|
|
| 209 |
- date:{bean.getHaulingStartTimeStamp()};
|
|
| 210 |
- propertyDate: {SetLonglineObsDto.PROPERTY_HAULING_START_TIME_STAMP};
|
|
| 211 |
-}
|
|
| 212 |
- |
|
| 213 | 109 |
#haulingStartCoordinates {
|
| 214 | 110 |
propertyLatitude:{SetLonglineObsDto.PROPERTY_HAULING_START_LATITUDE};
|
| 215 | 111 |
propertyLongitude:{SetLonglineObsDto.PROPERTY_HAULING_START_LONGITUDE};
|
| 216 | 112 |
propertyQuadrant:{SetLonglineObsDto.PROPERTY_HAULING_START_QUADRANT};
|
| 217 |
- latitude:{bean.getHaulingStartLatitude()};
|
|
| 218 |
- longitude:{bean.getHaulingStartLongitude()};
|
|
| 219 |
- quadrant:{bean.getHaulingStartQuadrant()};
|
|
| 220 |
- _validationContext:{"haulingStart"};
|
|
| 221 |
-}
|
|
| 222 |
- |
|
| 223 |
-#haulingEndTimeStamp {
|
|
| 224 |
- date:{bean.getHaulingEndTimeStamp()};
|
|
| 225 |
- propertyDate: {SetLonglineObsDto.PROPERTY_HAULING_END_TIME_STAMP};
|
|
| 113 |
+ property:haulingStart;
|
|
| 226 | 114 |
}
|
| 227 | 115 |
|
| 228 | 116 |
#haulingEndCoordinates {
|
| 229 | 117 |
propertyLatitude:{SetLonglineObsDto.PROPERTY_HAULING_END_LATITUDE};
|
| 230 | 118 |
propertyLongitude:{SetLonglineObsDto.PROPERTY_HAULING_END_LONGITUDE};
|
| 231 | 119 |
propertyQuadrant:{SetLonglineObsDto.PROPERTY_HAULING_END_QUADRANT};
|
| 232 |
- latitude:{bean.getHaulingEndLatitude()};
|
|
| 233 |
- longitude:{bean.getHaulingEndLongitude()};
|
|
| 234 |
- quadrant:{bean.getHaulingEndQuadrant()};
|
|
| 235 |
- _validationContext:{"haulingEnd"};
|
|
| 236 |
-}
|
|
| 237 |
- |
|
| 238 |
-#haulingBreaks {
|
|
| 239 |
- property:{SetLonglineObsDto.PROPERTY_HAULING_BREAKS};
|
|
| 240 |
- numberValue:{bean.getHaulingBreaks()};
|
|
| 120 |
+ property:haulingEnd;
|
|
| 241 | 121 |
}
|
| ... | ... | @@ -53,8 +53,6 @@ BeanComboBox { |
| 53 | 53 |
}
|
| 54 | 54 |
|
| 55 | 55 |
#objectOperation {
|
| 56 |
- property:{FloatingObjectDto.PROPERTY_OBJECT_OPERATION};
|
|
| 57 |
- selectedItem:{bean.getObjectOperation()};
|
|
| 58 | 56 |
enabled:{model.isCreatingMode()};
|
| 59 | 57 |
}
|
| 60 | 58 |
|
| ... | ... | @@ -93,7 +91,6 @@ BeanComboBox { |
| 93 | 91 |
}
|
| 94 | 92 |
|
| 95 | 93 |
#supportVesselName {
|
| 96 |
- property:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME};
|
|
| 97 | 94 |
resetTip:"observe.common.DataDto.action.reset.supportVesselName.tip";
|
| 98 | 95 |
}
|
| 99 | 96 |
|
| ... | ... | @@ -36,8 +36,6 @@ |
| 36 | 36 |
}
|
| 37 | 37 |
|
| 38 | 38 |
#startTime {
|
| 39 |
- propertyDate:{SetSeineDto.PROPERTY_START_TIME};
|
|
| 40 |
- date:{bean.getStartTime()};
|
|
| 41 | 39 |
dateEditable:false;
|
| 42 | 40 |
}
|
| 43 | 41 |
|
| ... | ... | @@ -45,37 +43,18 @@ |
| 45 | 43 |
propertyDate: {SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP};
|
| 46 | 44 |
propertyDayDate: {SetSeineDto.PROPERTY_END_PURSING_DATE};
|
| 47 | 45 |
propertyTimeDate: {SetSeineDto.PROPERTY_END_PURSING_TIME};
|
| 48 |
- date:{bean.getEndPursingTimeStamp()};
|
|
| 49 | 46 |
}
|
| 50 | 47 |
|
| 51 | 48 |
#endSetTimeStamp {
|
| 52 | 49 |
propertyDate: {SetSeineDto.PROPERTY_END_SET_TIME_STAMP};
|
| 53 | 50 |
propertyDayDate: {SetSeineDto.PROPERTY_END_SET_DATE};
|
| 54 | 51 |
propertyTimeDate: {SetSeineDto.PROPERTY_END_SET_TIME};
|
| 55 |
- date:{bean.getEndSetTimeStamp()};
|
|
| 56 |
-}
|
|
| 57 |
- |
|
| 58 |
-#reasonForNullSet {
|
|
| 59 |
- property:{SetSeineDto.PROPERTY_REASON_FOR_NULL_SET};
|
|
| 60 |
- selectedItem:{bean.getReasonForNullSet()};
|
|
| 61 | 52 |
}
|
| 62 | 53 |
|
| 63 | 54 |
#supportVesselName {
|
| 64 |
- _propertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME};
|
|
| 65 |
- property:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME};
|
|
| 66 | 55 |
resetTip:"observe.common.DataDto.action.reset.supportVesselName.tip";
|
| 67 | 56 |
}
|
| 68 | 57 |
|
| 69 |
-#targetDiscarded {
|
|
| 70 |
- _propertyName:{SetSeineDto.PROPERTY_TARGET_DISCARDED};
|
|
| 71 |
- booleanValue:{bean.getTargetDiscarded()};
|
|
| 72 |
-}
|
|
| 73 |
- |
|
| 74 |
-#nonTargetDiscarded {
|
|
| 75 |
- _propertyName:{SetSeineDto.PROPERTY_NON_TARGET_DISCARDED};
|
|
| 76 |
- booleanValue:{bean.getNonTargetDiscarded()};
|
|
| 77 |
-}
|
|
| 78 |
- |
|
| 79 | 58 |
#schoolTypeLabel {
|
| 80 | 59 |
actionIcon:info;
|
| 81 | 60 |
toolTipText:"observe.common.SetSeineDto.message.information.schoolType";
|
| ... | ... | @@ -90,41 +69,6 @@ |
| 90 | 69 |
border:{new TitledBorder(null, t("observe.common.SetSeineDto.sonarUsedAvantSet", 1, 0, getFont()))};
|
| 91 | 70 |
}
|
| 92 | 71 |
|
| 93 |
-#schoolThickness {
|
|
| 94 |
- property:{SetSeineDto.PROPERTY_SCHOOL_THICKNESS};
|
|
| 95 |
- numberValue:{bean.getSchoolThickness()};
|
|
| 96 |
-}
|
|
| 97 |
- |
|
| 98 |
-#schoolMeanDepth {
|
|
| 99 |
- property:{SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH};
|
|
| 100 |
- numberValue:{bean.getSchoolMeanDepth()};
|
|
| 101 |
-}
|
|
| 102 |
- |
|
| 103 |
-#schoolTopDepth {
|
|
| 104 |
- property:{SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH};
|
|
| 105 |
- numberValue:{bean.getSchoolTopDepth()};
|
|
| 106 |
-}
|
|
| 107 |
- |
|
| 108 |
-#currentMeasureDepth {
|
|
| 109 |
- property:{SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH};
|
|
| 110 |
- numberValue:{bean.getCurrentMeasureDepth()};
|
|
| 111 |
-}
|
|
| 112 |
- |
|
| 113 |
-#currentSpeed {
|
|
| 114 |
- property:{SetSeineDto.PROPERTY_CURRENT_SPEED};
|
|
| 115 |
- numberValue:{bean.getCurrentSpeed()};
|
|
| 116 |
-}
|
|
| 117 |
- |
|
| 118 |
-#currentDirection {
|
|
| 119 |
- property:{SetSeineDto.PROPERTY_CURRENT_DIRECTION};
|
|
| 120 |
- numberValue:{bean.getCurrentDirection()};
|
|
| 121 |
-}
|
|
| 122 |
- |
|
| 123 |
-#maxGearDepth {
|
|
| 124 |
- property:{SetSeineDto.PROPERTY_MAX_GEAR_DEPTH};
|
|
| 125 |
- numberValue:{bean.getMaxGearDepth()};
|
|
| 126 |
-}
|
|
| 127 |
- |
|
| 128 | 72 |
#delete {
|
| 129 | 73 |
_toolTipText:{t("observe.action.delete.set.tip")};
|
| 130 | 74 |
}
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2017.9</version>
|
|
| 29 |
+ <version>2017.10</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>ird-observe</artifactId>
|
| ... | ... | @@ -144,8 +144,7 @@ |
| 144 | 144 |
|
| 145 | 145 |
<!--persistence model version-->
|
| 146 | 146 |
<observe.model.version>6.904</observe.model.version>
|
| 147 |
- <lib.version.java4all.toolkit>2.0-alpha-2-SNAPSHOT</lib.version.java4all.toolkit>
|
|
| 148 |
- <lib.version.java4all.jaxx>3.0-alpha-23-SNAPSHOT</lib.version.java4all.jaxx>
|
|
| 147 |
+ <lib.version.java4all.toolkit>2.0-alpha-2</lib.version.java4all.toolkit>
|
|
| 149 | 148 |
|
| 150 | 149 |
<!-- license header configuration -->
|
| 151 | 150 |
<license.licenseName>gpl_v3</license.licenseName>
|