diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json index 0a0d8f8..334c728 100644 --- a/vasl_templates/webapp/data/default-template-pack/nationalities.json +++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json @@ -81,6 +81,10 @@ "slovakian": { "display_name": "Slovakian", "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ] +}, +"croatian": { + "display_name": "Croatian", + "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ] } } diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json new file mode 100644 index 0000000..f2bc341 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json @@ -0,0 +1,14 @@ +[ + +{ "name": "Canonne da 65/17", + "capabilities": [ "NT", "no Gunshield" ], + "note_number": "35", + "notes": [ "A" ] +}, +{ "name": "Skoda M28(FE)", + "capabilities": [ "NT" ], + "note_number": "36", + "notes": [ "A" ] +} + +] diff --git a/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json b/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json new file mode 100644 index 0000000..2018acf --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json @@ -0,0 +1,35 @@ +[ + +{ "name": "TKS", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "24\u2020", + "notes": [ "F" ] +}, +{ "name": "TKS(L)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "24\u2020", + "notes": [ "F" ] +}, +{ "name": "L6/40(i)", + "CS#": 2, + "note_number": "25" +}, +{ "name": "wz 34-I", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "26" +}, +{ "name": "wz 34-II", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "26" +}, +{ "name": "SMV L40 da 47/32", + "CS#": 3, + "note_number": "27\u2020", + "notes": [ "O\u20201" ] +} + +] diff --git a/vasl_templates/webapp/static/images/flags/croatian.png b/vasl_templates/webapp/static/images/flags/croatian.png new file mode 100644 index 0000000..79b78c6 Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/croatian.png differ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt new file mode 100644 index 0000000..d12ecd2 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1940 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt new file mode 100644 index 0000000..edf88b3 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1941 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt new file mode 100644 index 0000000..af37b0e --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1942 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt new file mode 100644 index 0000000..ceafe3e --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1943 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt new file mode 100644 index 0000000..ddb830f --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1944 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt new file mode 100644 index 0000000..f36a43f --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1945 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt new file mode 100644 index 0000000..98183a1 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1940 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt new file mode 100644 index 0000000..e7eef16 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1941 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt new file mode 100644 index 0000000..d93e12b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1942 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt new file mode 100644 index 0000000..a27e0f0 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1943 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt new file mode 100644 index 0000000..c183fde --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1944 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt new file mode 100644 index 0000000..c1a5852 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1945 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 6d37c3f..2886dfb 100644 --- a/vasl_templates/webapp/tests/test_vo_reports.py +++ b/vasl_templates/webapp/tests/test_vo_reports.py @@ -39,7 +39,7 @@ def test_vo_reports( webapp, webdriver ): nationalities = [ "german", "russian", "american", "british", "italian", "japanese", "chinese", "french", "polish", "belgian","yugoslavian","danish","dutch","greek", "allied-minor-common", - "romanian", "hungarian","slovakian", + "romanian", "hungarian","slovakian","croatian" ] for nat in nationalities: for vo_type in ["vehicles","ordnance"]: