changelog shortlog tags manifest raw

changeset: jpoker.plugins.tourneyDetails templates ranks shown when running or completed

changeset 738: 4086ec59b02e
parent 737:642321b1d840
child 739:d50073381113
author: root@kun
date: Tue Aug 19 14:29:10 2008 +0000 (3 months ago)
files: jpoker/js/jquery.jpoker.js jpoker/js/test-jpoker.js
description: jpoker.plugins.tourneyDetails templates ranks shown when running or completed
--- a/jpoker/js/jquery.jpoker.js	Tue Aug 19 13:48:42 2008 +0000
+++ b/jpoker/js/jquery.jpoker.js	Tue Aug 19 14:29:10 2008 +0000
@@ -2069,23 +2069,39 @@
 			'players_quota' : _("{players_quota} players max.")
 			    }).supplant(packet.tourney));
 
-        html.push(t.players.header.supplant({
-		        'name': _("Name"),
+
+	if (packet.tourney.state == "running" || packet.tourney.state == "complete") {
+	    html.push(t.players.header.supplant({
+			'name': _("Name"),
 			'money': _("Money"),
 			'rank' : _("Rank")    
-                        }));
-        for(var serial in packet.user2properties) {
-	    var player = packet.user2properties[serial];
-	    if (player.rank == -1) {
-		player.rank = "";
+			}));
+	    for(var serial in packet.user2properties) {
+		var player = packet.user2properties[serial];
+		if (player.rank == -1) {
+		    player.rank = "";
+		}
+		if (player.money == -1) {
+		    player.money = "";
+		}
+		html.push(t.players.rows.supplant(player));
 	    }
-	    if (player.money == -1) {
-		player.money = "";
+	    html.push(t.players.footer);
+	} else {
+	    html.push(t.players_no_rank.header.supplant({
+			'name': _("Name"),
+			'money': _("Money")
+			}));
+	    for(var serial in packet.user2properties) {
+		var player = packet.user2properties[serial];
+		if (player.money == -1) {
+		    player.money = "";
+		}
+		html.push(t.players_no_rank.rows.supplant(player));
 	    }
-            html.push(t.players.rows.supplant(player));
-        }
-        html.push(t.players.footer);
-
+	    html.push(t.players_no_rank.footer);
+	}
+	
 	if (logged) {
 	    if (registered) {
 		html.push(t.register.supplant({'register': _("Unregister")}));
@@ -2160,6 +2176,11 @@
 	players : {
 	    header : '<div class=\'jpoker_tourney_details_players\'><table><thead><tr><th>{name}</th><th>{money}</th><th>{rank}</th></tr></thead><tbody>',
 	    rows : '<tr><td>{name}</td><td>{money}</td><td>{rank}</td></tr>',
+	    footer : '</tbody></table></div>'
+	},
+	players_no_rank : {
+	    header : '<div class=\'jpoker_tourney_details_players\'><table><thead><tr><th>{name}</th><th>{money}</th></tr></thead><tbody>',
+	    rows : '<tr><td>{name}</td><td>{money}</td></tr>',
 	    footer : '</tbody></table></div>'
 	},
 	tables : {
--- a/jpoker/js/test-jpoker.js	Tue Aug 19 13:48:42 2008 +0000
+++ b/jpoker/js/test-jpoker.js	Tue Aug 19 14:29:10 2008 +0000
@@ -2148,7 +2148,7 @@
 test("jpoker.plugins.tourneyDetails templates no ranks no moneys", function(){
 	expect(7);
 	
-	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": -1, "table_serial": 606, "name": "user1", "rank": -1}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 1, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "registering", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
+	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": -1, "table_serial": 606, "name": "user1", "rank": -1}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 1, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "running", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
 
 	var id = jpoker.uid();
 	$("#main").append('<div class=\'jpoker_tourney_details\' id=\'' + id + '\'></div>');
@@ -2187,7 +2187,7 @@
 test("jpoker.plugins.tourneyDetails templates money and no ranks", function(){
 	expect(4);
 	
-	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": 100000, "table_serial": 606, "name": "user1", "rank": -1}, "X5": {"money": 100000, "table_serial": 606, "name": "user2", "rank": -1}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 2, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "registering", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
+	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": 100000, "table_serial": 606, "name": "user1", "rank": -1}, "X5": {"money": 100000, "table_serial": 606, "name": "user2", "rank": -1}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 2, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "running", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
 	$.each(TOURNEY_MANAGER_PACKET.user2properties, function(serial, player) {
 		player.money /= 100;
 	    });
@@ -2214,7 +2214,7 @@
 test("jpoker.plugins.tourneyDetails templates ranks and no money", function(){
 	expect(4);
 	
-	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": -1, "table_serial": 606, "name": "user1", "rank": 1}, "X5": {"money": -1, "table_serial": 606, "name": "user2", "rank": 2}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 2, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "registering", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
+	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": -1, "table_serial": 606, "name": "user1", "rank": 1}, "X5": {"money": -1, "table_serial": 606, "name": "user2", "rank": 2}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 2, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "running", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
 
 	var id = jpoker.uid();
 	$("#main").append('<div class=\'jpoker_tourney_details\' id=\'' + id + '\'></div>');
@@ -2232,6 +2232,29 @@
 	var ranks = $(".jpoker_tourney_details_players tr td:nth-child(3)", element);
 	equals(ranks.eq(0).html(), "1");
 	equals(ranks.eq(1).html(), "2");
+	cleanup();
+    });
+
+test("jpoker.plugins.tourneyDetails templates ranks shown when running or completed", function(){
+	expect(3);
+	
+	var TOURNEY_MANAGER_PACKET = {"user2properties": {"X4": {"money": -1, "table_serial": 606, "name": "user1", "rank": 1}, "X5": {"money": -1, "table_serial": 606, "name": "user2", "rank": 2}}, "length": 3, "tourney_serial": 1, "table2serials": {"X606": [4]}, "type": 149, "tourney": {"registered": 2, "betting_structure": "level-15-30-no-limit", "currency_serial": 1, "description_long": "Sit and Go 2 players", "breaks_interval": 3600, "serial": 1, "rebuy_count": 0, "state": "running", "buy_in": 300000, "add_on_count": 0, "description_short": "Sit and Go 2 players, Holdem", "player_timeout": 60, "players_quota": 2, "rake": 0, "add_on": 0, "start_time": 0, "breaks_first": 7200, "variant": "holdem", "players_min": 2, "schedule_serial": 1, "add_on_delay": 60, "name": "sitngo2", "finish_time": 0, "prize_min": 0, "breaks_duration": 300, "seats_per_game": 2, "bailor_serial": 0, "sit_n_go": "y", "rebuy_delay": 0}, "type": "PacketPokerTourneyManager"};
+
+	var id = jpoker.uid();
+	$("#main").append('<div class=\'jpoker_tourney_details\' id=\'' + id + '\'></div>');
+	var tourneyDetails = jpoker.plugins.tourneyDetails;
+	var element = document.getElementById(id);
+	var packet = TOURNEY_MANAGER_PACKET;
+	var logged = true;
+	var registered = true;
+	$(element).html(tourneyDetails.getHTML(id, packet, logged, registered));
+	equals($(".jpoker_tourney_details_players tr:nth-child(1) td", element).length, 3, "ranks shown");
+	packet.tourney.state = "complete";
+	$(element).html(tourneyDetails.getHTML(id, packet, logged, registered));
+	equals($(".jpoker_tourney_details_players tr:nth-child(1) td", element).length, 3, "ranks shown");
+	packet.tourney.state = "registering";
+	$(element).html(tourneyDetails.getHTML(id, packet, logged, registered));
+	equals($(".jpoker_tourney_details_players tr:nth-child(2) td", element).length, 2, "ranks hidden");
 	cleanup();
     });