From 7831bfaf6bde260e0ff92b51d60443a75872323f Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Thu, 14 Dec 2017 09:03:31 -0500 Subject: [PATCH] Pretty up wrestler show page --- .../calculate_wrestler_team_score.rb | 46 +++++---- app/views/wrestlers/.show.html.erb.swp | Bin 0 -> 12288 bytes app/views/wrestlers/show.html.erb | 95 +++++++++++++----- 3 files changed, 95 insertions(+), 46 deletions(-) create mode 100644 app/views/wrestlers/.show.html.erb.swp diff --git a/app/services/wrestler_services/calculate_wrestler_team_score.rb b/app/services/wrestler_services/calculate_wrestler_team_score.rb index c01db4d..c15267b 100644 --- a/app/services/wrestler_services/calculate_wrestler_team_score.rb +++ b/app/services/wrestler_services/calculate_wrestler_team_score.rb @@ -3,19 +3,19 @@ class CalculateWrestlerTeamScore @wrestler = wrestler @tournament = @wrestler.tournament end - + def totalScore if @wrestler.extra or @wrestler.matches.count == 0 - return 0 + return 0 else earnedPoints - deductedPoints end end - + def earnedPoints - return poolPoints + bracketPoints + placementPoints + bonusWinPoints + return poolPoints + bracketPoints + placementPoints + bonusWinPoints + byePoints end - + def deductedPoints points = 0 @wrestler.deductedPoints.each do |d| @@ -23,29 +23,37 @@ class CalculateWrestlerTeamScore end points end - + def placementPoints PoolBracketPlacementPoints.new(@wrestler).calcPoints if @tournament.tournament_type == "Pool to bracket" end - + def bracketPoints (@wrestler.championshipAdvancementWins.size * 2) + (@wrestler.consoAdvancementWins.size * 1) end - + def poolPoints if @tournament.tournament_type == "Pool to bracket" - if @wrestler.poolWins.size >= 1 and @wrestler.hasAPoolBye == true - ((@wrestler.poolWins.size * 2) + 2) - else - (@wrestler.poolWins.size * 2) - end + (@wrestler.poolWins.size * 2) else - 0 + 0 end end - - def bonusWinPoints - (@wrestler.pinWins.size * 2) + (@wrestler.techWins.size * 1.5) + (@wrestler.majorWins.size * 1) + + def byePoints + if @tournament.tournament_type == "Pool to bracket" + if @wrestler.poolWins.size >= 1 and @wrestler.hasAPoolBye == true + 2 + else + 0 + end + else + 0 + end end - -end \ No newline at end of file + + def bonusWinPoints + (@wrestler.pinWins.size * 2) + (@wrestler.techWins.size * 1.5) + (@wrestler.majorWins.size * 1) + end + +end diff --git a/app/views/wrestlers/.show.html.erb.swp b/app/views/wrestlers/.show.html.erb.swp new file mode 100644 index 0000000000000000000000000000000000000000..49cd3467ac2acacdca802df4cf32414cfd026000 GIT binary patch literal 12288 zcmeI2PiP!f9LHb8f2pY!wNU8gbwf&m$?Rq=7{X?wi%~=(!9o`mYKKN z22+br6%@r5k5v#96ogzv&>ng-Ck3J6K|QKH=|QUp(fEDyXJ`K;n~lVS@)kasoq50c z{rSE(znLXd$vyeVJiSjlLGU?5$ng36so!%`B!8R`-80tY;oUyc&fu%NnUUwEVb$lurGQdEDWDWk3Md7X0!o4ZvjULVg85fiJZ9T_eT9oM-i5P-<+;+$ z&cB`BP0pHmwo6tJX7TY*B59V^ zB9AZ1`nwN@VQDEUkS@dpcH2qCTaPv?f$un_O-DW{BlL>b+G6$)++?Xedagl{A zzPF4>1G(Gl(rjBB;q(T=_uOjx3c(avt_aFHvvo~)g4v6@=kstP68pB9YxT4w?V*A6 zK$pA*^9{PhnL{HVqd96Vqn!xubAz&g@-xC`V} z2Azvcp4yh;Txbo|(&f;yzPbdPXuFo$;u_qj>!N4m2V;|1pT48svvbs%&2;WS&>jUZ zBsTjPx8k|=;H2gD2wRdS$x;}tS#B`yuxCAgTyWhS=R(J{_bGc10ph;WE06fXM7H}W zz#8ur^QpOgj8*eIyGO7E4AWhz+f)CGVqtbV`d@gQ&U=QnY;nJJym_tesg*_kNR zhSzYnYiaV@uSH$B?IO^^#?kEVar>B)-DGyU*-m6b4A0)dNrPKeQ)mu5)9LACIMU@Q z?6BMB6X+(UL35cSJ0t{` zoXw11LfptqFiIb9BsxL z8>iFJy{nk12$zD1nr}JGU&}OO;s&5Ica}~&%w<)M)FSN?gO(&pcxIr;26?pTE3?RC XqXR)U9g7O>O2FXD3{N~^0)+exx|MRU literal 0 HcmV?d00001 diff --git a/app/views/wrestlers/show.html.erb b/app/views/wrestlers/show.html.erb index 67d46e9..ee3ce96 100644 --- a/app/views/wrestlers/show.html.erb +++ b/app/views/wrestlers/show.html.erb @@ -22,37 +22,78 @@ <%= @wrestler.weight.max %>

- Team Points Earned: - <%= @wrestler.teamPointsEarned %> + Extra?: + <%= @wrestler.extra %>

-

- Team Points Deducted: - <%= @wrestler.totalDeductedPoints %> -

-

- Total Team Points Scored: - <%= @wrestler.totalTeamPoints %> -

-

- Points Breakdown:
- Pool Win Points (including BYE points): <%= @wrestler_points_calc.poolPoints %>
- Bracket Win Points: <%= @wrestler_points_calc.bracketPoints %>
- Bonus Points: <%= @wrestler_points_calc.bonusWinPoints %>
- Placement Points:<%= @wrestler_points_calc.placementPoints %>
-

- +
+
+

Point Breakdown

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Point ModifierPoints
Pool Win Points+<%= @wrestler_points_calc.poolPoints %>
BYE Points+<%= @wrestler_points_calc.byePoints %>
Bracket Win Points+<%= @wrestler_points_calc.bracketPoints %>
Bonus Points (pins,major,tech,etc)+<%= @wrestler_points_calc.bonusWinPoints %>
Placement Points+<%= @wrestler_points_calc.placementPoints %>
Deducted Points-<%= @wrestler_points_calc.deductedPoints %>
Total Points Earned<%= @wrestler_points_calc.earnedPoints %>
Total Points Toward Team Score (0 if entered as extra)<%= @wrestler_points_calc.totalScore %>


Matches


- <% @wrestler.allMatches.each do |m| %> -
Bout: <%= m.bout_number %> <%= m.bracket_position %> <%= m.wrestler1.name %> vs. <%= m.wrestler2.name %> <%= @wrestler.resultByBout(m.bout_number) %>
- <% if m.w1_stat || m.w2_stat %> -
Stats:
-
<%= m.list_w1_stats %>
-
<%= m.list_w2_stats %>
-
- <% end %> - <% end %> + + + + + + + + + + + <% @wrestler.allMatches.each do |m| %> + + + + + + <% end %> + +
BoutMatch Bracket PositionStatsResult
<%= m.bout_number %><%= m.bracket_position %><%= m.list_w1_stats %>
<%= m.list_w2_stats %>		<%= @wrestler.resultByBout(m.bout_number) %> +
<% end %>