@@ -5,7 +5,9 @@ class TurnsController < ApplicationController @turn = Turn.new(:player_id => current_player.id) end + require 'ruby-debug' def create + debugger @turn = Turn.new(params[:turn]) if @turn.save app/controllers/turns_controller.rb @@ -32,6 +32,10 @@ class Turn < ActiveRecord::Base end end + def round + (position.to_f / player.game.players.size.to_f).ceil + end + def next player.game.turns.find_by_position(position+1) end app/models/turn.rb @@ -41,29 +41,38 @@ <h3>Turns</h3> <table class="lined"> <tr> - <th>Turn #</th> <th>Round</th> <th>Year</th> + <th>Turn #</th> <th>Player</th> <th>Date</th> <th>Turn Length</th> </tr> <tr> + <% current_round = (@game.turns.size.to_f / @game.players.size.to_f).ceil + turns_in_round = @game.turns.reverse.select{|r| r.round == current_round }.size %> + <td rowspan="<%= turns_in_round + 1 %>" class="round"><%= current_round %></td> + <% if turns_in_round > 0 %> + <td rowspan="<%= turns_in_round + 1 %>"><%= @game.turns.last.year %></td> + <% else -%> + <td><%= @game.turns.last.nil? ? "4000" : @game.turns.last.year - 40 %> + <% end -%> <td><%= @game.turns.size %></td> - <td><%= (@game.turns.size.to_f / @game.players.size.to_f).ceil %></td> <% if @game.next_player.user.id == current_user.id -%> - <td colspan="3"><%= link_to "You're Next!", new_turn_url %></td> + <td colspan="2"><%= link_to "You're Next!", new_turn_url %></td> <% else -%> <td><%= link_to @game.next_player.user.name, @game.next_player.user %> (<%= @game.next_player.civilization %>)</td> <td>Next</td> <% end -%> - <td><%= elapsed(Time.now.to_i - (@game.turns.size == 0 ? @game.created_at : @game.turns.last.created_at).to_i)%> and counting...</td> + <td colspan="2"><%= elapsed(Time.now.to_i - (@game.turns.size == 0 ? @game.created_at : @game.turns.last.created_at).to_i)%> and counting...</td> </tr> <% @game.turns.reverse.each do |turn| -%> <tr <%= "class=\"yearboundary\"" if turn.next && turn.next.year != turn.year %>> + <% if (turn.next.nil? && turns_in_round == 0) || (turn.next && turn.next.round != turn.round) -%> + <td rowspan="<%= @game.players.size %>" class="round"><%= turn.round %></td> + <td rowspan="<%= @game.players.size %>" class="round"><%= turn.year %></td> + <% end -%> <td><%= link_to turn.position, turn.game_file.url %></td> - <td><%= (turn.position.to_f / @game.players.size.to_f).ceil %></td> - <td><%= turn.year %></td> <td><%= link_to turn.player.user.name, turn.player.user %></td> <td><%= timeago(turn.created_at) %></td> <td><%= elapsed(turn.time_elapsed) %></td> app/views/games/show.html.erb @@ -1,4 +1,4 @@ -<h1>New player</h1> +<h1>New Player</h1> <% form_for(@player) do |f| %> <%= f.error_messages %> app/views/players/new.html.erb @@ -15,11 +15,12 @@ a:hover, a:active { color: #fff; background: #000; } #notice {color: green; font-size: 14px; font-weight: bold;} table.lined { margin: 5px 10px; border-spacing: 0px;} -table.lined th { color: #000; padding-right: 10px; } +table.lined th { text-align: center; color: #000; padding-right: 10px; } table.lined th a { color: #000; } table.lined th img { border:0; } table.lined tr { text-align: left; } table.lined td { font-size: 12px; padding: 2px; padding-right: 10px; border-top: 1px dotted #CCC;} +table.lined td.round { text-align: center;} table.lined tr.alerted { background-color: #FFF; color: #0C1027; background-color: #F8C6CC; } table.lined tr.highlighted {background-color: #FFFFCC;} table.lined tr.yearboundary td {border-top: 2px solid #CCC;} public/stylesheets/application.css 84943b5d0906ee10ddc15ee655089a2f0b37b414 Erik Peterson erik@subwindow.com http://github.com/subwindow/Civ4-Game-Repo/commit/28a0fdeb209a703c421590ea6864452fc2542f50 28a0fdeb209a703c421590ea6864452fc2542f50 2009-05-12T11:37:25-07:00 2009-05-12T11:37:25-07:00 Better-looking rounds 6868054851a877fb7fbed7b8ab5a50b2fd22fcee Erik Peterson erik@subwindow.com