From 614c78d06cf0f384150f2bd52fedf017b20bca61 Mon Sep 17 00:00:00 2001 From: Taka Date: Tue, 11 Sep 2018 06:26:38 +0000 Subject: [PATCH] Added the Croatian nationality and vehicles/ordnance. --- .../default-template-pack/nationalities.json | 4 ++ .../data/ordnance/axis-minor/croatian.json | 14 +++++++ .../data/vehicles/axis-minor/croatian.json | 35 ++++++++++++++++++ .../webapp/static/images/flags/croatian.png | Bin 0 -> 14143 bytes .../vo-reports/ordnance/croatian/1940.txt | 6 +++ .../vo-reports/ordnance/croatian/1941.txt | 6 +++ .../vo-reports/ordnance/croatian/1942.txt | 6 +++ .../vo-reports/ordnance/croatian/1943.txt | 6 +++ .../vo-reports/ordnance/croatian/1944.txt | 6 +++ .../vo-reports/ordnance/croatian/1945.txt | 6 +++ .../vo-reports/vehicles/croatian/1940.txt | 10 +++++ .../vo-reports/vehicles/croatian/1941.txt | 10 +++++ .../vo-reports/vehicles/croatian/1942.txt | 10 +++++ .../vo-reports/vehicles/croatian/1943.txt | 10 +++++ .../vo-reports/vehicles/croatian/1944.txt | 10 +++++ .../vo-reports/vehicles/croatian/1945.txt | 10 +++++ .../webapp/tests/test_vo_reports.py | 2 +- 17 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 vasl_templates/webapp/data/ordnance/axis-minor/croatian.json create mode 100644 vasl_templates/webapp/data/vehicles/axis-minor/croatian.json create mode 100644 vasl_templates/webapp/static/images/flags/croatian.png create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json index 0a0d8f8..334c728 100644 --- a/vasl_templates/webapp/data/default-template-pack/nationalities.json +++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json @@ -81,6 +81,10 @@ "slovakian": { "display_name": "Slovakian", "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ] +}, +"croatian": { + "display_name": "Croatian", + "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ] } } diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json new file mode 100644 index 0000000..f2bc341 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json @@ -0,0 +1,14 @@ +[ + +{ "name": "Canonne da 65/17", + "capabilities": [ "NT", "no Gunshield" ], + "note_number": "35", + "notes": [ "A" ] +}, +{ "name": "Skoda M28(FE)", + "capabilities": [ "NT" ], + "note_number": "36", + "notes": [ "A" ] +} + +] diff --git a/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json b/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json new file mode 100644 index 0000000..2018acf --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json @@ -0,0 +1,35 @@ +[ + +{ "name": "TKS", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "24\u2020", + "notes": [ "F" ] +}, +{ "name": "TKS(L)", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "24\u2020", + "notes": [ "F" ] +}, +{ "name": "L6/40(i)", + "CS#": 2, + "note_number": "25" +}, +{ "name": "wz 34-I", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "26" +}, +{ "name": "wz 34-II", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "26" +}, +{ "name": "SMV L40 da 47/32", + "CS#": 3, + "note_number": "27\u2020", + "notes": [ "O\u20201" ] +} + +] diff --git a/vasl_templates/webapp/static/images/flags/croatian.png b/vasl_templates/webapp/static/images/flags/croatian.png new file mode 100644 index 0000000000000000000000000000000000000000..79b78c6d65f550593d89c369ccbdfb302b388ba8 GIT binary patch literal 14143 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

} z79F!LTqr?9lIz^b$jV0l*62}>p5d)mPb*od_~v~Uc05<7J1O-=w>Wg_P-T5RHpZ58 zsm4Fm_!Xi2w@-teDJxAvVC&GuL5<$HTsgfi7r{J+<(k+$O|izR2hP?D<0-bPCTlr~S$v3|2F`J;)ZCfka!sPMT9)k=K=H%>M!rDv&f| z{t~;mR4aN>7Uw&rf_1-1vF!;>@}iJSwUjb8n~oihlx^LW_b}a$O`XiBan)Pq@6ER7 zFo}jnx!@2t?3{_HVo_j!xc#ySV9tNgle}F2XJZg87u&6VAQ(1i?89>+5ah8W(I3|4 z0SQ?u(p_@u5-nL09UTd)v*<1rG8C?yT|KDPSKaU)YB1VuNF;oNYJoXq$qOIm4W^Ow zmBx6o>H9;f=Y7fe-~B*J4CGr|DgTm}&d&doSel#TUjq<5z1POpzq_p-14-Nm+pAl( S8ejK`0Wx3(iE1&UkpBm4@Fd~@ literal 0 HcmV?d00001 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt new file mode 100644 index 0000000..d12ecd2 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1940 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt new file mode 100644 index 0000000..edf88b3 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1941 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt new file mode 100644 index 0000000..af37b0e --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1942 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt new file mode 100644 index 0000000..ceafe3e --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1943 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt new file mode 100644 index 0000000..ddb830f --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1944 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt new file mode 100644 index 0000000..f36a43f --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt @@ -0,0 +1,6 @@ +=== ordnance/croatian/1945 === + +Name Capabilities (effective) # Notes +---------------- --------------- --------------- --- ------- +Canonne da 65/17 NT no Gunshield NT no Gunshield 35 A +Skoda M28(FE) NT NT 36 A diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt new file mode 100644 index 0000000..98183a1 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1940 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt new file mode 100644 index 0000000..e7eef16 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1941 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt new file mode 100644 index 0000000..d93e12b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1942 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt new file mode 100644 index 0000000..a27e0f0 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1943 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt new file mode 100644 index 0000000..c183fde --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1944 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt new file mode 100644 index 0000000..c1a5852 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt @@ -0,0 +1,10 @@ +=== vehicles/croatian/1945 === + +Name Radio IF Crew survival Capabilities (effective) # Notes +---------------- ------- ---- --------------- -------------- ------------- --- -------------- +TKS ® yes CS 2 n/a n/a 24† F +TKS(L) ® yes CS 2 n/a n/a 24† F +L6/40(i) n/a yes CS 2 n/a n/a 25 n/a +wz 34-I ® yes CS 2 n/a n/a 26 n/a +wz 34-II ® yes CS 2 n/a n/a 26 n/a +SMV L40 da 47/32 n/a yes CS 3 n/a n/a 27† O†1 diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 6d37c3f..2886dfb 100644 --- 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","slovakian", + "romanian", "hungarian","slovakian","croatian" ] for nat in nationalities: for vo_type in ["vehicles","ordnance"]: