From 8dec8b01a5e71135d5acfed16a2b0bfd1e299b5a Mon Sep 17 00:00:00 2001 From: Alexey Lukashov Date: Wed, 20 Jul 2016 11:23:58 +0200 Subject: [PATCH] ESPD-115 #8 added default currency EUR for each country --- .../grow/espd/domain/enums/other/Country.java | 507 +++++++++--------- .../criteriaTemplates/common/currencies.jsp | 4 +- .../resources/WEB-INF/views/filter.jsp | 4 +- .../resources/WEB-INF/views/print.jsp | 22 +- .../META-INF/resources/WEB-INF/views/test.jsp | 2 +- .../WEB-INF/views/wizard/exclusionCA.jsp | 2 +- .../WEB-INF/views/wizard/exclusionEO.jsp | 2 +- .../resources/WEB-INF/views/wizard/finish.jsp | 2 +- .../WEB-INF/views/wizard/procedureForm.jsp | 4 +- .../WEB-INF/views/wizard/selectionCA.jsp | 2 +- .../WEB-INF/views/wizard/selectionEO.jsp | 2 +- .../main/resources/i18n/messages.properties | 2 - 12 files changed, 273 insertions(+), 282 deletions(-) diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java index e8427bb51..90b13166d 100644 --- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java +++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/other/Country.java @@ -37,263 +37,265 @@ */ @Getter public enum Country implements CacCountry { - - AD("AD", "Andorra"), - AE("AE", "United Arab Emirates"), - AF("AF", "Afghanistan"), - AG("AG", "Antigua and Barbuda"), - AI("AI", "Anguilla"), - AL("AL", "Albania"), - AM("AM", "Armenia"), - AO("AO", "Angola"), - AQ("AQ", "Antarctica"), - AR("AR", "Argentina"), - AS("AS", "American Samoa"), - AT("AT", "Austria"), - AU("AU", "Australia"), - AW("AW", "Aruba"), - AX("AX", "Åland Islands"), - AZ("AZ", "Azerbaijan"), - BA("BA", "Bosnia and Herzegovina"), - BB("BB", "Barbados"), - BD("BD", "Bangladesh"), - BE("BE", "Belgium"), - BF("BF", "Burkina Faso"), - BG("BG", "Bulgaria"), - BH("BH", "Bahrain"), - BI("BI", "Burundi"), - BJ("BJ", "Benin"), - BL("BL", "Saint Barthélemy"), - BM("BM", "Bermuda"), - BN("BN", "Brunei Darussalam"), - BO("BO", "Bolivia, Plurinational State of"), - BQ("BQ", "Bonaire, Sint Eustatius and Saba"), - BR("BR", "Brazil"), - BS("BS", "The Bahamas"), - BT("BT", "Bhutan"), - BV("BV", "Bouvet Island"), - BW("BW", "Botswana"), - BY("BY", "Belarus"), - BZ("BZ", "Belize"), - CA("CA", "Canada"), - CC("CC", "Cocos (Keeling) Islands"), - CD("CD", "Congo, the Democratic Republic of the"), - CF("CF", "Central African Republic"), - CG("CG", "Congo"), - CH("CH", "Switzerland"), - CI("CI", "Côte d'Ivoire"), - CK("CK", "Cook Islands"), - CL("CL", "Chile"), - CM("CM", "Cameroon"), - CN("CN", "China"), - CO("CO", "Colombia"), - CR("CR", "Costa Rica"), - CU("CU", "Cuba"), - CV("CV", "Cabo Verde"), - CW("CW", "Curaçao"), - CX("CX", "Christmas Island"), - CY("CY", "Cyprus"), - CZ("CZ", "Czech Republic"), - DE("DE", "Germany"), - DJ("DJ", "Djibouti"), - DK("DK", "Denmark"), - DM("DM", "Dominica"), - DO("DO", "Dominican Republic"), - DZ("DZ", "Algeria"), - EC("EC", "Ecuador"), - EE("EE", "Estonia"), - EG("EG", "Egypt"), - EH("EH", "Western Sahara"), - ER("ER", "Eritrea"), - ES("ES", "Spain"), - ET("ET", "Ethiopia"), - FI("FI", "Finland"), - FJ("FJ", "Fiji"), - FK("FK", "Falkland Islands (Malvinas)"), - FM("FM", "Micronesia, Federated States of"), - FO("FO", "Faroe Islands"), - FR("FR", "France"), - GA("GA", "Gabon"), - GB("GB", "United Kingdom of Great Britain and Northern Ireland"), - GD("GD", "Grenada"), - GE("GE", "Georgia"), - GF("GF", "French Guiana"), - GG("GG", "Guernsey"), - GH("GH", "Ghana"), - GI("GI", "Gibraltar"), - GL("GL", "Greenland"), - GM("GM", "The Gambia"), - GN("GN", "Guinea"), - GP("GP", "Guadeloupe"), - GQ("GQ", "Equatorial Guinea"), - GR("GR", "Greece"), - GS("GS", "South Georgia and the South Sandwich Islands"), - GT("GT", "Guatemala"), - GU("GU", "Guam"), - GW("GW", "Guinea-Bissau"), - GY("GY", "Guyana"), - HK("HK", "Hong Kong"), - HM("HM", "Heard Island and McDonald Islands"), - HN("HN", "Honduras"), - HR("HR", "Croatia"), - HT("HT", "Haiti"), - HU("HU", "Hungary"), - ID("ID", "Indonesia"), - IE("IE", "Ireland"), - IL("IL", "Israel"), - IM("IM", "Isle of Man"), - IN("IN", "British India"), - IO("IO", "British Indian Ocean Territory"), - IQ("IQ", "Iraq"), - IR("IR", "Iran, Islamic Republic of"), - IS("IS", "Iceland"), - IT("IT", "Italy"), - JE("JE", "Jersey"), - JM("JM", "Jamaica"), - JO("JO", "Jordan"), - JP("JP", "Japan"), - KE("KE", "Kenya"), - KG("KG", "Kyrgyzstan"), - KH("KH", "Cambodia"), - KI("KI", "Kiribati"), - KM("KM", "The Comoros"), - KN("KN", "Saint Kitts and Nevis"), - KP("KP", "North Korea, Democratic People's Republic of"), - KR("KR", "North Korea, Republic of"), - KW("KW", "Kuwait"), - KY("KY", "Cayman Islands"), - KZ("KZ", "Kazakhstan"), - LA("LA", "Lao People's Democratic Republic"), - LB("LB", "Lebanon"), - LC("LC", "Saint Lucia"), - LI("LI", "Liechtenstein"), - LK("LK", "Sri Lanka"), - LR("LR", "Liberia"), - LS("LS", "Lesotho"), - LT("LT", "Lithuania"), - LU("LU", "Luxembourg"), - LV("LV", "Latvia"), - LY("LY", "Libya"), - MA("MA", "Morocco"), - MC("MC", "Monaco"), - MD("MD", "Moldova, Republic of"), - ME("ME", "Montenegro"), - MF("MF", "Saint Martin (French part)"), - MG("MG", "Madagascar"), - MH("MH", "Marshall Islands"), - MK("MK", "The former Yugoslav Republic of Macedonia, the former Yugoslav Republic of"), - ML("ML", "Mali"), - MM("MM", "Myanmar"), - MN("MN", "Mongolia"), - MO("MO", "Macao"), - MP("MP", "Northern Mariana Islands"), - MQ("MQ", "Martinique"), - MR("MR", "Mauritania"), - MS("MS", "Montserrat"), - MT("MT", "Malta"), - MU("MU", "Mauritius"), - MV("MV", "Maldives"), - MW("MW", "Malawi"), - MX("MX", "Mexico"), - MY("MY", "Malaysia"), - MZ("MZ", "Mozambique"), - NA("NA", "Namibia"), - NC("NC", "New Caledonia"), - NE("NE", "Niger"), - NF("NF", "Norfolk Island"), - NG("NG", "Nigeria"), - NI("NI", "Nicaragua"), - NL("NL", "Netherlands"), - NO("NO", "Norway"), - NP("NP", "Nepal"), - NR("NR", "Nauru"), - NU("NU", "Niue"), - NZ("NZ", "New Zealand"), - OM("OM", "Oman"), - PA("PA", "Panama"), - PE("PE", "Peru"), - PF("PF", "French Polynesia"), - PG("PG", "Papua New Guinea"), - PH("PH", "Philippines"), - PK("PK", "Pakistan"), - PL("PL", "Poland"), - PM("PM", "Saint Pierre and Miquelon"), - PN("PN", "Pitcairn"), - PR("PR", "Puerto Rico"), - PS("PS", "Palestine, State of"), - PT("PT", "Portugal"), - PW("PW", "Palau"), - PY("PY", "Paraguay"), - QA("QA", "Qatar"), - RE("RE", "Réunion"), - RO("RO", "Romania"), - RS("RS", "Serbia"), - RU("RU", "Russian Federation"), - RW("RW", "Rwanda"), - SA("SA", "Saudi Arabia"), - SB("SB", "Solomon Islands"), - SC("SC", "Seychelles"), - SD("SD", "South Sudan"), - SE("SE", "Sweden"), - SG("SG", "Singapore"), - SH("SH", "Saint Helena, Ascension and Tristan da Cunha"), - SI("SI", "Slovenia"), - SJ("SJ", "Svalbard and Jan Mayen"), - SK("SK", "Slovakia"), - SL("SL", "Sierra Leone"), - SM("SM", "San Marino"), - SN("SN", "Senegal"), - SO("SO", "Somalia"), - SR("SR", "Suriname"), - SS("SS", "South Sudan"), - ST("ST", "São Tomé and Principe"), - SV("SV", "El Salvador"), - SX("SX", "Sint Maarten (Dutch part)"), - SY("SY", "Syrian Arab Republic"), - SZ("SZ", "Swaziland"), - TC("TC", "Turks and Caicos Islands"), - TD("TD", "Chad"), - TF("TF", "French Southern Territories"), - TG("TG", "Togo"), - TH("TH", "Thailand"), - TJ("TJ", "Tajikistan"), - TK("TK", "Tokelau"), - TL("TL", "Timor-Leste"), - TM("TM", "Turkmenistan"), - TN("TN", "Tunisia"), - TO("TO", "Tonga"), - TR("TR", "Turkey"), - TT("TT", "Trinidad and Tobago"), - TV("TV", "Tuvalu"), - TW("TW", "Taiwan, Province of China"), - TZ("TZ", "Tanzania, United Republic of"), - UA("UA", "Ukraine"), - UG("UG", "Uganda"), - UM("UM", "United States Minor Outlying Islands"), - US("US", "United States of America"), - UY("UY", "Uruguay"), - UZ("UZ", "Uzbekistan"), - VA("VA", "Holy See"), - VC("VC", "Saint Vincent and the Grenadines"), - VE("VE", "Venezuela, Bolivarian Republic of"), - VG("VG", "British Virgin Islands, British"), - VI("VI", "British Virgin Islands, U.S."), - VN("VN", "Viet Nam"), - VU("VU", "Vanuatu"), - WF("WF", "Wallis and Futuna"), - WS("WS", "Samoa"), - XK("XK", "Kosovo"), - YE("YE", "Yemen"), - YT("YT", "Mayotte"), - ZA("ZA", "South Africa"), - ZM("ZM", "Zambia"), - ZW("ZW", "Zimbabwe"); + + AD("AD", "Andorra", Currency.EUR), + AE("AE", "United Arab Emirates", Currency.EUR), + AF("AF", "Afghanistan", Currency.EUR), + AG("AG", "Antigua and Barbuda", Currency.EUR), + AI("AI", "Anguilla", Currency.EUR), + AL("AL", "Albania", Currency.EUR), + AM("AM", "Armenia", Currency.EUR), + AO("AO", "Angola", Currency.EUR), + AQ("AQ", "Antarctica", Currency.EUR), + AR("AR", "Argentina", Currency.EUR), + AS("AS", "American Samoa", Currency.EUR), + AT("AT", "Austria", Currency.EUR), + AU("AU", "Australia", Currency.EUR), + AW("AW", "Aruba", Currency.EUR), + AX("AX", "Åland Islands", Currency.EUR), + AZ("AZ", "Azerbaijan", Currency.EUR), + BA("BA", "Bosnia and Herzegovina", Currency.EUR), + BB("BB", "Barbados", Currency.EUR), + BD("BD", "Bangladesh", Currency.EUR), + BE("BE", "Belgium", Currency.EUR), + BF("BF", "Burkina Faso", Currency.EUR), + BG("BG", "Bulgaria", Currency.EUR), + BH("BH", "Bahrain", Currency.EUR), + BI("BI", "Burundi", Currency.EUR), + BJ("BJ", "Benin", Currency.EUR), + BL("BL", "Saint Barthélemy", Currency.EUR), + BM("BM", "Bermuda", Currency.EUR), + BN("BN", "Brunei Darussalam", Currency.EUR), + BO("BO", "Bolivia, Plurinational State of", Currency.EUR), + BQ("BQ", "Bonaire, Sint Eustatius and Saba", Currency.EUR), + BR("BR", "Brazil", Currency.EUR), + BS("BS", "The Bahamas", Currency.EUR), + BT("BT", "Bhutan", Currency.EUR), + BV("BV", "Bouvet Island", Currency.EUR), + BW("BW", "Botswana", Currency.EUR), + BY("BY", "Belarus", Currency.EUR), + BZ("BZ", "Belize", Currency.EUR), + CA("CA", "Canada", Currency.EUR), + CC("CC", "Cocos (Keeling) Islands", Currency.EUR), + CD("CD", "Congo, the Democratic Republic of the", Currency.EUR), + CF("CF", "Central African Republic", Currency.EUR), + CG("CG", "Congo", Currency.EUR), + CH("CH", "Switzerland", Currency.EUR), + CI("CI", "Côte d'Ivoire", Currency.EUR), + CK("CK", "Cook Islands", Currency.EUR), + CL("CL", "Chile", Currency.EUR), + CM("CM", "Cameroon", Currency.EUR), + CN("CN", "China", Currency.EUR), + CO("CO", "Colombia", Currency.EUR), + CR("CR", "Costa Rica", Currency.EUR), + CU("CU", "Cuba", Currency.EUR), + CV("CV", "Cabo Verde", Currency.EUR), + CW("CW", "Curaçao", Currency.EUR), + CX("CX", "Christmas Island", Currency.EUR), + CY("CY", "Cyprus", Currency.EUR), + CZ("CZ", "Czech Republic", Currency.EUR), + DE("DE", "Germany", Currency.EUR), + DJ("DJ", "Djibouti", Currency.EUR), + DK("DK", "Denmark", Currency.EUR), + DM("DM", "Dominica", Currency.EUR), + DO("DO", "Dominican Republic", Currency.EUR), + DZ("DZ", "Algeria", Currency.EUR), + EC("EC", "Ecuador", Currency.EUR), + EE("EE", "Estonia", Currency.EUR), + EG("EG", "Egypt", Currency.EUR), + EH("EH", "Western Sahara", Currency.EUR), + ER("ER", "Eritrea", Currency.EUR), + ES("ES", "Spain", Currency.EUR), + ET("ET", "Ethiopia", Currency.EUR), + FI("FI", "Finland", Currency.EUR), + FJ("FJ", "Fiji", Currency.EUR), + FK("FK", "Falkland Islands (Malvinas)", Currency.EUR), + FM("FM", "Micronesia, Federated States of", Currency.EUR), + FO("FO", "Faroe Islands", Currency.EUR), + FR("FR", "France", Currency.EUR), + GA("GA", "Gabon", Currency.EUR), + GB("GB", "United Kingdom of Great Britain and Northern Ireland", Currency.EUR), + GD("GD", "Grenada", Currency.EUR), + GE("GE", "Georgia", Currency.EUR), + GF("GF", "French Guiana", Currency.EUR), + GG("GG", "Guernsey", Currency.EUR), + GH("GH", "Ghana", Currency.EUR), + GI("GI", "Gibraltar", Currency.EUR), + GL("GL", "Greenland", Currency.EUR), + GM("GM", "The Gambia", Currency.EUR), + GN("GN", "Guinea", Currency.EUR), + GP("GP", "Guadeloupe", Currency.EUR), + GQ("GQ", "Equatorial Guinea", Currency.EUR), + GR("GR", "Greece", Currency.EUR), + GS("GS", "South Georgia and the South Sandwich Islands", Currency.EUR), + GT("GT", "Guatemala", Currency.EUR), + GU("GU", "Guam", Currency.EUR), + GW("GW", "Guinea-Bissau", Currency.EUR), + GY("GY", "Guyana", Currency.EUR), + HK("HK", "Hong Kong", Currency.EUR), + HM("HM", "Heard Island and McDonald Islands", Currency.EUR), + HN("HN", "Honduras", Currency.EUR), + HR("HR", "Croatia", Currency.EUR), + HT("HT", "Haiti", Currency.EUR), + HU("HU", "Hungary", Currency.EUR), + ID("ID", "Indonesia", Currency.EUR), + IE("IE", "Ireland", Currency.EUR), + IL("IL", "Israel", Currency.EUR), + IM("IM", "Isle of Man", Currency.EUR), + IN("IN", "British India", Currency.EUR), + IO("IO", "British Indian Ocean Territory", Currency.EUR), + IQ("IQ", "Iraq", Currency.EUR), + IR("IR", "Iran, Islamic Republic of", Currency.EUR), + IS("IS", "Iceland", Currency.EUR), + IT("IT", "Italy", Currency.EUR), + JE("JE", "Jersey", Currency.EUR), + JM("JM", "Jamaica", Currency.EUR), + JO("JO", "Jordan", Currency.EUR), + JP("JP", "Japan", Currency.EUR), + KE("KE", "Kenya", Currency.EUR), + KG("KG", "Kyrgyzstan", Currency.EUR), + KH("KH", "Cambodia", Currency.EUR), + KI("KI", "Kiribati", Currency.EUR), + KM("KM", "The Comoros", Currency.EUR), + KN("KN", "Saint Kitts and Nevis", Currency.EUR), + KP("KP", "North Korea, Democratic People's Republic of", Currency.EUR), + KR("KR", "North Korea, Republic of", Currency.EUR), + KW("KW", "Kuwait", Currency.EUR), + KY("KY", "Cayman Islands", Currency.EUR), + KZ("KZ", "Kazakhstan", Currency.EUR), + LA("LA", "Lao People's Democratic Republic", Currency.EUR), + LB("LB", "Lebanon", Currency.EUR), + LC("LC", "Saint Lucia", Currency.EUR), + LI("LI", "Liechtenstein", Currency.EUR), + LK("LK", "Sri Lanka", Currency.EUR), + LR("LR", "Liberia", Currency.EUR), + LS("LS", "Lesotho", Currency.EUR), + LT("LT", "Lithuania", Currency.EUR), + LU("LU", "Luxembourg", Currency.EUR), + LV("LV", "Latvia", Currency.EUR), + LY("LY", "Libya", Currency.EUR), + MA("MA", "Morocco", Currency.EUR), + MC("MC", "Monaco", Currency.EUR), + MD("MD", "Moldova, Republic of", Currency.EUR), + ME("ME", "Montenegro", Currency.EUR), + MF("MF", "Saint Martin (French part)", Currency.EUR), + MG("MG", "Madagascar", Currency.EUR), + MH("MH", "Marshall Islands", Currency.EUR), + MK("MK", "The former Yugoslav Republic of Macedonia, the former Yugoslav Republic of", Currency.EUR), + ML("ML", "Mali", Currency.EUR), + MM("MM", "Myanmar", Currency.EUR), + MN("MN", "Mongolia", Currency.EUR), + MO("MO", "Macao", Currency.EUR), + MP("MP", "Northern Mariana Islands", Currency.EUR), + MQ("MQ", "Martinique", Currency.EUR), + MR("MR", "Mauritania", Currency.EUR), + MS("MS", "Montserrat", Currency.EUR), + MT("MT", "Malta", Currency.EUR), + MU("MU", "Mauritius", Currency.EUR), + MV("MV", "Maldives", Currency.EUR), + MW("MW", "Malawi", Currency.EUR), + MX("MX", "Mexico", Currency.EUR), + MY("MY", "Malaysia", Currency.EUR), + MZ("MZ", "Mozambique", Currency.EUR), + NA("NA", "Namibia", Currency.EUR), + NC("NC", "New Caledonia", Currency.EUR), + NE("NE", "Niger", Currency.EUR), + NF("NF", "Norfolk Island", Currency.EUR), + NG("NG", "Nigeria", Currency.EUR), + NI("NI", "Nicaragua", Currency.EUR), + NL("NL", "Netherlands", Currency.EUR), + NO("NO", "Norway", Currency.EUR), + NP("NP", "Nepal", Currency.EUR), + NR("NR", "Nauru", Currency.EUR), + NU("NU", "Niue", Currency.EUR), + NZ("NZ", "New Zealand", Currency.EUR), + OM("OM", "Oman", Currency.EUR), + PA("PA", "Panama", Currency.EUR), + PE("PE", "Peru", Currency.EUR), + PF("PF", "French Polynesia", Currency.EUR), + PG("PG", "Papua New Guinea", Currency.EUR), + PH("PH", "Philippines", Currency.EUR), + PK("PK", "Pakistan", Currency.EUR), + PL("PL", "Poland", Currency.EUR), + PM("PM", "Saint Pierre and Miquelon", Currency.EUR), + PN("PN", "Pitcairn", Currency.EUR), + PR("PR", "Puerto Rico", Currency.EUR), + PS("PS", "Palestine, State of", Currency.EUR), + PT("PT", "Portugal", Currency.EUR), + PW("PW", "Palau", Currency.EUR), + PY("PY", "Paraguay", Currency.EUR), + QA("QA", "Qatar", Currency.EUR), + RE("RE", "Réunion", Currency.EUR), + RO("RO", "Romania", Currency.EUR), + RS("RS", "Serbia", Currency.EUR), + RU("RU", "Russian Federation", Currency.EUR), + RW("RW", "Rwanda", Currency.EUR), + SA("SA", "Saudi Arabia", Currency.EUR), + SB("SB", "Solomon Islands", Currency.EUR), + SC("SC", "Seychelles", Currency.EUR), + SD("SD", "South Sudan", Currency.EUR), + SE("SE", "Sweden", Currency.EUR), + SG("SG", "Singapore", Currency.EUR), + SH("SH", "Saint Helena, Ascension and Tristan da Cunha", Currency.EUR), + SI("SI", "Slovenia", Currency.EUR), + SJ("SJ", "Svalbard and Jan Mayen", Currency.EUR), + SK("SK", "Slovakia", Currency.EUR), + SL("SL", "Sierra Leone", Currency.EUR), + SM("SM", "San Marino", Currency.EUR), + SN("SN", "Senegal", Currency.EUR), + SO("SO", "Somalia", Currency.EUR), + SR("SR", "Suriname", Currency.EUR), + SS("SS", "South Sudan", Currency.EUR), + ST("ST", "São Tomé and Principe", Currency.EUR), + SV("SV", "El Salvador", Currency.EUR), + SX("SX", "Sint Maarten (Dutch part)", Currency.EUR), + SY("SY", "Syrian Arab Republic", Currency.EUR), + SZ("SZ", "Swaziland", Currency.EUR), + TC("TC", "Turks and Caicos Islands", Currency.EUR), + TD("TD", "Chad", Currency.EUR), + TF("TF", "French Southern Territories", Currency.EUR), + TG("TG", "Togo", Currency.EUR), + TH("TH", "Thailand", Currency.EUR), + TJ("TJ", "Tajikistan", Currency.EUR), + TK("TK", "Tokelau", Currency.EUR), + TL("TL", "Timor-Leste", Currency.EUR), + TM("TM", "Turkmenistan", Currency.EUR), + TN("TN", "Tunisia", Currency.EUR), + TO("TO", "Tonga", Currency.EUR), + TR("TR", "Turkey", Currency.EUR), + TT("TT", "Trinidad and Tobago", Currency.EUR), + TV("TV", "Tuvalu", Currency.EUR), + TW("TW", "Taiwan, Province of China", Currency.EUR), + TZ("TZ", "Tanzania, United Republic of", Currency.EUR), + UA("UA", "Ukraine", Currency.EUR), + UG("UG", "Uganda", Currency.EUR), + UM("UM", "United States Minor Outlying Islands", Currency.EUR), + US("US", "United States of America", Currency.EUR), + UY("UY", "Uruguay", Currency.EUR), + UZ("UZ", "Uzbekistan", Currency.EUR), + VA("VA", "Holy See", Currency.EUR), + VC("VC", "Saint Vincent and the Grenadines", Currency.EUR), + VE("VE", "Venezuela, Bolivarian Republic of", Currency.EUR), + VG("VG", "British Virgin Islands, British", Currency.EUR), + VI("VI", "British Virgin Islands, U.S.", Currency.EUR), + VN("VN", "Viet Nam", Currency.EUR), + VU("VU", "Vanuatu", Currency.EUR), + WF("WF", "Wallis and Futuna", Currency.EUR), + WS("WS", "Samoa", Currency.EUR), + XK("XK", "Kosovo", Currency.EUR), + YE("YE", "Yemen", Currency.EUR), + YT("YT", "Mayotte", Currency.EUR), + ZA("ZA", "South Africa", Currency.EUR), + ZM("ZM", "Zambia", Currency.EUR), + ZW("ZW", "Zimbabwe", Currency.EUR); private final String countryName; private final String iso2Code; private final CountryType countryType; + + private final Currency currency; private static final Map BY_ISO2_CODE = new HashMap<>(values().length); @@ -303,8 +305,9 @@ public enum Country implements CacCountry { } } - Country(String iso2Code, String countryName) { + Country(String iso2Code, String countryName, Currency currency) { this.countryName = countryName; + this.currency = currency; this.iso2Code = iso2Code; this.countryType = CountryType.ISO_3166_1; } diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/currencies.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/currencies.jsp index 5d4db2607..a21f7d14d 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/currencies.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/common/currencies.jsp @@ -32,9 +32,9 @@ - + - ${curr} (${curr.description}) + ${curr} (${curr.description}) \ No newline at end of file diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp index 1ac763ba7..e2f41725b 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp @@ -69,7 +69,7 @@ $(function() { -
+

@@ -89,7 +89,7 @@ $(function() {
-
+

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp index a39e280e7..3760529c7 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp @@ -221,7 +221,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc margin: -75px 0 0 -75px; border-radius: 50%; border: 3px solid transparent; - border-top-color: #3498db; + border-top-color: #04498a; -webkit-animation: spin 2s linear infinite; /* Chrome, Opera 15+, Safari 5+ */ animation: spin 2s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ @@ -238,7 +238,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc bottom: 5px; border-radius: 50%; border: 3px solid transparent; - border-top-color: #e74c3c; + border-top-color: #04498a; -webkit-animation: spin 3s linear infinite; /* Chrome, Opera 15+, Safari 5+ */ animation: spin 3s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ @@ -253,7 +253,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc bottom: 15px; border-radius: 50%; border: 3px solid transparent; - border-top-color: #f9c922; + border-top-color: #04498a; -webkit-animation: spin 1.5s linear infinite; /* Chrome, Opera 15+, Safari 5+ */ animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */ @@ -346,16 +346,6 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
-
-

- ${span18n["report_generating"]} -

-

- - ${span18n["back_to_final"]} - -

-

@@ -367,7 +357,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc <%-- EXCLUSION --%>
-
+

${span18n["createcaexcl_header"]}

@@ -402,7 +392,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
-

${span18n['createcasel_header']}

+

${span18n['createcasel_header']}

  • @@ -478,7 +468,7 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc <%-- FINISH --%>
    -
    +

    diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/test.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/test.jsp index 9e5401aec..e4f8fd2b3 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/test.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/test.jsp @@ -160,7 +160,7 @@
-

${span18n['createcasel_header']}

+

${span18n['createcasel_header']}

  • diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp index 5a7a2aff1..767b5435f 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionCA.jsp @@ -47,7 +47,7 @@ -
    +

    diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp index b2695348c..32c7210cd 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/exclusionEO.jsp @@ -72,7 +72,7 @@
-
+

${span18n["createcaexcl_header"]}

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp index a930fb2de..b5b7fb98c 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/finish.jsp @@ -35,7 +35,7 @@ -
+

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp index 8db43ca22..fe52d53cb 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp @@ -14,7 +14,7 @@
-
+

${span18n['createca_header']}

@@ -113,7 +113,7 @@
-
+

${span18n['createeo_header']}

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp index afe64b586..0c8c89fcc 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp @@ -45,7 +45,7 @@ -
+

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp index 9ab53bb57..981a1b531 100644 --- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp +++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp @@ -71,7 +71,7 @@
-

${span18n['createcasel_header']}

+

${span18n['createcasel_header']}

  • diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties index 3c1cba922..a761a1351 100644 --- a/espd-web/src/main/resources/i18n/messages.properties +++ b/espd-web/src/main/resources/i18n/messages.properties @@ -331,7 +331,6 @@ country_ZM=Zambia country_ZW=Zimbabwe back_to_main=Back to main page -back_to_final=Back to final page filter_header=Welcome to the ESPD service filter_alert=

    European Single Procurement Document (ESPD) is a self-declaration of the businesses' financial status, abilities and suitability for a public procurement procedure. It is available in all EU languages and used as a preliminary evidence of fulfilment of the conditions required in public procurement procedures across the EU. Thanks to the ESPD, the tenderers no longer have to provide full documentary evidence and different forms previously used in the EU procurement, which means a significant simplification of access to cross-border tendering opportunities. From October 2018 onwards the ESPD shall be provided exclusively in an electronic form.

    The European Commission provides a free web service for the buyers, bidders and other parties interested in filling in the ESPD electronically. The online form can be filled in, printed and then sent to the buyer together with the rest of the bid. If the procedure is run electronically, the ESPD can be exported, stored and submitted electronically. The ESPD provided in a previous public procurement procedure can be reused as long as the information remains correct. Bidders may be excluded from the procedure or be subject to prosecution if the information in the ESPD is seriously misrepresented, withheld or cannot be complemented with supporting documents.

    filter_who_are_you=Who are you? @@ -679,7 +678,6 @@ createcafinish_concl_statements_text=The undersigned formally declare that the i createcafinish_concl_statements_signature=Date, place and, where required or necessary, signature(s): place=Place signature=Signature -report_generating=Generating Report #ECERTIS Link ecertis_404=No ECERTIS data