Added the Romanian nationality and vehicles/ordnance.

master
Pacman Ghost 6 years ago
parent 4e5b20e1ca
commit 193521d4e1
  1. 5
      vasl_templates/webapp/data/default-template-pack/nationalities.json
  2. 114
      vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
  3. 49
      vasl_templates/webapp/data/vehicles/axis-minor/romanian.json
  4. 0
      vasl_templates/webapp/static/images/flags/romanian.png
  5. 26
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
  6. 26
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
  7. 26
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
  8. 26
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
  9. 26
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
  10. 26
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
  11. 12
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
  12. 12
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
  13. 12
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
  14. 12
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
  15. 12
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
  16. 12
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
  17. 3
      vasl_templates/webapp/tests/test_vo_reports.py

@ -68,6 +68,11 @@
"greek": {
"display_name": "Greek",
"ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ]
},
"romanian": {
"display_name": "Romanian",
"ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
}
}

@ -0,0 +1,114 @@
[
{ "name": "Brandt M35",
"capabilities": [ "IR" ],
"capabilities_other": [ "5PP" ],
"note_number": "1",
"notes": [ "A" ]
},
{ "name": "Bofors 37mm",
"capabilities": [ "NT", "QSU" ],
"note_number": "2\u2020",
"notes": [ "A" ]
},
{ "name": "45mm PTP obr. 32",
"capabilities": [ "NT", "QSU" ],
"note_number": "3\u2020"
},
{ "name": "Resita M43",
"capabilities": [ "NT", "QSU" ],
"capabilities_other": [ "Blk TH", "AP TK#18\u2020" ],
"note_number": "4\u2020"
},
{ "name": "76.2mm PaK 36(r)",
"capabilities": [ "NT", "QSU" ],
"capabilities2": { "s": 7 },
"note_number": "5",
"notes": [ "K\u2020" ]
},
{ "name": "Breda 47",
"capabilities": [ "NT", "QSU", "no Gunshield" ],
"note_number": "6\u2020",
"notes": [ "A" ]
},
{ "name": "75mm PP obr. 27",
"capabilities": [ "NT", "QSU" ],
"capabilities2": { "H": 6, "s": 8 },
"note_number": "7",
"notes": [ "A" ]
},
{ "name": "75 M mle 28",
"capabilities": [ "NT", "QSU", "h-d" ],
"capabilities2": { "AP": 5, "s": 5 },
"note_number": "8",
"notes": [ "A" ]
},
{ "name": "Skoda M14/34",
"capabilities": [ "NT" ],
"capabilities2": { "AP": 6 },
"note_number": "9\u2020",
"notes": [ "A" ]
},
{ "name": "76.2mm P obr. 00/02",
"capabilities": [ "NT", "QSU", "h-d" ],
"capabilities2": { "s": 7 },
"note_number": "10"
},
{ "name": "76.2mm P obr. 02/30",
"capabilities": [ "NT", "QSU", "h-d" ],
"capabilities2": { "s": 7 },
"note_number": "11"
},
{ "name": "76.2mm P obr. 39(r)",
"capabilities": [ "NT", "QSU" ],
"capabilities2": { "s": 5 },
"note_number": "12",
"notes": [ "K\u2020" ]
},
{ "name": "s 10cm K 18(g)",
"capabilities": [ "NT", "NM" ],
"capabilities2": { "s": 5 },
"note_number": "13",
"notes": [ "E" ]
},
{ "name": "Skoda M39(D9)",
"capabilities": [ "NT" ],
"note_number": "14"
},
{ "name": "Canon de 105L mle 36S",
"capabilities": [ "NT" ],
"note_number": "15"
},
{ "name": "Canon mle 10/12",
"capabilities": [ "NT", "h-d" ],
"capabilities2": { "s": 4 },
"note_number": "16"
},
{ "name": "OQF 4.5in",
"capabilities": [ "NT" ],
"capabilities2": { "s": 4 },
"note_number": "17"
},
{ "name": "Skoda M28 NOa",
"capabilities": [ "NM", "no IF" ],
"capabilities_other": [ "ST" ],
"note_number": "18"
},
{ "name": "Skoda M33 (K1)",
"capabilities": [ "NT" ],
"note_number": "19"
},
{ "name": "CA mle 38",
"capabilities": [ "T" ],
"note_number": "20"
},
{ "name": "Vickers/Resita M36/39",
"capabilities": [ "T" ],
"note_number": "21\u2020"
},
{ "name": "Kanon PL vz. 12/20",
"capabilities": [ "T", "NM" ],
"note_number": "22"
}
]

@ -0,0 +1,49 @@
[
{ "name": "R-1(t)",
"no_radio": "\u00ae",
"CS#": 2,
"note_number": "1\u2020",
"notes": [ "E" ]
},
{ "name": "R-35/45(f)",
"no_radio": "\u00ae",
"CS#": 2,
"note_number": "2",
"notes": [ "D" ]
},
{ "name": "TACAM T-60(r)",
"CS#": 3,
"note_number": "3\u2020",
"notes": [ "E" ]
},
{ "name": "TACAM T-60A(r)",
"CS#": 3,
"note_number": "3\u2020",
"notes": [ "E" ]
},
{ "name": "TACAM R-2(r)",
"CS#": 3,
"capabilities2": { "AP": 5 },
"note_number": "4\u2020",
"notes": [ "E", "N" ]
},
{ "name": "BA-6(r)",
"no_radio": "\u00ae",
"CS#": 4,
"note_number": "5\u2020",
"notes": [ "E" ]
},
{ "name": "BA-20(r)",
"no_radio": "\u00ae",
"CS#": 3,
"note_number": "5\u2020",
"notes": [ "E" ]
},
{ "name": "Malaxa UE2",
"cs#": "2\u2020<sup>1</sup>",
"note_number": "6\u2020",
"notes": [ "F", "I\u2020<sup>1</sup>", "J" ]
}
]

@ -0,0 +1,26 @@
=== ordnance/romanian/1940 ===
Name Capabilities (effective) # Notes
--------------------- ----------------------- ----------------------- --- -------
Brandt M35 IR 5PP IR 5PP 1 A
Bofors 37mm NT QSU NT QSU 2† A
45mm PTP obr. 32 NT QSU NT QSU 3† n/a
Resita M43 NT QSU Blk TH AP TK#18† NT QSU Blk TH AP TK#18† 4† n/a
76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
Breda 47 NT QSU no Gunshield NT QSU no Gunshield 6† A
75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
Skoda M14/34 NT AP6 NT AP6 9† A
76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
s 10cm K 18(g) NT NM s5 NT NM s5 13 E
Skoda M39(D9) NT NT 14 n/a
Canon de 105L mle 36S NT NT 15 n/a
Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
OQF 4.5in NT s4 NT s4 17 n/a
Skoda M28 NOa NM no IF ST NM no IF ST 18 n/a
Skoda M33 (K1) NT NT 19 n/a
CA mle 38 T T 20 n/a
Vickers/Resita M36/39 T T 21† n/a
Kanon PL vz. 12/20 T NM T NM 22 n/a

@ -0,0 +1,26 @@
=== ordnance/romanian/1941 ===
Name Capabilities (effective) # Notes
--------------------- ----------------------- ----------------------- --- -------
Brandt M35 IR 5PP IR 5PP 1 A
Bofors 37mm NT QSU NT QSU 2† A
45mm PTP obr. 32 NT QSU NT QSU 3† n/a
Resita M43 NT QSU Blk TH AP TK#18† NT QSU Blk TH AP TK#18† 4† n/a
76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
Breda 47 NT QSU no Gunshield NT QSU no Gunshield 6† A
75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
Skoda M14/34 NT AP6 NT AP6 9† A
76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
s 10cm K 18(g) NT NM s5 NT NM s5 13 E
Skoda M39(D9) NT NT 14 n/a
Canon de 105L mle 36S NT NT 15 n/a
Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
OQF 4.5in NT s4 NT s4 17 n/a
Skoda M28 NOa NM no IF ST NM no IF ST 18 n/a
Skoda M33 (K1) NT NT 19 n/a
CA mle 38 T T 20 n/a
Vickers/Resita M36/39 T T 21† n/a
Kanon PL vz. 12/20 T NM T NM 22 n/a

@ -0,0 +1,26 @@
=== ordnance/romanian/1942 ===
Name Capabilities (effective) # Notes
--------------------- ----------------------- ----------------------- --- -------
Brandt M35 IR 5PP IR 5PP 1 A
Bofors 37mm NT QSU NT QSU 2† A
45mm PTP obr. 32 NT QSU NT QSU 3† n/a
Resita M43 NT QSU Blk TH AP TK#18† NT QSU Blk TH AP TK#18† 4† n/a
76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
Breda 47 NT QSU no Gunshield NT QSU no Gunshield 6† A
75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
Skoda M14/34 NT AP6 NT AP6 9† A
76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
s 10cm K 18(g) NT NM s5 NT NM s5 13 E
Skoda M39(D9) NT NT 14 n/a
Canon de 105L mle 36S NT NT 15 n/a
Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
OQF 4.5in NT s4 NT s4 17 n/a
Skoda M28 NOa NM no IF ST NM no IF ST 18 n/a
Skoda M33 (K1) NT NT 19 n/a
CA mle 38 T T 20 n/a
Vickers/Resita M36/39 T T 21† n/a
Kanon PL vz. 12/20 T NM T NM 22 n/a

@ -0,0 +1,26 @@
=== ordnance/romanian/1943 ===
Name Capabilities (effective) # Notes
--------------------- ----------------------- ----------------------- --- -------
Brandt M35 IR 5PP IR 5PP 1 A
Bofors 37mm NT QSU NT QSU 2† A
45mm PTP obr. 32 NT QSU NT QSU 3† n/a
Resita M43 NT QSU Blk TH AP TK#18† NT QSU Blk TH AP TK#18† 4† n/a
76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
Breda 47 NT QSU no Gunshield NT QSU no Gunshield 6† A
75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
Skoda M14/34 NT AP6 NT AP6 9† A
76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
s 10cm K 18(g) NT NM s5 NT NM s5 13 E
Skoda M39(D9) NT NT 14 n/a
Canon de 105L mle 36S NT NT 15 n/a
Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
OQF 4.5in NT s4 NT s4 17 n/a
Skoda M28 NOa NM no IF ST NM no IF ST 18 n/a
Skoda M33 (K1) NT NT 19 n/a
CA mle 38 T T 20 n/a
Vickers/Resita M36/39 T T 21† n/a
Kanon PL vz. 12/20 T NM T NM 22 n/a

@ -0,0 +1,26 @@
=== ordnance/romanian/1944 ===
Name Capabilities (effective) # Notes
--------------------- ----------------------- ----------------------- --- -------
Brandt M35 IR 5PP IR 5PP 1 A
Bofors 37mm NT QSU NT QSU 2† A
45mm PTP obr. 32 NT QSU NT QSU 3† n/a
Resita M43 NT QSU Blk TH AP TK#18† NT QSU Blk TH AP TK#18† 4† n/a
76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
Breda 47 NT QSU no Gunshield NT QSU no Gunshield 6† A
75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
Skoda M14/34 NT AP6 NT AP6 9† A
76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
s 10cm K 18(g) NT NM s5 NT NM s5 13 E
Skoda M39(D9) NT NT 14 n/a
Canon de 105L mle 36S NT NT 15 n/a
Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
OQF 4.5in NT s4 NT s4 17 n/a
Skoda M28 NOa NM no IF ST NM no IF ST 18 n/a
Skoda M33 (K1) NT NT 19 n/a
CA mle 38 T T 20 n/a
Vickers/Resita M36/39 T T 21† n/a
Kanon PL vz. 12/20 T NM T NM 22 n/a

@ -0,0 +1,26 @@
=== ordnance/romanian/1945 ===
Name Capabilities (effective) # Notes
--------------------- ----------------------- ----------------------- --- -------
Brandt M35 IR 5PP IR 5PP 1 A
Bofors 37mm NT QSU NT QSU 2† A
45mm PTP obr. 32 NT QSU NT QSU 3† n/a
Resita M43 NT QSU Blk TH AP TK#18† NT QSU Blk TH AP TK#18† 4† n/a
76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
Breda 47 NT QSU no Gunshield NT QSU no Gunshield 6† A
75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
Skoda M14/34 NT AP6 NT AP6 9† A
76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
s 10cm K 18(g) NT NM s5 NT NM s5 13 E
Skoda M39(D9) NT NT 14 n/a
Canon de 105L mle 36S NT NT 15 n/a
Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
OQF 4.5in NT s4 NT s4 17 n/a
Skoda M28 NOa NM no IF ST NM no IF ST 18 n/a
Skoda M33 (K1) NT NT 19 n/a
CA mle 38 T T 20 n/a
Vickers/Resita M36/39 T T 21† n/a
Kanon PL vz. 12/20 T NM T NM 22 n/a

@ -0,0 +1,12 @@
=== vehicles/romanian/1940 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
-------------- ------- ---- ----------------- -------------- ------------- --- ------------------
R-1(t) ® yes CS 2 n/a n/a 1† E
R-35/45(f) ® yes CS 2 n/a n/a 2 D
TACAM T-60(r) n/a yes CS 3 n/a n/a 3† E
TACAM T-60A(r) n/a yes CS 3 n/a n/a 3† E
TACAM R-2(r) n/a yes CS 3 AP5 AP5 4† E N
BA-6(r) ® yes CS 4 n/a n/a 5† E
BA-20(r) ® yes CS 3 n/a n/a 5† E
Malaxa UE2 n/a yes cs 2†<sup>1</sup> n/a n/a 6† F I†<sup>1</sup> J

@ -0,0 +1,12 @@
=== vehicles/romanian/1941 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
-------------- ------- ---- ----------------- -------------- ------------- --- ------------------
R-1(t) ® yes CS 2 n/a n/a 1† E
R-35/45(f) ® yes CS 2 n/a n/a 2 D
TACAM T-60(r) n/a yes CS 3 n/a n/a 3† E
TACAM T-60A(r) n/a yes CS 3 n/a n/a 3† E
TACAM R-2(r) n/a yes CS 3 AP5 AP5 4† E N
BA-6(r) ® yes CS 4 n/a n/a 5† E
BA-20(r) ® yes CS 3 n/a n/a 5† E
Malaxa UE2 n/a yes cs 2†<sup>1</sup> n/a n/a 6† F I†<sup>1</sup> J

@ -0,0 +1,12 @@
=== vehicles/romanian/1942 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
-------------- ------- ---- ----------------- -------------- ------------- --- ------------------
R-1(t) ® yes CS 2 n/a n/a 1† E
R-35/45(f) ® yes CS 2 n/a n/a 2 D
TACAM T-60(r) n/a yes CS 3 n/a n/a 3† E
TACAM T-60A(r) n/a yes CS 3 n/a n/a 3† E
TACAM R-2(r) n/a yes CS 3 AP5 AP5 4† E N
BA-6(r) ® yes CS 4 n/a n/a 5† E
BA-20(r) ® yes CS 3 n/a n/a 5† E
Malaxa UE2 n/a yes cs 2†<sup>1</sup> n/a n/a 6† F I†<sup>1</sup> J

@ -0,0 +1,12 @@
=== vehicles/romanian/1943 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
-------------- ------- ---- ----------------- -------------- ------------- --- ------------------
R-1(t) ® yes CS 2 n/a n/a 1† E
R-35/45(f) ® yes CS 2 n/a n/a 2 D
TACAM T-60(r) n/a yes CS 3 n/a n/a 3† E
TACAM T-60A(r) n/a yes CS 3 n/a n/a 3† E
TACAM R-2(r) n/a yes CS 3 AP5 AP5 4† E N
BA-6(r) ® yes CS 4 n/a n/a 5† E
BA-20(r) ® yes CS 3 n/a n/a 5† E
Malaxa UE2 n/a yes cs 2†<sup>1</sup> n/a n/a 6† F I†<sup>1</sup> J

@ -0,0 +1,12 @@
=== vehicles/romanian/1944 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
-------------- ------- ---- ----------------- -------------- ------------- --- ------------------
R-1(t) ® yes CS 2 n/a n/a 1† E
R-35/45(f) ® yes CS 2 n/a n/a 2 D
TACAM T-60(r) n/a yes CS 3 n/a n/a 3† E
TACAM T-60A(r) n/a yes CS 3 n/a n/a 3† E
TACAM R-2(r) n/a yes CS 3 AP5 AP5 4† E N
BA-6(r) ® yes CS 4 n/a n/a 5† E
BA-20(r) ® yes CS 3 n/a n/a 5† E
Malaxa UE2 n/a yes cs 2†<sup>1</sup> n/a n/a 6† F I†<sup>1</sup> J

@ -0,0 +1,12 @@
=== vehicles/romanian/1945 ===
Name Radio IF Crew survival Capabilities (effective) # Notes
-------------- ------- ---- ----------------- -------------- ------------- --- ------------------
R-1(t) ® yes CS 2 n/a n/a 1† E
R-35/45(f) ® yes CS 2 n/a n/a 2 D
TACAM T-60(r) n/a yes CS 3 n/a n/a 3† E
TACAM T-60A(r) n/a yes CS 3 n/a n/a 3† E
TACAM R-2(r) n/a yes CS 3 AP5 AP5 4† E N
BA-6(r) ® yes CS 4 n/a n/a 5† E
BA-20(r) ® yes CS 3 n/a n/a 5† E
Malaxa UE2 n/a yes cs 2†<sup>1</sup> n/a n/a 6† F I†<sup>1</sup> J

@ -38,7 +38,8 @@ 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", "allied-minor-common"
"polish", "belgian","yugoslavian","danish","dutch","greek", "allied-minor-common",
"romanian"
]
for nat in nationalities:
for vo_type in ["vehicles","ordnance"]:

Loading…
Cancel
Save