From 3d275b31c3a6b72bbd2e05112a2a30e6481dee43 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 30 Nov 2011 20:43:18 +0000
Subject: [PATCH] - Game history now includes also name of the format the game
 was played in, as well as your deck name you used in it.

---
 .../com/gempukku/lotro/db/GameHistoryDAO.java |  2 +-
 .../com/gempukku/lotro/game/LotroServer.java  | 28 +++++++++----------
 .../src/main/webapp/includes/changeLog.html   |  1 +
 .../src/main/webapp/js/gameHistoryUi.js       |  1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/GameHistoryDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/GameHistoryDAO.java
index 9e7592829..04f13c03c 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/GameHistoryDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/GameHistoryDAO.java
@@ -22,7 +22,7 @@ public class GameHistoryDAO {
         try {
             Connection connection = _dbAccess.getDataSource().getConnection();
             try {
-                PreparedStatement statement = connection.prepareStatement("insert into game_history (winner, loser, win_reason, lose_reason, win_recording_id, lose_recording_id, format_name, winner_deck_name, loser_deck_name, start_date, end_date) values (?,?,?,?,?,?,?,?)");
+                PreparedStatement statement = connection.prepareStatement("insert into game_history (winner, loser, win_reason, lose_reason, win_recording_id, lose_recording_id, format_name, winner_deck_name, loser_deck_name, start_date, end_date) values (?,?,?,?,?,?,?,?,?,?,?)");
                 try {
                     statement.setString(1, winner);
                     statement.setString(2, loser);
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
index 060d54f54..c4e786975 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
@@ -147,23 +147,23 @@ public class LotroServer extends AbstractServer {
                         }
                     }
                 });
-        if (!_test) {
-            Map<String, String> deckNames = new HashMap<String, String>();
-            for (LotroGameParticipant participant : participants)
-                deckNames.put(participant.getPlayerId(), participant.getDeckName());
+//        if (!_test) {
+        Map<String, String> deckNames = new HashMap<String, String>();
+        for (LotroGameParticipant participant : participants)
+            deckNames.put(participant.getPlayerId(), participant.getDeckName());
 
-            final GameRecorder.GameRecordingInProgress gameRecordingInProgress = _gameRecorder.recordGame(lotroGameMediator, formatName, deckNames);
-            lotroGameMediator.addGameResultListener(
-                    new GameResultListener() {
-                        @Override
-                        public void gameFinished(String winnerPlayerId, String winReason, Map<String, String> loserPlayerIdsWithReasons) {
-                            final Map.Entry<String, String> loserEntry = loserPlayerIdsWithReasons.entrySet().iterator().next();
+        final GameRecorder.GameRecordingInProgress gameRecordingInProgress = _gameRecorder.recordGame(lotroGameMediator, formatName, deckNames);
+        lotroGameMediator.addGameResultListener(
+                new GameResultListener() {
+                    @Override
+                    public void gameFinished(String winnerPlayerId, String winReason, Map<String, String> loserPlayerIdsWithReasons) {
+                        final Map.Entry<String, String> loserEntry = loserPlayerIdsWithReasons.entrySet().iterator().next();
 
-                            gameRecordingInProgress.finishRecording(winnerPlayerId, winReason, loserEntry.getKey(), loserEntry.getValue());
-                        }
+                        gameRecordingInProgress.finishRecording(winnerPlayerId, winReason, loserEntry.getKey(), loserEntry.getValue());
                     }
-            );
-        }
+                }
+        );
+//        }
 
         _runningGames.put(gameId, lotroGameMediator);
         _nextGameId++;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 808f3f02d..0b078845a 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -3,6 +3,7 @@
 - When instructed to choose a card to heal/wound X times, a card with vitality/wounds &lt;X can be chosen, as long as
 that character can be healed/wounded by the card at least once.
 - "Narya" from Reflections now has a twilight cost of 0.
+- Game history now includes also name of the format the game was played in, as well as your deck name you used in it.
 
 <b>27 Nov. 2011</b>
 - Characters should not die between turns.
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameHistoryUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameHistoryUi.js
index ad5a84c71..9faa6a206 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameHistoryUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameHistoryUi.js
@@ -47,7 +47,6 @@ var GameHistoryUI = Class.extend({
                 else
                     row.append($("<td></td>").html("&nbsp;"));
                 row.append($("<td></td>").html(winner));
-                row.append($("<td></td>").html(winner));
                 row.append($("<td></td>").html(loser));
                 row.append($("<td></td>").html(winReason));
                 row.append($("<td></td>").html(loseReason));