Cleaned up the manager even more

2 files changed, 27 insertions, 29 deletions

diff --git a/src/main.js b/src/main.js
index 4c88167..cb7ec8e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -63,9 +63,9 @@ export class GameManager extends Manager {
       const startIndex = 4 * index;
       const endIndex = startIndex + 4;
       const courtPlayers = players.slice(startIndex, endIndex);
-      const team_1 = new Team(courtPlayers[0].name, courtPlayers[3].name);
-      const team_2 = new Team(courtPlayers[1].name, courtPlayers[2].name);
-      const game = new Game(courts[index].id, false, team_1, team_2);
+      const teamOne = new Team(courtPlayers[0].name, courtPlayers[3].name);
+      const teamTwo = new Team(courtPlayers[1].name, courtPlayers[2].name);
+      const game = new Game(courts[index].id, false, teamOne, teamTwo);
       game.print();
       this.data.push(game);
     }
diff --git a/src/manage.js b/src/manage.js
index ef48f8e..952c72f 100644
--- a/src/manage.js
+++ b/src/manage.js
@@ -106,22 +106,20 @@ export class GuestManager extends Manager {
     let games = data.games;
     return new Guest(id, status, games);
   }
-  active(factor) {
-    factor = typeof factor !== "undefined" ? factor : 1;
+  active() {
     return normalize(super.active());
   }
 }
 
 export function randomLevel() {
-  const max_level = 10;
-  return Math.floor(Math.random() * max_level + 1);
+  const maxLevel = 10;
+  return Math.floor(Math.random() * maxLevel + 1);
 }
 
 export class PlayerManager extends Manager {
   constructor() {
     super("Regular", 71);
     addLoadBehaviour(this);
-    this.g = new GuestManager();
   }
   createItem(i) {
     return new Player(i, randomStatus(), randomLevel());
@@ -134,25 +132,7 @@ export class PlayerManager extends Manager {
     let games = Number(data.games);
     return new Player(id, status, level, games, name);
   }
-  import(data) {
-    var lines = data.split("\n");
-    var players = [];
-    for (var i = 1; i < lines.length; i++) {
-      if (lines[i] == undefined || lines[i].trim() == "") {
-        continue;
-      }
-      players.push(parseLineToPlayer(lines[i]));
-    }
-    console.log("Loaded " + players.length + " Players");
-    for (var i = 0; i < players.length; i++) {
-      players[i].print();
-    }
-    this.data = players;
-    this.store();
-    this.render();
-  }
-  active(factor) {
-    factor = typeof factor !== "undefined" ? factor : 1;
+  active() {
     return normalize(super.active());
   }
 }
@@ -162,7 +142,23 @@ function parseLineToPlayer(data) {
   var id = Number(info[0].trim());
   var name = info[1].trim() + " " + info[2].trim();
   var level = Number(info[3].trim());
-  return new Player(id, true, level, 0, name);
+  return new Player(id, randomStatus(), level, 0, name);
+}
+
+function parseCsv(data) {
+  let lines = data.split("\n");
+  let players = [];
+  for (let i = 1; i < lines.length; i++) {
+    if (lines[i] == undefined || lines[i].trim() == "") {
+      continue;
+    }
+    players.push(parseLineToPlayer(lines[i]));
+  }
+  console.log("Loaded " + players.length + " Players");
+  for (let i = 0; i < players.length; i++) {
+    players[i].print();
+  }
+  return players;
 }
 
 function addLoadBehaviour(p) {
@@ -174,7 +170,9 @@ function addLoadBehaviour(p) {
     const reader = new FileReader();
     reader.onload = function (e) {
       importData = reader.result;
-      p.import(importData);
+      p.data = parseCsv(importData);
+      p.store();
+      p.render();
     };
     reader.readAsText(file);
   });