Fixed some issues in the PF template.

master
Pacman Ghost 3 years ago
parent 9d7e5d400c
commit 71d4396678
  1. 28
      vasl_templates/webapp/data/default-template-pack/pf.j2
  2. 10
      vasl_templates/webapp/static/snippets.js
  3. 2
      vasl_templates/webapp/tests/fixtures/data/default-template-pack/pf.j2
  4. 8
      vasl_templates/webapp/tests/test_ob.py

@ -2,7 +2,10 @@
<head>
<meta charset="utf-8">
<style> {{CSS:common}} </style>
<style>
{{CSS:common}}
.pfk { color: #444 ; font-style: italic ; }
</style>
</head>
<table>
@ -19,7 +22,7 @@
<tr>
<td valign="top" rowspan="2" style="padding:2px 5px;">
PF check: dr &le; {{PF_CHECK_DR}} (&#9651;)
<b>PF check</b>: dr &le; {{PF_CHECK_DR}} (&#9651;)
<table style="margin-left:10px;">
<tr>
<td style="width:25px;"> +1 <td> HS/crew
@ -29,13 +32,21 @@
<td> +1 <td> CX
<tr>
<td> +1 <td> non-AFV target
{%if not SCENARIO_YEAR%}
<tr>
<td> -1 <td> 1945
{%endif%}
{%if SCENARIO_YEAR == 1943 and SCENARIO_MONTH >= 8 and SCENARIO_MONTH <= 9 %}
<tr class="pfk">
<td> +1 <td> PFk
{%endif%}
</table>
original 6 = pinned
<td valign="top" style="padding:0 5px;">
<table>
<tr>
<td> <b>Range</b> <td> <b>TH#</b>
<td> Range <td> &nbsp; <b>TH#</b> &nbsp;
<tr>
<td class="c"> 0 <td class="c"> 10
<tr>
@ -49,12 +60,17 @@
{%endif%}
{%endif%}
</table>
original 12 = CR
<tr>
<td style="padding:0 5px;text-align:right;">
<b>TK#:</b> 31 <br>
16-3
<td style="padding:0 5px;">
<div>
<b>TK#</b>: 31 <i>(16-3)</i>
</div>
<div class="pfk">
PFk TK#: 22 <i>(12-1)</i>
</div>
</table>

@ -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 ) {

@ -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}}]

@ -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():

Loading…
Cancel
Save