Persist the scenario date in ISO-8601 format.

master
Pacman Ghost 6 years ago
parent 742cef4cc9
commit 30df02d542
  1. 12
      vasl_templates/webapp/static/snippets.js
  2. 2
      vasl_templates/webapp/tests/fixtures/new-default-scenario.json
  3. 2
      vasl_templates/webapp/tests/test_default_scenario.py
  4. 3
      vasl_templates/webapp/tests/test_scenario_persistence.py

@ -511,7 +511,12 @@ function do_load_scenario_data( params )
var params_loaded = {} ;
var unknown_vo = [] ;
var set_param = function( $elem, key ) {
$elem.val( params[key] ) ;
if ( key === "SCENARIO_DATE" ) {
var scenario_date = $.datepicker.parseDate( "yy-mm-dd", params[key] ) ;
$elem.datepicker( "setDate", scenario_date ) ;
}
else
$elem.val( params[key] ) ;
if ( $elem[0].nodeName.toLowerCase() === "select" )
$elem.selectmenu( "refresh" ) ;
params_loaded[key] = true ;
@ -679,6 +684,11 @@ function unload_params_for_save()
extract_vo_names( "VEHICLES_2" ) ;
extract_vo_names( "ORDNANCE_2" ) ;
// save the scenario date in ISO-8601 format
var scenario_date = $("input[name='SCENARIO_DATE']").datepicker( "getDate" ) ;
if ( scenario_date )
params.SCENARIO_DATE = scenario_date.toISOString().substring( 0, 10 ) ;
return params ;
}

@ -2,7 +2,7 @@
"SCENARIO_NAME": "default scenario name",
"SCENARIO_LOCATION": "default location",
"SCENARIO_DATE": "01/01/2000",
"SCENARIO_DATE": "2000-12-25",
"SCENARIO_WIDTH": "1px",
"PLAYER_1": "american",

@ -42,7 +42,7 @@ def test_default_scenario( webapp, webdriver, monkeypatch ):
# check the scenario fields
check_textbox( "SCENARIO_NAME", "default scenario name" )
check_textbox( "SCENARIO_LOCATION", "default location" )
check_textbox( "SCENARIO_DATE", "01/01/2000" )
check_textbox( "SCENARIO_DATE", "12/25/2000" )
check_textbox( "SCENARIO_WIDTH", "1px" )
# check the player fields

@ -2,6 +2,7 @@
import json
import itertools
import re
from selenium.webdriver.support.ui import Select
@ -111,6 +112,8 @@ def test_scenario_persistence( webapp, webdriver ): #pylint: disable=too-many-st
expected = {
k.upper(): v for tab in SCENARIO_PARAMS.values() for k,v in tab.items()
}
mo = re.search( r"^(\d{2})/(\d{2})/(\d{4})$", expected["SCENARIO_DATE"] )
expected["SCENARIO_DATE"] = "{}-{}-{}".format( mo.group(3), mo.group(1), mo.group(2) ) # nb: convert from ISO-8601
assert saved_scenario == expected
# make sure that our list of scenario parameters is correct

Loading…
Cancel
Save