From 5cfcfe0448abd5c4829445a4feb36a650bb53bf8 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Mon, 13 Nov 2017 08:42:16 -0500
Subject: [PATCH] Added info to match edit (mat -> show) and up_matches pages.

---
 .tmux.sh.swp                                  | Bin 0 -> 12288 bytes
 app/views/mats/._match_edit_form.html.erb.swp | Bin 0 -> 20480 bytes
 app/views/mats/_match_edit_form.html.erb      |  28 +++++++++---------
 app/views/tournaments/up_matches.html.erb     |  14 ++++-----
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 .tmux.sh.swp
 create mode 100644 app/views/mats/._match_edit_form.html.erb.swp

diff --git a/.tmux.sh.swp b/.tmux.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..dd840161e1cbae35b59693f644a6b76e94010f4e
GIT binary patch
literal 12288
zcmeI&O-lkn7zgmj=xRmXI*k>0TGw8n2s)G*c*wvv=oG6v=#s9ov$=W6&rtL|f-ZfB
zt{u8|>k9;3dnUDf3-c)a7yb-8^UTc7?<P($UPzsa-PjKCvqaQ>c{*R6-=jB&s8qLG
zx_i>2>ulMaR7N+t(DY=ZuFSxb%C9<ZnJ50f95x!JU%R@FsmjFFPyhi4OeYYg?XAtY
zp0mCd5i862>87I^0uX=z1Rwwb2tWV=5SVEJzY(G~pJ1+gig33L4Yl1@G!TFQ1Rwwb
z2tWV=5P$##AOHaf%%Ff}6CEuO-Es8)|GnS;AB#k<oCnT5M{x?A6OO_8<ob8cGv|?`
z=ihShKmY;|fB*y_009U<00Izz00jOgpznVR%lEBPMHs%=NaQn_WIA_|O=h#Hvow8=
zD_NB#-v}Jnt_Qj--s$(GYt>}0-?N;mGRltM8FXdP9qBFN+Qy}9DG@DNsv<h&d?B5$
zpNswr>QNC*7`5o1TZ~_R+_yBH+Q{Df>15_O=SexRjgmhf$CCzz^f{DN%Bj1;u!W&U
Uk%rI?`cFga5wqyHram)$0ZM+Txc~qF

literal 0
HcmV?d00001

diff --git a/app/views/mats/._match_edit_form.html.erb.swp b/app/views/mats/._match_edit_form.html.erb.swp
new file mode 100644
index 0000000000000000000000000000000000000000..a70785a5560c3874d25f60167c81b04771b94ee6
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/app/views/mats/_match_edit_form.html.erb b/app/views/mats/_match_edit_form.html.erb
index d5dd506..08dbcab 100644
--- a/app/views/mats/_match_edit_form.html.erb
+++ b/app/views/mats/_match_edit_form.html.erb
@@ -10,15 +10,15 @@
       </ul>
     </div>
   <% end %>
-  <h4>Bout <%= @match.bout_number %></h4>
+  <h4>Bout: <%= @match.bout_number %> </h4><h4>Round: <%= @match.round %></h4><h4>Weight: <%= @match.weight_max %> lbs</h4>
 <table class="table">
   <thead>
       <tr>
-        <th><%= @w1.name %> <select id="w1-color" onchange="changeW1Color(this)">
+        <th><%= @w1.name %> - <%= @w1.school.name %> <select id="w1-color" onchange="changeW1Color(this)">
             <option value="green">Green</option>
             <option value="red">Red</option>
         </select><br>Last Match: <%= if @w1.lastMatch != nil then time_ago_in_words(@w1.lastMatch.updated_at) end%></th>
-        <th><%= @w2.name %> <select id="w2-color" onchange="changeW2Color(this)">
+        <th><%= @w2.name %> - <%= @w2.school.name %> <select id="w2-color" onchange="changeW2Color(this)">
             <option value="red">Red</option>
             <option value="green">Green</option>
         </select><br>Last Match: <%= if @w2.lastMatch != nil then time_ago_in_words(@w2.lastMatch.updated_at) end%></th>
@@ -94,7 +94,7 @@
 
   <div class="actions">
     <%= f.submit onclick: "return confirm('Is the name of the winner ' + document.getElementById('match_winner_id').options[document.getElementById('match_winner_id').selectedIndex].text + '?')", :class=>"btn btn-success" %>
-     
+
   </div>
 <% end %>
 
@@ -116,17 +116,17 @@
   	w1.stats=document.getElementById("match_w1_stat").value;
   	w2.stats=document.getElementById("match_w2_stat").value;
   }
-  
+
   function takedown(wrestler){
   	updateStats(wrestler,"T2")
   }
-  
+
   function updateStats(wrestler,text){
     updatejsvalues();
   	wrestler.stats = wrestler.stats + text + " ";
   	updatehtmlvalues();
   }
-  
+
   //For Changing button colors
   function changeW1Color(color){
     if (color.value == "red") {
@@ -140,7 +140,7 @@
         document.getElementById("w2-color").value = "red";
     }
   }
-  
+
   function changeW2Color(color){
     if (color.value == "red") {
         w2Red();
@@ -153,15 +153,15 @@
         document.getElementById("w1-color").value = "red";
     }
   }
-  
+
   function redColor(id){
     document.getElementById(id).className = "btn btn-danger btn-sm";
   }
-  
+
   function greenColor(id){
     document.getElementById(id).className = "btn btn-success btn-sm";
   }
-  
+
   function w1Red(){
     redColor("w1-takedown");
     redColor("w1-escape");
@@ -177,7 +177,7 @@
     redColor("w1-stalling");
     redColor("w1-caution");
   }
-  
+
   function w1Green(){
     greenColor("w1-takedown");
     greenColor("w1-escape");
@@ -193,7 +193,7 @@
     greenColor("w1-stalling");
     greenColor("w1-caution");
   }
-  
+
   function w2Red(){
     redColor("w2-takedown");
     redColor("w2-escape");
@@ -209,7 +209,7 @@
     redColor("w2-stalling");
     redColor("w2-caution");
   }
-  
+
   function w2Green(){
     greenColor("w2-takedown");
     greenColor("w2-escape");
diff --git a/app/views/tournaments/up_matches.html.erb b/app/views/tournaments/up_matches.html.erb
index 70e3eec..1406d9b 100644
--- a/app/views/tournaments/up_matches.html.erb
+++ b/app/views/tournaments/up_matches.html.erb
@@ -24,15 +24,15 @@
         <th>Warm Up</th>
       </tr>
     </thead>
-  
+
     <tbody>
       <% @mats.each.map do |m| %>
         <tr>
           <td><%= m.name %></td>
-          <td><% if m.unfinishedMatches.first %><%=m.unfinishedMatches.first.bout_number%><br><%= m.unfinishedMatches.first.w1_name %> vs. <%= m.unfinishedMatches.first.w2_name %><% end %></td>
-          <td><% if m.unfinishedMatches.second %><%=m.unfinishedMatches.second.bout_number%><br><%= m.unfinishedMatches.second.w1_name %> vs. <%= m.unfinishedMatches.second.w2_name %><% end %></td>
-          <td><% if m.unfinishedMatches.third %><%=m.unfinishedMatches.third.bout_number%><br><%= m.unfinishedMatches.third.w1_name %> vs. <%= m.unfinishedMatches.third.w2_name %><% end %></td>
-          <td><% if m.unfinishedMatches.fourth %><%=m.unfinishedMatches.fourth.bout_number%><br><%= m.unfinishedMatches.fourth.w1_name %> vs. <%= m.unfinishedMatches.fourth.w2_name %><% end %></td>
+          <td><% if m.unfinishedMatches.first %><strong><%=m.unfinishedMatches.first.bout_number%></strong> - <%= m.unfinishedMatches.first.weight_max %> lbs<br><%= m.unfinishedMatches.first.w1_name %> vs. <%= m.unfinishedMatches.first.w2_name %><% end %></td>
+          <td><% if m.unfinishedMatches.second %><strong><%=m.unfinishedMatches.second.bout_number%></strong> - <%= m.unfinishedMatches.second.weight_max %> lbs<br><%= m.unfinishedMatches.second.w1_name %> vs. <%= m.unfinishedMatches.second.w2_name %><% end %></td>
+          <td><% if m.unfinishedMatches.third %><strong><%=m.unfinishedMatches.third.bout_number%></strong> - <%= m.unfinishedMatches.third.weight_max %> lbs<br><%= m.unfinishedMatches.third.w1_name %> vs. <%= m.unfinishedMatches.third.w2_name %><% end %></td>
+          <td><% if m.unfinishedMatches.fourth %><strong><%=m.unfinishedMatches.fourth.bout_number%></strong> - <%= m.unfinishedMatches.fourth.weight_max %> lbs<br><%= m.unfinishedMatches.fourth.w1_name %> vs. <%= m.unfinishedMatches.fourth.w2_name %><% end %></td>
         </tr>
       <% end %>
     </tbody>
@@ -49,7 +49,7 @@
         <th>Matchup</th>
       </tr>
     </thead>
-  
+
     <tbody>
       <% if @matches.size > 0 %>
       <% @matches.each.map do |m| %>
@@ -63,6 +63,6 @@
       <% end %>
     </tbody>
   </table>
-  
+
   <br>
 <% end %>