From eb53e65564a4b216e90400f947bc216613015c69 Mon Sep 17 00:00:00 2001 From: Taka Date: Mon, 16 Jul 2018 09:15:51 +0000 Subject: [PATCH] Fixed a misteak in the PF settings. --- vasl_templates/webapp/static/generate.js | 2 +- vasl_templates/webapp/tests/test_ob_setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vasl_templates/webapp/static/generate.js b/vasl_templates/webapp/static/generate.js index 81f3be6..882a8e4 100644 --- a/vasl_templates/webapp/static/generate.js +++ b/vasl_templates/webapp/static/generate.js @@ -58,7 +58,7 @@ function generate_snippet( $btn ) 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 = 4 ; + params.PF_CHECK_DR = 2 ; } else if ( params.SCENARIO_YEAR >= 1945 ) { params.PF_CHECK_DRM = "-1" ; params.PF_CHECK_DR = 4 ; diff --git a/vasl_templates/webapp/tests/test_ob_setup.py b/vasl_templates/webapp/tests/test_ob_setup.py index 1cb38d3..25cab4e 100644 --- a/vasl_templates/webapp/tests/test_ob_setup.py +++ b/vasl_templates/webapp/tests/test_ob_setup.py @@ -93,8 +93,8 @@ def test_nationality_specific( webapp, webdriver ): assert last_warning.startswith( "PF are only available" ) else: assert last_warning == "" - do_test( (1942,1), "PF: range=[1] ; check=[4] (drm=[+1])", True ) - do_test( (1943,9), "PF: range=[1] ; check=[4] (drm=[+1])", True ) + do_test( (1942,1), "PF: range=[1] ; check=[2] (drm=[+1])", True ) + do_test( (1943,9), "PF: range=[1] ; check=[2] (drm=[+1])", True ) do_test( (1943,10), "PF: range=[1] ; check=[3]", False ) do_test( (1944,5), "PF: range=[1] ; check=[3]", False ) do_test( (1944,6), "PF: range=[2] ; check=[3]", False )