From f4b8fe20ec86b61903d184dcefc4ff3f3f9628b1 Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Sun, 20 Aug 2017 18:09:29 +0300
Subject: [PATCH 1/3] Changed sorting icons to a material-icons versions in
 ranking

---
 src/js/views/ranking.js      | 10 +++++-----
 src/views/pages/ranking.html | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/js/views/ranking.js b/src/js/views/ranking.js
index 479a6055..5fb978e3 100644
--- a/src/js/views/ranking.js
+++ b/src/js/views/ranking.js
@@ -70,15 +70,15 @@ define('views/ranking',[
                 var icon = '';
                 if (stage.sort == col) {
                     if (stage.rev){
-                        icon = 'icon-sort-down';
+                        icon = 'arrow_drop_down';
                     } else {
-                        icon = 'icon-sort-up';
+                        icon = 'arrow_drop_up';
                     }
                 } else if (stage.sort === undefined && col == $scope.sort) {
                     if (stage.rev === undefined && $scope.rev) {
-                        icon = 'icon-sort-down';
+                        icon = 'arrow_drop_down';
                     } else {
-                        icon = 'icon-sort-up';
+                        icon = 'arrow_drop_up';
                     }
                 } else {
                     icon = ''; // no icon if column is not sorted
@@ -159,7 +159,7 @@ define('views/ranking',[
             $scope.getRoundLabel = function(round){
                 return "Round " + round;
             };
-            
+
 
         }
     ]);
diff --git a/src/views/pages/ranking.html b/src/views/pages/ranking.html
index e20bb320..5f9c0d66 100644
--- a/src/views/pages/ranking.html
+++ b/src/views/pages/ranking.html
@@ -41,27 +41,27 @@ <h1 ng-if="stage.rounds > 0">
                     <tr class="clickable">
                         <th class="span1" ng-click="doSort(stage, 'rank',false)">
                             <span style="float: left;">Rank</span>
-                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'rank')"></span>
+                            <i style="float: right" class="material-icons">{{sortIcon(stage, 'rank')}}</i>
                         </th>
                         <th class="span1" ng-click="doSort(stage, 'team.number',false)">
                             <span style="float: left;">Team</span>
-                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'team.number')"></span>
+                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'team.number')}}</i>
                         </th>
                         <th class="span2" ng-click="doSort(stage, 'team.name',false)">
                             <span style="float: left;">Name</span>
-                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'team.name')"></span>
+                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'team.name')}}</i>
                         </th>
                         <th class="span1" ng-if="stage.rounds > 1" ng-click="doSort(stage, 'highest',true)">
                             <span style="float: left;">Highest</span>
-                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'highest')"></span>
+                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'highest')}}</i>
                         </th>
                         <th class="span1" ng-if="stage.rounds == 1" ng-click="doSort(stage, 'highest',true)">
                             <span style="float: left;">Score</span>
-                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'highest')"></span>
+                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'highest')}}</i>
                         </th>
                         <th class="span1" ng-if="stage.rounds > 1" ng-repeat="round in stage.$rounds track by $index" ng-click="doSort(stage, 'scores['+$index+']',true)">
                             <span style="float: left;">Round {{round}}</span>
-                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'scores['+$index+']')"></span>
+                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'scores['+$index+']')}}</i>
                         </th>
                         <!-- padding cols -->
                         <th class="span1 clearCell" ng-repeat="col in emptyCols(stage) track by $index"></th>
@@ -69,7 +69,7 @@ <h1 ng-if="stage.rounds > 0">
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in scoreboard[stage.id] | index | orderBy:stage.sort:stage.rev track by item.team.number">
+                    <tr ng-repeat="item in scoreboard[stage.id]  | orderBy:stage.sort:stage.rev track by item.team.number">
                         <td>{{item.rank}}</td>
                         <td>{{item.team.number}}</td>
                         <td>{{item.team.name}}</td>

From 645d36e5444cef45d58e77382df823658bf877fb Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Tue, 22 Aug 2017 17:54:08 +0300
Subject: [PATCH 2/3] Added current score to the appbar

---
 src/css/elements.css            | 14 ++++++++++++++
 src/views/pages/scoresheet.html |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/src/css/elements.css b/src/css/elements.css
index e4f8cbe6..1c8183ed 100644
--- a/src/css/elements.css
+++ b/src/css/elements.css
@@ -18,6 +18,13 @@ h1 {
     font-weight: normal;
 }
 
+h3 {
+    font-family: 'latolight', 'Segoe UI Light','helvetica','Arial';
+    font-size: 20px;
+    padding: 0 7px;
+    font-weight: normal;
+}
+
 table {
     border-collapse: collapse;
     width: 100%;
@@ -94,6 +101,13 @@ table {
         color: white;
         text-transform: capitalize;
     }
+
+    .appbar h3 {
+        display: inline-block;
+        color: black;
+        float: right;
+    }
+
     .appbar .appbar-actions {
         position: absolute;
         top: 6px;
diff --git a/src/views/pages/scoresheet.html b/src/views/pages/scoresheet.html
index 2549870e..91e3659f 100644
--- a/src/views/pages/scoresheet.html
+++ b/src/views/pages/scoresheet.html
@@ -6,6 +6,9 @@
         <h1>
             {{currentPage.title}}
         </h1>
+        <h3>
+            Current Score: {{score()}}
+        </h3>
     </div>
     <div>
         <div ng-show="errorMessage">

From 1d11dbb96853a5fe38fdeebaad2de2ab19ea600f Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Tue, 22 Aug 2017 17:57:12 +0300
Subject: [PATCH 3/3] Revert "Changed sorting icons to a material-icons
 versions in ranking"

This reverts commit f4b8fe2
---
 src/js/views/ranking.js      | 10 +++++-----
 src/views/pages/ranking.html | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/js/views/ranking.js b/src/js/views/ranking.js
index 5fb978e3..479a6055 100644
--- a/src/js/views/ranking.js
+++ b/src/js/views/ranking.js
@@ -70,15 +70,15 @@ define('views/ranking',[
                 var icon = '';
                 if (stage.sort == col) {
                     if (stage.rev){
-                        icon = 'arrow_drop_down';
+                        icon = 'icon-sort-down';
                     } else {
-                        icon = 'arrow_drop_up';
+                        icon = 'icon-sort-up';
                     }
                 } else if (stage.sort === undefined && col == $scope.sort) {
                     if (stage.rev === undefined && $scope.rev) {
-                        icon = 'arrow_drop_down';
+                        icon = 'icon-sort-down';
                     } else {
-                        icon = 'arrow_drop_up';
+                        icon = 'icon-sort-up';
                     }
                 } else {
                     icon = ''; // no icon if column is not sorted
@@ -159,7 +159,7 @@ define('views/ranking',[
             $scope.getRoundLabel = function(round){
                 return "Round " + round;
             };
-
+            
 
         }
     ]);
diff --git a/src/views/pages/ranking.html b/src/views/pages/ranking.html
index 5f9c0d66..e20bb320 100644
--- a/src/views/pages/ranking.html
+++ b/src/views/pages/ranking.html
@@ -41,27 +41,27 @@ <h1 ng-if="stage.rounds > 0">
                     <tr class="clickable">
                         <th class="span1" ng-click="doSort(stage, 'rank',false)">
                             <span style="float: left;">Rank</span>
-                            <i style="float: right" class="material-icons">{{sortIcon(stage, 'rank')}}</i>
+                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'rank')"></span>
                         </th>
                         <th class="span1" ng-click="doSort(stage, 'team.number',false)">
                             <span style="float: left;">Team</span>
-                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'team.number')}}</i>
+                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'team.number')"></span>
                         </th>
                         <th class="span2" ng-click="doSort(stage, 'team.name',false)">
                             <span style="float: left;">Name</span>
-                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'team.name')}}</i>
+                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'team.name')"></span>
                         </th>
                         <th class="span1" ng-if="stage.rounds > 1" ng-click="doSort(stage, 'highest',true)">
                             <span style="float: left;">Highest</span>
-                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'highest')}}</i>
+                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'highest')"></span>
                         </th>
                         <th class="span1" ng-if="stage.rounds == 1" ng-click="doSort(stage, 'highest',true)">
                             <span style="float: left;">Score</span>
-                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'highest')}}</i>
+                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'highest')"></span>
                         </th>
                         <th class="span1" ng-if="stage.rounds > 1" ng-repeat="round in stage.$rounds track by $index" ng-click="doSort(stage, 'scores['+$index+']',true)">
                             <span style="float: left;">Round {{round}}</span>
-                             <i style="float: right" class="material-icons">{{sortIcon(stage, 'scores['+$index+']')}}</i>
+                            <span style="float: right;" class="icon" ng-class="sortIcon(stage, 'scores['+$index+']')"></span>
                         </th>
                         <!-- padding cols -->
                         <th class="span1 clearCell" ng-repeat="col in emptyCols(stage) track by $index"></th>
@@ -69,7 +69,7 @@ <h1 ng-if="stage.rounds > 0">
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in scoreboard[stage.id]  | orderBy:stage.sort:stage.rev track by item.team.number">
+                    <tr ng-repeat="item in scoreboard[stage.id] | index | orderBy:stage.sort:stage.rev track by item.team.number">
                         <td>{{item.rank}}</td>
                         <td>{{item.team.number}}</td>
                         <td>{{item.team.name}}</td>