diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json index 9a62047..b5d7e99 100644 --- a/vasl_templates/webapp/data/default-template-pack/nationalities.json +++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json @@ -52,6 +52,10 @@ "belgian": { "display_name": "Belgian", "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ] +}, +"yugoslavian": { + "display_name": "Yugoslavian", + "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ] } } diff --git a/vasl_templates/webapp/data/ordnance/yugoslavian.json b/vasl_templates/webapp/data/ordnance/yugoslavian.json new file mode 100644 index 0000000..1726501 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/yugoslavian.json @@ -0,0 +1,20 @@ +[ + +{ "name": "3.7cm Infantry Gun", + "capabilities": [ "NT", "QSU", "h-d" ], + "note_number": "20", + "notes": [ "Y" ] +}, +{ "name": "80mm M28/M33", + "capabilities": [ "NT", "h-d" ], + "capabilities2": { "s": 5 }, + "note_number": "21", + "notes": [ "Y" ] +}, +{ "name": "100mm M14/19", + "capabilities": [ "NT" ], + "note_number": "22", + "notes": [ "Y" ] +} + +] diff --git a/vasl_templates/webapp/data/vehicles/yugoslavian.json b/vasl_templates/webapp/data/vehicles/yugoslavian.json new file mode 100644 index 0000000..968d10a --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/yugoslavian.json @@ -0,0 +1,38 @@ +[ + +{ "name": "T-32", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "19", + "notes": [ "D" ] +}, +{ "name": "M3A1(a)", + "CS#": 4, + "capabilities2": { "C": "3\u2020" }, + "note_number": "20\u2020", + "notes": [ "A", "B", "C", "L" ] +}, +{ "name": "M3A3(a)", + "CS#": 4, + "capabilities2": { "C": "3\u2020", "sD": 3 }, + "note_number": "20\u2020", + "notes": [ "A", "B", "C", "L" ] +}, +{ "name": "M3(a) PaK 40", + "CS#": 2, + "note_number": "21\u2020", + "notes": [ "A", "H\u20201", "L" ] +}, +{ "name": "M3(a) FlaK 38", + "CS#": 2, + "note_number": "22\u2020", + "notes": [ "A", "H\u20201", "L", "AA\u20202" ] +}, +{ "name": "AEC II(b)", + "CS#": 4, + "capabilities2": { "HE": 5, "D": 4, "sM": 8 }, + "note_number": "23", + "notes": [ "A", "G\u2020", "L" ] +} + +] diff --git a/vasl_templates/webapp/static/images/flags/yugoslavian.png b/vasl_templates/webapp/static/images/flags/yugoslavian.png new file mode 100644 index 0000000..6133139 Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/yugoslavian.png differ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt new file mode 100644 index 0000000..f769208 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt @@ -0,0 +1,7 @@ +=== ordnance/yugoslavian/1940 === + +Name Capabilities (effective) # Notes +------------------ -------------- ------------- --- ------- +3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y +80mm M28/M33 NT h-d s5 NT h-d s5 21 Y +100mm M14/19 NT NT 22 Y diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt new file mode 100644 index 0000000..a83d114 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt @@ -0,0 +1,7 @@ +=== ordnance/yugoslavian/1941 === + +Name Capabilities (effective) # Notes +------------------ -------------- ------------- --- ------- +3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y +80mm M28/M33 NT h-d s5 NT h-d s5 21 Y +100mm M14/19 NT NT 22 Y diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt new file mode 100644 index 0000000..3b37f33 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt @@ -0,0 +1,7 @@ +=== ordnance/yugoslavian/1942 === + +Name Capabilities (effective) # Notes +------------------ -------------- ------------- --- ------- +3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y +80mm M28/M33 NT h-d s5 NT h-d s5 21 Y +100mm M14/19 NT NT 22 Y diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt new file mode 100644 index 0000000..08bd848 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt @@ -0,0 +1,7 @@ +=== ordnance/yugoslavian/1943 === + +Name Capabilities (effective) # Notes +------------------ -------------- ------------- --- ------- +3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y +80mm M28/M33 NT h-d s5 NT h-d s5 21 Y +100mm M14/19 NT NT 22 Y diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt new file mode 100644 index 0000000..666dca4 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt @@ -0,0 +1,7 @@ +=== ordnance/yugoslavian/1944 === + +Name Capabilities (effective) # Notes +------------------ -------------- ------------- --- ------- +3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y +80mm M28/M33 NT h-d s5 NT h-d s5 21 Y +100mm M14/19 NT NT 22 Y diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt new file mode 100644 index 0000000..816f2c4 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt @@ -0,0 +1,7 @@ +=== ordnance/yugoslavian/1945 === + +Name Capabilities (effective) # Notes +------------------ -------------- ------------- --- ------- +3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y +80mm M28/M33 NT h-d s5 NT h-d s5 21 Y +100mm M14/19 NT NT 22 Y diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt new file mode 100644 index 0000000..d869b9b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt @@ -0,0 +1,10 @@ +=== vehicles/yugoslavian/1940 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------- ------- ---- --------------- -------------- ------------- --- ---------------------------------- +T-32 ® yes CS 2 n/a n/a 19 D +M3A1(a) n/a yes CS 4 C3† C3† 20† A B C L +M3A3(a) n/a yes CS 4 C3† sD3 C3† sD3 20† A B C L +M3(a) PaK 40 n/a yes CS 2 n/a n/a 21† A H†1 L +M3(a) FlaK 38 n/a yes CS 2 n/a n/a 22† A H†1 L AA†2 +AEC II(b) n/a yes CS 4 D4 HE5 sM8 D4 HE5 sM8 23 A G† L diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt new file mode 100644 index 0000000..73087d3 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt @@ -0,0 +1,10 @@ +=== vehicles/yugoslavian/1941 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------- ------- ---- --------------- -------------- ------------- --- ---------------------------------- +T-32 ® yes CS 2 n/a n/a 19 D +M3A1(a) n/a yes CS 4 C3† C3† 20† A B C L +M3A3(a) n/a yes CS 4 C3† sD3 C3† sD3 20† A B C L +M3(a) PaK 40 n/a yes CS 2 n/a n/a 21† A H†1 L +M3(a) FlaK 38 n/a yes CS 2 n/a n/a 22† A H†1 L AA†2 +AEC II(b) n/a yes CS 4 D4 HE5 sM8 D4 HE5 sM8 23 A G† L diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt new file mode 100644 index 0000000..b4a458a --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt @@ -0,0 +1,10 @@ +=== vehicles/yugoslavian/1942 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------- ------- ---- --------------- -------------- ------------- --- ---------------------------------- +T-32 ® yes CS 2 n/a n/a 19 D +M3A1(a) n/a yes CS 4 C3† C3† 20† A B C L +M3A3(a) n/a yes CS 4 C3† sD3 C3† sD3 20† A B C L +M3(a) PaK 40 n/a yes CS 2 n/a n/a 21† A H†1 L +M3(a) FlaK 38 n/a yes CS 2 n/a n/a 22† A H†1 L AA†2 +AEC II(b) n/a yes CS 4 D4 HE5 sM8 D4 HE5 sM8 23 A G† L diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt new file mode 100644 index 0000000..a8fc855 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt @@ -0,0 +1,10 @@ +=== vehicles/yugoslavian/1943 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------- ------- ---- --------------- -------------- ------------- --- ---------------------------------- +T-32 ® yes CS 2 n/a n/a 19 D +M3A1(a) n/a yes CS 4 C3† C3† 20† A B C L +M3A3(a) n/a yes CS 4 C3† sD3 C3† sD3 20† A B C L +M3(a) PaK 40 n/a yes CS 2 n/a n/a 21† A H†1 L +M3(a) FlaK 38 n/a yes CS 2 n/a n/a 22† A H†1 L AA†2 +AEC II(b) n/a yes CS 4 D4 HE5 sM8 D4 HE5 sM8 23 A G† L diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt new file mode 100644 index 0000000..96db758 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt @@ -0,0 +1,10 @@ +=== vehicles/yugoslavian/1944 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------- ------- ---- --------------- -------------- ------------- --- ---------------------------------- +T-32 ® yes CS 2 n/a n/a 19 D +M3A1(a) n/a yes CS 4 C3† C3† 20† A B C L +M3A3(a) n/a yes CS 4 C3† sD3 C3† sD3 20† A B C L +M3(a) PaK 40 n/a yes CS 2 n/a n/a 21† A H†1 L +M3(a) FlaK 38 n/a yes CS 2 n/a n/a 22† A H†1 L AA†2 +AEC II(b) n/a yes CS 4 D4 HE5 sM8 D4 HE5 sM8 23 A G† L diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt new file mode 100644 index 0000000..94b09ea --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt @@ -0,0 +1,10 @@ +=== vehicles/yugoslavian/1945 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------- ------- ---- --------------- -------------- ------------- --- ---------------------------------- +T-32 ® yes CS 2 n/a n/a 19 D +M3A1(a) n/a yes CS 4 C3† C3† 20† A B C L +M3A3(a) n/a yes CS 4 C3† sD3 C3† sD3 20† A B C L +M3(a) PaK 40 n/a yes CS 2 n/a n/a 21† A H†1 L +M3(a) FlaK 38 n/a yes CS 2 n/a n/a 22† A H†1 L AA†2 +AEC II(b) n/a yes CS 4 D4 HE5 sM8 D4 HE5 sM8 23 A G† L diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 95f38af..c9e4db6 100644 --- a/vasl_templates/webapp/tests/test_vo_reports.py +++ b/vasl_templates/webapp/tests/test_vo_reports.py @@ -38,7 +38,7 @@ def test_vo_reports( webapp, webdriver ): # check each vehicle/ordnance report nationalities = [ "german", "russian", "american", "british", "italian", "japanese", "chinese", "french", - "polish", "belgian" + "polish", "belgian","yugoslavian" ] for nat in nationalities: for vo_type in ["vehicles","ordnance"]: