diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json index bce4f54..870aefe 100644 --- a/vasl_templates/webapp/data/default-template-pack/nationalities.json +++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json @@ -60,6 +60,10 @@ "danish": { "display_name": "Danish", "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ] +}, +"dutch": { + "display_name": "Dutch", + "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ] } } diff --git a/vasl_templates/webapp/data/ordnance/dutch.json b/vasl_templates/webapp/data/ordnance/dutch.json new file mode 100644 index 0000000..e311040 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/dutch.json @@ -0,0 +1,9 @@ +[ + +{ "name": "Solothurn s/18-1100", + "capabilities_other": [ "5PP" ], + "note_number": "15", + "notes": [ "A", "Ne" ] +} + +] diff --git a/vasl_templates/webapp/data/vehicles/dutch.json b/vasl_templates/webapp/data/vehicles/dutch.json new file mode 100644 index 0000000..5a0d1da --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/dutch.json @@ -0,0 +1,48 @@ +[ + +{ "name": "VCL M1936(b)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "25\u2020", + "notes": [ "A", "V" ] +}, +{ "name": "CTLS-4(a)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "26\u2020", + "notes": [ "A", "V" ] +}, +{ "name": "M36", + "no_radio": "\u00ae", + "CS#": 5, + "capabilities2": { "HE": 10 }, + "note_number": "27", + "notes": [ "V" ] +}, +{ "name": "M38", + "no_radio": "\u00ae", + "CS#": 5, + "capabilities2": { "HE": 10 }, + "note_number": "27", + "notes": [ "V" ] +}, +{ "name": "M39", + "no_radio": "\u00ae", + "CS#": 6, + "capabilities2": { "HE": 10 }, + "note_number": "28", + "notes": [ "V" ] +}, +{ "name": "Marmon-Herrington III(b)", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "29\u2020", + "notes": [ "A", "V" ] +}, +{ "name": "Jeep(a)", + "cs#": "2\u2020", + "note_number": "30\u2020", + "notes": [ "A", "V" ] +} + +] diff --git a/vasl_templates/webapp/static/images/flags/dutch.png b/vasl_templates/webapp/static/images/flags/dutch.png new file mode 100644 index 0000000..6133139 Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/dutch.png differ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt new file mode 100644 index 0000000..6d6a84b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt @@ -0,0 +1,5 @@ +=== ordnance/dutch/1940 === + +Name Capabilities (effective) # Notes +------------------- -------------- ------------- --- ------- +Solothurn s/18-1100 5PP 5PP 15 A Ne diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt new file mode 100644 index 0000000..5d63a2d --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt @@ -0,0 +1,5 @@ +=== ordnance/dutch/1941 === + +Name Capabilities (effective) # Notes +------------------- -------------- ------------- --- ------- +Solothurn s/18-1100 5PP 5PP 15 A Ne diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt new file mode 100644 index 0000000..21cf4ec --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt @@ -0,0 +1,5 @@ +=== ordnance/dutch/1942 === + +Name Capabilities (effective) # Notes +------------------- -------------- ------------- --- ------- +Solothurn s/18-1100 5PP 5PP 15 A Ne diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt new file mode 100644 index 0000000..6db63ea --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt @@ -0,0 +1,5 @@ +=== ordnance/dutch/1943 === + +Name Capabilities (effective) # Notes +------------------- -------------- ------------- --- ------- +Solothurn s/18-1100 5PP 5PP 15 A Ne diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt new file mode 100644 index 0000000..4d4b45a --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt @@ -0,0 +1,5 @@ +=== ordnance/dutch/1944 === + +Name Capabilities (effective) # Notes +------------------- -------------- ------------- --- ------- +Solothurn s/18-1100 5PP 5PP 15 A Ne diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt new file mode 100644 index 0000000..8ffe550 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt @@ -0,0 +1,5 @@ +=== ordnance/dutch/1945 === + +Name Capabilities (effective) # Notes +------------------- -------------- ------------- --- ------- +Solothurn s/18-1100 5PP 5PP 15 A Ne diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt new file mode 100644 index 0000000..5006800 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt @@ -0,0 +1,11 @@ +=== vehicles/dutch/1940 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------ ------- ---- --------------- -------------- ------------- --- -------- +VCL M1936(b) ® yes CS 2 n/a n/a 25† A V +CTLS-4(a) ® yes CS 2 n/a n/a 26† A V +M36 ® yes CS 5 HE10 HE10 27 V +M38 ® yes CS 5 HE10 HE10 27 V +M39 ® yes CS 6 HE10 HE10 28 V +Marmon-Herrington III(b) ® yes CS 4 n/a n/a 29† A V +Jeep(a) n/a yes cs 2† n/a n/a 30† A V diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt new file mode 100644 index 0000000..0a15be4 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt @@ -0,0 +1,11 @@ +=== vehicles/dutch/1941 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------ ------- ---- --------------- -------------- ------------- --- -------- +VCL M1936(b) ® yes CS 2 n/a n/a 25† A V +CTLS-4(a) ® yes CS 2 n/a n/a 26† A V +M36 ® yes CS 5 HE10 HE10 27 V +M38 ® yes CS 5 HE10 HE10 27 V +M39 ® yes CS 6 HE10 HE10 28 V +Marmon-Herrington III(b) ® yes CS 4 n/a n/a 29† A V +Jeep(a) n/a yes cs 2† n/a n/a 30† A V diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt new file mode 100644 index 0000000..ef06e9b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt @@ -0,0 +1,11 @@ +=== vehicles/dutch/1942 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------ ------- ---- --------------- -------------- ------------- --- -------- +VCL M1936(b) ® yes CS 2 n/a n/a 25† A V +CTLS-4(a) ® yes CS 2 n/a n/a 26† A V +M36 ® yes CS 5 HE10 HE10 27 V +M38 ® yes CS 5 HE10 HE10 27 V +M39 ® yes CS 6 HE10 HE10 28 V +Marmon-Herrington III(b) ® yes CS 4 n/a n/a 29† A V +Jeep(a) n/a yes cs 2† n/a n/a 30† A V diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt new file mode 100644 index 0000000..58d580b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt @@ -0,0 +1,11 @@ +=== vehicles/dutch/1943 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------ ------- ---- --------------- -------------- ------------- --- -------- +VCL M1936(b) ® yes CS 2 n/a n/a 25† A V +CTLS-4(a) ® yes CS 2 n/a n/a 26† A V +M36 ® yes CS 5 HE10 HE10 27 V +M38 ® yes CS 5 HE10 HE10 27 V +M39 ® yes CS 6 HE10 HE10 28 V +Marmon-Herrington III(b) ® yes CS 4 n/a n/a 29† A V +Jeep(a) n/a yes cs 2† n/a n/a 30† A V diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt new file mode 100644 index 0000000..bb96de6 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt @@ -0,0 +1,11 @@ +=== vehicles/dutch/1944 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------ ------- ---- --------------- -------------- ------------- --- -------- +VCL M1936(b) ® yes CS 2 n/a n/a 25† A V +CTLS-4(a) ® yes CS 2 n/a n/a 26† A V +M36 ® yes CS 5 HE10 HE10 27 V +M38 ® yes CS 5 HE10 HE10 27 V +M39 ® yes CS 6 HE10 HE10 28 V +Marmon-Herrington III(b) ® yes CS 4 n/a n/a 29† A V +Jeep(a) n/a yes cs 2† n/a n/a 30† A V diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt new file mode 100644 index 0000000..4f9c4bd --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt @@ -0,0 +1,11 @@ +=== vehicles/dutch/1945 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------ ------- ---- --------------- -------------- ------------- --- -------- +VCL M1936(b) ® yes CS 2 n/a n/a 25† A V +CTLS-4(a) ® yes CS 2 n/a n/a 26† A V +M36 ® yes CS 5 HE10 HE10 27 V +M38 ® yes CS 5 HE10 HE10 27 V +M39 ® yes CS 6 HE10 HE10 28 V +Marmon-Herrington III(b) ® yes CS 4 n/a n/a 29† A V +Jeep(a) n/a yes cs 2† n/a n/a 30† A V diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 0e663d8..28dc0c2 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" + "polish", "belgian","yugoslavian","danish","dutch", ] for nat in nationalities: for vo_type in ["vehicles","ordnance"]: