| ... |
... |
@@ -58,6 +58,30 @@ |
|
58
|
58
|
<message>observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp</message>
|
|
59
|
59
|
</field-validator>
|
|
60
|
60
|
</field>
|
|
|
61
|
+ <field name="haulingStartTimeStamp">
|
|
|
62
|
+ <field-validator type="mandatory" short-circuit="true">
|
|
|
63
|
+ <message/>
|
|
|
64
|
+ </field-validator>
|
|
|
65
|
+ <!-- settingEndTimeStamp < haulingStartTimeStamp -->
|
|
|
66
|
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
|
67
|
+ <param name="expression">
|
|
|
68
|
+ <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]>
|
|
|
69
|
+ </param>
|
|
|
70
|
+ <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message>
|
|
|
71
|
+ </field-validator>
|
|
|
72
|
+ </field>
|
|
|
73
|
+ <field name="haulingEndTimeStamp">
|
|
|
74
|
+ <field-validator type="mandatory" short-circuit="true">
|
|
|
75
|
+ <message/>
|
|
|
76
|
+ </field-validator>
|
|
|
77
|
+ <!-- haulingStartTimeStamp < haulingEndTimeStamp -->
|
|
|
78
|
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
|
79
|
+ <param name="expression">
|
|
|
80
|
+ <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]>
|
|
|
81
|
+ </param>
|
|
|
82
|
+ <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message>
|
|
|
83
|
+ </field-validator>
|
|
|
84
|
+ </field>
|
|
61
|
85
|
<field name="settingVesselSpeed">
|
|
62
|
86
|
<field-validator type="boundNumber" short-circuit="true">
|
|
63
|
87
|
<param name="min">0.0</param>
|
| ... |
... |
@@ -100,41 +124,6 @@ |
|
100
|
124
|
<message/>
|
|
101
|
125
|
</field-validator>
|
|
102
|
126
|
</field>
|
|
103
|
|
- <field name="haulingStartTimeStamp">
|
|
104
|
|
- <field-validator type="mandatory" short-circuit="true">
|
|
105
|
|
- <message/>
|
|
106
|
|
- </field-validator>
|
|
107
|
|
-
|
|
108
|
|
- <!-- settingEndTimeStamp < haulingStartTimeStamp -->
|
|
109
|
|
- <field-validator type="fieldexpression" short-circuit="true">
|
|
110
|
|
- <param name="expression">
|
|
111
|
|
- <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]>
|
|
112
|
|
- </param>
|
|
113
|
|
- <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message>
|
|
114
|
|
- </field-validator>
|
|
115
|
|
- </field>
|
|
116
|
|
- <field name="haulingEndTimeStamp">
|
|
117
|
|
- <field-validator type="mandatory" short-circuit="true">
|
|
118
|
|
- <message/>
|
|
119
|
|
- </field-validator>
|
|
120
|
|
-
|
|
121
|
|
- <!-- haulingStartTimeStamp < haulingEndTimeStamp -->
|
|
122
|
|
- <field-validator type="fieldexpression" short-circuit="true">
|
|
123
|
|
- <param name="expression">
|
|
124
|
|
- <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]>
|
|
125
|
|
- </param>
|
|
126
|
|
- <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message>
|
|
127
|
|
- </field-validator>
|
|
128
|
|
- </field>
|
|
129
|
|
- <field name="settingStartQuadrant">
|
|
130
|
|
- <field-validator type="mandatory" short-circuit="true">
|
|
131
|
|
- <message/>
|
|
132
|
|
- </field-validator>
|
|
133
|
|
- <field-validator type="quadrantDto" short-circuit="true">
|
|
134
|
|
- <param name="ocean">currentTripLongline.ocean</param>
|
|
135
|
|
- <message/>
|
|
136
|
|
- </field-validator>
|
|
137
|
|
- </field>
|
|
138
|
127
|
<field name="settingStartLatitude">
|
|
139
|
128
|
<field-validator type="mandatory" short-circuit="true">
|
|
140
|
129
|
<message/>
|
| ... |
... |
@@ -153,7 +142,7 @@ |
|
153
|
142
|
<message/>
|
|
154
|
143
|
</field-validator>
|
|
155
|
144
|
</field>
|
|
156
|
|
- <field name="settingEndQuadrant">
|
|
|
145
|
+ <field name="settingStartQuadrant">
|
|
157
|
146
|
<field-validator type="mandatory" short-circuit="true">
|
|
158
|
147
|
<message/>
|
|
159
|
148
|
</field-validator>
|
| ... |
... |
@@ -180,7 +169,7 @@ |
|
180
|
169
|
<message/>
|
|
181
|
170
|
</field-validator>
|
|
182
|
171
|
</field>
|
|
183
|
|
- <field name="haulingStartQuadrant">
|
|
|
172
|
+ <field name="settingEndQuadrant">
|
|
184
|
173
|
<field-validator type="mandatory" short-circuit="true">
|
|
185
|
174
|
<message/>
|
|
186
|
175
|
</field-validator>
|
| ... |
... |
@@ -207,7 +196,7 @@ |
|
207
|
196
|
<message/>
|
|
208
|
197
|
</field-validator>
|
|
209
|
198
|
</field>
|
|
210
|
|
- <field name="haulingEndQuadrant">
|
|
|
199
|
+ <field name="haulingStartQuadrant">
|
|
211
|
200
|
<field-validator type="mandatory" short-circuit="true">
|
|
212
|
201
|
<message/>
|
|
213
|
202
|
</field-validator>
|
| ... |
... |
@@ -234,6 +223,15 @@ |
|
234
|
223
|
<message/>
|
|
235
|
224
|
</field-validator>
|
|
236
|
225
|
</field>
|
|
|
226
|
+ <field name="haulingEndQuadrant">
|
|
|
227
|
+ <field-validator type="mandatory" short-circuit="true">
|
|
|
228
|
+ <message/>
|
|
|
229
|
+ </field-validator>
|
|
|
230
|
+ <field-validator type="quadrantDto" short-circuit="true">
|
|
|
231
|
+ <param name="ocean">currentTripLongline.ocean</param>
|
|
|
232
|
+ <message/>
|
|
|
233
|
+ </field-validator>
|
|
|
234
|
+ </field>
|
|
237
|
235
|
<field name="totalSectionsCount">
|
|
238
|
236
|
<field-validator type="mandatory" short-circuit="true">
|
|
239
|
237
|
<message/>
|
| ... |
... |
@@ -267,7 +265,7 @@ |
|
267
|
265
|
<field name="totalBasketsCount">
|
|
268
|
266
|
<field-validator type="boundNumber" short-circuit="true">
|
|
269
|
267
|
<param name="min">0.0</param>
|
|
270
|
|
- <param name="max">100.0</param>
|
|
|
268
|
+ <param name="max">400.0</param>
|
|
271
|
269
|
<message/>
|
|
272
|
270
|
</field-validator>
|
|
273
|
271
|
</field>
|