From eacbee6fd6a780c60e0114b866888b48c69a87dd Mon Sep 17 00:00:00 2001
From: Taka <taka@vm-linux-dev>
Date: Mon, 16 Jul 2018 08:20:26 +0000
Subject: [PATCH] Include player display names in generated snippets.

---
 vasl_templates/webapp/data/default-templates/players.j2 | 4 ++--
 vasl_templates/webapp/static/generate.js                | 4 ++++
 vasl_templates/webapp/tests/test_generate.py            | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/vasl_templates/webapp/data/default-templates/players.j2 b/vasl_templates/webapp/data/default-templates/players.j2
index 20b629c..abca931 100644
--- a/vasl_templates/webapp/data/default-templates/players.j2
+++ b/vasl_templates/webapp/data/default-templates/players.j2
@@ -1,2 +1,2 @@
-player1=[{{PLAYER_1}}] ; ELR=[{{PLAYER_1_ELR}}] ; SAN=[{{PLAYER_1_SAN}}]
-player2=[{{PLAYER_2}}] ; ELR=[{{PLAYER_2_ELR}}] ; SAN=[{{PLAYER_2_SAN}}]
+player1=[{{PLAYER_1}}:{{PLAYER_1_NAME}}] ; ELR=[{{PLAYER_1_ELR}}] ; SAN=[{{PLAYER_1_SAN}}]
+player2=[{{PLAYER_2}}:{{PLAYER_2_NAME}}] ; ELR=[{{PLAYER_2_ELR}}] ; SAN=[{{PLAYER_2_SAN}}]
diff --git a/vasl_templates/webapp/static/generate.js b/vasl_templates/webapp/static/generate.js
index de99c70..75266d2 100644
--- a/vasl_templates/webapp/static/generate.js
+++ b/vasl_templates/webapp/static/generate.js
@@ -36,6 +36,10 @@ function generate_snippet( $btn )
         params.OB_SETUP_WIDTH = params.OB_SETUP_WIDTH_2 ;
     }
 
+    // include the player display names
+    params.PLAYER_1_NAME = gNationalities[params.PLAYER_1].display_name ;
+    params.PLAYER_2_NAME = gNationalities[params.PLAYER_2].display_name ;
+
     // extract the scenario date components
     var scenario_date = $("input[name='SCENARIO_DATE']").datepicker( "getDate" ) ;
     if ( scenario_date ) {
diff --git a/vasl_templates/webapp/tests/test_generate.py b/vasl_templates/webapp/tests/test_generate.py
index d782752..e1b5d06 100644
--- a/vasl_templates/webapp/tests/test_generate.py
+++ b/vasl_templates/webapp/tests/test_generate.py
@@ -135,7 +135,7 @@ def test_players_snippets( webapp, webdriver ):
         "PLAYER_2_ELR": "3",
         "PLAYER_2_SAN": "4",
     },
-        "player1=[french] ; ELR=[1] ; SAN=[2] | player2=[british] ; ELR=[3] ; SAN=[4]",
+        "player1=[french:French] ; ELR=[1] ; SAN=[2] | player2=[british:British] ; ELR=[3] ; SAN=[4]",
         None
     )
 
@@ -143,6 +143,6 @@ def test_players_snippets( webapp, webdriver ):
     _test_snippet( webdriver, "players", {
         "PLAYER_1": "british",
         },
-        "player1=[british] ; ELR=[1] ; SAN=[2] | player2=[british] ; ELR=[3] ; SAN=[4]",
+        "player1=[british:British] ; ELR=[1] ; SAN=[2] | player2=[british:British] ; ELR=[3] ; SAN=[4]",
         [ "Both players have the same nationality!" ],
     )