diff --git a/vasl_templates/webapp/data/default-template-pack/pf.j2 b/vasl_templates/webapp/data/default-template-pack/pf.j2 index 77519a2..5abc756 100644 --- a/vasl_templates/webapp/data/default-template-pack/pf.j2 +++ b/vasl_templates/webapp/data/default-template-pack/pf.j2 @@ -2,7 +2,10 @@ - + @@ -19,7 +22,7 @@ -
- PF check: dr ≤ {{PF_CHECK_DR}} (△) + PF check: dr ≤ {{PF_CHECK_DR}} (△) + +
+1 HS/crew @@ -29,13 +32,21 @@ +1 CX
+1 non-AFV target +{%if not SCENARIO_YEAR%} +
-1 1945 +{%endif%} +{%if SCENARIO_YEAR == 1943 and SCENARIO_MONTH >= 8 and SCENARIO_MONTH <= 9 %} +
+1 PFk +{%endif%}
original 6 = pinned 		- @@ -49,12 +60,17 @@ {%endif%} {%endif%}
Range TH# + Range   TH#  
0 10
+ original 12 = CR
- TK#: 31
- 16-3 +		 +
+ TK#: 31 (16-3) +
+
+ PFk TK#: 22 (12-1) +
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js index 2f9a2d6..1dc247d 100644 --- a/vasl_templates/webapp/static/snippets.js +++ b/vasl_templates/webapp/static/snippets.js @@ -342,16 +342,10 @@ function make_snippet( $btn, params, extra_params, show_date_warnings ) params.PF_RANGE = 2 ; else params.PF_RANGE = 3 ; - if ( params.SCENARIO_YEAR < 1943 || (params.SCENARIO_YEAR === 1943 && params.SCENARIO_MONTH <= 9) ) { - params.PF_CHECK_DRM = "+1" ; - params.PF_CHECK_DR = 2 ; - } else if ( params.SCENARIO_YEAR >= 1945 ) { - params.PF_CHECK_DRM = "-1" ; + if ( params.SCENARIO_YEAR >= 1945 ) params.PF_CHECK_DR = 4 ; - } else { - params.PF_CHECK_DRM = "" ; + else params.PF_CHECK_DR = 3 ; - } // generate BAZ parameters if ( params.SCENARIO_YEAR >= 1945 ) { diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/pf.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/pf.j2 index ca4ab51..b5c837a 100644 --- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/pf.j2 +++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/pf.j2 @@ -1 +1 @@ -PF: range=[{{PF_RANGE}}] ; check=[{{PF_CHECK_DR}}]{%if PF_CHECK_DRM%} (drm=[{{PF_CHECK_DRM}}]){%endif%} ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}] +PF: range=[{{PF_RANGE}}] ; check=[{{PF_CHECK_DR}}] ; col=[{{OB_COLOR}}]/[{{OB_COLOR_2}}] diff --git a/vasl_templates/webapp/tests/test_ob.py b/vasl_templates/webapp/tests/test_ob.py index 86ec990..5565336 100644 --- a/vasl_templates/webapp/tests/test_ob.py +++ b/vasl_templates/webapp/tests/test_ob.py @@ -129,14 +129,14 @@ def test_nationality_specific( webapp, webdriver ): #pylint: disable=too-many-lo """Check that the PF snippets are generated correctly.""" btn = find_child( "button[data-id='pf']" ) col = "[OBCOL:german]/[OBCOL-BORDER:german]" - do_check_snippets( btn, (1942,1), "PF: range=[1] ; check=[2] (drm=[+1]) ; col={}".format(col), True ) - do_check_snippets( btn, (1943,9), "PF: range=[1] ; check=[2] (drm=[+1]) ; col={}".format(col), True ) + do_check_snippets( btn, (1942,1), "PF: range=[1] ; check=[3] ; col={}".format(col), True ) + do_check_snippets( btn, (1943,9), "PF: range=[1] ; check=[3] ; col={}".format(col), True ) do_check_snippets( btn, (1943,10), "PF: range=[1] ; check=[3] ; col={}".format(col), False ) do_check_snippets( btn, (1944,5), "PF: range=[1] ; check=[3] ; col={}".format(col), False ) do_check_snippets( btn, (1944,6), "PF: range=[2] ; check=[3] ; col={}".format(col), False ) do_check_snippets( btn, (1944,12), "PF: range=[2] ; check=[3] ; col={}".format(col), False ) - do_check_snippets( btn, (1945,1), "PF: range=[3] ; check=[4] (drm=[-1]) ; col={}".format(col), False ) - do_check_snippets( btn, (1946,1), "PF: range=[3] ; check=[4] (drm=[-1]) ; col={}".format(col), False ) + do_check_snippets( btn, (1945,1), "PF: range=[3] ; check=[4] ; col={}".format(col), False ) + do_check_snippets( btn, (1946,1), "PF: range=[3] ; check=[4] ; col={}".format(col), False ) # initialize def check_psk_snippets():