From d52b100c817bf25696ea4114cee8222a628c8c1a Mon Sep 17 00:00:00 2001 From: Taka Date: Mon, 10 Sep 2018 13:38:05 +0000 Subject: [PATCH] Added the Allied Minor common vehicles/ordnance. --- .../data/ordnance/allied-minor-common.json | 81 +++++++++++++++++++ .../data/vehicles/allied-minor-common.json | 79 ++++++++++++++++++ .../ordnance/allied-minor-common/1940.txt | 18 +++++ .../ordnance/allied-minor-common/1941.txt | 18 +++++ .../ordnance/allied-minor-common/1942.txt | 18 +++++ .../ordnance/allied-minor-common/1943.txt | 18 +++++ .../ordnance/allied-minor-common/1944.txt | 18 +++++ .../ordnance/allied-minor-common/1945.txt | 18 +++++ .../vehicles/allied-minor-common/1940.txt | 18 +++++ .../vehicles/allied-minor-common/1941.txt | 18 +++++ .../vehicles/allied-minor-common/1942.txt | 18 +++++ .../vehicles/allied-minor-common/1943.txt | 18 +++++ .../vehicles/allied-minor-common/1944.txt | 18 +++++ .../vehicles/allied-minor-common/1945.txt | 18 +++++ .../webapp/tests/test_vo_reports.py | 2 +- 15 files changed, 377 insertions(+), 1 deletion(-) create mode 100644 vasl_templates/webapp/data/ordnance/allied-minor-common.json create mode 100644 vasl_templates/webapp/data/vehicles/allied-minor-common.json create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt diff --git a/vasl_templates/webapp/data/ordnance/allied-minor-common.json b/vasl_templates/webapp/data/ordnance/allied-minor-common.json new file mode 100644 index 0000000..d0b9973 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/allied-minor-common.json @@ -0,0 +1,81 @@ +[ + +{ "name": "Brandt Medium Mortar", + "capabilities": [ "NT", "QSU" ], + "capabilities2": { "s": 8 }, + "note_number": "23\u2020", + "notes": [ "A", "B", "Gr", "N", "P", "Y" ] +}, +{ "name": "37mm Bofors AT", + "capabilities": [ "NT", "QSU" ], + "note_number": "24\u2020", + "notes": [ "A", "De", "P" ] +}, +{ "name": "3.7cm PaK 35/36", + "capabilities": [ "NT", "QSU" ], + "note_number": "25\u2020", + "notes": [ "Gr", "Ne", "Y" ] +}, +{ "name": "Bohler M35 47mm", + "capabilities": [ "NT", "QSU" ], + "note_number": "26\u2020", + "notes": [ "A", "Gr", "Ne", "Y" ] +}, +{ "name": "65mm wz.06", + "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ], + "note_number": "27\u2020", + "notes": [ "A", "Gr", "P", "Y" ] +}, +{ "name": "75mm wz.97", + "capabilities": [ "NT", "QSU" ], + "capabilities2": { "s": 8 }, + "note_number": "28\u2020", + "notes": [ "A", "Gr", "N", "P" ] +}, +{ "name": "Bofors M34", + "capabilities": [ "NT", "QSU" ], + "note_number": "29\u2020", + "notes": [ "A", "B", "Gr", "Ne", "N" ] +}, +{ "name": "75M 19S", + "capabilities": [ "NT", "QSU", "h-d" ], + "capabilities2": { "s": 6, "AP": 5 }, + "note_number": "30\u2020", + "notes": [ "A", "Gr", "P", "Y" ] +}, +{ "name": "C105 L 13 S", + "capabilities": [ "NT" ], + "note_number": "31\u2020", + "notes": [ "B", "P", "Y" ] +}, +{ "name": "120mm wz. 09/31", + "capabilities": [ "NT", "h-d" ], + "capabilities2": { "s": 6 }, + "note_number": "32\u2020", + "notes": [ "N", "P" ] +}, +{ "name": "155mm 17 S", + "capabilities": [ "NT" ], + "capabilities2": { "s": 8 }, + "note_number": "33", + "notes": [ "B", "Gr", "P", "Y" ] +}, +{ "name": "Mitrailleuse de 13.2 CAJ mle 30", + "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u20201" ], + "note_number": "34\u2020", + "notes": [ "T\u20201", "B", "Gr", "Y" ] +}, +{ "name": "20mm Oerlikon", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "NT", "20\u20201", "2 ROF", "B11" ] }, + "note_number": "35\u2020", + "notes": [ "C\u20201", "Gr", "Ne", "Y" ] +}, +{ "name": "40mm Bofors AA", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "40\u20201", "2 ROF" ] }, + "note_number": "36\u2020", + "notes": [ "C\u20201", "B", "N", "Ne", "P" ] +} + +] diff --git a/vasl_templates/webapp/data/vehicles/allied-minor-common.json b/vasl_templates/webapp/data/vehicles/allied-minor-common.json new file mode 100644 index 0000000..e27bcde --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/allied-minor-common.json @@ -0,0 +1,79 @@ +[ + +{ "name": "L5/30(i)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "31", + "notes": [ "A" ] +}, +{ "name": "L3/35(i)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "31\u2020", + "notes": [ "A", "D" ] +}, +{ "name": "L6/40(i)", + "CS#": 2, + "note_number": "31\u2020", + "notes": [ "A" ] +}, +{ "name": "M13/40(i)", + "CS#": 4, + "note_number": "31\u2020", + "notes": [ "A" ] +}, +{ "name": "FT-17M(f)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "32\u2020", + "notes": [ "A", "F" ] +}, +{ "name": "FT-17C(f)", + "no_radio": "\u00ae", + "CS#": 2, + "no_if": true, + "capabilities2": { "AP": 9 }, + "note_number": "32\u2020", + "notes": [ "A", "F" ] +}, +{ "name": "R-35(f)", + "no_radio": "\u00ae", + "CS#": 2, + "capabilities2": { "AP": 10 }, + "note_number": "33\u2020", + "notes": [ "A", "E\u20201", "F" ] +}, +{ "name": "M3A1(a)", + "CS#": 4, + "note_number": "34\u2020", + "notes": [ "A", "V" ] +}, +{ "name": "C-K P17(f)", + "cs#": 4, + "note_number": "35", + "notes": [ "A" ] +}, +{ "name": "C-K P19(f)", + "cs#": 5, + "note_number": "35\u2020", + "notes": [ "A" ] +}, +{ "name": "VCL Utility B(b)", + "cs#": 2, + "note_number": "36\u2020", + "notes": [ "A", "H\u20201", "V" ] +}, +{ "name": "Light Truck", + "cs#": 4, + "note_number": "37" +}, +{ "name": "Medium Truck", + "cs#": 5, + "note_number": "37" +}, +{ "name": "Heavy Truck", + "cs#": 7, + "note_number": "37" +} + +] diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt new file mode 100644 index 0000000..8b8a884 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt @@ -0,0 +1,18 @@ +=== ordnance/allied-minor-common/1940 === + +Name Capabilities (effective) # Notes +------------------------------- ----------------------------- ----------------------------- --- ----------------------- +Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y +37mm Bofors AT NT QSU NT QSU 24† A De P +3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y +Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y +65mm wz.06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 27† A Gr P Y +75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P +Bofors M34 NT QSU NT QSU 29† A B Gr Ne N +75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y +C105 L 13 S NT NT 31† B P Y +120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P +155mm 17 S NT s8 NT s8 33 B Gr P Y +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† Towing NA†[1] T 2 TK DR† Towing NA†[1] 34† T†1 B Gr Y +20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y +40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt new file mode 100644 index 0000000..c5d1157 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt @@ -0,0 +1,18 @@ +=== ordnance/allied-minor-common/1941 === + +Name Capabilities (effective) # Notes +------------------------------- ----------------------------- ----------------------------- --- ----------------------- +Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y +37mm Bofors AT NT QSU NT QSU 24† A De P +3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y +Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y +65mm wz.06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 27† A Gr P Y +75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P +Bofors M34 NT QSU NT QSU 29† A B Gr Ne N +75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y +C105 L 13 S NT NT 31† B P Y +120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P +155mm 17 S NT s8 NT s8 33 B Gr P Y +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† Towing NA†[1] T 2 TK DR† Towing NA†[1] 34† T†1 B Gr Y +20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y +40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt new file mode 100644 index 0000000..51d3989 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt @@ -0,0 +1,18 @@ +=== ordnance/allied-minor-common/1942 === + +Name Capabilities (effective) # Notes +------------------------------- ----------------------------- ----------------------------- --- ----------------------- +Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y +37mm Bofors AT NT QSU NT QSU 24† A De P +3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y +Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y +65mm wz.06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 27† A Gr P Y +75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P +Bofors M34 NT QSU NT QSU 29† A B Gr Ne N +75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y +C105 L 13 S NT NT 31† B P Y +120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P +155mm 17 S NT s8 NT s8 33 B Gr P Y +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† Towing NA†[1] T 2 TK DR† Towing NA†[1] 34† T†1 B Gr Y +20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y +40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt new file mode 100644 index 0000000..b54ce8f --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt @@ -0,0 +1,18 @@ +=== ordnance/allied-minor-common/1943 === + +Name Capabilities (effective) # Notes +------------------------------- ----------------------------- ----------------------------- --- ----------------------- +Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y +37mm Bofors AT NT QSU NT QSU 24† A De P +3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y +Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y +65mm wz.06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 27† A Gr P Y +75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P +Bofors M34 NT QSU NT QSU 29† A B Gr Ne N +75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y +C105 L 13 S NT NT 31† B P Y +120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P +155mm 17 S NT s8 NT s8 33 B Gr P Y +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† Towing NA†[1] T 2 TK DR† Towing NA†[1] 34† T†1 B Gr Y +20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y +40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt new file mode 100644 index 0000000..c41ebe0 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt @@ -0,0 +1,18 @@ +=== ordnance/allied-minor-common/1944 === + +Name Capabilities (effective) # Notes +------------------------------- ----------------------------- ----------------------------- --- ----------------------- +Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y +37mm Bofors AT NT QSU NT QSU 24† A De P +3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y +Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y +65mm wz.06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 27† A Gr P Y +75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P +Bofors M34 NT QSU NT QSU 29† A B Gr Ne N +75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y +C105 L 13 S NT NT 31† B P Y +120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P +155mm 17 S NT s8 NT s8 33 B Gr P Y +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† Towing NA†[1] T 2 TK DR† Towing NA†[1] 34† T†1 B Gr Y +20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y +40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt new file mode 100644 index 0000000..a0c3de6 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt @@ -0,0 +1,18 @@ +=== ordnance/allied-minor-common/1945 === + +Name Capabilities (effective) # Notes +------------------------------- ----------------------------- ----------------------------- --- ----------------------- +Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y +37mm Bofors AT NT QSU NT QSU 24† A De P +3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y +Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y +65mm wz.06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 27† A Gr P Y +75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P +Bofors M34 NT QSU NT QSU 29† A B Gr Ne N +75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y +C105 L 13 S NT NT 31† B P Y +120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P +155mm 17 S NT s8 NT s8 33 B Gr P Y +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† Towing NA†[1] T 2 TK DR† Towing NA†[1] 34† T†1 B Gr Y +20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y +40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt new file mode 100644 index 0000000..1d8aeae --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt @@ -0,0 +1,18 @@ +=== vehicles/allied-minor-common/1940 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- ------------------ +L5/30(i) ® yes CS 2 n/a n/a 31 A +L3/35(i) ® yes CS 2 n/a n/a 31† A D +L6/40(i) n/a yes CS 2 n/a n/a 31† A +M13/40(i) n/a yes CS 4 n/a n/a 31† A +FT-17M(f) ® yes CS 2 n/a n/a 32† A F +FT-17C(f) ® n/a CS 2 AP9 AP9 32† A F +R-35(f) ® yes CS 2 AP10 AP10 33† A E†1 F +M3A1(a) n/a yes CS 4 n/a n/a 34† A V +C-K P17(f) n/a yes cs 4 n/a n/a 35 A +C-K P19(f) n/a yes cs 5 n/a n/a 35† A +VCL Utility B(b) n/a yes cs 2 n/a n/a 36† A H†1 V +Light Truck n/a yes cs 4 n/a n/a 37 n/a +Medium Truck n/a yes cs 5 n/a n/a 37 n/a +Heavy Truck n/a yes cs 7 n/a n/a 37 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt new file mode 100644 index 0000000..34f7767 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt @@ -0,0 +1,18 @@ +=== vehicles/allied-minor-common/1941 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- ------------------ +L5/30(i) ® yes CS 2 n/a n/a 31 A +L3/35(i) ® yes CS 2 n/a n/a 31† A D +L6/40(i) n/a yes CS 2 n/a n/a 31† A +M13/40(i) n/a yes CS 4 n/a n/a 31† A +FT-17M(f) ® yes CS 2 n/a n/a 32† A F +FT-17C(f) ® n/a CS 2 AP9 AP9 32† A F +R-35(f) ® yes CS 2 AP10 AP10 33† A E†1 F +M3A1(a) n/a yes CS 4 n/a n/a 34† A V +C-K P17(f) n/a yes cs 4 n/a n/a 35 A +C-K P19(f) n/a yes cs 5 n/a n/a 35† A +VCL Utility B(b) n/a yes cs 2 n/a n/a 36† A H†1 V +Light Truck n/a yes cs 4 n/a n/a 37 n/a +Medium Truck n/a yes cs 5 n/a n/a 37 n/a +Heavy Truck n/a yes cs 7 n/a n/a 37 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt new file mode 100644 index 0000000..d097e4f --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt @@ -0,0 +1,18 @@ +=== vehicles/allied-minor-common/1942 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- ------------------ +L5/30(i) ® yes CS 2 n/a n/a 31 A +L3/35(i) ® yes CS 2 n/a n/a 31† A D +L6/40(i) n/a yes CS 2 n/a n/a 31† A +M13/40(i) n/a yes CS 4 n/a n/a 31† A +FT-17M(f) ® yes CS 2 n/a n/a 32† A F +FT-17C(f) ® n/a CS 2 AP9 AP9 32† A F +R-35(f) ® yes CS 2 AP10 AP10 33† A E†1 F +M3A1(a) n/a yes CS 4 n/a n/a 34† A V +C-K P17(f) n/a yes cs 4 n/a n/a 35 A +C-K P19(f) n/a yes cs 5 n/a n/a 35† A +VCL Utility B(b) n/a yes cs 2 n/a n/a 36† A H†1 V +Light Truck n/a yes cs 4 n/a n/a 37 n/a +Medium Truck n/a yes cs 5 n/a n/a 37 n/a +Heavy Truck n/a yes cs 7 n/a n/a 37 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt new file mode 100644 index 0000000..33c400d --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt @@ -0,0 +1,18 @@ +=== vehicles/allied-minor-common/1943 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- ------------------ +L5/30(i) ® yes CS 2 n/a n/a 31 A +L3/35(i) ® yes CS 2 n/a n/a 31† A D +L6/40(i) n/a yes CS 2 n/a n/a 31† A +M13/40(i) n/a yes CS 4 n/a n/a 31† A +FT-17M(f) ® yes CS 2 n/a n/a 32† A F +FT-17C(f) ® n/a CS 2 AP9 AP9 32† A F +R-35(f) ® yes CS 2 AP10 AP10 33† A E†1 F +M3A1(a) n/a yes CS 4 n/a n/a 34† A V +C-K P17(f) n/a yes cs 4 n/a n/a 35 A +C-K P19(f) n/a yes cs 5 n/a n/a 35† A +VCL Utility B(b) n/a yes cs 2 n/a n/a 36† A H†1 V +Light Truck n/a yes cs 4 n/a n/a 37 n/a +Medium Truck n/a yes cs 5 n/a n/a 37 n/a +Heavy Truck n/a yes cs 7 n/a n/a 37 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt new file mode 100644 index 0000000..aef1a77 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt @@ -0,0 +1,18 @@ +=== vehicles/allied-minor-common/1944 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- ------------------ +L5/30(i) ® yes CS 2 n/a n/a 31 A +L3/35(i) ® yes CS 2 n/a n/a 31† A D +L6/40(i) n/a yes CS 2 n/a n/a 31† A +M13/40(i) n/a yes CS 4 n/a n/a 31† A +FT-17M(f) ® yes CS 2 n/a n/a 32† A F +FT-17C(f) ® n/a CS 2 AP9 AP9 32† A F +R-35(f) ® yes CS 2 AP10 AP10 33† A E†1 F +M3A1(a) n/a yes CS 4 n/a n/a 34† A V +C-K P17(f) n/a yes cs 4 n/a n/a 35 A +C-K P19(f) n/a yes cs 5 n/a n/a 35† A +VCL Utility B(b) n/a yes cs 2 n/a n/a 36† A H†1 V +Light Truck n/a yes cs 4 n/a n/a 37 n/a +Medium Truck n/a yes cs 5 n/a n/a 37 n/a +Heavy Truck n/a yes cs 7 n/a n/a 37 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt new file mode 100644 index 0000000..7e4cb98 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt @@ -0,0 +1,18 @@ +=== vehicles/allied-minor-common/1945 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- ------------------ +L5/30(i) ® yes CS 2 n/a n/a 31 A +L3/35(i) ® yes CS 2 n/a n/a 31† A D +L6/40(i) n/a yes CS 2 n/a n/a 31† A +M13/40(i) n/a yes CS 4 n/a n/a 31† A +FT-17M(f) ® yes CS 2 n/a n/a 32† A F +FT-17C(f) ® n/a CS 2 AP9 AP9 32† A F +R-35(f) ® yes CS 2 AP10 AP10 33† A E†1 F +M3A1(a) n/a yes CS 4 n/a n/a 34† A V +C-K P17(f) n/a yes cs 4 n/a n/a 35 A +C-K P19(f) n/a yes cs 5 n/a n/a 35† A +VCL Utility B(b) n/a yes cs 2 n/a n/a 36† A H†1 V +Light Truck n/a yes cs 4 n/a n/a 37 n/a +Medium Truck n/a yes cs 5 n/a n/a 37 n/a +Heavy Truck n/a yes cs 7 n/a n/a 37 n/a diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 3abccf2..29e83ab 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","greek" + "polish", "belgian","yugoslavian","danish","dutch","greek", "allied-minor-common" ] for nat in nationalities: for vo_type in ["vehicles","ordnance"]: