From 81fd8efc46e54c8f5ba4b0f3713f033e6aa2f72b Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Sun, 20 Aug 2017 15:14:01 +0300
Subject: [PATCH 1/3] Added support for custom delimiter in team import dialog

---
 .../controllers/TeamImportDialogController.js | 42 ++++++++++++-------
 src/views/dialogs.html                        | 29 +++++++------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/js/controllers/TeamImportDialogController.js b/src/js/controllers/TeamImportDialogController.js
index e8e1c08a..2720ddc4 100644
--- a/src/js/controllers/TeamImportDialogController.js
+++ b/src/js/controllers/TeamImportDialogController.js
@@ -1,21 +1,24 @@
-define('controllers/TeamImportDialogController',[
+define('controllers/TeamImportDialogController', [
     'services/ng-handshake',
     'angular'
-], function() {
+], function () {
     var moduleName = 'TeamImportDialog';
 
-    return angular.module(moduleName, []).controller('TeamImportDialogController',[
+    return angular.module(moduleName, []).controller('TeamImportDialogController', [
         '$scope', '$handshake',
         function ($scope, $handshake) {
             var defer;
 
             function parseData(data) {
                 //parse raw import, split lines
-                var lines = data?data.split(/[\n\r]/):[];
+                var lines = data ? data.split(/[\n\r]/) : [];
                 if ($scope.importHeader) {
                     lines.shift();
                 }
-                lines = lines.map(function(line) {
+                lines = lines.map(function (line) {
+                    if ($scope.useCustomDelimiter) {
+                        return line.split($scope.delimiterCharacter);
+                    }
                     //split by tab character
                     return line.split(/\t/);
                 });
@@ -24,8 +27,8 @@ define('controllers/TeamImportDialogController',[
                 $scope.importNameColumn = 2;
 
                 if (lines[0]) {
-                    $scope.importNumberExample = lines[0][$scope.importNumberColumn -1];
-                    $scope.importNameExample = lines[0][$scope.importNameColumn -1];
+                    $scope.importNumberExample = lines[0][$scope.importNumberColumn - 1];
+                    $scope.importNameExample = lines[0][$scope.importNameColumn - 1];
                 } else {
                     $scope.importNumberExample = '';
                     $scope.importNameExample = '';
@@ -34,29 +37,38 @@ define('controllers/TeamImportDialogController',[
                 $scope.importLines = lines;
             }
 
-            $scope.$watch('importRaw',function(data) {
+            $scope.$watch('importRaw', function (data) {
                 parseData($scope.importRaw);
             });
 
-            $scope.$watch('importHeader',function(data) {
+            $scope.$watch('importHeader', function (data) {
                 parseData($scope.importRaw);
             });
 
-            $handshake.$on('importTeams',function(e) {
+            $scope.$watch('useCustomDelimiter', function (data) {
+                parseData($scope.importRaw)
+            });
+
+            $scope.$watch('delimiterCharacter', function (data) {
+                parseData($scope.importRaw)
+            });
+
+
+            $handshake.$on('importTeams', function (e) {
                 $scope.dialogVisible = true;
                 defer = $handshake.defer();
                 return defer.promise;
             });
 
-            $scope.ok = function() {
+            $scope.ok = function () {
                 $scope.dialogVisible = false;
-                var teams = $scope.importLines.map(function(line) {
+                var teams = $scope.importLines.map(function (line) {
                     return {
-                        number: line[$scope.importNumberColumn -1],
-                        name: line[$scope.importNameColumn -1]
+                        number: line[$scope.importNumberColumn - 1],
+                        name: line[$scope.importNameColumn - 1]
                     };
                 });
-                defer.resolve({teams:teams});
+                defer.resolve({teams: teams});
             };
 
             $scope.cancel = function () {
diff --git a/src/views/dialogs.html b/src/views/dialogs.html
index b3e34e47..c0f39061 100644
--- a/src/views/dialogs.html
+++ b/src/views/dialogs.html
@@ -29,6 +29,11 @@ <h1>
                         <input type="text" ng-model="importNameColumn" size="3">
                         ({{importNameExample}})
                     </p>
+                    <p>
+                        Use custom delimiter? (Default is tab, the delimiter used when pasting from excel) <br/>
+                        <input type="checkbox" ng-model="useCustomDelimiter">
+                        <input type="text" ng-model="delimiterCharacter">
+                    </p>
 
                     <table>
                         <tr ng-repeat="line in importLines">
@@ -186,20 +191,20 @@ <h1>
                         </button>
                     <p>
                         <a  href="{{exportdata}}" download="{{exportname}}" ng-show="exportvisible"><i class="material-icons">file_download</i> Export naar USB</a>
-                        
+
                         <div ng-hide="true" id="scoreexport">
                             <style>
                                 #bodyranking{
-                                    background-color:#DEDEDE; 
+                                    background-color:#DEDEDE;
                                     background-repeat:no-repeat;
                                 }
-                                #rankingtable{     
+                                #rankingtable{
                                     font-family:"Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", "DejaVu Sans", Verdana, sans-serif;
                                     text-align:center;
                                     width:95%;
-                                    margin-left:auto; 
+                                    margin-left:auto;
                                     margin-right:auto;
-                                
+
                                 }
                                 #scoreexport{
                                     border:1px solid black;
@@ -219,7 +224,7 @@ <h1>
                                     color:white;
                                     font-size:x-large;
                                     white-space:nowrap;
-                                    
+
                                 }
                                 .top{
                                     background-color:silver;
@@ -229,7 +234,7 @@ <h1>
                                     background-color:rgba(255, 255, 255, 0.8);
 
                                 }
-                                .out{  
+                                .out{
                                     opacity: 0;
                                     -webkit-transition: opacity 2s ease-in;
                                     -moz-transition: opacity 2s ease-in;
@@ -246,24 +251,24 @@ <h1>
                                     FLOWAMOUNT        = angular.element(document.querySelector('[ng-controller="rankingCtrl"]')).scope().export.flowAmount;
                                     // The amount of scores always visible at top
                                     FIXEDSHOWNTOP     = angular.element(document.querySelector('[ng-controller="rankingCtrl"]')).scope().export.fixedShownTop;
-                                    // Amount of seconds that the first page shows       
+                                    // Amount of seconds that the first page shows
                                     TIMEFORFRAME1     = angular.element(document.querySelector('[ng-controller="rankingCtrl"]')).scope().export.timeForFrame1;
-                                    // Amount of seconds that each scroll takes      
+                                    // Amount of seconds that each scroll takes
                                     TIMETHROUGHFRAMES = angular.element(document.querySelector('[ng-controller="rankingCtrl"]')).scope().export.timeThroughFrames;
                                     // Amount of scores that move away and appear
                                     FADEATONEGO       = angular.element(document.querySelector('[ng-controller="rankingCtrl"]')).scope().export.fadeAtOneGo;
 
                                     for(var p = 0 ; p <= FIXEDSHOWNTOP -1 ; p++){
                                     document.getElementById('trrow'+p).className = 'top';
-                                        
+
                                     }
                                     for(var q = FIXEDSHOWNTOP ; q <= TOTALAMOUNT -1 ; q++){
                                     document.getElementById('trrow'+q).className = 'all';
-                                        
+
                                     }
                                     for(var x = FLOWAMOUNT; x<(TOTALAMOUNT);x++){
                                         document.getElementById('trrow'+x).style.visibility = 'hidden';
-                                    }   
+                                    }
                                     //alert(amount);
                                     setTimeout(gotoNext,(TIMEFORFRAME1*1000));
                                 }

From 94d9b11059aca104c3ad356d5be05ffb6e503868 Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Sun, 20 Aug 2017 15:29:41 +0300
Subject: [PATCH 2/3] Renamed delimiterCharacter variable to delimiter

---
 src/js/controllers/TeamImportDialogController.js | 4 ++--
 src/views/dialogs.html                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/TeamImportDialogController.js b/src/js/controllers/TeamImportDialogController.js
index 2720ddc4..ab08679a 100644
--- a/src/js/controllers/TeamImportDialogController.js
+++ b/src/js/controllers/TeamImportDialogController.js
@@ -17,7 +17,7 @@ define('controllers/TeamImportDialogController', [
                 }
                 lines = lines.map(function (line) {
                     if ($scope.useCustomDelimiter) {
-                        return line.split($scope.delimiterCharacter);
+                        return line.split($scope.delimiter);
                     }
                     //split by tab character
                     return line.split(/\t/);
@@ -49,7 +49,7 @@ define('controllers/TeamImportDialogController', [
                 parseData($scope.importRaw)
             });
 
-            $scope.$watch('delimiterCharacter', function (data) {
+            $scope.$watch('delimiter', function (data) {
                 parseData($scope.importRaw)
             });
 
diff --git a/src/views/dialogs.html b/src/views/dialogs.html
index c0f39061..8ff39dc4 100644
--- a/src/views/dialogs.html
+++ b/src/views/dialogs.html
@@ -32,7 +32,7 @@ <h1>
                     <p>
                         Use custom delimiter? (Default is tab, the delimiter used when pasting from excel) <br/>
                         <input type="checkbox" ng-model="useCustomDelimiter">
-                        <input type="text" ng-model="delimiterCharacter">
+                        <input type="text" ng-model="delimiter">
                     </p>
 
                     <table>

From 3d31c917ac459904382888c67f91969629cc58d3 Mon Sep 17 00:00:00 2001
From: ThinkRedstone <ittai11@gmail.com>
Date: Sun, 20 Aug 2017 15:46:50 +0300
Subject: [PATCH 3/3] Added test case for custom import delimiter

---
 spec/controllers/TeamImportDialogControllerSpec.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/controllers/TeamImportDialogControllerSpec.js b/spec/controllers/TeamImportDialogControllerSpec.js
index 4806f9ec..b2387bfc 100644
--- a/spec/controllers/TeamImportDialogControllerSpec.js
+++ b/spec/controllers/TeamImportDialogControllerSpec.js
@@ -53,6 +53,20 @@ describe('TeamImportDialogController',function() {
             expect($scope.importNumberExample).toEqual('');
             expect($scope.importNameExample).toEqual('');
         });
+
+        it('should correctly populate importLines when using a custom delimiter', function () {
+            $scope.importLines = [];
+            $scope.useCustomDelimiter = true;
+            $scope.delimiter = ",";
+            $scope.importRaw = "42,FooBar\n7,QuxMoo";
+            $scope.$digest();
+            expect($scope.importLines).toEqual([
+                ['42','FooBar'],
+                ['7','QuxMoo']
+            ]);
+            expect($scope.importNumberExample).toEqual('42');
+            expect($scope.importNameExample).toEqual('FooBar');
+        })
     });
 
     describe('handshake receive',function() {