Added the Belgian nationality and vehicles/ordnance.

6 years ago · 779f326bf7
parent 8f6086f01b
commit 779f326bf7
18 changed files with 246 additions and 2 deletions
--- a/vasl_templates/webapp/data/default-template-pack/nationalities.json
+++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json
@ -48,6 +48,10 @@
 "polish": {
  "display_name": "Polish",
  "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ]
+},
+"belgian": {
+  "display_name": "Belgian",
+  "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ]
 }

 }
--- a/vasl_templates/webapp/data/ordnance/belgian.json
+++ b/vasl_templates/webapp/data/ordnance/belgian.json
@ -0,0 +1,62 @@
+[
+
+{ "name": "DBT",
+  "capabilities_other": [ "3PP", "\u2020" ],
+  "note_number": "6\u2020",
+  "notes": [ "A", "B", "D" ]
+},
+{ "name": "M76 A",
+  "capabilities": [ "NT", "h-d" ],
+  "capabilities2": { "LF": [ ["INF"], "\u2020" ] },
+  "note_number": "7\u2020",
+  "notes": [ "A", "B", "D" ]
+},
+{ "name": "M76 A",
+  "capabilities": [ "NT", "h-d" ],
+  "capabilities2": { "LF": [ ["INF"], "\u2020" ] },
+  "note_number": "7\u2020",
+  "notes": [ "A", "B", "D" ]
+},
+{ "name": "7.6cm FRC",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities_other": [ "\u2020" ],
+  "note_number": "8\u2020",
+  "notes": [ "A", "B" ]
+},
+{ "name": "C47 FRC M 32",
+  "capabilities": [ "NT", "QSU" ],
+  "note_number": "9",
+  "notes": [ "B" ]
+},
+{ "name": "C75 TR",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 5 },
+  "note_number": "10",
+  "notes": [ "B" ]
+},
+{ "name": "C75 GP",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "LF": [ "75*", "B10" ], "s": 5 },
+  "note_number": "11",
+  "notes": [ "B" ]
+},
+{ "name": "Ob 105 GP",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "LF": [ "105*" ], "s": 5 },
+  "note_number": "12",
+  "notes": [ "B" ]
+},
+{ "name": "C120 M31",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "LF": [ "120*" ] },
+  "note_number": "13",
+  "notes": [ "B" ]
+},
+{ "name": "M27 FRC",
+  "capabilities": [ "NM" ],
+  "capabilities_other": [ "ST" ],
+  "note_number": "14",
+  "notes": [ "B" ]
+}
+
+]
--- a/vasl_templates/webapp/data/vehicles/belgian.json
+++ b/vasl_templates/webapp/data/vehicles/belgian.json
@ -0,0 +1,34 @@
+[
+
+{ "name": "VCL Mk VI/c47(b)",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "14\u2020",
+  "notes": [ "A", "Q\u2020<sup>1</sup>" ]
+},
+{ "name": "T-13 II(b)",
+  "no_radio": "\u00ae",
+  "CS#": "4:brewup\u2020",
+  "note_number": "15\u2020",
+  "notes": [ "A" ]
+},
+{ "name": "T-13 III(b)",
+  "no_radio": "\u00ae",
+  "CS#": "4:brewup",
+  "note_number": "16",
+  "notes": [ "A" ]
+},
+{ "name": "T-15(b)",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "17",
+  "notes": [ "A" ]
+},
+{ "name": "ACG1(f)",
+  "no_radio": "\u00ae",
+  "CS#": "3:brewup",
+  "note_number": "18\u2020",
+  "notes": [ "A" ]
+}
+
+]
--- a/vasl_templates/webapp/static/images/flags/belgian.png
+++ b/vasl_templates/webapp/static/images/flags/belgian.png
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@ -292,7 +292,13 @@ function make_capabilities( entry, scenario_theater, scenario_year, scenario_mon
            }
            // check for LF
            if ( key == "LF" ) {
-                capabilities.push( "LF [" + entry.capabilities2[key].join(", ") + "]" ) ;
+                var caps = $.extend( true, [], entry.capabilities2[key] ) ;
+                if ( caps[caps.length-1] == "\u2020" ) {
+                    caps.pop() ;
+                    capabilities.push( "LF\u2020" ) ;
+                } else
+                    capabilities.push( "LF" ) ;
+                capabilities[ capabilities.length-1 ] += " [" + caps.join(", ") + "]" ;
                continue ;
            }
            if ( $.inArray( key, ["HE","AP","A","D","C","H","s","sM","sD","sN","WP","IR","Towed"] ) === -1 ) {
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
@ -0,0 +1,14 @@
+=== ordnance/belgian/1940 ===
+
+Name          Capabilities         (effective)          #    Notes
+------------  -------------------  -------------------  ---  -------
+DBT           3PP †                3PP †                6†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+C47 FRC M 32  NT QSU               NT QSU               9    B
+C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
+C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
+Ob 105 GP     NT LF [105*] s5      NT LF [105*] s5      12   B
+C120 M31      NT LF [120*]         NT LF [120*]         13   B
+M27 FRC       NM ST                NM ST                14   B
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
@ -0,0 +1,14 @@
+=== ordnance/belgian/1941 ===
+
+Name          Capabilities         (effective)          #    Notes
+------------  -------------------  -------------------  ---  -------
+DBT           3PP †                3PP †                6†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+C47 FRC M 32  NT QSU               NT QSU               9    B
+C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
+C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
+Ob 105 GP     NT LF [105*] s5      NT LF [105*] s5      12   B
+C120 M31      NT LF [120*]         NT LF [120*]         13   B
+M27 FRC       NM ST                NM ST                14   B
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
@ -0,0 +1,14 @@
+=== ordnance/belgian/1942 ===
+
+Name          Capabilities         (effective)          #    Notes
+------------  -------------------  -------------------  ---  -------
+DBT           3PP †                3PP †                6†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+C47 FRC M 32  NT QSU               NT QSU               9    B
+C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
+C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
+Ob 105 GP     NT LF [105*] s5      NT LF [105*] s5      12   B
+C120 M31      NT LF [120*]         NT LF [120*]         13   B
+M27 FRC       NM ST                NM ST                14   B
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
@ -0,0 +1,14 @@
+=== ordnance/belgian/1943 ===
+
+Name          Capabilities         (effective)          #    Notes
+------------  -------------------  -------------------  ---  -------
+DBT           3PP †                3PP †                6†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+C47 FRC M 32  NT QSU               NT QSU               9    B
+C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
+C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
+Ob 105 GP     NT LF [105*] s5      NT LF [105*] s5      12   B
+C120 M31      NT LF [120*]         NT LF [120*]         13   B
+M27 FRC       NM ST                NM ST                14   B
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
@ -0,0 +1,14 @@
+=== ordnance/belgian/1944 ===
+
+Name          Capabilities         (effective)          #    Notes
+------------  -------------------  -------------------  ---  -------
+DBT           3PP †                3PP †                6†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+C47 FRC M 32  NT QSU               NT QSU               9    B
+C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
+C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
+Ob 105 GP     NT LF [105*] s5      NT LF [105*] s5      12   B
+C120 M31      NT LF [120*]         NT LF [120*]         13   B
+M27 FRC       NM ST                NM ST                14   B
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
@ -0,0 +1,14 @@
+=== ordnance/belgian/1945 ===
+
+Name          Capabilities         (effective)          #    Notes
+------------  -------------------  -------------------  ---  -------
+DBT           3PP †                3PP †                6†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
+7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+C47 FRC M 32  NT QSU               NT QSU               9    B
+C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
+C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
+Ob 105 GP     NT LF [105*] s5      NT LF [105*] s5      12   B
+C120 M31      NT LF [120*]         NT LF [120*]         13   B
+M27 FRC       NM ST                NM ST                14   B
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
@ -0,0 +1,9 @@
+=== vehicles/belgian/1940 ===
+
+Name              Radio    IF    Crew survival                          Capabilities    (effective)    #    Notes
+----------------  -------  ----  -------------------------------------  --------------  -------------  ---  ----------------
+VCL Mk VI/c47(b)  ®        yes   CS 2                                   n/a             n/a            14†  A Q†<sup>1</sup>
+T-13 II(b)        ®        yes   CS 4 <small><i>(brew up)</i></small>†  n/a             n/a            15†  A
+T-13 III(b)       ®        yes   CS 4 <small><i>(brew up)</i></small>   n/a             n/a            16   A
+T-15(b)           ®        yes   CS 2                                   n/a             n/a            17   A
+ACG1(f)           ®        yes   CS 3 <small><i>(brew up)</i></small>   n/a             n/a            18†  A
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
@ -0,0 +1,9 @@
+=== vehicles/belgian/1941 ===
+
+Name              Radio    IF    Crew survival                          Capabilities    (effective)    #    Notes
+----------------  -------  ----  -------------------------------------  --------------  -------------  ---  ----------------
+VCL Mk VI/c47(b)  ®        yes   CS 2                                   n/a             n/a            14†  A Q†<sup>1</sup>
+T-13 II(b)        ®        yes   CS 4 <small><i>(brew up)</i></small>†  n/a             n/a            15†  A
+T-13 III(b)       ®        yes   CS 4 <small><i>(brew up)</i></small>   n/a             n/a            16   A
+T-15(b)           ®        yes   CS 2                                   n/a             n/a            17   A
+ACG1(f)           ®        yes   CS 3 <small><i>(brew up)</i></small>   n/a             n/a            18†  A
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
@ -0,0 +1,9 @@
+=== vehicles/belgian/1942 ===
+
+Name              Radio    IF    Crew survival                          Capabilities    (effective)    #    Notes
+----------------  -------  ----  -------------------------------------  --------------  -------------  ---  ----------------
+VCL Mk VI/c47(b)  ®        yes   CS 2                                   n/a             n/a            14†  A Q†<sup>1</sup>
+T-13 II(b)        ®        yes   CS 4 <small><i>(brew up)</i></small>†  n/a             n/a            15†  A
+T-13 III(b)       ®        yes   CS 4 <small><i>(brew up)</i></small>   n/a             n/a            16   A
+T-15(b)           ®        yes   CS 2                                   n/a             n/a            17   A
+ACG1(f)           ®        yes   CS 3 <small><i>(brew up)</i></small>   n/a             n/a            18†  A
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
@ -0,0 +1,9 @@
+=== vehicles/belgian/1943 ===
+
+Name              Radio    IF    Crew survival                          Capabilities    (effective)    #    Notes
+----------------  -------  ----  -------------------------------------  --------------  -------------  ---  ----------------
+VCL Mk VI/c47(b)  ®        yes   CS 2                                   n/a             n/a            14†  A Q†<sup>1</sup>
+T-13 II(b)        ®        yes   CS 4 <small><i>(brew up)</i></small>†  n/a             n/a            15†  A
+T-13 III(b)       ®        yes   CS 4 <small><i>(brew up)</i></small>   n/a             n/a            16   A
+T-15(b)           ®        yes   CS 2                                   n/a             n/a            17   A
+ACG1(f)           ®        yes   CS 3 <small><i>(brew up)</i></small>   n/a             n/a            18†  A
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
@ -0,0 +1,9 @@
+=== vehicles/belgian/1944 ===
+
+Name              Radio    IF    Crew survival                          Capabilities    (effective)    #    Notes
+----------------  -------  ----  -------------------------------------  --------------  -------------  ---  ----------------
+VCL Mk VI/c47(b)  ®        yes   CS 2                                   n/a             n/a            14†  A Q†<sup>1</sup>
+T-13 II(b)        ®        yes   CS 4 <small><i>(brew up)</i></small>†  n/a             n/a            15†  A
+T-13 III(b)       ®        yes   CS 4 <small><i>(brew up)</i></small>   n/a             n/a            16   A
+T-15(b)           ®        yes   CS 2                                   n/a             n/a            17   A
+ACG1(f)           ®        yes   CS 3 <small><i>(brew up)</i></small>   n/a             n/a            18†  A
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
@ -0,0 +1,9 @@
+=== vehicles/belgian/1945 ===
+
+Name              Radio    IF    Crew survival                          Capabilities    (effective)    #    Notes
+----------------  -------  ----  -------------------------------------  --------------  -------------  ---  ----------------
+VCL Mk VI/c47(b)  ®        yes   CS 2                                   n/a             n/a            14†  A Q†<sup>1</sup>
+T-13 II(b)        ®        yes   CS 4 <small><i>(brew up)</i></small>†  n/a             n/a            15†  A
+T-13 III(b)       ®        yes   CS 4 <small><i>(brew up)</i></small>   n/a             n/a            16   A
+T-15(b)           ®        yes   CS 2                                   n/a             n/a            17   A
+ACG1(f)           ®        yes   CS 3 <small><i>(brew up)</i></small>   n/a             n/a            18†  A
--- 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"
+        "polish", "belgian"
    ]
    for nat in nationalities:
        for vo_type in ["vehicles","ordnance"]: