atomaka/trugul-bot
1
0
Fork 0
Code Releases Activity

account for unkilled

Browse source
This commit is contained in:
Andrew Tomaka 2015-04-28 11:59:39 -04:00
parent 3b1325654b
commit 69bd64abf8
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app.rb
View file

@ -36,14 +36,17 @@ get '/bossfight' do
user_defenses = Raid.defenses_for_user(@username) user_defenses = Raid.defenses_for_user(@username)
user_attacks = Raid.attacks_for_user(@username) user_attacks = Raid.attacks_for_user(@username)
@first_negative = user_defenses.first_negative first_negative = user_defenses.first_negative
@soldiers_killed = user_defenses.soldiers_lost_to_date(@first_negative.created_at) @kill_date = first_negative ? first_negative.created_at : DateTime.now
@kill_user = first_negative ? first_negative.attacker : '<strong>UNKILLED</strong>'
@contributor_attacks = user_defenses.contributor_attacks(@first_negative.created_at) @soldiers_killed = user_defenses.soldiers_lost_to_date(@kill_date)
@contributor_soldiers = user_defenses.contributor_soldiers(@first_negative.created_at)
@contributor_defenses = user_attacks.contributor_defenses(@first_negative.created_at) @contributor_attacks = user_defenses.contributor_attacks(@kill_date)
@contributor_defenders = user_attacks.contributor_defenders(@first_negative.created_at) @contributor_soldiers = user_defenses.contributor_soldiers(@kill_date)
@contributor_defenses = user_attacks.contributor_defenses(@kill_date)
@contributor_defenders = user_attacks.contributor_defenders(@kill_date)
@contributors = [] @contributors = []
@contributor_attacks.each do |k, v| @contributor_attacks.each do |k, v|

4
views/bossfight.erb
View file

@ -6,11 +6,11 @@
</li> </li>
<li class="list-group-item text-right"> <li class="list-group-item text-right">
<span class="pull-left"><strong>Kill Date:</strong></span> <span class="pull-left"><strong>Kill Date:</strong></span>
<%= @first_negative.created_at.strftime('%H:%M on %m-%d-%Y') if @first_negative %> <%= @kill_date.strftime('%H:%M on %m-%d-%Y') if @kill_date %>
</li> </li>
<li class="list-group-item text-right"> <li class="list-group-item text-right">
<span class="pull-left"><strong>Killing Blow:</strong></span> <span class="pull-left"><strong>Killing Blow:</strong></span>
<%= @first_negative.attacker if @first_negative %> <%= @kill_user if @kill_user %>
</li> </li>
<li class="list-group-item text-right"> <li class="list-group-item text-right">
<span class="pull-left"><strong>Soliders Killed:</strong></span> <span class="pull-left"><strong>Soliders Killed:</strong></span>