diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json index 870aefe..550297d 100644 --- a/vasl_templates/webapp/data/default-template-pack/nationalities.json +++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json @@ -64,6 +64,10 @@ "dutch": { "display_name": "Dutch", "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ] +}, +"greek": { + "display_name": "Greek", + "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ] } } diff --git a/vasl_templates/webapp/data/ordnance/greek.json b/vasl_templates/webapp/data/ordnance/greek.json new file mode 100644 index 0000000..23e4444 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/greek.json @@ -0,0 +1,20 @@ +[ + +{ "name": "Vari 85/24 M", + "capabilities": [ "NT" ], + "capabilities2": { "s": 5 }, + "note_number": "16", + "notes": [ "Gr" ] +}, +{ "name": "OR 105/19", + "capabilities": [ "NT", "h-d" ], + "note_number": "17", + "notes": [ "Gr" ] +}, +{ "name": "3.7cm Bofors AA", + "capabilities": [ "T" ], + "note_number": "18", + "notes": [ "Gr" ] +} + +] diff --git a/vasl_templates/webapp/data/vehicles/greek.json b/vasl_templates/webapp/data/vehicles/greek.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/greek.json @@ -0,0 +1 @@ +[] diff --git a/vasl_templates/webapp/static/images/flags/greek.png b/vasl_templates/webapp/static/images/flags/greek.png new file mode 100644 index 0000000..6133139 Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/greek.png differ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt new file mode 100644 index 0000000..af5a02b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt @@ -0,0 +1,7 @@ +=== ordnance/greek/1940 === + +Name Capabilities (effective) # Notes +--------------- -------------- ------------- --- ------- +Vari 85/24 M NT s5 NT s5 16 Gr +OR 105/19 NT h-d NT h-d 17 Gr +3.7cm Bofors AA T T 18 Gr diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt new file mode 100644 index 0000000..9c6cadb --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt @@ -0,0 +1,7 @@ +=== ordnance/greek/1941 === + +Name Capabilities (effective) # Notes +--------------- -------------- ------------- --- ------- +Vari 85/24 M NT s5 NT s5 16 Gr +OR 105/19 NT h-d NT h-d 17 Gr +3.7cm Bofors AA T T 18 Gr diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt new file mode 100644 index 0000000..a1a6da8 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt @@ -0,0 +1,7 @@ +=== ordnance/greek/1942 === + +Name Capabilities (effective) # Notes +--------------- -------------- ------------- --- ------- +Vari 85/24 M NT s5 NT s5 16 Gr +OR 105/19 NT h-d NT h-d 17 Gr +3.7cm Bofors AA T T 18 Gr diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt new file mode 100644 index 0000000..53e4f5b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt @@ -0,0 +1,7 @@ +=== ordnance/greek/1943 === + +Name Capabilities (effective) # Notes +--------------- -------------- ------------- --- ------- +Vari 85/24 M NT s5 NT s5 16 Gr +OR 105/19 NT h-d NT h-d 17 Gr +3.7cm Bofors AA T T 18 Gr diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt new file mode 100644 index 0000000..b9f68f3 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt @@ -0,0 +1,7 @@ +=== ordnance/greek/1944 === + +Name Capabilities (effective) # Notes +--------------- -------------- ------------- --- ------- +Vari 85/24 M NT s5 NT s5 16 Gr +OR 105/19 NT h-d NT h-d 17 Gr +3.7cm Bofors AA T T 18 Gr diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt new file mode 100644 index 0000000..51baa18 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt @@ -0,0 +1,7 @@ +=== ordnance/greek/1945 === + +Name Capabilities (effective) # Notes +--------------- -------------- ------------- --- ------- +Vari 85/24 M NT s5 NT s5 16 Gr +OR 105/19 NT h-d NT h-d 17 Gr +3.7cm Bofors AA T T 18 Gr diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt new file mode 100644 index 0000000..830bb64 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt @@ -0,0 +1,4 @@ +=== vehicles/greek/1940 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------ ------- ---- --------------- -------------- ------------- --- ------- diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt new file mode 100644 index 0000000..820cac2 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt @@ -0,0 +1,4 @@ +=== vehicles/greek/1941 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------ ------- ---- --------------- -------------- ------------- --- ------- diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt new file mode 100644 index 0000000..ec19674 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt @@ -0,0 +1,4 @@ +=== vehicles/greek/1942 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------ ------- ---- --------------- -------------- ------------- --- ------- diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt new file mode 100644 index 0000000..812a46c --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt @@ -0,0 +1,4 @@ +=== vehicles/greek/1943 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------ ------- ---- --------------- -------------- ------------- --- ------- diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt new file mode 100644 index 0000000..d0614ca --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt @@ -0,0 +1,4 @@ +=== vehicles/greek/1944 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------ ------- ---- --------------- -------------- ------------- --- ------- diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt new file mode 100644 index 0000000..8a40aff --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt @@ -0,0 +1,4 @@ +=== vehicles/greek/1945 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------ ------- ---- --------------- -------------- ------------- --- ------- diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 28dc0c2..3abccf2 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","yugoslavian","danish","dutch", + "polish", "belgian","yugoslavian","danish","dutch","greek" ] for nat in nationalities: for vo_type in ["vehicles","ordnance"]: