Merge branch 'master' of github.com:ZeusWPI/12Urenloop

12urenloop · May 1, 2014 · d001d3a · d001d3a
2 parents 535ada7 + e5cc040
commit d001d3a
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 25 deletions.
diff --git a/boxxy/content/dj-contest.html b/boxxy/content/dj-contest.html
@@ -2,20 +2,19 @@
     <div class="four columns offset-by-five">
         <table>
             <tr><th>10u30</th><td>Vyncue (1)</td></tr>
-            <tr><th>11u30</th><td>Snap-ah (2)</td></tr>
-            <tr><th>12u30</th><td>DJ Plancke (3)</td></tr>
-            <tr><th>13u30</th><td>Bouclé (4)</td></tr>
-            <tr><th>14u30</th><td>Bassick (5)</td></tr>
-            <tr><th>15u30</th><td>Bollé (6)</td></tr>
+            <tr><th>12u30</th><td>DJ Plancke (2)</td></tr>
+            <tr><th>13u30</th><td>Bouclé (3)</td></tr>
+            <tr><th>14u30</th><td>Bassick (4)</td></tr>
+            <tr><th>15u30</th><td>Bollé (5)</td></tr>
         </table>
     </div>
     <div class="four columns">
         <table>
-            <tr><th>16u30</th><td>G-Danza (7)</td></tr>
-            <tr><th>17u30</th><td>B-tech (8)</td></tr>
-            <tr><th>18u30</th><td>Pulp Mixion (9)</td></tr>
-            <tr><th>19u30</th><td>Tous les deux (10)</td></tr>
-            <tr><th>20u30</th><td>Sennen (11)</td></tr>
+            <tr><th>16u30</th><td>Snap-ah (6)</td></tr>
+            <tr><th>17u30</th><td>B-tech (7)</td></tr>
+            <tr><th>18u30</th><td>Pulp Mixion (8)</td></tr>
+            <tr><th>19u30</th><td>Tous les deux (9)</td></tr>
+            <tr><th>20u30</th><td>Sennen (10)</td></tr>
         </table>
     </div>
 </div>

diff --git a/manual-count/database.sql b/manual-count/database.sql
@@ -2,6 +2,8 @@
 -- Database: `urenloop`
 --
 
+DROP TABLE IF EXISTS `teams`, `laps`;
+
 CREATE TABLE  `teams` (
   `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
   `name` VARCHAR( 255 ) NOT NULL ,

diff --git a/manual-count/resetdb.sh b/manual-count/resetdb.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+mysql urenloop -p < database.sql
diff --git a/manual-count/script.js b/manual-count/script.js
@@ -1,5 +1,5 @@
 var DELAY = 30; // delay to prevent accidental double taps
-var BUTTONS_PER_VIEW = 7;
+var BUTTONS_PER_VIEW = 9
 var error = '';
 
 // Detect local storage

diff --git a/manual-count/style.css b/manual-count/style.css
@@ -34,13 +34,13 @@ h1 {
 
 #buttonHolder {
   /* TODO: determine width @media-queries */
-  width: 984px; /* Portrait: 740px; */
+  width: 1200px; /* Portrait: 740px; */
   margin: 40px auto 0; padding: 0;
 }
 
 #buttonHolder > li {
   list-style: none;
-  width: 200px; height: 180px;
+  width: 190px; height: 180px;
   margin: 0 12px 36px; padding: 10px;
   display: block; float: left;
   text-align: center;

diff --git a/site/index.html b/site/index.html
@@ -390,8 +390,8 @@ <h3><span class="lines">DJ-contest</span></h3>
 
         <table class="schedule">
           <tr><td colspan="4"><strong>Programma DJ-contest</strong></td></tr>
-          <tr><th>10u30</th><td>Vyncue</td><th>16u30</th><td>G-Danza</td></tr>
-          <tr><th>11u30</th><td>Snap-ah</td><th>17u30</th><td>B-tech</td></tr>
+          <tr><th>10u30</th><td>Vyncue</td><th>16u30</th><td>Snap-ah</td></tr>
+          <tr><th>11u30</th><td>/</td><th>17u30</th><td>B-tech</td></tr>
           <tr><th>12u30</th><td>DJ Plancke</td><th>18u30</th><td>Pulp Mixion</td></tr>
           <tr><th>13u30</th><td>Bouclé</td><th>19u30</th><td>Tous les deux</td></tr>
           <tr><th>14u30</th><td>Bassick</td><th>20u30</th><td>Sennen</td></tr>

diff --git a/tools/dj-ratings/dj-ratings.hs b/tools/dj-ratings/dj-ratings.hs
@@ -25,16 +25,15 @@ djs2014 :: [Dj]
 djs2014 =
     -- TODO add a base rating by us?
     [ Dj "Vyncue"                         1 (Time 10 30) (Time 11 30)
-    , Dj "Snap-ah"                        2 (Time 11 30) (Time 12 30)
-    , Dj "DJ Plancke"                     3 (Time 12 30) (Time 13 30)
-    , Dj "Bouclé"                         4 (Time 13 30) (Time 14 30)
-    , Dj "Bassick"                        5 (Time 14 30) (Time 15 30)
-    , Dj "Bollé"                          6 (Time 15 30) (Time 16 30)
-    , Dj "G-Danza"                        7 (Time 16 30) (Time 17 30)
-    , Dj "B-tech"                         8 (Time 17 30) (Time 18 30)
-    , Dj "Pulp Mixion"                    9 (Time 18 30) (Time 19 30)
-    , Dj "Tous les deux"                 10 (Time 19 30) (Time 20 30)
-    , Dj "Sennen"                        11 (Time 20 30) (Time 21 30)
+    , Dj "DJ Plancke"                     2 (Time 12 30) (Time 13 30)
+    , Dj "Bouclé"                         3 (Time 13 30) (Time 14 30)
+    , Dj "Bassick"                        4 (Time 14 30) (Time 15 30)
+    , Dj "Bollé"                          5 (Time 15 30) (Time 16 30)
+    , Dj "Snap-ah"                        6 (Time 16 30) (Time 17 30)
+    , Dj "B-tech"                         7 (Time 17 30) (Time 18 30)
+    , Dj "Pulp Mixion"                    8 (Time 18 30) (Time 19 30)
+    , Dj "Tous les deux"                  9 (Time 19 30) (Time 20 30)
+    , Dj "Sennen"                        10 (Time 20 30) (Time 21 30)
     ]