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/5] 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 b6caf2106f837707552adf8e53a8eb8d9489b77c Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Thu, 24 Aug 2017 19:23:37 +0300
Subject: [PATCH 2/5] now alerting user if cannot access server

---
 src/js/services/fs-xhr.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/js/services/fs-xhr.js b/src/js/services/fs-xhr.js
index 2d8635d0..bca34e8f 100644
--- a/src/js/services/fs-xhr.js
+++ b/src/js/services/fs-xhr.js
@@ -19,6 +19,10 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) {
         this._get(url).done(function(data) {
             def.resolve(data);
         }).fail(function(data) {
+            if(data.statusText === "error"){ //status text given when server is inaccessible
+                alert("Server is inaccessible!")
+            }
+            console.log(data);
             def.reject(data);
         });
 
@@ -31,6 +35,9 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) {
         this._post(url,data).done(function(data) {
             def.resolve(data);
         }).fail(function(data) {
+            if(data.statusText === "error"){ //status text given when server is inaccessible
+                alert("Server is inaccessible!")
+            }
             def.reject(data);
         });
         return def.promise;
@@ -40,6 +47,9 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) {
         var def = Q.defer();
         var url = baseurl+path;
         this._delete(url).done(function(data) {
+            if(data.statusText === "error"){ //status text given when server is inaccessible
+                alert("Server is inaccessible!")
+            }
             def.resolve(data);
         }).fail(function(data) {
             def.reject(data);

From 248d0ba7fcdbf8616843103c07a5c64b10e806bd Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Thu, 24 Aug 2017 19:42:42 +0300
Subject: [PATCH 3/5] now alerting user if cannot access mhub server

---
 src/js/services/ng-message.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/js/services/ng-message.js b/src/js/services/ng-message.js
index c12324cf..0c8595fa 100644
--- a/src/js/services/ng-message.js
+++ b/src/js/services/ng-message.js
@@ -14,7 +14,7 @@ define('services/ng-message',[
             var ws;
 
             function init() {
-                if (ws) {
+                if (ws && ws.readyState === 1) {//the socket has to be open to work
                     return $q.when(ws);
                 }
                 return $settings.init().then(function(settings) {
@@ -32,6 +32,9 @@ define('services/ng-message',[
                         def.resolve(ws);
                     };
                     ws.onerror = function(e){
+                        if(e.type === "error"){
+                            alert("mhub server is inaccessible!")
+                        }
                         log("socket error", e);
                     };
                     ws.onclose = function() {

From 5151bb0cd527e8acb3f599ab7cbb8d8183d554fc Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Thu, 24 Aug 2017 19:45:28 +0300
Subject: [PATCH 4/5] 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>

From 84b66c22c7d15e794f377f98f32539881571ac80 Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Fri, 25 Aug 2017 16:58:23 +0300
Subject: [PATCH 5/5] removed debugging log

---
 src/js/services/fs-xhr.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/js/services/fs-xhr.js b/src/js/services/fs-xhr.js
index bca34e8f..1f91d98a 100644
--- a/src/js/services/fs-xhr.js
+++ b/src/js/services/fs-xhr.js
@@ -22,7 +22,6 @@ define('services/fs-xhr',['q','jquery'],function(Q,$) {
             if(data.statusText === "error"){ //status text given when server is inaccessible
                 alert("Server is inaccessible!")
             }
-            console.log(data);
             def.reject(data);
         });