Added the Hungarian nationality and vehicles/ordnance.

6 years ago · ce450d00ee
parent 193521d4e1
commit ce450d00ee
17 changed files with 242 additions and 1 deletions
--- a/vasl_templates/webapp/data/default-template-pack/nationalities.json
+++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json
@ -73,6 +73,10 @@
 "romanian": {
  "display_name": "Romanian",
  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"hungarian": {
+  "display_name": "Hungarian",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
 }

 }
--- a/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
@ -0,0 +1,29 @@
+[
+
+{ "name": "5cm leGrW 39(h)",
+  "capabilities_other": [ "5PP" ],
+  "note_number": "23",
+  "notes": [ "A" ]
+},
+{ "name": "40mm MAVAG 40 M",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": "7[9]\u2020" },
+  "note_number": "24\u2020"
+},
+{ "name": "Skoda M05/08",
+  "capabilities": [ "NT" ],
+  "note_number": "25",
+  "notes": [ "A" ]
+},
+{ "name": "105mm MAVAG M40",
+  "capabilities": [ "NT", "h-d" ],
+  "note_number": "26"
+},
+{ "name": "Bofors 80mm M29/38",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "80\u2020<sup>1</sup>", "1 ROF", "B11" ] },
+  "note_number": "27\u2020",
+  "notes": [ "G\u2020<sup>1</sup>" ]
+}
+
+]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/hungarian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/hungarian.json
@ -0,0 +1,64 @@
+[
+
+{ "name": "38M Toldi I",
+  "CS#": 3,
+  "note_number": "7\u2020",
+  "notes": [ "A\u2020<sup>1</sup>" ]
+},
+{ "name": "38M Toldi IIA",
+  "CS#": 3,
+  "note_number": "8\u2020",
+  "notes": [ "A\u2020<sup>1</sup>" ]
+},
+{ "name": "40M Turan I(r)",
+  "CS#": 5,
+  "capabilities2": { "sD": 5 },
+  "note_number": "9\u2020",
+  "notes": [ "E", "N", "Q" ]
+},
+{ "name": "41M Turan II(r)",
+  "CS#": 5,
+  "capabilities2": { "AP": 6, "s": 7, "sD": 5 },
+  "note_number": "10\u2020",
+  "notes": [ "E", "N", "Q" ]
+},
+{ "name": "PzKpfw VG(g)",
+  "CS#": 6,
+  "capabilities2": { "sN": 6 },
+  "note_number": "11\u2020",
+  "notes": [ "E" ]
+},
+{ "name": "PzKpfw VIE(L)(g)",
+  "CS#": 6,
+  "capabilities2": { "A": [ [3,4] ], "sN": 6 },
+  "note_number": "12\u2020",
+  "notes": [ "E" ]
+},
+{ "name": "43M Zrinyi II",
+  "CS#": 4,
+  "capabilities2": { "s": 7, "sD": 5 },
+  "note_number": "13\u2020",
+  "notes": [ "Q" ]
+},
+{ "name": "39M Csaba",
+  "CS#": 4,
+  "note_number": "14"
+},
+{ "name": "40M Csaba",
+  "CS#": 4,
+  "note_number": "14"
+},
+{ "name": "Marder II(g)",
+  "CS#": "4:brewup",
+  "capabilities2": { "A": [ [4,3], [3,4] ], "HE": 7, "s": 6 },
+  "note_number": "15",
+  "notes": [ "E" ]
+},
+{ "name": "40M Nimrod",
+  "CS#": 6,
+  "capabilities2": { "H": [ ["6[9]","3+"] ] },
+  "note_number": "16\u2020",
+  "notes": [ "P\u2020<sup>1</sup>" ]
+}
+
+]
--- a/vasl_templates/webapp/static/images/flags/hungarian.png
+++ b/vasl_templates/webapp/static/images/flags/hungarian.png
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
@ -0,0 +1,9 @@
+=== ordnance/hungarian/1940 ===
+
+Name                Capabilities               (effective)                #    Notes
+------------------  -------------------------  -------------------------  ---  --------------
+5cm leGrW 39(h)     5PP                        5PP                        23   A
+40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
+Skoda M05/08        NT                         NT                         25   A
+105mm MAVAG M40     NT h-d                     NT h-d                     26   n/a
+Bofors 80mm M29/38  T LF [80†[1], 1 ROF, B11]  T LF [80†[1], 1 ROF, B11]  27†  G†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
@ -0,0 +1,9 @@
+=== ordnance/hungarian/1941 ===
+
+Name                Capabilities               (effective)                #    Notes
+------------------  -------------------------  -------------------------  ---  --------------
+5cm leGrW 39(h)     5PP                        5PP                        23   A
+40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
+Skoda M05/08        NT                         NT                         25   A
+105mm MAVAG M40     NT h-d                     NT h-d                     26   n/a
+Bofors 80mm M29/38  T LF [80†[1], 1 ROF, B11]  T LF [80†[1], 1 ROF, B11]  27†  G†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
@ -0,0 +1,9 @@
+=== ordnance/hungarian/1942 ===
+
+Name                Capabilities               (effective)                #    Notes
+------------------  -------------------------  -------------------------  ---  --------------
+5cm leGrW 39(h)     5PP                        5PP                        23   A
+40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
+Skoda M05/08        NT                         NT                         25   A
+105mm MAVAG M40     NT h-d                     NT h-d                     26   n/a
+Bofors 80mm M29/38  T LF [80†[1], 1 ROF, B11]  T LF [80†[1], 1 ROF, B11]  27†  G†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
@ -0,0 +1,9 @@
+=== ordnance/hungarian/1943 ===
+
+Name                Capabilities               (effective)                #    Notes
+------------------  -------------------------  -------------------------  ---  --------------
+5cm leGrW 39(h)     5PP                        5PP                        23   A
+40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
+Skoda M05/08        NT                         NT                         25   A
+105mm MAVAG M40     NT h-d                     NT h-d                     26   n/a
+Bofors 80mm M29/38  T LF [80†[1], 1 ROF, B11]  T LF [80†[1], 1 ROF, B11]  27†  G†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
@ -0,0 +1,9 @@
+=== ordnance/hungarian/1944 ===
+
+Name                Capabilities               (effective)                #    Notes
+------------------  -------------------------  -------------------------  ---  --------------
+5cm leGrW 39(h)     5PP                        5PP                        23   A
+40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
+Skoda M05/08        NT                         NT                         25   A
+105mm MAVAG M40     NT h-d                     NT h-d                     26   n/a
+Bofors 80mm M29/38  T LF [80†[1], 1 ROF, B11]  T LF [80†[1], 1 ROF, B11]  27†  G†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
@ -0,0 +1,9 @@
+=== ordnance/hungarian/1945 ===
+
+Name                Capabilities               (effective)                #    Notes
+------------------  -------------------------  -------------------------  ---  --------------
+5cm leGrW 39(h)     5PP                        5PP                        23   A
+40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
+Skoda M05/08        NT                         NT                         25   A
+105mm MAVAG M40     NT h-d                     NT h-d                     26   n/a
+Bofors 80mm M29/38  T LF [80†[1], 1 ROF, B11]  T LF [80†[1], 1 ROF, B11]  27†  G†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
@ -0,0 +1,15 @@
+=== vehicles/hungarian/1940 ===
+
+Name              Radio    IF    Crew survival                         Capabilities      (effective)    #    Notes
+----------------  -------  ----  ------------------------------------  ----------------  -------------  ---  --------------
+38M Toldi I       n/a      yes   CS 3                                  n/a               n/a            7†   A†<sup>1</sup>
+38M Toldi IIA     n/a      yes   CS 3                                  n/a               n/a            8†   A†<sup>1</sup>
+40M Turan I(r)    n/a      yes   CS 5                                  sD5               sD5            9†   E N Q
+41M Turan II(r)   n/a      yes   CS 5                                  AP6 s7 sD5        AP6 s7 sD5     10†  E N Q
+PzKpfw VG(g)      n/a      yes   CS 6                                  sN6               sN6            11†  E
+PzKpfw VIE(L)(g)  n/a      yes   CS 6                                  A3[4] sN6         sN6            12†  E
+43M Zrinyi II     n/a      yes   CS 4                                  s7 sD5            s7 sD5         13†  Q
+39M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+40M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+Marder II(g)      n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s6  HE7 s6         15   E
+40M Nimrod        n/a      yes   CS 6                                  H6[9][3+]         n/a            16†  P†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
@ -0,0 +1,15 @@
+=== vehicles/hungarian/1941 ===
+
+Name              Radio    IF    Crew survival                         Capabilities      (effective)    #    Notes
+----------------  -------  ----  ------------------------------------  ----------------  -------------  ---  --------------
+38M Toldi I       n/a      yes   CS 3                                  n/a               n/a            7†   A†<sup>1</sup>
+38M Toldi IIA     n/a      yes   CS 3                                  n/a               n/a            8†   A†<sup>1</sup>
+40M Turan I(r)    n/a      yes   CS 5                                  sD5               sD5            9†   E N Q
+41M Turan II(r)   n/a      yes   CS 5                                  AP6 s7 sD5        AP6 s7 sD5     10†  E N Q
+PzKpfw VG(g)      n/a      yes   CS 6                                  sN6               sN6            11†  E
+PzKpfw VIE(L)(g)  n/a      yes   CS 6                                  A3[4] sN6         sN6            12†  E
+43M Zrinyi II     n/a      yes   CS 4                                  s7 sD5            s7 sD5         13†  Q
+39M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+40M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+Marder II(g)      n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s6  HE7 s6         15   E
+40M Nimrod        n/a      yes   CS 6                                  H6[9][3+]         n/a            16†  P†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
@ -0,0 +1,15 @@
+=== vehicles/hungarian/1942 ===
+
+Name              Radio    IF    Crew survival                         Capabilities      (effective)    #    Notes
+----------------  -------  ----  ------------------------------------  ----------------  -------------  ---  --------------
+38M Toldi I       n/a      yes   CS 3                                  n/a               n/a            7†   A†<sup>1</sup>
+38M Toldi IIA     n/a      yes   CS 3                                  n/a               n/a            8†   A†<sup>1</sup>
+40M Turan I(r)    n/a      yes   CS 5                                  sD5               sD5            9†   E N Q
+41M Turan II(r)   n/a      yes   CS 5                                  AP6 s7 sD5        AP6 s7 sD5     10†  E N Q
+PzKpfw VG(g)      n/a      yes   CS 6                                  sN6               sN6            11†  E
+PzKpfw VIE(L)(g)  n/a      yes   CS 6                                  A3[4] sN6         sN6            12†  E
+43M Zrinyi II     n/a      yes   CS 4                                  s7 sD5            s7 sD5         13†  Q
+39M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+40M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+Marder II(g)      n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s6  HE7 s6         15   E
+40M Nimrod        n/a      yes   CS 6                                  H6[9][3+]         n/a            16†  P†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
@ -0,0 +1,15 @@
+=== vehicles/hungarian/1943 ===
+
+Name              Radio    IF    Crew survival                         Capabilities      (effective)    #    Notes
+----------------  -------  ----  ------------------------------------  ----------------  -------------  ---  --------------
+38M Toldi I       n/a      yes   CS 3                                  n/a               n/a            7†   A†<sup>1</sup>
+38M Toldi IIA     n/a      yes   CS 3                                  n/a               n/a            8†   A†<sup>1</sup>
+40M Turan I(r)    n/a      yes   CS 5                                  sD5               sD5            9†   E N Q
+41M Turan II(r)   n/a      yes   CS 5                                  AP6 s7 sD5        AP6 s7 sD5     10†  E N Q
+PzKpfw VG(g)      n/a      yes   CS 6                                  sN6               sN6            11†  E
+PzKpfw VIE(L)(g)  n/a      yes   CS 6                                  A3[4] sN6         sN6            12†  E
+43M Zrinyi II     n/a      yes   CS 4                                  s7 sD5            s7 sD5         13†  Q
+39M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+40M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+Marder II(g)      n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s6  A4 HE7 s6      15   E
+40M Nimrod        n/a      yes   CS 6                                  H6[9][3+]         H6[9]          16†  P†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
@ -0,0 +1,15 @@
+=== vehicles/hungarian/1944 ===
+
+Name              Radio    IF    Crew survival                         Capabilities      (effective)    #    Notes
+----------------  -------  ----  ------------------------------------  ----------------  -------------  ---  --------------
+38M Toldi I       n/a      yes   CS 3                                  n/a               n/a            7†   A†<sup>1</sup>
+38M Toldi IIA     n/a      yes   CS 3                                  n/a               n/a            8†   A†<sup>1</sup>
+40M Turan I(r)    n/a      yes   CS 5                                  sD5               sD5            9†   E N Q
+41M Turan II(r)   n/a      yes   CS 5                                  AP6 s7 sD5        AP6 s7 sD5     10†  E N Q
+PzKpfw VG(g)      n/a      yes   CS 6                                  sN6               sN6            11†  E
+PzKpfw VIE(L)(g)  n/a      yes   CS 6                                  A3[4] sN6         A3 sN6         12†  E
+43M Zrinyi II     n/a      yes   CS 4                                  s7 sD5            s7 sD5         13†  Q
+39M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+40M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+Marder II(g)      n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s6  A3 HE7 s6      15   E
+40M Nimrod        n/a      yes   CS 6                                  H6[9][3+]         H6[9]          16†  P†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
@ -0,0 +1,15 @@
+=== vehicles/hungarian/1945 ===
+
+Name              Radio    IF    Crew survival                         Capabilities      (effective)    #    Notes
+----------------  -------  ----  ------------------------------------  ----------------  -------------  ---  --------------
+38M Toldi I       n/a      yes   CS 3                                  n/a               n/a            7†   A†<sup>1</sup>
+38M Toldi IIA     n/a      yes   CS 3                                  n/a               n/a            8†   A†<sup>1</sup>
+40M Turan I(r)    n/a      yes   CS 5                                  sD5               sD5            9†   E N Q
+41M Turan II(r)   n/a      yes   CS 5                                  AP6 s7 sD5        AP6 s7 sD5     10†  E N Q
+PzKpfw VG(g)      n/a      yes   CS 6                                  sN6               sN6            11†  E
+PzKpfw VIE(L)(g)  n/a      yes   CS 6                                  A3[4] sN6         A3 sN6         12†  E
+43M Zrinyi II     n/a      yes   CS 4                                  s7 sD5            s7 sD5         13†  Q
+39M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+40M Csaba         n/a      yes   CS 4                                  n/a               n/a            14   n/a
+Marder II(g)      n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s6  A3 HE7 s6      15   E
+40M Nimrod        n/a      yes   CS 6                                  H6[9][3+]         H6[9]          16†  P†<sup>1</sup>
--- a/vasl_templates/webapp/tests/test_vo_reports.py
+++ b/vasl_templates/webapp/tests/test_vo_reports.py
@ -39,7 +39,7 @@ def test_vo_reports( webapp, webdriver ):
    nationalities = [
        "german", "russian", "american", "british", "italian", "japanese", "chinese", "french",
        "polish", "belgian","yugoslavian","danish","dutch","greek", "allied-minor-common",
-        "romanian"
+        "romanian", "hungarian"
    ]
    for nat in nationalities:
        for vo_type in ["vehicles","ordnance"]: