public
/
vasl-templates
1
0
Fork 0
Code Issues Pull Requests Projects Releases 29 Wiki Activity

Added the Chinese vehicles.

Browse Source
master
Pacman Ghost 6 years ago
parent eec5ecfbbf
commit c719b82829
9 changed files with 277 additions and 1 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 119
      vasl_templates/webapp/data/vehicles/chinese.json
  2. 25
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
  3. 25
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
  4. 25
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
  5. 25
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
  6. 25
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
  7. 25
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
  8. 7
      vasl_templates/webapp/tests/test_capabilities.py
  9. 2
      vasl_templates/webapp/tests/test_vo_reports.py

119
vasl_templates/webapp/data/vehicles/chinese.json
Unescape View File

@ -0,0 +1,119 @@
[
{ "name": "VCL M1931(b)",
"no_radio": "\u00ae",
"CS#": 2,
"note_number": "1\u2020",
"notes": [ "A", "<s>B</s>" ]
},
{ "name": "L3/35(i)",
"no_radio": "\u00ae",
"CS#": "2\u2020",
"note_number": "2\u2020",
"notes": [ "A", "<s>B</s>", "D\u2020<sup>1</sup>" ]
},
{ "name": "PzKpfw IA(g)",
"no_radio": "\u00ae",
"CS#": 2,
"note_number": "3\u2020",
"notes": [ "A", "<s>B</s>", "D\u2020<sup>1</sup>" ]
},
{ "name": "Vickers 6-Ton Mk E(b)",
"no_radio": "\u00ae",
"CS#": 3,
"capabilities2": { "C": "5\u2020<sup>2</sup>" },
"note_number": "4\u2020",
"notes": [ "A", "<s>B</s>", "C\u2020<sup>2</sup>", "E\u2020<sup>1</sup>" ]
},
{ "name": "T-26TU M33(r)",
"CS#": 3,
"note_number": "5\u2020",
"notes": [ "A", "E\u2020<sup>1</sup>" ]
},
{ "name": "M3A3(a)",
"CS#": 4,
"capabilities2": { "C": "9\u2020<sup>1</sup>" },
"note_number": "6\u2020",
"notes": [ "A", "B", "C\u2020<sup>1</sup>", "E\u2020<sup>2</sup>", "G" ]
},
{ "name": "M4A4(a)",
"CS#": "5:brewup",
"capabilities2": { "s": 8, "WP": [ [7,"J4+"], "\u2020" ] },
"note_number": "7\u2020",
"notes": [ "A", "B", "E\u2020<sup>1</sup>", "G" ]
},
{ "name": "M3A1(a)",
"CS#": 4,
"note_number": "8\u2020",
"notes": [ "A", "B", "E\u2020<sup>1</sup>" ]
},
{ "name": "Stuart Recon(a)",
"CS#": 5,
"note_number": "9\u2020",
"notes": [ "A", "B", "D\u2020<sup>1</sup>", "E\u2020<sup>2</sup>" ]
},
{ "name": "Type 22",
"no_radio": "\u00ae",
"CS#": 4,
"note_number": "10\u2020<sup>1</sup>",
"notes": [ "<s>B</s>", "E\u2020<sup>2</sup>", "F\u2020" ]
},
{ "name": "PSW 221(g)",
"CS#": 2,
"note_number": "11\u2020",
"notes": [ "A", "<s>B</s>", "F\u2020" ]
},
{ "name": "PSW 222(g)",
"CS#": 3,
"note_number": "11\u2020",
"notes": [ "A", "<s>B</s>", "E\u2020<sup>1</sup>", "F\u2020" ]
},
{ "name": "BA-20(r)",
"no_radio": "\u00ae",
"CS#": 3,
"note_number": "12",
"notes": [ "A", "<s>B</s>", "F\u2020" ]
},
{ "name": "BA-6(r)",
"no_radio": "\u00ae",
"CS#": 4,
"note_number": "12",
"notes": [ "A", "<s>B</s>", "E\u2020<sup>1</sup>", "F\u2020" ]
},
{ "name": "VCL Mk VI Carrier(b)",
"CS#": "2\u2020",
"note_number": "13\u2020",
"notes": [ "A", "<s>B</s>", "H\u2020<sup>1</sup>" ]
},
{ "name": "Carrier A(b)",
"CS#": 3,
"note_number": "14\u2020",
"notes": [ "A" ]
},
{ "name": "Carrier B(b)",
"CS#": 3,
"note_number": "14\u2020",
"notes": [ "A", "E\u2020<sup>1</sup>" ]
},
{ "name": "Carrier C(b)",
"CS#": 3,
"note_number": "14\u2020",
"notes": [ "A", "E\u2020<sup>1</sup>" ]
},
{ "name": "Henschel 33(g)",
"cs#": 7,
"note_number": "15\u2020<sup>1</sup>",
"notes": [ "A", "F\u2020" ]
},
{ "name": "Jeep(a)",
"cs#": "2\u2020",
"note_number": "16\u2020",
"notes": [ "A", "H\u2020<sup>1</sup>" ]
},
{ "name": "2\u00bd-Ton(a)",
"cs#": 7,
"note_number": "16\u2020",
"notes": [ "A" ]
}
]

25
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt vendored
Unescape View File

@ -0,0 +1,25 @@
=== vehicles/chinese/1940 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
--------------------- ------- ---- ------------------------------------ -------------- ------------- ------ ----------------------------------------
VCL M1931(b) ® yes CS 2 n/a n/a 1† A <s>B</s>
L3/35(i) ® yes CS 2† n/a n/a 2† A <s>B</s> D†<sup>1</sup>
PzKpfw IA(g) ® yes CS 2 n/a n/a 3† A <s>B</s> D†<sup>1</sup>
Vickers 6-Ton Mk E(b) ® yes CS 3 C5†[2] C5†[2] 4† A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
T-26TU M33(r) n/a yes CS 3 n/a n/a 5† A E†<sup>1</sup>
M3A3(a) n/a yes CS 4 C9†[1] C9†[1] 6† A B C†<sup>1</sup> E†<sup>2</sup> G
M4A4(a) n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]† s8 s8 7† A B E†<sup>1</sup> G
M3A1(a) n/a yes CS 4 n/a n/a 8† A B E†<sup>1</sup>
Stuart Recon(a) n/a yes CS 5 n/a n/a 9† A B D†<sup>1</sup> E†<sup>2</sup>
Type 22 ® yes CS 4 n/a n/a 10†[1] <s>B</s> E†<sup>2</sup> F†
PSW 221(g) n/a yes CS 2 n/a n/a 11† A <s>B</s> F†
PSW 222(g) n/a yes CS 3 n/a n/a 11† A <s>B</s> E†<sup>1</sup> F†
BA-20(r) ® yes CS 3 n/a n/a 12 A <s>B</s> F†
BA-6(r) ® yes CS 4 n/a n/a 12 A <s>B</s> E†<sup>1</sup> F†
VCL Mk VI Carrier(b) n/a yes CS 2† n/a n/a 13† A <s>B</s> H†<sup>1</sup>
Carrier A(b) n/a yes CS 3 n/a n/a 14† A
Carrier B(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Carrier C(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Henschel 33(g) n/a yes cs 7 n/a n/a 15†[1] A F†
Jeep(a) n/a yes cs 2† n/a n/a 16† A H†<sup>1</sup>
2&#189;-Ton(a) n/a yes cs 7 n/a n/a 16† A

25
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt vendored
Unescape View File

@ -0,0 +1,25 @@
=== vehicles/chinese/1941 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
--------------------- ------- ---- ------------------------------------ -------------- ------------- ------ ----------------------------------------
VCL M1931(b) ® yes CS 2 n/a n/a 1† A <s>B</s>
L3/35(i) ® yes CS 2† n/a n/a 2† A <s>B</s> D†<sup>1</sup>
PzKpfw IA(g) ® yes CS 2 n/a n/a 3† A <s>B</s> D†<sup>1</sup>
Vickers 6-Ton Mk E(b) ® yes CS 3 C5†[2] C5†[2] 4† A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
T-26TU M33(r) n/a yes CS 3 n/a n/a 5† A E†<sup>1</sup>
M3A3(a) n/a yes CS 4 C9†[1] C9†[1] 6† A B C†<sup>1</sup> E†<sup>2</sup> G
M4A4(a) n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]† s8 s8 7† A B E†<sup>1</sup> G
M3A1(a) n/a yes CS 4 n/a n/a 8† A B E†<sup>1</sup>
Stuart Recon(a) n/a yes CS 5 n/a n/a 9† A B D†<sup>1</sup> E†<sup>2</sup>
Type 22 ® yes CS 4 n/a n/a 10†[1] <s>B</s> E†<sup>2</sup> F†
PSW 221(g) n/a yes CS 2 n/a n/a 11† A <s>B</s> F†
PSW 222(g) n/a yes CS 3 n/a n/a 11† A <s>B</s> E†<sup>1</sup> F†
BA-20(r) ® yes CS 3 n/a n/a 12 A <s>B</s> F†
BA-6(r) ® yes CS 4 n/a n/a 12 A <s>B</s> E†<sup>1</sup> F†
VCL Mk VI Carrier(b) n/a yes CS 2† n/a n/a 13† A <s>B</s> H†<sup>1</sup>
Carrier A(b) n/a yes CS 3 n/a n/a 14† A
Carrier B(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Carrier C(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Henschel 33(g) n/a yes cs 7 n/a n/a 15†[1] A F†
Jeep(a) n/a yes cs 2† n/a n/a 16† A H†<sup>1</sup>
2&#189;-Ton(a) n/a yes cs 7 n/a n/a 16† A

25
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt vendored
Unescape View File

@ -0,0 +1,25 @@
=== vehicles/chinese/1942 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
--------------------- ------- ---- ------------------------------------ -------------- ------------- ------ ----------------------------------------
VCL M1931(b) ® yes CS 2 n/a n/a 1† A <s>B</s>
L3/35(i) ® yes CS 2† n/a n/a 2† A <s>B</s> D†<sup>1</sup>
PzKpfw IA(g) ® yes CS 2 n/a n/a 3† A <s>B</s> D†<sup>1</sup>
Vickers 6-Ton Mk E(b) ® yes CS 3 C5†[2] C5†[2] 4† A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
T-26TU M33(r) n/a yes CS 3 n/a n/a 5† A E†<sup>1</sup>
M3A3(a) n/a yes CS 4 C9†[1] C9†[1] 6† A B C†<sup>1</sup> E†<sup>2</sup> G
M4A4(a) n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]† s8 s8 7† A B E†<sup>1</sup> G
M3A1(a) n/a yes CS 4 n/a n/a 8† A B E†<sup>1</sup>
Stuart Recon(a) n/a yes CS 5 n/a n/a 9† A B D†<sup>1</sup> E†<sup>2</sup>
Type 22 ® yes CS 4 n/a n/a 10†[1] <s>B</s> E†<sup>2</sup> F†
PSW 221(g) n/a yes CS 2 n/a n/a 11† A <s>B</s> F†
PSW 222(g) n/a yes CS 3 n/a n/a 11† A <s>B</s> E†<sup>1</sup> F†
BA-20(r) ® yes CS 3 n/a n/a 12 A <s>B</s> F†
BA-6(r) ® yes CS 4 n/a n/a 12 A <s>B</s> E†<sup>1</sup> F†
VCL Mk VI Carrier(b) n/a yes CS 2† n/a n/a 13† A <s>B</s> H†<sup>1</sup>
Carrier A(b) n/a yes CS 3 n/a n/a 14† A
Carrier B(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Carrier C(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Henschel 33(g) n/a yes cs 7 n/a n/a 15†[1] A F†
Jeep(a) n/a yes cs 2† n/a n/a 16† A H†<sup>1</sup>
2&#189;-Ton(a) n/a yes cs 7 n/a n/a 16† A

25
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt vendored
Unescape View File

@ -0,0 +1,25 @@
=== vehicles/chinese/1943 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
--------------------- ------- ---- ------------------------------------ -------------- ------------- ------ ----------------------------------------
VCL M1931(b) ® yes CS 2 n/a n/a 1† A <s>B</s>
L3/35(i) ® yes CS 2† n/a n/a 2† A <s>B</s> D†<sup>1</sup>
PzKpfw IA(g) ® yes CS 2 n/a n/a 3† A <s>B</s> D†<sup>1</sup>
Vickers 6-Ton Mk E(b) ® yes CS 3 C5†[2] C5†[2] 4† A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
T-26TU M33(r) n/a yes CS 3 n/a n/a 5† A E†<sup>1</sup>
M3A3(a) n/a yes CS 4 C9†[1] C9†[1] 6† A B C†<sup>1</sup> E†<sup>2</sup> G
M4A4(a) n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]† s8 s8 7† A B E†<sup>1</sup> G
M3A1(a) n/a yes CS 4 n/a n/a 8† A B E†<sup>1</sup>
Stuart Recon(a) n/a yes CS 5 n/a n/a 9† A B D†<sup>1</sup> E†<sup>2</sup>
Type 22 ® yes CS 4 n/a n/a 10†[1] <s>B</s> E†<sup>2</sup> F†
PSW 221(g) n/a yes CS 2 n/a n/a 11† A <s>B</s> F†
PSW 222(g) n/a yes CS 3 n/a n/a 11† A <s>B</s> E†<sup>1</sup> F†
BA-20(r) ® yes CS 3 n/a n/a 12 A <s>B</s> F†
BA-6(r) ® yes CS 4 n/a n/a 12 A <s>B</s> E†<sup>1</sup> F†
VCL Mk VI Carrier(b) n/a yes CS 2† n/a n/a 13† A <s>B</s> H†<sup>1</sup>
Carrier A(b) n/a yes CS 3 n/a n/a 14† A
Carrier B(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Carrier C(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Henschel 33(g) n/a yes cs 7 n/a n/a 15†[1] A F†
Jeep(a) n/a yes cs 2† n/a n/a 16† A H†<sup>1</sup>
2&#189;-Ton(a) n/a yes cs 7 n/a n/a 16† A

25
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt vendored
Unescape View File

@ -0,0 +1,25 @@
=== vehicles/chinese/1944 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
--------------------- ------- ---- ------------------------------------ -------------- ------------- ------ ----------------------------------------
VCL M1931(b) ® yes CS 2 n/a n/a 1† A <s>B</s>
L3/35(i) ® yes CS 2† n/a n/a 2† A <s>B</s> D†<sup>1</sup>
PzKpfw IA(g) ® yes CS 2 n/a n/a 3† A <s>B</s> D†<sup>1</sup>
Vickers 6-Ton Mk E(b) ® yes CS 3 C5†[2] C5†[2] 4† A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
T-26TU M33(r) n/a yes CS 3 n/a n/a 5† A E†<sup>1</sup>
M3A3(a) n/a yes CS 4 C9†[1] C9†[1] 6† A B C†<sup>1</sup> E†<sup>2</sup> G
M4A4(a) n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]† s8 s8 7† A B E†<sup>1</sup> G
M3A1(a) n/a yes CS 4 n/a n/a 8† A B E†<sup>1</sup>
Stuart Recon(a) n/a yes CS 5 n/a n/a 9† A B D†<sup>1</sup> E†<sup>2</sup>
Type 22 ® yes CS 4 n/a n/a 10†[1] <s>B</s> E†<sup>2</sup> F†
PSW 221(g) n/a yes CS 2 n/a n/a 11† A <s>B</s> F†
PSW 222(g) n/a yes CS 3 n/a n/a 11† A <s>B</s> E†<sup>1</sup> F†
BA-20(r) ® yes CS 3 n/a n/a 12 A <s>B</s> F†
BA-6(r) ® yes CS 4 n/a n/a 12 A <s>B</s> E†<sup>1</sup> F†
VCL Mk VI Carrier(b) n/a yes CS 2† n/a n/a 13† A <s>B</s> H†<sup>1</sup>
Carrier A(b) n/a yes CS 3 n/a n/a 14† A
Carrier B(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Carrier C(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Henschel 33(g) n/a yes cs 7 n/a n/a 15†[1] A F†
Jeep(a) n/a yes cs 2† n/a n/a 16† A H†<sup>1</sup>
2&#189;-Ton(a) n/a yes cs 7 n/a n/a 16† A

25
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt vendored
Unescape View File

@ -0,0 +1,25 @@
=== vehicles/chinese/1945 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
--------------------- ------- ---- ------------------------------------ -------------- ------------- ------ ----------------------------------------
VCL M1931(b) ® yes CS 2 n/a n/a 1† A <s>B</s>
L3/35(i) ® yes CS 2† n/a n/a 2† A <s>B</s> D†<sup>1</sup>
PzKpfw IA(g) ® yes CS 2 n/a n/a 3† A <s>B</s> D†<sup>1</sup>
Vickers 6-Ton Mk E(b) ® yes CS 3 C5†[2] C5†[2] 4† A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
T-26TU M33(r) n/a yes CS 3 n/a n/a 5† A E†<sup>1</sup>
M3A3(a) n/a yes CS 4 C9†[1] C9†[1] 6† A B C†<sup>1</sup> E†<sup>2</sup> G
M4A4(a) n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]† s8 WP7† s8 7† A B E†<sup>1</sup> G
M3A1(a) n/a yes CS 4 n/a n/a 8† A B E†<sup>1</sup>
Stuart Recon(a) n/a yes CS 5 n/a n/a 9† A B D†<sup>1</sup> E†<sup>2</sup>
Type 22 ® yes CS 4 n/a n/a 10†[1] <s>B</s> E†<sup>2</sup> F†
PSW 221(g) n/a yes CS 2 n/a n/a 11† A <s>B</s> F†
PSW 222(g) n/a yes CS 3 n/a n/a 11† A <s>B</s> E†<sup>1</sup> F†
BA-20(r) ® yes CS 3 n/a n/a 12 A <s>B</s> F†
BA-6(r) ® yes CS 4 n/a n/a 12 A <s>B</s> E†<sup>1</sup> F†
VCL Mk VI Carrier(b) n/a yes CS 2† n/a n/a 13† A <s>B</s> H†<sup>1</sup>
Carrier A(b) n/a yes CS 3 n/a n/a 14† A
Carrier B(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Carrier C(b) n/a yes CS 3 n/a n/a 14† A E†<sup>1</sup>
Henschel 33(g) n/a yes cs 7 n/a n/a 15†[1] A F†
Jeep(a) n/a yes cs 2† n/a n/a 16† A H†<sup>1</sup>
2&#189;-Ton(a) n/a yes cs 7 n/a n/a 16† A

7
vasl_templates/webapp/tests/test_capabilities.py
Unescape View File

@ -255,6 +255,13 @@ def test_month_capabilities( webapp, webdriver ):
assert "H7\u2020<sup>2</sup>" in val2
assert _get_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1943" ) == val2
# M4A4(a): WP7(J4+)†
vehicle = [ "chinese", "vehicles", "M4A4(a)" ]
_check_capabilities( webdriver, webapp, *vehicle, "ETO", "12/1943", "s8" )
_check_capabilities( webdriver, webapp, *vehicle, "ETO", "05/1944", "s8" )
_check_capabilities( webdriver, webapp, *vehicle, "ETO", "06/1944", "WP7\u2020 s8" )
_check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1945", "WP7\u2020 s8" )
# ---------------------------------------------------------------------
@pytest.mark.skipif(

2
vasl_templates/webapp/tests/test_vo_reports.py
Unescape View File

@ -36,7 +36,7 @@ def test_vo_reports( webapp, webdriver ):
)
# check each vehicle/ordnance report
for nat in ["german","russian","american","british","italian","japanese"]:
for nat in ["german","russian","american","british","italian","japanese","chinese"]:
for vo_type in ["vehicles","ordnance"]:
for year in range(1940,1945+1):

Write Preview
Loading…
Cancel
Save