Added the Slovakian nationality and vehicles/ordnance.

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

 }
--- a/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
@ -0,0 +1,41 @@
+[
+
+{ "name": "Minomet vz. 36",
+  "capabilities": [ "NT", "QSU" ],
+  "note_number": "28",
+  "notes": [ "A" ]
+},
+{ "name": "Kanon PUV vz. 36(t)",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": [ [5,1], [4,2] ] },
+  "note_number": "29",
+  "notes": [ "E" ]
+},
+{ "name": "leIG 18(g)",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": [ ["7","3+"] ] },
+  "note_number": "30",
+  "notes": [ "A", "E" ]
+},
+{ "name": "Skoda M37(K4)",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "s": 6 },
+  "note_number": "31"
+},
+{ "name": "Skoda 47L40(t)",
+  "capabilities": [ "T", "QSU" ],
+  "capabilities_other": [ "AA Fire ROF 2\u2020" ],
+  "note_number": "32\u2020",
+  "notes": [ "E" ]
+},
+{ "name": "Skoda PL vz. 37(t)",
+  "capabilities": [ "T" ],
+  "note_number": "33",
+  "notes": [ "E" ]
+},
+{ "name": "Kanon PL vz. 22/24",
+  "capabilities_other": [ "ST" ],
+  "note_number": "34\u2020"
+}
+
+]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/slovakian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/slovakian.json
@ -0,0 +1,43 @@
+[
+
+{ "name": "T vz 33(t)",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "17\u2020",
+  "notes": [ "K\u2020<sup>1</sup>", "E", "F", "G\u2020<sup>2</sup>" ]
+},
+{ "name": "LT vz 34",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "18"
+},
+{ "name": "PzKpfw IIA(g)",
+  "CS#": 3,
+  "capabilities2": { "sD": 6 },
+  "note_number": "19",
+  "notes": [ "E" ]
+},
+{ "name": "LT vz 40(t)",
+  "CS#": 4,
+  "capabilities2": { "sD": 6 },
+  "note_number": "20\u2020",
+  "notes": [ "K\u2020<sup>1</sup>", "E" ]
+},
+{ "name": "Marder III(t)H",
+  "CS#": "4:brewup",
+  "capabilities2": { "A": [ [4,3], [3,4] ], "HE": 7, "s": 7, "sD": 6 },
+  "note_number": "21\u2020",
+  "notes": [ "E" ]
+},
+{ "name": "Kfz 1(g)",
+  "cs#": "2\u2020<sup>1</sup>",
+  "note_number": "22\u2020",
+  "notes": [ "E", "L\u2020<sup>2</sup>", "I\u2020<sup>1</sup>" ]
+},
+{ "name": "SdKfz 2(g)",
+  "cs#": 2,
+  "note_number": "23\u2020",
+  "notes": [ "E", "L\u2020<sup>1</sup>" ]
+}
+
+]
--- a/vasl_templates/webapp/static/images/flags/slovakian.png
+++ b/vasl_templates/webapp/static/images/flags/slovakian.png
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
@ -0,0 +1,11 @@
+=== ordnance/slovakian/1940 ===
+
+Name                 Capabilities          (effective)           #    Notes
+-------------------  --------------------  --------------------  ---  -------
+Minomet vz. 36       NT QSU                NT QSU                28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU                29   E
+leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
+Skoda M37(K4)        NT s6                 NT s6                 31   n/a
+Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
+Skoda PL vz. 37(t)   T                     T                     33   E
+Kanon PL vz. 22/24   ST                    ST                    34†  n/a
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
@ -0,0 +1,11 @@
+=== ordnance/slovakian/1941 ===
+
+Name                 Capabilities          (effective)           #    Notes
+-------------------  --------------------  --------------------  ---  -------
+Minomet vz. 36       NT QSU                NT QSU                28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A5             29   E
+leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
+Skoda M37(K4)        NT s6                 NT s6                 31   n/a
+Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
+Skoda PL vz. 37(t)   T                     T                     33   E
+Kanon PL vz. 22/24   ST                    ST                    34†  n/a
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
@ -0,0 +1,11 @@
+=== ordnance/slovakian/1942 ===
+
+Name                 Capabilities          (effective)           #    Notes
+-------------------  --------------------  --------------------  ---  -------
+Minomet vz. 36       NT QSU                NT QSU                28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
+leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
+Skoda M37(K4)        NT s6                 NT s6                 31   n/a
+Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
+Skoda PL vz. 37(t)   T                     T                     33   E
+Kanon PL vz. 22/24   ST                    ST                    34†  n/a
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
@ -0,0 +1,11 @@
+=== ordnance/slovakian/1943 ===
+
+Name                 Capabilities          (effective)           #    Notes
+-------------------  --------------------  --------------------  ---  -------
+Minomet vz. 36       NT QSU                NT QSU                28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
+leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
+Skoda M37(K4)        NT s6                 NT s6                 31   n/a
+Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
+Skoda PL vz. 37(t)   T                     T                     33   E
+Kanon PL vz. 22/24   ST                    ST                    34†  n/a
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
@ -0,0 +1,11 @@
+=== ordnance/slovakian/1944 ===
+
+Name                 Capabilities          (effective)           #    Notes
+-------------------  --------------------  --------------------  ---  -------
+Minomet vz. 36       NT QSU                NT QSU                28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
+leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
+Skoda M37(K4)        NT s6                 NT s6                 31   n/a
+Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
+Skoda PL vz. 37(t)   T                     T                     33   E
+Kanon PL vz. 22/24   ST                    ST                    34†  n/a
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
@ -0,0 +1,11 @@
+=== ordnance/slovakian/1945 ===
+
+Name                 Capabilities          (effective)           #    Notes
+-------------------  --------------------  --------------------  ---  -------
+Minomet vz. 36       NT QSU                NT QSU                28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
+leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
+Skoda M37(K4)        NT s6                 NT s6                 31   n/a
+Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
+Skoda PL vz. 37(t)   T                     T                     33   E
+Kanon PL vz. 22/24   ST                    ST                    34†  n/a
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
@ -0,0 +1,11 @@
+=== vehicles/slovakian/1940 ===
+
+Name            Radio    IF    Crew survival                         Capabilities          (effective)    #    Notes
+--------------  -------  ----  ------------------------------------  --------------------  -------------  ---  ---------------------------------
+T vz 33(t)      ®        yes   CS 2                                  n/a                   n/a            17†  K†<sup>1</sup> E F G†<sup>2</sup>
+LT vz 34        ®        yes   CS 2                                  n/a                   n/a            18   n/a
+PzKpfw IIA(g)   n/a      yes   CS 3                                  sD6                   sD6            19   E
+LT vz 40(t)     n/a      yes   CS 4                                  sD6                   sD6            20†  K†<sup>1</sup> E
+Marder III(t)H  n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s7 sD6  HE7 s7 sD6     21†  E
+Kfz 1(g)        n/a      yes   cs 2†<sup>1</sup>                     n/a                   n/a            22†  E L†<sup>2</sup> I†<sup>1</sup>
+SdKfz 2(g)      n/a      yes   cs 2                                  n/a                   n/a            23†  E L†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
@ -0,0 +1,11 @@
+=== vehicles/slovakian/1941 ===
+
+Name            Radio    IF    Crew survival                         Capabilities          (effective)    #    Notes
+--------------  -------  ----  ------------------------------------  --------------------  -------------  ---  ---------------------------------
+T vz 33(t)      ®        yes   CS 2                                  n/a                   n/a            17†  K†<sup>1</sup> E F G†<sup>2</sup>
+LT vz 34        ®        yes   CS 2                                  n/a                   n/a            18   n/a
+PzKpfw IIA(g)   n/a      yes   CS 3                                  sD6                   sD6            19   E
+LT vz 40(t)     n/a      yes   CS 4                                  sD6                   sD6            20†  K†<sup>1</sup> E
+Marder III(t)H  n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s7 sD6  HE7 s7 sD6     21†  E
+Kfz 1(g)        n/a      yes   cs 2†<sup>1</sup>                     n/a                   n/a            22†  E L†<sup>2</sup> I†<sup>1</sup>
+SdKfz 2(g)      n/a      yes   cs 2                                  n/a                   n/a            23†  E L†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
@ -0,0 +1,11 @@
+=== vehicles/slovakian/1942 ===
+
+Name            Radio    IF    Crew survival                         Capabilities          (effective)    #    Notes
+--------------  -------  ----  ------------------------------------  --------------------  -------------  ---  ---------------------------------
+T vz 33(t)      ®        yes   CS 2                                  n/a                   n/a            17†  K†<sup>1</sup> E F G†<sup>2</sup>
+LT vz 34        ®        yes   CS 2                                  n/a                   n/a            18   n/a
+PzKpfw IIA(g)   n/a      yes   CS 3                                  sD6                   sD6            19   E
+LT vz 40(t)     n/a      yes   CS 4                                  sD6                   sD6            20†  K†<sup>1</sup> E
+Marder III(t)H  n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s7 sD6  HE7 s7 sD6     21†  E
+Kfz 1(g)        n/a      yes   cs 2†<sup>1</sup>                     n/a                   n/a            22†  E L†<sup>2</sup> I†<sup>1</sup>
+SdKfz 2(g)      n/a      yes   cs 2                                  n/a                   n/a            23†  E L†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
@ -0,0 +1,11 @@
+=== vehicles/slovakian/1943 ===
+
+Name            Radio    IF    Crew survival                         Capabilities          (effective)    #    Notes
+--------------  -------  ----  ------------------------------------  --------------------  -------------  ---  ---------------------------------
+T vz 33(t)      ®        yes   CS 2                                  n/a                   n/a            17†  K†<sup>1</sup> E F G†<sup>2</sup>
+LT vz 34        ®        yes   CS 2                                  n/a                   n/a            18   n/a
+PzKpfw IIA(g)   n/a      yes   CS 3                                  sD6                   sD6            19   E
+LT vz 40(t)     n/a      yes   CS 4                                  sD6                   sD6            20†  K†<sup>1</sup> E
+Marder III(t)H  n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s7 sD6  A4 HE7 s7 sD6  21†  E
+Kfz 1(g)        n/a      yes   cs 2†<sup>1</sup>                     n/a                   n/a            22†  E L†<sup>2</sup> I†<sup>1</sup>
+SdKfz 2(g)      n/a      yes   cs 2                                  n/a                   n/a            23†  E L†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
@ -0,0 +1,11 @@
+=== vehicles/slovakian/1944 ===
+
+Name            Radio    IF    Crew survival                         Capabilities          (effective)    #    Notes
+--------------  -------  ----  ------------------------------------  --------------------  -------------  ---  ---------------------------------
+T vz 33(t)      ®        yes   CS 2                                  n/a                   n/a            17†  K†<sup>1</sup> E F G†<sup>2</sup>
+LT vz 34        ®        yes   CS 2                                  n/a                   n/a            18   n/a
+PzKpfw IIA(g)   n/a      yes   CS 3                                  sD6                   sD6            19   E
+LT vz 40(t)     n/a      yes   CS 4                                  sD6                   sD6            20†  K†<sup>1</sup> E
+Marder III(t)H  n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s7 sD6  A3 HE7 s7 sD6  21†  E
+Kfz 1(g)        n/a      yes   cs 2†<sup>1</sup>                     n/a                   n/a            22†  E L†<sup>2</sup> I†<sup>1</sup>
+SdKfz 2(g)      n/a      yes   cs 2                                  n/a                   n/a            23†  E L†<sup>1</sup>
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
@ -0,0 +1,11 @@
+=== vehicles/slovakian/1945 ===
+
+Name            Radio    IF    Crew survival                         Capabilities          (effective)    #    Notes
+--------------  -------  ----  ------------------------------------  --------------------  -------------  ---  ---------------------------------
+T vz 33(t)      ®        yes   CS 2                                  n/a                   n/a            17†  K†<sup>1</sup> E F G†<sup>2</sup>
+LT vz 34        ®        yes   CS 2                                  n/a                   n/a            18   n/a
+PzKpfw IIA(g)   n/a      yes   CS 3                                  sD6                   sD6            19   E
+LT vz 40(t)     n/a      yes   CS 4                                  sD6                   sD6            20†  K†<sup>1</sup> E
+Marder III(t)H  n/a      yes   CS 4 <small><i>(brew up)</i></small>  A4[3]3[4] HE7 s7 sD6  A3 HE7 s7 sD6  21†  E
+Kfz 1(g)        n/a      yes   cs 2†<sup>1</sup>                     n/a                   n/a            22†  E L†<sup>2</sup> I†<sup>1</sup>
+SdKfz 2(g)      n/a      yes   cs 2                                  n/a                   n/a            23†  E L†<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", "hungarian"
+        "romanian", "hungarian","slovakian",
    ]
    for nat in nationalities:
        for vo_type in ["vehicles","ordnance"]: