From 9e0d510502618c0335272643fb95a1ec342d2da1 Mon Sep 17 00:00:00 2001 From: gmanifavas Date: Fri, 14 May 2021 12:56:56 +0300 Subject: [PATCH 1/2] [UNIONVMS-4999] Add ICCAT field in asset search and view. --- .../advancedSearch/vessel/staticAdvancedSearch.html | 5 ++++- .../vessel/vesselDetails/vesselDetails.html | 7 ++++++- .../directive/vessel/vesselDetails/vesselDetails.js | 5 +++++ unionvms-web/app/i18n/bg-bg/vessel.lang.json | 10 ++++++---- unionvms-web/app/i18n/cs-cz/vessel.lang.json | 10 ++++++---- unionvms-web/app/i18n/da-dk/vessel.lang.json | 10 ++++++---- unionvms-web/app/i18n/de-at/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/de-de/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/de-lu/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/el-cy/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/el-gr/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/en-gb/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/en-ie/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/es-es/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/et-ee/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/fi-fi/vessel.lang.json | 8 +++++--- unionvms-web/app/i18n/fr-fr/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/fr-lu/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/hr-hr/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/hu-hu/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/im-im/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/it-it/vessel.lang.json | 12 ++++++++---- unionvms-web/app/i18n/lt-lt/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/lv-lv/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/mt/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/nl-be/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/nl-nl/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/nl/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/pl/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/pt-pt/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/ro-ro/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/si-si/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/sk-sk/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/sv/vessel.lang.json | 7 +++++-- unionvms-web/app/i18n/tr-cy/vessel.lang.json | 7 +++++-- unionvms-web/app/service/vessel/model/vesselModel.js | 4 ++++ .../app/service/vessel/vesselValidationService.js | 3 +++ 37 files changed, 188 insertions(+), 75 deletions(-) diff --git a/unionvms-web/app/directive/common/search/advancedSearch/vessel/staticAdvancedSearch.html b/unionvms-web/app/directive/common/search/advancedSearch/vessel/staticAdvancedSearch.html index fe74916b5..8b5380bb7 100644 --- a/unionvms-web/app/directive/common/search/advancedSearch/vessel/staticAdvancedSearch.html +++ b/unionvms-web/app/directive/common/search/advancedSearch/vessel/staticAdvancedSearch.html @@ -16,9 +16,12 @@
-
+
+
+ +
diff --git a/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.html b/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.html index b3fb735e1..af1a0be0f 100644 --- a/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.html +++ b/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.html @@ -51,10 +51,15 @@
-
+
+
+ + + +
diff --git a/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.js b/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.js index d21734de5..d247ccc81 100644 --- a/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.js +++ b/unionvms-web/app/directive/vessel/vesselDetails/vesselDetails.js @@ -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(); diff --git a/unionvms-web/app/i18n/bg-bg/vessel.lang.json b/unionvms-web/app/i18n/bg-bg/vessel.lang.json index 327179cd1..84ed46c1e 100644 --- a/unionvms-web/app/i18n/bg-bg/vessel.lang.json +++ b/unionvms-web/app/i18n/bg-bg/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -133,8 +135,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", diff --git a/unionvms-web/app/i18n/cs-cz/vessel.lang.json b/unionvms-web/app/i18n/cs-cz/vessel.lang.json index 327179cd1..84ed46c1e 100644 --- a/unionvms-web/app/i18n/cs-cz/vessel.lang.json +++ b/unionvms-web/app/i18n/cs-cz/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -133,8 +135,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", diff --git a/unionvms-web/app/i18n/da-dk/vessel.lang.json b/unionvms-web/app/i18n/da-dk/vessel.lang.json index 327179cd1..84ed46c1e 100644 --- a/unionvms-web/app/i18n/da-dk/vessel.lang.json +++ b/unionvms-web/app/i18n/da-dk/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -133,8 +135,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", diff --git a/unionvms-web/app/i18n/de-at/vessel.lang.json b/unionvms-web/app/i18n/de-at/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/de-at/vessel.lang.json +++ b/unionvms-web/app/i18n/de-at/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/de-de/vessel.lang.json b/unionvms-web/app/i18n/de-de/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/de-de/vessel.lang.json +++ b/unionvms-web/app/i18n/de-de/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/de-lu/vessel.lang.json b/unionvms-web/app/i18n/de-lu/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/de-lu/vessel.lang.json +++ b/unionvms-web/app/i18n/de-lu/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/el-cy/vessel.lang.json b/unionvms-web/app/i18n/el-cy/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/el-cy/vessel.lang.json +++ b/unionvms-web/app/i18n/el-cy/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/el-gr/vessel.lang.json b/unionvms-web/app/i18n/el-gr/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/el-gr/vessel.lang.json +++ b/unionvms-web/app/i18n/el-gr/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/en-gb/vessel.lang.json b/unionvms-web/app/i18n/en-gb/vessel.lang.json index debbaa706..c535f8fc4 100644 --- a/unionvms-web/app/i18n/en-gb/vessel.lang.json +++ b/unionvms-web/app/i18n/en-gb/vessel.lang.json @@ -32,6 +32,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", @@ -126,8 +127,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", @@ -168,6 +170,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.", diff --git a/unionvms-web/app/i18n/en-ie/vessel.lang.json b/unionvms-web/app/i18n/en-ie/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/en-ie/vessel.lang.json +++ b/unionvms-web/app/i18n/en-ie/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/es-es/vessel.lang.json b/unionvms-web/app/i18n/es-es/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/es-es/vessel.lang.json +++ b/unionvms-web/app/i18n/es-es/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/et-ee/vessel.lang.json b/unionvms-web/app/i18n/et-ee/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/et-ee/vessel.lang.json +++ b/unionvms-web/app/i18n/et-ee/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/fi-fi/vessel.lang.json b/unionvms-web/app/i18n/fi-fi/vessel.lang.json index 97fac4c79..a8b16aca5 100644 --- a/unionvms-web/app/i18n/fi-fi/vessel.lang.json +++ b/unionvms-web/app/i18n/fi-fi/vessel.lang.json @@ -32,7 +32,7 @@ "advanced_search_placeholder_signal_ircs" : "IRCS", "advanced_search_placeholder_cfr" : "CFR", "advanced_search_placeholder_uvi" : "UVI", - "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", @@ -119,8 +119,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", @@ -136,6 +137,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", diff --git a/unionvms-web/app/i18n/fr-fr/vessel.lang.json b/unionvms-web/app/i18n/fr-fr/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/fr-fr/vessel.lang.json +++ b/unionvms-web/app/i18n/fr-fr/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/fr-lu/vessel.lang.json b/unionvms-web/app/i18n/fr-lu/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/fr-lu/vessel.lang.json +++ b/unionvms-web/app/i18n/fr-lu/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/hr-hr/vessel.lang.json b/unionvms-web/app/i18n/hr-hr/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/hr-hr/vessel.lang.json +++ b/unionvms-web/app/i18n/hr-hr/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/hu-hu/vessel.lang.json b/unionvms-web/app/i18n/hu-hu/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/hu-hu/vessel.lang.json +++ b/unionvms-web/app/i18n/hu-hu/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/im-im/vessel.lang.json b/unionvms-web/app/i18n/im-im/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/im-im/vessel.lang.json +++ b/unionvms-web/app/i18n/im-im/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/it-it/vessel.lang.json b/unionvms-web/app/i18n/it-it/vessel.lang.json index 327179cd1..75ff534d9 100644 --- a/unionvms-web/app/i18n/it-it/vessel.lang.json +++ b/unionvms-web/app/i18n/it-it/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -133,8 +135,10 @@ "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_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", diff --git a/unionvms-web/app/i18n/lt-lt/vessel.lang.json b/unionvms-web/app/i18n/lt-lt/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/lt-lt/vessel.lang.json +++ b/unionvms-web/app/i18n/lt-lt/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/lv-lv/vessel.lang.json b/unionvms-web/app/i18n/lv-lv/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/lv-lv/vessel.lang.json +++ b/unionvms-web/app/i18n/lv-lv/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/mt/vessel.lang.json b/unionvms-web/app/i18n/mt/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/mt/vessel.lang.json +++ b/unionvms-web/app/i18n/mt/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/nl-be/vessel.lang.json b/unionvms-web/app/i18n/nl-be/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/nl-be/vessel.lang.json +++ b/unionvms-web/app/i18n/nl-be/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/nl-nl/vessel.lang.json b/unionvms-web/app/i18n/nl-nl/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/nl-nl/vessel.lang.json +++ b/unionvms-web/app/i18n/nl-nl/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/nl/vessel.lang.json b/unionvms-web/app/i18n/nl/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/nl/vessel.lang.json +++ b/unionvms-web/app/i18n/nl/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/pl/vessel.lang.json b/unionvms-web/app/i18n/pl/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/pl/vessel.lang.json +++ b/unionvms-web/app/i18n/pl/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/pt-pt/vessel.lang.json b/unionvms-web/app/i18n/pt-pt/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/pt-pt/vessel.lang.json +++ b/unionvms-web/app/i18n/pt-pt/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/ro-ro/vessel.lang.json b/unionvms-web/app/i18n/ro-ro/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/ro-ro/vessel.lang.json +++ b/unionvms-web/app/i18n/ro-ro/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/si-si/vessel.lang.json b/unionvms-web/app/i18n/si-si/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/si-si/vessel.lang.json +++ b/unionvms-web/app/i18n/si-si/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/sk-sk/vessel.lang.json b/unionvms-web/app/i18n/sk-sk/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/sk-sk/vessel.lang.json +++ b/unionvms-web/app/i18n/sk-sk/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/i18n/sv/vessel.lang.json b/unionvms-web/app/i18n/sv/vessel.lang.json index 4d61f7984..bb5f29e60 100644 --- a/unionvms-web/app/i18n/sv/vessel.lang.json +++ b/unionvms-web/app/i18n/sv/vessel.lang.json @@ -32,6 +32,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", "advanced_search_placeholder_homeport_name":"Homeport name", "advanced_search_placeholder_producer_name":"Producer name", @@ -111,8 +112,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", @@ -128,6 +130,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", diff --git a/unionvms-web/app/i18n/tr-cy/vessel.lang.json b/unionvms-web/app/i18n/tr-cy/vessel.lang.json index 327179cd1..a8b16aca5 100644 --- a/unionvms-web/app/i18n/tr-cy/vessel.lang.json +++ b/unionvms-web/app/i18n/tr-cy/vessel.lang.json @@ -32,6 +32,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", @@ -118,8 +119,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", @@ -135,6 +137,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", diff --git a/unionvms-web/app/service/vessel/model/vesselModel.js b/unionvms-web/app/service/vessel/model/vesselModel.js index f75f7723d..eba11fae3 100644 --- a/unionvms-web/app/service/vessel/model/vesselModel.js +++ b/unionvms-web/app/service/vessel/model/vesselModel.js @@ -24,6 +24,7 @@ angular.module('unionvmsWeb') this.homePort = undefined; this.imo = null; this.uvi = null; + this.iccat = null; this.ircs = undefined; this.lastMovement = undefined; this.lengthType = "LOA"; @@ -66,6 +67,7 @@ angular.module('unionvmsWeb') vessel.mmsiNo = data.mmsiNo; vessel.imo = data.imo; vessel.uvi = data.uvi; + vessel.iccat = data.iccat; vessel.externalMarking = data.externalMarking; vessel.homePort = data.homePort; @@ -138,6 +140,7 @@ angular.module('unionvmsWeb') countryCode : this.countryCode, imo : this.imo, uvi : this.uvi, + iccat: this.iccat, externalMarking : this.externalMarking, hasIrcs : this.hasIrcs(), ircs : this.ircs, @@ -187,6 +190,7 @@ angular.module('unionvmsWeb') copy.homePort = this.homePort; copy.imo = this.imo; copy.uvi = this.uvi; + copy.iccat = this.iccat; copy.lengthValue = this.lengthValue; copy.lengthType = this.lengthType; //copy.lengthOverAll = this.lengthOverAll; diff --git a/unionvms-web/app/service/vessel/vesselValidationService.js b/unionvms-web/app/service/vessel/vesselValidationService.js index 26458161c..07887acb0 100644 --- a/unionvms-web/app/service/vessel/vesselValidationService.js +++ b/unionvms-web/app/service/vessel/vesselValidationService.js @@ -32,6 +32,9 @@ angular.module('unionvmsWeb').factory('vesselValidationService',function() { getUVIPattern: function() { return new RegExp(/^[0-9]{7}$/); }, + getICCATPattern: function() { + return new RegExp(/^AT[A-Z0-9]{11}$/); + }, getProducerCodePattern: function() { return new RegExp(/^\d{1,9}$/); }, From a9916d2cfc4c6f5148b9559361b7d83a4edaed43 Mon Sep 17 00:00:00 2001 From: gmanifavas Date: Fri, 14 May 2021 14:04:38 +0300 Subject: [PATCH 2/2] [UNIONVMS-5046] Add ICCAT field in the list of Assets. --- unionvms-web/app/i18n/bg-bg/vessel.lang.json | 1 + unionvms-web/app/i18n/cs-cz/vessel.lang.json | 1 + unionvms-web/app/i18n/da-dk/vessel.lang.json | 1 + unionvms-web/app/i18n/de-at/vessel.lang.json | 1 + unionvms-web/app/i18n/de-de/vessel.lang.json | 1 + unionvms-web/app/i18n/de-lu/vessel.lang.json | 1 + unionvms-web/app/i18n/el-cy/vessel.lang.json | 1 + unionvms-web/app/i18n/el-gr/vessel.lang.json | 1 + unionvms-web/app/i18n/en-gb/vessel.lang.json | 1 + unionvms-web/app/i18n/en-ie/vessel.lang.json | 1 + unionvms-web/app/i18n/es-es/vessel.lang.json | 1 + unionvms-web/app/i18n/et-ee/vessel.lang.json | 1 + unionvms-web/app/i18n/fi-fi/vessel.lang.json | 1 + unionvms-web/app/i18n/fr-fr/vessel.lang.json | 1 + unionvms-web/app/i18n/fr-lu/vessel.lang.json | 1 + unionvms-web/app/i18n/hr-hr/vessel.lang.json | 1 + unionvms-web/app/i18n/hu-hu/vessel.lang.json | 1 + unionvms-web/app/i18n/im-im/vessel.lang.json | 1 + unionvms-web/app/i18n/it-it/vessel.lang.json | 1 + unionvms-web/app/i18n/lt-lt/vessel.lang.json | 1 + unionvms-web/app/i18n/lv-lv/vessel.lang.json | 1 + unionvms-web/app/i18n/mt/vessel.lang.json | 1 + unionvms-web/app/i18n/nl-be/vessel.lang.json | 1 + unionvms-web/app/i18n/nl-nl/vessel.lang.json | 1 + unionvms-web/app/i18n/nl/vessel.lang.json | 1 + unionvms-web/app/i18n/pl/vessel.lang.json | 1 + unionvms-web/app/i18n/pt-pt/vessel.lang.json | 1 + unionvms-web/app/i18n/ro-ro/vessel.lang.json | 1 + unionvms-web/app/i18n/si-si/vessel.lang.json | 1 + unionvms-web/app/i18n/sk-sk/vessel.lang.json | 1 + unionvms-web/app/i18n/sv/vessel.lang.json | 1 + unionvms-web/app/i18n/tr-cy/vessel.lang.json | 1 + unionvms-web/app/partial/vessel/vessel.js | 2 ++ unionvms-web/app/partial/vessel/vesselList/vesselList.html | 4 ++++ unionvms-web/app/service/common/assetCsvService.js | 2 ++ 35 files changed, 40 insertions(+) diff --git a/unionvms-web/app/i18n/bg-bg/vessel.lang.json b/unionvms-web/app/i18n/bg-bg/vessel.lang.json index 84ed46c1e..7f91ee467 100644 --- a/unionvms-web/app/i18n/bg-bg/vessel.lang.json +++ b/unionvms-web/app/i18n/bg-bg/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/cs-cz/vessel.lang.json b/unionvms-web/app/i18n/cs-cz/vessel.lang.json index 84ed46c1e..7f91ee467 100644 --- a/unionvms-web/app/i18n/cs-cz/vessel.lang.json +++ b/unionvms-web/app/i18n/cs-cz/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/da-dk/vessel.lang.json b/unionvms-web/app/i18n/da-dk/vessel.lang.json index 84ed46c1e..7f91ee467 100644 --- a/unionvms-web/app/i18n/da-dk/vessel.lang.json +++ b/unionvms-web/app/i18n/da-dk/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/de-at/vessel.lang.json b/unionvms-web/app/i18n/de-at/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/de-at/vessel.lang.json +++ b/unionvms-web/app/i18n/de-at/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/de-de/vessel.lang.json b/unionvms-web/app/i18n/de-de/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/de-de/vessel.lang.json +++ b/unionvms-web/app/i18n/de-de/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/de-lu/vessel.lang.json b/unionvms-web/app/i18n/de-lu/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/de-lu/vessel.lang.json +++ b/unionvms-web/app/i18n/de-lu/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/el-cy/vessel.lang.json b/unionvms-web/app/i18n/el-cy/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/el-cy/vessel.lang.json +++ b/unionvms-web/app/i18n/el-cy/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/el-gr/vessel.lang.json b/unionvms-web/app/i18n/el-gr/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/el-gr/vessel.lang.json +++ b/unionvms-web/app/i18n/el-gr/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/en-gb/vessel.lang.json b/unionvms-web/app/i18n/en-gb/vessel.lang.json index c535f8fc4..93df47274 100644 --- a/unionvms-web/app/i18n/en-gb/vessel.lang.json +++ b/unionvms-web/app/i18n/en-gb/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/en-ie/vessel.lang.json b/unionvms-web/app/i18n/en-ie/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/en-ie/vessel.lang.json +++ b/unionvms-web/app/i18n/en-ie/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/es-es/vessel.lang.json b/unionvms-web/app/i18n/es-es/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/es-es/vessel.lang.json +++ b/unionvms-web/app/i18n/es-es/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/et-ee/vessel.lang.json b/unionvms-web/app/i18n/et-ee/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/et-ee/vessel.lang.json +++ b/unionvms-web/app/i18n/et-ee/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/fi-fi/vessel.lang.json b/unionvms-web/app/i18n/fi-fi/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/fi-fi/vessel.lang.json +++ b/unionvms-web/app/i18n/fi-fi/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/fr-fr/vessel.lang.json b/unionvms-web/app/i18n/fr-fr/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/fr-fr/vessel.lang.json +++ b/unionvms-web/app/i18n/fr-fr/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/fr-lu/vessel.lang.json b/unionvms-web/app/i18n/fr-lu/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/fr-lu/vessel.lang.json +++ b/unionvms-web/app/i18n/fr-lu/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/hr-hr/vessel.lang.json b/unionvms-web/app/i18n/hr-hr/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/hr-hr/vessel.lang.json +++ b/unionvms-web/app/i18n/hr-hr/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/hu-hu/vessel.lang.json b/unionvms-web/app/i18n/hu-hu/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/hu-hu/vessel.lang.json +++ b/unionvms-web/app/i18n/hu-hu/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/im-im/vessel.lang.json b/unionvms-web/app/i18n/im-im/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/im-im/vessel.lang.json +++ b/unionvms-web/app/i18n/im-im/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/it-it/vessel.lang.json b/unionvms-web/app/i18n/it-it/vessel.lang.json index 75ff534d9..e02d47240 100644 --- a/unionvms-web/app/i18n/it-it/vessel.lang.json +++ b/unionvms-web/app/i18n/it-it/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/lt-lt/vessel.lang.json b/unionvms-web/app/i18n/lt-lt/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/lt-lt/vessel.lang.json +++ b/unionvms-web/app/i18n/lt-lt/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/lv-lv/vessel.lang.json b/unionvms-web/app/i18n/lv-lv/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/lv-lv/vessel.lang.json +++ b/unionvms-web/app/i18n/lv-lv/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/mt/vessel.lang.json b/unionvms-web/app/i18n/mt/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/mt/vessel.lang.json +++ b/unionvms-web/app/i18n/mt/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/nl-be/vessel.lang.json b/unionvms-web/app/i18n/nl-be/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/nl-be/vessel.lang.json +++ b/unionvms-web/app/i18n/nl-be/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/nl-nl/vessel.lang.json b/unionvms-web/app/i18n/nl-nl/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/nl-nl/vessel.lang.json +++ b/unionvms-web/app/i18n/nl-nl/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/nl/vessel.lang.json b/unionvms-web/app/i18n/nl/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/nl/vessel.lang.json +++ b/unionvms-web/app/i18n/nl/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/pl/vessel.lang.json b/unionvms-web/app/i18n/pl/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/pl/vessel.lang.json +++ b/unionvms-web/app/i18n/pl/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/pt-pt/vessel.lang.json b/unionvms-web/app/i18n/pt-pt/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/pt-pt/vessel.lang.json +++ b/unionvms-web/app/i18n/pt-pt/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/ro-ro/vessel.lang.json b/unionvms-web/app/i18n/ro-ro/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/ro-ro/vessel.lang.json +++ b/unionvms-web/app/i18n/ro-ro/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/si-si/vessel.lang.json b/unionvms-web/app/i18n/si-si/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/si-si/vessel.lang.json +++ b/unionvms-web/app/i18n/si-si/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/sk-sk/vessel.lang.json b/unionvms-web/app/i18n/sk-sk/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/sk-sk/vessel.lang.json +++ b/unionvms-web/app/i18n/sk-sk/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/sv/vessel.lang.json b/unionvms-web/app/i18n/sv/vessel.lang.json index bb5f29e60..ec0a92f48 100644 --- a/unionvms-web/app/i18n/sv/vessel.lang.json +++ b/unionvms-web/app/i18n/sv/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/i18n/tr-cy/vessel.lang.json b/unionvms-web/app/i18n/tr-cy/vessel.lang.json index a8b16aca5..11c306411 100644 --- a/unionvms-web/app/i18n/tr-cy/vessel.lang.json +++ b/unionvms-web/app/i18n/tr-cy/vessel.lang.json @@ -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", diff --git a/unionvms-web/app/partial/vessel/vessel.js b/unionvms-web/app/partial/vessel/vessel.js index 1f96af6aa..8fc61b0b8 100644 --- a/unionvms-web/app/partial/vessel/vessel.js +++ b/unionvms-web/app/partial/vessel/vessel.js @@ -353,6 +353,7 @@ angular.module('unionvmsWeb').controller('VesselCtrl', function($scope, $log, $s locale.getString('vessel.table_header_signal'), locale.getString('vessel.table_header_cfr'), locale.getString('vessel.table_header_uvi'), + locale.getString('vessel.table_header_iccat'), locale.getString('vessel.table_header_gear_type'), locale.getString('vessel.table_header_license_type'), locale.getString('vessel.table_header_last_report'), @@ -380,6 +381,7 @@ angular.module('unionvmsWeb').controller('VesselCtrl', function($scope, $log, $s item.ircs, item.cfr, item.uvi, + item.iccat, $filter('vesselGearTypeTranslation')(item.gearType), $filter('vesselLicenseTypeTranslation')(item.licenseType), angular.isDefined(item.lastMovement) ? $filter('timeAgo')(item.lastMovement.time) : '', diff --git a/unionvms-web/app/partial/vessel/vesselList/vesselList.html b/unionvms-web/app/partial/vessel/vesselList/vesselList.html index b73625e39..8d4d09c03 100644 --- a/unionvms-web/app/partial/vessel/vesselList/vesselList.html +++ b/unionvms-web/app/partial/vessel/vesselList/vesselList.html @@ -35,6 +35,9 @@ {{'vessel.table_header_uvi' | i18n}} + + {{'vessel.table_header_iccat' | i18n}} + {{'vessel.table_header_gear_type' | i18n}} @@ -56,6 +59,7 @@ {{item.ircs}} {{item.cfr}} {{item.uvi}} + {{item.iccat}} {{item.gearType | vesselGearTypeTranslation}} {{item.licenseType | vesselLicenseTypeTranslation}} {{item.lastMovement.time | timeAgo}} diff --git a/unionvms-web/app/service/common/assetCsvService.js b/unionvms-web/app/service/common/assetCsvService.js index d89f594dc..b0c1f21bd 100644 --- a/unionvms-web/app/service/common/assetCsvService.js +++ b/unionvms-web/app/service/common/assetCsvService.js @@ -28,6 +28,7 @@ copy of the GNU General Public License along with the IFDM Suite. If not, see