Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
<div class="col-md-2 smallerpadding searchcriteria">
<input type="text" placeholder="{{'vessel.advanced_search_placeholder_cfr' | i18n}}" class="form-control" tabindex="5" ng-model="advancedSearchObject.CFR" ng-change="resetSelectedVesselGroup()" id="asset-input-search-cfr">
</div>
<div class="col-md-2 smallerpadding searchcriteria">
<div class="col-md-1 smallerpadding searchcriteria">
<input type="text" placeholder="{{'vessel.advanced_search_placeholder_uvi' | i18n}}" class="form-control" tabindex="5" ng-model="advancedSearchObject.UVI" ng-change="resetSelectedVesselGroup()" id="asset-input-search-uvi">
</div>
<div class="col-md-1 smallerpadding searchcriteria">
<input type="text" placeholder="{{'vessel.advanced_search_placeholder_iccat' | i18n}}" class="form-control" tabindex="5" ng-model="advancedSearchObject.ICCAT" ng-change="resetSelectedVesselGroup()" id="asset-input-search-iccat">
</div>
</div>

<div class="row nomargin">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@
<input type="text" name="mmsi" id="asset-input-mmsi" class="form-control" ng-model="vessel.mmsiNo" ng-pattern="mmsiRegExp" existing="existingValues.mmsi">
<input-validation-message types="pattern, unique" input="vesselForm.mmsi" custom-messages="{{mmsiValidationMessages}}"></input-validation-message >
</div>
<div class="col-md-4 smallerpaddingleft form-group" ng-class="{'has-error': (submitAttempted || vesselForm.licenseType.$dirty) && vesselForm.licenseType.$invalid}">
<div class="col-md-2 smallerpaddingleft form-group" ng-class="{'has-error': (submitAttempted || vesselForm.licenseType.$dirty) && vesselForm.licenseType.$invalid}">
<label>{{ 'vessel.vessel_details_license_type' | i18n }}</label>
<dropdown name="licenseType" input-field-id="asset-input-licenseType" ng-model="vessel.licenseType" initialtext="{{ 'vessel.vessel_details_license_type' | i18n }}" items="vesselLicensTypes" ng-disabled="disableForm"></dropdown>
</div>
<div class="col-md-2 form-group smallerpaddingleft" ng-class="{'has-error': (submitAttempted || vesselForm.iccat.$dirty) && vesselForm.iccat.$invalid}">
<label>{{ 'vessel.vessel_details_ICCAT' | i18n }}</label>
<input type="text" name="iccat" id="asset-input-iccat" class="form-control" ng-model="vessel.iccat" ng-pattern="iccatRegExp" existing="existingValues.iccat">
<input-validation-message types="pattern, unique" input="vesselForm.iccat" custom-messages="{{iccatValidationMessages}}"></input-validation-message>
</div>
</div>

<div class="row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ angular.module('unionvmsWeb')
$scope.uviRegExp = vesselValidationService.getUVIPattern();
$scope.uviValidationMessages = {
'pattern' : locale.getString('vessel.vessel_details_uvi_pattern_validation_message')
};

$scope.iccatRegExp = vesselValidationService.getICCATPattern();
$scope.iccatValidationMessages = {
'pattern' : locale.getString('vessel.vessel_details_iccat_pattern_validation_message')
};

$scope.maxTwoDecimalsRegExp = vesselValidationService.getMaxTwoDecimalsPattern();
Expand Down
11 changes: 7 additions & 4 deletions unionvms-web/app/i18n/bg-bg/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -133,8 +136,8 @@
"vessel_details_type": "Main gear type",
"vessel_details_cfr_pattern_validation_message": "Must be 3 letters followed by 9 digits and/or letters.",
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.", "vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
11 changes: 7 additions & 4 deletions unionvms-web/app/i18n/cs-cz/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -133,8 +136,8 @@
"vessel_details_type": "Main gear type",
"vessel_details_cfr_pattern_validation_message": "Must be 3 letters followed by 9 digits and/or letters.",
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.", "vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
11 changes: 7 additions & 4 deletions unionvms-web/app/i18n/da-dk/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -133,8 +136,8 @@
"vessel_details_type": "Main gear type",
"vessel_details_cfr_pattern_validation_message": "Must be 3 letters followed by 9 digits and/or letters.",
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.", "vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
8 changes: 6 additions & 2 deletions unionvms-web/app/i18n/de-at/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -135,6 +138,7 @@
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
8 changes: 6 additions & 2 deletions unionvms-web/app/i18n/de-de/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -135,6 +138,7 @@
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
8 changes: 6 additions & 2 deletions unionvms-web/app/i18n/de-lu/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -135,6 +138,7 @@
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
8 changes: 6 additions & 2 deletions unionvms-web/app/i18n/el-cy/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -135,6 +138,7 @@
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
8 changes: 6 additions & 2 deletions unionvms-web/app/i18n/el-gr/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"table_header_reports" : "Reports",
"table_header_signal" : "IRCS",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"active":"Active",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -118,8 +120,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand All @@ -135,6 +138,7 @@
"vessel_details_mmsi_pattern_validation_message": "Must be 9 digits.",
"vessel_details_max_decimals_pattern_validation_message": "There can be max {1} decimals.",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"vessel_details_email": "Email",
"vessel_details_contact_name": "Contact name",
"vessel_details_contact_number": "Contact number",
Expand Down
8 changes: 6 additions & 2 deletions unionvms-web/app/i18n/en-gb/vessel.lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"table_header_signal" : "IRCS",
"table_header_cfr" : "CFR",
"table_header_uvi" : "UVI",
"table_header_iccat" : "ICCAT",
"table_header_gear_type" : "Gear Type",
"table_report_button" : "Report",
"add_new" : "Add new",
Expand All @@ -32,6 +33,7 @@
"advanced_search_placeholder_signal_ircs" : "IRCS",
"advanced_search_placeholder_cfr" : "CFR",
"advanced_search_placeholder_uvi" : "UVI",
"advanced_search_placeholder_iccat" : "ICCAT",
"advanced_search_placeholder_mmsi" : "MMSI No",
"advanced_search_placeholder_homeport_name":"Homeport name",
"advanced_search_placeholder_producer_name":"Producer name",
Expand Down Expand Up @@ -126,8 +128,9 @@
"vessel_details_flagstate": "F. S.",
"vessel_details_has_IRCS": "Has IRCS",
"vessel_details_home_port": "Home port",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_IMO": "IMO",
"vessel_details_UVI": "UVI",
"vessel_details_ICCAT": "ICCAT",
"vessel_details_IRCS_code": "IRCS",
"vessel_details_length": "Length",
"vessel_details_license": "License",
Expand Down Expand Up @@ -168,6 +171,7 @@
"vessel_stateparams_failed_to_load_error" : "The page could not be found",
"view_mobile_terminal_history": "History",
"vessel_details_uvi_pattern_validation_message": "Must be 7 numbers",
"vessel_details_iccat_pattern_validation_message": "AT + 3 alphanumeric characters + Iso3 code from territory list + 5 alphanumeric characters Eg. ATEU0FRA12345",
"warning_multiple_terminals": "There is more than one active terminal of the same type for this asset.",
"zero_connected_mobile_terminals" : "There is no mobile terminals connected to this asset.",
"view_vessel_on_failed_to_load_error" : "Failed to load asset details.",
Expand Down
Loading