show winner and scores at the end of the game

Author: makemeunsee

app/assets/javascripts/robotagram_game.js

@@ -679,6 +679,16 @@ var messageReceived = function(event){
             currentGame.gamePhase = PHASEID_SHOW_SOLUTION
             console.log("entered phase " + currentGame.gamePhase);
             notifyGameTimeUp();
+            var $endOfGameWinner = $("#endOfGameWinner");
+            var winner = d.args[0];
+            if(winner === "") {
+                winner = $_("game.nowinner");
+            }
+            $endOfGameWinner.append(" " + winner);
+            var $endOfGameScores = $("#endOfGameScores");
+            for (var i=1;i<d.args.length;i++) {
+                $endOfGameScores.append("<tr><td>" + d.args[i] + "</td></tr>");
+            }
         } else {
             activateNextGameLink();
             notifyGameTimeUp();

app/controllers/Gaming.scala

@@ -114,7 +114,7 @@ object Gaming extends CookieLang {
   // list of players and scores (persisted + players in the room)
   private def playersAndScores(roomName:String, gameId:String) : Seq[(String, Option[Int])] = {
     val wsRoom = WsManager.room(roomName).get
-    var scores: mutable.HashMap[String, Option[Int]] = new mutable.HashMap[String, Option[Int]]()
+    val scores: mutable.HashMap[String, Option[Int]] = new mutable.HashMap[String, Option[Int]]()
 
     DbScore.findByGame(gameId).foreach{s=>
       scores += ((s.playerName, Some(s.score)))

app/models/DbScore.scala

@@ -6,24 +6,27 @@ import java.util.Date
 import play.api.db.DB
 import anorm.SqlParser._
 import scala.Some
+import scala.collection.mutable.HashMap
+import scala.collection.Map
 
 case class DbScore(id: Pk[Long], score: Int, dateSubmitted:Date, playerName:String)
-case class DbRoomScores(score: Int, gameId: String, playerName:String)
+case class DbRoomScores(score: Int, gameId: String, playerName:String, date: Date)
 
 object DbRoomScores{
 
-  val simple = {
+  private val simple = {
       get[Int]("scores.score") ~
       get[String]("scores.game_id") ~
-      get[String]("users.name") map {
-      case score~gameId~playerName => DbRoomScores(score, gameId, playerName)
+      get[String]("users.name") ~
+      get[Date]("scores.submitted_on") map {
+      case score~gameId~playerName~date => DbRoomScores(score, gameId, playerName, date)
     }
   }
 
-  def scoresInRoom(roomId: Long): Seq[DbRoomScores] = {
+  private def scoresInRoom(roomId: Long): Seq[DbRoomScores] = {
     DB.withConnection { implicit connection =>
       SQL("""
-          select scores.score, scores.game_id, users.name
+          select scores.score, scores.game_id, users.name, scores.submitted_on
           from games
           inner join scores
             on scores.game_id = games.id
@@ -36,6 +39,21 @@ object DbRoomScores{
       ).as(DbRoomScores.simple *)
     }
   }
+  
+  def winnersOfRoomId(roomId: Long): Map[String, (String, Int, Date)] = scoresInRoom(roomId).foldLeft(Map[String, (String, Int, Date)]()) {
+    // fold to find the author of shortest and first solution of each game
+    (map: Map[String, (String, Int, Date)], gameScore: DbRoomScores) => {
+      val gameId = gameScore.gameId
+      map.get(gameId) match  {
+        case None => map + (gameId -> (gameScore.playerName, gameScore.score, gameScore.date))
+        case Some((playerName, score, date)) => if (score < gameScore.score || (score == gameScore.score && date.before(gameScore.date)) ) {
+          map
+        } else {
+          map + (gameId -> (gameScore.playerName, gameScore.score, gameScore.date))
+        }
+      }
+    }
+  }
 
 }
 

app/models/Game.scala

@@ -11,6 +11,7 @@ import java.util.{Date,Random}
 import play.api.Logger
 import controllers.Gaming
 import controllers.MessageID.TIME_UP
+import play.api.i18n.Messages
 
 
 class Game(val id:String, val roomId: Long, val board:Board, val goal: Goal, val startDate:Date, val endDate:Date, val robots:Map[Color, Robot], val gamePhase: Phase){
@@ -33,30 +34,22 @@ class Game(val id:String, val roomId: Long, val board:Board, val goal: Goal, val
       // switch to next game phase unless already at the end of the cycle
       val endedGame = toPhase(SHOW_SOLUTION)
       endedGame.timer.start()
-      //TODO: update room scores, show them during game too
-      println(DbRoomScores.scoresInRoom(roomId).foldLeft(new HashMap[String, (String, Int)]) {
-        // first fold: first the winner of each game
-        (map: HashMap[String, (String, Int)], gameScore: DbRoomScores) => {
-          val gameId = gameScore.gameId
-          map.get(gameId) match  {
-            case None => map + (gameId -> (gameScore.playerName, gameScore.score))
-            case Some((playerName, score)) => if (score < gameScore.score) {
-              map
-            } else {
-              map + (gameId -> (gameScore.playerName, gameScore.score))
-            }
-          }
-        }
-      }.foldLeft(new HashMap[String, Int]) {
-        // second fold: count number of victories for each winner
-        (map: HashMap[String, Int], victory: (String, (String, Int))) => map.get(victory._2._1) match {
+      val winners = DbRoomScores.winnersOfRoomId(roomId)
+      val winner = winners.get(id) match {
+        case None => ""
+        case Some((username, _, _)) => username
+      }
+      val scores = winners.foldLeft(new HashMap[String, Int]) {
+        // fold to count number of victories for each winner
+        (map: HashMap[String, Int], victory: (String, (String, Int, Date))) => map.get(victory._2._1) match {
           case None => map + (victory._2._1 -> 1)
           case Some(count) => map + (victory._2._1 -> (count+1))
         }
-      })
+      }.map(pair => pair._1 + ": " + pair._2).toList
+      Gaming.notifyRoom(DbRoom.findById(roomId).get.name, TIME_UP, winner :: scores)
+    } else {
+      Gaming.notifyRoom(DbRoom.findById(roomId).get.name, TIME_UP, Seq())
     }
-    // announce game dead to the rooms
-    Gaming.notifyRoom(DbRoom.findById(roomId).get.name, TIME_UP, Seq())
   }
 
   // game init

app/views/gaming/game.scala.html

@@ -95,12 +95,17 @@ <h3>@Messages("game.solutionFound.title")</h3>
             <h3>@Messages("game.endOfGame.title")</h3>
         </div>
         <div class="modal-body" align="center">
+            <p id="endOfGameWinner">@Messages("game.winner")</p>
+            <p>@Messages("game.scores")</p>
+            <table id="endOfGameScores">
+            </table>
+            <br>
             <p>@Messages("game.endOfGame.details")</p>
         </div>
         <div id="endOfGameModalFooter" class="modal-footer">
             <a href="@routes.Home.index" class="btn">@Messages("game.endOfGame.giveup")</a>
             @* "current" is the url for the current game in this room *@
-            <p id="waitingForGame">@Messages("game.endOfGame.waiting")</p>
+            <p id="waitingForGame" class="btn">@Messages("game.endOfGame.waiting")</p>
         </div>
     </div>
 </div>

app/views/shared/scores.scala.html

@@ -1,12 +1,12 @@
-@(scores: Seq[(String, Option[Int])])
+@(scores: Seq[(String, Option[Int])])(implicit flash: Flash, request: RequestHeader, lang: Lang) @* implicits are needed ! *@
 
 @import models._
 
 <table class="table table-condensed">
     <thead>
         <tr>
-            <th>Player</th>
-            <th>Best score</th>
+            <th>@Messages("score.player")</th>
+            <th>@Messages("score.best")</th>
         </tr>
     </thead>
     <tbody id="leaderBoard">

conf/messages

@@ -105,11 +105,20 @@ game.solutionFound.announce=Announce solution
 game.solutionFound.improve=Improve solution
 game.solutionFound.retry=Retry from zero
 
+game.winner=The winner of this round is... 
+game.scores=Score (rounds won):
+
 game.endOfGame.title=Time is over !
-game.endOfGame.details=Another game is starting now ...
+game.endOfGame.details=Another game is going to start soon...
 game.endOfGame.giveup=Give up
 game.endOfGame.waiting=Waiting for the next game to start...
 
+# Score
+# =====
+score.player=Player
+score.best=Best score
+
+
 # Already in the same room in another window
 alreadyIn.title=Already in this room
 alreadyIn.whatdo=Disconnect the other connection?

conf/messages.fr

@@ -102,11 +102,20 @@ game.solutionFound.announce=Annoncer ma solution
 game.solutionFound.improve=Améliorer ma solution
 game.solutionFound.retry=Recommencer depuis le début
 
+game.winner=Le gagnant de la manche est... 
+game.scores=Score (manches gagnées) :
+
 game.endOfGame.title=Le temps est écoulé !
-game.endOfGame.details=Une autre partie commence...
+game.endOfGame.details=Une autre partie va bientôt commencer...
 game.endOfGame.giveup=Abandonner
 game.endOfGame.waiting=En attente de démarrage de la partie suivante...
 
+# Score
+# =====
+score.player=Joueur
+score.best=Meilleur score
+
+
 # Already in the same room in another window
 alreadyIn.title=Déjà dans cette salle
 alreadyIn.whatdo=Couper l''autre connexion ?

public/i18n/Messages.client.properties

@@ -7,4 +7,5 @@ game.leave.gameIsActive.confirm=A game is active... are you sure you want to lea
 game.kicked=You''ve been kicked!
 game.noselection=A robot must be selected
 game.nextgame=Join the next game !
-game.solutionfound=A solution was announced! No time to lose!
+game.solutionfound=A solution was announced! No time to lose!
+game.nowinner=no one!

public/i18n/Messages.client_fr.properties

@@ -7,4 +7,5 @@ game.leave.gameIsActive.confirm=Une partie est en cours...Êtes-vous sûr de vou
 game.kicked=Vous avez été kické !
 game.noselection=Il faut sélectionner un robot
 game.nextgame=Rejoindre la partie suivante !
-game.solutionfound=Une solution a été trouvée ! Plus de temps à perdre !
+game.solutionfound=Une solution a été trouvée ! Plus de temps à perdre !
+game.nowinner=personne !