that is resolved when init is complete.
*/
Scores.prototype.init = function() {
- var self = this;
- if (!this._initialized) {
+ if(!this._initialized) {
+ var self = this;
this._initialized = $stages.init()
.then(function() {
// Stages got defined, rebuild scoreboard
@@ -158,159 +102,36 @@ define('services/ng-scores',[
Scores.prototype.clear = function() {
- this._rawScores = [];
+ this.scores = [];
this._update();
};
- Scores.prototype.save = function() {
- var data = {
- version: 2,
- scores: this._rawScores,
- sheets: Object.keys(this._sheets),
- };
- return $fs.write('scores.json', data).then(function() {
- log('scores saved');
- }, function(err) {
- log('scores write error', err);
- });
- };
-
- Scores.prototype.load = function() {
+ Scores.prototype.load = function(data) {
var self = this;
- return $fs.read('scores.json').then(function(res) {
+ var processScores = function(res) {
self.beginupdate();
try {
// Determine scores file version
- var scores;
- var version;
- var sheetNames = [];
- if (res.version === undefined) {
- // 'Legacy' storage, all scores stored directly
- // as an array
- scores = res;
- version = 1;
- } else {
- // New style storage, scores in a property,
- // and an explicit version identifier.
- version = res.version;
- scores = res.scores;
- sheetNames = res.sheets;
+ // And throw an exception if it is not supported
+ var version = res.version || 1;
+ if (version !== SCORES_VERSION) {
+ throw new Error(`unsupported scores version ${version}, (expected ${SCORES_VERSION})`);
}
- if (version > SCORES_VERSION) {
- throw new Error(format("unknown scores version {0}, (expected {1})", version, SCORES_VERSION));
- }
- self.clear();
- scores.forEach(function(score) {
- self.add(score);
- });
- self._sheets = {};
- sheetNames.forEach(function(name) { self._sheets[name] = true; });
+
+ self.scores = res.scores.map(score => new $score(score));
log("scores loaded, version " + version);
} finally {
self.endupdate();
}
- }, function(err) {
- log('scores read error', err);
- });
- };
-
- Scores.prototype.remove = function(index) {
- // TODO: this function used to remove an associated
- // score sheet file.
- // However, as creating that scoresheet was not
- // the concern of this class, I (Martin) decided
- // that removing it should not be its concern either.
- // Note that e.g. the clear() method also did not
- // remove 'obsolete' scoresheet files.
- // Additionally note that a scoresheet may be the digital
- // representation of a 'physical' scoresheet, something
- // with a signature even, and may indeed be a very different
- // beast than 'merely' a score entry.
- this._rawScores.splice(index, 1);
- this._update();
- };
-
- /**
- * Convert 'dirty' score value to correct type used during score
- * computations etc.
- * Valid inputs are fixed strings like "dnc" (Did Not Compete) and
- * "dnq" (Did Not Qualify) in any combination of upper/lower case,
- * null (dummy entry, maybe because score was removed) and numbers
- * (also as strings). Empty string is converted to null.
- * Invalid input is simply returned (and later marked as invalid
- * during scoreboard computation).
- */
- function sanitizeScore(score) {
- // Passthrough for already valid inputs
- if (typeof score === "number")
- return score;
- switch (score) {
- case "dnc":
- case "dsq":
- case null:
- return score;
- }
- // Accept numbers stored as strings
- var n = parseInt(score, 10);
- if (String(n) === score)
- return n;
- // Try to convert some spellings of accepted strings
- if (typeof score === "string") {
- var s = score.toLowerCase();
- switch (s) {
- case "dnc":
- case "dsq":
- return s;
- case "":
- return null;
- }
- }
- // Pass through the rest
- log("Warning: invalid score " + score);
- return score;
- }
-
- /**
- * Convert 'dirty' input score entry to a representation that we can store
- * on a filesystem. This means e.g. not storing denormalized version of
- * team and stage, but only their ID's. Additionally, forces values to be
- * of the right type where possible.
- */
- function sanitizeEntry(entry) {
- return {
- file: (entry.file !== undefined && entry.file !== null) ? String(entry.file) : "",
- teamNumber: parseInt((entry.teamNumber !== undefined) ? entry.teamNumber : entry.team.number, 10),
- stageId: String((entry.stageId !== undefined) ? entry.stageId : entry.stage.id),
- round: parseInt(entry.round, 10),
- score: sanitizeScore(entry.score), // can be Number, null, "dnc", etc.
- originalScore: parseInt(entry.originalScore !== undefined ? entry.originalScore : entry.score, 10),
- edited: entry.edited !== undefined ? String(entry.edited) : undefined, // timestamp, e.g. "Wed Nov 26 2014 21:11:43 GMT+0100 (CET)"
- published: !!entry.published,
- table: entry.table
};
- }
-
- Scores.prototype.add = function(score) {
- // Create a copy of the score, in case the
- // original score is being modified...
- this._rawScores.push(sanitizeEntry(score));
- this._update();
- };
- /**
- * Update score at given index.
- * This differs from e.g. remove(index); add(score); in that
- * it ensures that only allowed changes are made, and marks the
- * the score as modified.
- */
- Scores.prototype.update = function(index, score) {
- if (index < 0 || index >= this._rawScores.length) {
- throw new RangeError("unknown score index: " + index);
+ if(data) {
+ return processScores(data);
+ } else {
+ return $fs.read('scores.json').then(processScores, function(err) {
+ log('scores read error', err);
+ });
}
- var newScore = sanitizeEntry(score);
- newScore.edited = (new Date()).toString();
- this._rawScores.splice(index, 1, newScore);
- this._update();
};
Scores.prototype.beginupdate = function() {
@@ -327,374 +148,63 @@ define('services/ng-scores',[
}
};
- /**
- * Poll storage for any new score sheets.
- * Ignore already processed sheets, add a new score entry for each
- * new sheet.
- * FIXME: this is a temporary hack to get basic multi-user scoring
- * working very quickly. Functionality like this should be moved to
- * a server-instance and/or be distributed. The reason for integrating
- * it directly in $scores for now, is that this reduces the change of
- * having the state of processed sheets getting out of sync with the
- * list of scores.
- */
- Scores.prototype.pollSheets = function() {
- var self = this;
- // Prevent (accidentally) performing the check in parallel
- if (self._pollingSheets) {
- return self._pollingSheets;
- }
-
- self._pollingSheets = $fs.list("scoresheets/").catch(function(err) {
- // Ignore the fact that there are no sheets at all yet
- if (err.status === 404) {
- return [];
- }
- // Convert to 'normal' errors in case of XHR response
- if (err.status && err.responseText) {
- throw new Error(format("error {0} ({1}): {2}",
- err.status, err.statusText,
- err.responseText
- ));
- }
- // Otherwise, pass the error on
- if (err instanceof Error) {
- throw err;
- }
- // Fallback
- throw new Error("unknown error: " + String(err));
- }).then(function(filenames) {
- var promises = [];
- // Walk over all sheets, find the 'new' ones
- filenames.forEach(function(filename) {
- if (filename in self._sheets) {
- return;
- }
- // Retrieve the new sheet
- var p = $fs.read("scoresheets/" + filename).then(function(sheet) {
- // Convert to score entry and add to list
- var score = {
- file: filename,
- teamNumber: sheet.teamNumber !== undefined ? sheet.teamNumber : sheet.team.number,
- stageId: sheet.stageId !== undefined ? sheet.stageId : sheet.stage.id,
- round: sheet.round,
- score: sheet.score,
- table: sheet.table
- };
- self.add(score);
- // Mark as processed
- self._sheets[filename] = true;
- log(format("Added new scoresheet: stage {0}, round {1}, team {2}, score {3}",
- score.stageId, score.round, score.teamNumber, score.score
- ));
- });
- promises.push(p);
- });
- // Make sure to wait for all sheets to be processed
- // before resolving the promise.
- return $q.all(promises).finally(function() {
- // Always save scores if there was work to do,
- // even in case of errors, as some scores may still
- // have been added successfully.
- if (promises.length > 0) {
- return self.save();
- }
- });
- }).finally(function() {
- self._pollingSheets = null;
- });
- return self._pollingSheets;
- };
-
Scores.prototype._update = function() {
if (this._updating > 0) {
return;
}
-
var self = this;
- var results = this.getRankings();
-
- // Update global scores without creating a new object
- var scores = results.scores;
- scores.unshift(0, this.scores.length);
- this.scores.splice.apply(this.scores, scores);
-
- // Update global scoreboard without creating a new object
- var board = this.scoreboard;
- var k;
- for (k in this.scoreboard) {
- if (!this.scoreboard.hasOwnProperty(k)) {
- continue;
- }
- delete this.scoreboard[k];
- }
- Object.keys(results.scoreboard).forEach(function(stageId) {
- self.scoreboard[stageId] = results.scoreboard[stageId];
- });
-
- // Update validation errors (useful for views)
- this.validationErrors.splice(0, this.validationErrors.length);
- this.scores.forEach(function(score) {
- if (score.error) {
- self.validationErrors.push(score.error);
- }
+ this.getRankings().then(function() {
+ $rootScope.$broadcast('validationError', self.validationErrors);
});
- $rootScope.$broadcast('validationError', this.validationErrors);
};
- /**
- * Compute scoreboard and sanitized/validated scores.
- *
- * Optionally, pass an object containing stageId => nrOfRoundsOrTrue mapping.
- * E.g. { "practice": true, "qualifying": 2 }, which computes the ranking
- * for all rounds in the practice stage, and the first 2 rounds of the
- * qualifying stage.
- *
- * Resulting object contains `scores` and `scoreboard` properties.
- * If no stages filter is passed, all scores will be output.
- * If a stages filter is passed, only valid and relevant scores are
- * output.
- *
- * @param stages Optional object stageId => nrOfRoundsOrTrue
- * @return Results object with validated scores and per-stage rankings
- */
- Scores.prototype.getRankings = function(stages) {
- var self = this;
- var results = {
- scores: [], // List of sanitized scores
- scoreboard: {}, // Sorted rankings for each stage
- };
-
- var haveFilter = !!stages;
- if (!stages) {
- stages = {};
- $stages.stages.forEach(function(stage) {
- stages[stage.id] = true;
- });
- }
-
- // Convert number of stages to take to a number (i.e. Infinity when
- // e.g. `true` is passed)
- // And create empty lists for each stage
- var board = results.scoreboard;
- Object.keys(stages).forEach(function(stage) {
- var s = stages[stage];
- stages[stage] = typeof s === "number" && s || s && Infinity || 0;
- board[stage] = [];
- });
-
- // Walk all scores, and put them in the corresponding round of each stage.
- // This also performs sanity checks on the scores, marking failures.
- // Highest scores and rankings are computed later.
- this._rawScores.forEach(function(_score) {
- // Create a copy of the score, such that we can add
- // additional info
- var s = {
- file: _score.file,
- teamNumber: _score.teamNumber,
- team: $teams.get(_score.teamNumber),
- stageId: _score.stageId,
- stage: $stages.get(_score.stageId),
- round: _score.round,
- score: _score.score,
- originalScore: _score.originalScore,
- edited: _score.edited,
- published: _score.published,
- table: _score.table,
- modified: false,
- error: null
- };
- results.scores.push(s);
-
- // Mark score as modified if there have been changes to the
- // original entry
- if (s.score !== s.originalScore) {
- s.modified = true;
- }
-
- // Check whether score is for a 'known' stage
- var bstage = board[_score.stageId];
- if (!bstage) {
- s.error = new UnknownStageError(_score.stageId);
- return;
- }
-
- // Check whether score's round is valid for this stage
- if (!(s.round >= 1 && s.round <= s.stage.rounds)) {
- s.error = new UnknownRoundError(s.round);
- return;
- }
-
- // Check whether the score's value is sane
- // Note: null is not considered valid here, as it would
- // mean that one could 'reset' a team's score for that round.
- // If a team did not play in a round, there will simply be no
- // entry in scores.
- if (!(
- typeof s.score === "number" && s.score > -Infinity && s.score < Infinity ||
- s.score === "dnc" ||
- s.score === "dsq"
- )) {
- s.error = new InvalidScoreError(s.score);
- return;
- }
-
- // Check whether team is valid
- if (!s.team) {
- s.error = new UnknownTeamError(_score.teamNumber);
- return;
- }
-
- // Ignore score if filtered
- if (haveFilter && s.round > stages[s.stageId]) {
- return;
- }
-
- // Find existing entry for this team, or create one
- var bteam;
- var i;
- for (i = 0; i < bstage.length; i++) {
- if (bstage[i].team.number === s.team.number) {
- bteam = bstage[i];
- break;
- }
- }
- if (!bteam) {
- var maxRounds = Math.min(s.stage.rounds, stages[s.stageId]);
- var initialScores = new Array(maxRounds);
- var initialEntries = new Array(maxRounds);
- for (i = 0; i < maxRounds; i++) {
- initialScores[i] = null;
- initialEntries[i] = null;
- }
- bteam = {
- team: s.team,
- scores: initialScores,
- rank: null,
- highest: null,
- entries: initialEntries,
- };
- bstage.push(bteam);
- }
-
- // Add score to team's entry
- if (bteam.scores[s.round - 1] !== null) {
- // Find the original entry with which this entry collides,
- // then assign an error to that entry and to ourselves.
- var dupEntry = bteam.entries[s.round - 1];
- var e = dupEntry.error;
- if (!e) {
- e = new DuplicateScoreError(bteam.team, s.stage, s.round);
- dupEntry.error = e;
- }
- s.error = e;
- return;
- }
- bteam.scores[s.round - 1] = s.score;
- bteam.entries[s.round - 1] = s;
- });
-
- // Compares two scores.
- // Returns 0 if scores are equal, 1 if score2 is larger than score1,
- // -1 otherwise.
- // Note: this ordering causes Array.sort() to sort from highest to lowest score.
- function scoreCompare(score1, score2) {
- if (score1 === score2) {
- return 0;
- }
- var comp = false;
- if (score1 === null || score2 === null) {
- comp = (score1 === null);
- } else if (score1 === "dsq" || score2 === "dsq") {
- comp = (score1 === "dsq");
- } else if (score1 === "dnc" || score2 === "dnc") {
- comp = (score1 === "dnc");
- } else if (typeof score1 === "number" && typeof score2 === "number") {
- comp = score1 < score2;
- } else {
- throw new TypeError("cannot compare scores '" + score1 + "' and '" + score2 + '"');
- }
- return comp ? 1 : -1;
- }
-
- // Compares two scores-arrays.
- // Returns 0 if arrays are equal, 1 is scores2 is larger than scores1,
- // -1 otherwise.
- // Note: this ordering causes Array.sort() to sort from highest to lowest score.
- function scoresCompare(scores1, scores2) {
- var result = 0;
- var i;
- if (scores1.length !== scores2.length) {
- throw new RangeError("cannot compare score arrays with different number of rounds");
- }
- for (i = 0; i < scores1.length; i++) {
- result = scoreCompare(scores1[i], scores2[i]);
- if (result !== 0)
- break;
- }
- return result;
- }
-
- // Compare two 'team entries' (members of a scoreboard stage).
- // 1 is teamEntry2 has higher scores than teamEntry1, or -if scores are
- // equal- teamEntry1 has a higher team number. Returns -1 otherwise.
- // Note: this ordering causes Array.sort() to sort from highest to lowest score,
- // or in ascending team-id order.
- function entryCompare(teamEntry1, teamEntry2) {
- var result = scoresCompare(teamEntry1.sortedScores, teamEntry2.sortedScores);
- if (result === 0) {
- // Equal scores, ensure stable sort by introducing
- // extra criterion.
- // Note: team number's might be strings, so don't assume numeric
- // compare is possible.
- result = (teamEntry1.team.number > teamEntry2.team.number) ? 1 : -1;
- }
- return result;
- }
+ Scores.prototype.acceptScores = function(res) {
+ this.load(res.data);
+ $message.send('scores:reload');
+ }
- function createSortedScores(teamEntry) {
- teamEntry.sortedScores = teamEntry.scores.slice(0); // create a copy
- teamEntry.sortedScores.sort(scoreCompare);
- teamEntry.highest = teamEntry.sortedScores[0];
- }
+ Scores.prototype.create = function(scoresheet, score) {
+ var self = this;
- function calculateRank(state,teamEntry) {
- if (state.lastScores === null || scoresCompare(state.lastScores, teamEntry.sortedScores) !== 0) {
- state.rank++;
- }
- state.lastScores = teamEntry.sortedScores;
- teamEntry.rank = state.rank;
- return state;
- }
+ return $independence.act('scores','/scores/create',{ scoresheet: scoresheet, score: score }, function() {
+ self.scores.push(score);
+ })
+ .then((res) => self.acceptScores(res));
+ };
- // Sort by scores and compute rankings
- for (var stageId in board) {
- if (!board.hasOwnProperty(stageId)) {
- continue;
- }
- var stage = board[stageId];
+ Scores.prototype.delete = function(score) {
+ var self = this;
+ return $independence.act('scores','/scores/delete/' + score.id, {}, function() {
+ self.scores.splice(self.scores.findIndex(s => s.id === score.id), 1);
+ }).then((res) => self.acceptScores(res));
+ };
- // Create sorted scores and compute highest score per team
- stage.forEach(createSortedScores);
+ Scores.prototype.update = function(score) {
+ score.edited = (new Date()).toString();
+ var self = this;
+ return $independence.act('scores','/scores/update/' + score.id, score, function() {
+ self.scores[self.scores.findIndex(s => s.id === score.id)] = score;
+ }).then((res) => self.acceptScores(res));
+ };
- // Sort teams based on sorted scores
- stage.sort(entryCompare);
+ Scores.prototype.getRankings = function(filter) {
+ this.validationErrors = $validation.validate(this.scores);
- // Compute ranking, assigning equal rank to equal scores
- stage.reduce(calculateRank,{
- rank: 0,
- lastScores: null
+ var self = this;
+ if(this.validationErrors.length === 0) {
+ return $rankings.calculate(this.scores, filter).then(function(scoreboard) {
+ self.scoreboard = scoreboard;
+ return scoreboard;
});
- }
-
- // Filter scores if requested
- if (haveFilter) {
- results.scores = results.scores.filter(function(score) {
- return !score.error && stages[score.stageId] && score.round <= stages[score.stageId];
+ } else {
+ return new Promise(function(resolve) {
+ resolve(self.scoreboard);
});
}
+ };
- return results;
+ Scores.prototype.pendingActions = function() {
+ return $independence.pendingActions();
};
return new Scores();
diff --git a/src/js/services/ng-services.js b/src/js/services/ng-services.js
index 8374a32b..6e91e14f 100644
--- a/src/js/services/ng-services.js
+++ b/src/js/services/ng-services.js
@@ -1,3 +1,3 @@
define('services/ng-services',['angular'],function() {
- return angular.module('services',[]);
+ return angular.module('services',['ngStorage']);
});
diff --git a/src/js/services/ng-session.js b/src/js/services/ng-session.js
new file mode 100644
index 00000000..cbd443e0
--- /dev/null
+++ b/src/js/services/ng-session.js
@@ -0,0 +1,27 @@
+define('services/ng-session',[
+ 'services/ng-services',
+], function(module) {
+
+ return module.service('$session', [
+ '$http',
+ function($http) {
+
+ var session = {};
+
+ return {
+ load: function() {
+ return $http.get('/session').then(function(response) {
+ session = response.data;
+ return session;
+ });
+ },
+ get: function(key) {
+ return session[key];
+ },
+ keys: function() {
+ return Object.keys(session);
+ }
+ };
+
+ }]);
+});
diff --git a/src/js/services/ng-validation.js b/src/js/services/ng-validation.js
new file mode 100644
index 00000000..cc193620
--- /dev/null
+++ b/src/js/services/ng-validation.js
@@ -0,0 +1,89 @@
+/**
+ * This is a service that searches for errors in the scores before ranking
+ */
+define('services/ng-validation',[
+ 'services/ng-services',
+ 'services/ng-stages',
+ 'services/ng-teams'
+],function(module) {
+ "use strict";
+
+ return module.service('$validation',
+ ['$stages','$teams',
+ function($stages, $teams) {
+
+ const VALIDATORS = [{
+ validate: (score) => $stages.get(score.stageId),
+ error:(score) => {
+ return {
+ name: 'UnknownStageError',
+ stageId: score.stageId,
+ message: `unknown stage '${String(score.stageId)}'`
+ };
+ }
+ }, {
+ validate: (score) => score.round >= 1 && score.round <= $stages.get(score.stageId).rounds,
+ error: (score) => {
+ return {
+ name: 'UnknownRoundError',
+ round: score.round,
+ message: `unknown round '${String(score.round)}'`
+ };
+ }
+ }, {
+ validate: (score) => isFinite(score.score),
+ error: (score) => {
+ return {
+ name: 'InvalidScoreError',
+ score: score.score,
+ message: `invalid score '${String(score.score)}'`
+ };
+ }
+ }, {
+ validate: (score) => $teams.get(score.teamNumber),
+ error: (score) => {
+ return {
+ name: 'UnknownTeamError',
+ team: score.teamNumber,
+ message: `invalid team '${String(score.teamNumber)}'`
+ };
+ }
+ }, {
+ validate: (score, scores) => {
+ for(var i = 0; i < scores.length && scores[i] !== score; i++) {
+ if(score.stageId === scores[i].stageId && score.round === scores[i].round && score.teamNumber === scores[i].teamNumber) {
+ return false;
+ }
+ }
+ return true;
+ },
+ error: (score, stages) => {
+ return {
+ name: 'DuplicateScoreError',
+ team: score.teamNumber,
+ stage: score.stageId,
+ round: score.round,
+ message: `duplicate score for team #${score.teamNumber}, ${score.stageId}, round ${score.round}`
+ };
+ }
+ }];
+
+ return {
+ validate: function(scores) {
+ var errors = [];
+ scores.forEach(function(score) {
+ validators: for(var i = 0; i < VALIDATORS.length; i++) {
+ var validator = VALIDATORS[i]
+ if(!validator.validate(score, scores)) {
+ score.error = validator.error(score, scores);
+ errors.push(score.error);
+ break validators;
+ }
+ }
+ });
+ return errors;
+ }
+ };
+
+ }]);
+});
diff --git a/src/js/services/session.js b/src/js/services/session.js
deleted file mode 100644
index fcdb3682..00000000
--- a/src/js/services/session.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define('services/session',[
- 'services/ng-services',
-], function(module) {
-
- return module.service('session', [
- '$http',
- function($http) {
-
- var eventListeners = [];
- var session = {};
-
- $http.get('/session').then(function(response) {
- for(var key in response.data) {
- session[key] = response.data[key];
- }
-
- eventListeners.forEach(function(eventListener) {
- eventListener();
- });
- });
-
- return {
- get: function(key) {
- return session[key];
- },
- keys: function() {
- return Object.keys(session);
- },
- onload: function(func) {
- if(typeof func === 'function') {
- eventListeners.push(func);
- }
- }
- };
-
- }]);
-});
diff --git a/src/js/views/ranking.js b/src/js/views/ranking.js
index 479a6055..93cca43a 100644
--- a/src/js/views/ranking.js
+++ b/src/js/views/ranking.js
@@ -20,13 +20,32 @@ define('views/ranking',[
$scope.scores = $scores;
+ function removeEmptyRanks(scoreboard) {
+ let result = {};
+ for(let stageId in scoreboard) {
+ let stage = scoreboard[stageId];
+ result[stageId] = stage.filter(rank => rank.scores.filter(score => score !== undefined).length);
+ }
+ return result;
+ }
+
+ $scope.$watch(function() {
+ return $scores.scoreboard;
+ }, function () {
+ $scope.scoreboard = removeEmptyRanks($scores.scoreboard)
+ }, true);
+
+ $scores.init().then(() => $stages.init()).then(function() {
+ $scope.stages = $stages.stages;
+ return $scores.getRankings();
+ });
+
$scope.exportRanking = function() {
$handshake.$emit('exportRanking',{
scores: $scope.scores,
stages: $scope.stages
});
};
-
//TODO: this is a very specific message tailored to display system.
//we want less contract here
$scope.broadcastRanking = function(stage) {
@@ -136,7 +155,7 @@ define('views/ranking',[
entry.rank,
entry.team.number,
entry.team.name,
- entry.highest,
+ entry.highest ? entry.highest.score : undefined,
].concat(entry.scores);
});
var header = ["Rank", "Team Number", "Team Name", "Highest"];
@@ -153,13 +172,10 @@ define('views/ranking',[
$scope.rebuildCSV($scores.scoreboard);
}, true);
- $scope.stages = $stages.stages;
- $scope.scoreboard = $scores.scoreboard;
-
$scope.getRoundLabel = function(round){
return "Round " + round;
};
-
+
}
]);
diff --git a/src/js/views/scores.js b/src/js/views/scores.js
index 574ab79c..82f7b1c7 100644
--- a/src/js/views/scores.js
+++ b/src/js/views/scores.js
@@ -5,7 +5,7 @@ define('views/scores',[
'angular'
],function(log) {
var moduleName = 'scores';
- return angular.module(moduleName,[]).controller(moduleName+'Ctrl',[
+ return angular.module(moduleName,['filters']).controller(moduleName+'Ctrl',[
'$scope', '$scores','$teams','$stages','$window',
function($scope,$scores,$teams,$stages,$window) {
log('init scores ctrl');
@@ -13,61 +13,66 @@ define('views/scores',[
$scope.sort = 'index';
$scope.rev = true;
- $scope.scores = $scores.scores;
- $scope.stages = $stages.stages;
+ function enrich(scores) {
+ return scores.map(score => {
+ var enrichedScore = {};
+ for(var key in score) enrichedScore[key] = score[key];
+ enrichedScore.team = $teams.get(score.teamNumber);
+ enrichedScore.stage = $stages.get(score.stageId);
+ return enrichedScore;
+ });
+ }
+
+ $scope.$watch(function() {
+ return $scores.scores;
+ }, function() {
+ $scope.scores = enrich($scores.scores);
+ });
+
+ $scores.init().then(() => $stages.init()).then(function() {
+ $scope.stages = $stages.stages;
+ });
$scope.doSort = function(col, defaultSort) {
$scope.rev = (String($scope.sort) === String(col)) ? !$scope.rev : !!defaultSort;
$scope.sort = col;
};
- $scope.removeScore = function(index) {
- $scores.remove(index);
- return $scores.save();
+ $scope.deleteScore = function(score) {
+ $scores.delete(score);
};
- $scope.editScore = function(index) {
- var score = $scores.scores[index];
+ $scope.editScore = function(score) {
score.$editing = true;
};
- $scope.publishScore = function(index) {
- var score = $scores.scores[index];
+ $scope.publishScore = function(score) {
score.published = true;
saveScore(score);
};
- $scope.unpublishScore = function(index) {
- var score = $scores.scores[index];
+ $scope.unpublishScore = function(score) {
score.published = false;
saveScore(score);
};
- $scope.finishEditScore = function(index) {
+ $scope.finishEditScore = function(score) {
// The score entry is edited 'inline', then used to
// replace the entry in the scores list and its storage.
// Because scores are always 'sanitized' before storing,
// the $editing flag is automatically discarded.
- var score = $scores.scores[index];
+ score.$editing = false;
saveScore(score);
};
function saveScore(score) {
try {
- $scores.update(score.index, score);
- $scores.save();
+ $scores.update(score);
} catch(e) {
$window.alert("Error updating score: " + e);
}
}
- $scope.cancelEditScore = function() {
- $scores._update();
- };
-
- $scope.pollSheets = function() {
- return $scores.pollSheets().catch(function(err) {
- log("pollSheets() failed", err);
- $window.alert("failed to poll sheets: " + err);
- });
+ $scope.cancelEditScore = function(score) {
+ score.$editing = false;
};
$scope.refresh = function() {
diff --git a/src/js/views/scoresheet.js b/src/js/views/scoresheet.js
index 1e18838a..22be4cdd 100644
--- a/src/js/views/scoresheet.js
+++ b/src/js/views/scoresheet.js
@@ -23,38 +23,27 @@ define('views/scoresheet',[
]);
return module.controller(moduleName + 'Ctrl', [
- '$scope','$fs','$stages','$settings','$challenge','$window','$q','$teams','$handshake',
- function($scope,$fs,$stages,$settings,$challenge,$window,$q,$teams,$handshake) {
+ '$scope','$fs','$stages','$scores','$score','$settings','$challenge','$window','$q','$teams','$handshake',
+ function($scope,$fs,$stages,$scores,$score,$settings,$challenge,$window,$q,$teams,$handshake) {
log('init scoresheet ctrl');
// Set up defaults
$scope.settings = {};
$scope.missions = [];
$scope.strings = [];
- $scope.table = null;
$scope.referee = null;
// add teams and stages to scope for selection
$scope.teams = $teams.teams;
$scope.stages = $stages.stages;
- $settings.init().then(function(res) {
- $scope.settings = res;
- return $scope.load();
- });
-
- function generateId() {
- var max = 0x100000000; // 8 digits
- // Add current time to prevent Math.random() generating the same
- // sequence if it's seeded with a constant. Not sure this is
- // really needed, but better safe than sorry...
- var num = (Math.floor(Math.random() * max) + Date.now()) % max;
- // Convert to nice hex representation with padded zeroes, then strip that initial 1.
- return (num + max).toString(16).slice(1);
- }
-
$scope.load = function() {
- return $challenge.load($scope.settings.challenge).then(function(defs) {
+ return $settings.init()
+ .then(function(res) {
+ $scope.settings = res;
+ return $challenge.load($scope.settings.challenge);
+ })
+ .then(function(defs) {
$scope.field = defs.field;
$scope.missions = defs.missions;
$scope.strings = defs.strings;
@@ -67,6 +56,8 @@ define('views/scoresheet',[
});
};
+ $scope.load();
+
$scope.getString = function(key) {
return $scope.strings[key]||key;
};
@@ -84,7 +75,7 @@ define('views/scoresheet',[
mission.errors = [];
mission.percentages = [];
mission.completed = false;
- //addd watcher for all dependencies
+ //add watcher for all dependencies
$scope.$watch(function() {
return deps.map(function(dep) {
return $scope.objectiveIndex[dep].value;
@@ -211,11 +202,10 @@ define('views/scoresheet',[
};
$scope.clear = function() {
- $scope.uniqueId = generateId();
+ $scope.team = undefined;
+ $scope.stage = undefined;
+ $scope.round = undefined;
$scope.signature = null;
- $scope.team = null;
- $scope.stage = null;
- $scope.round = null;
$scope.missions.forEach(function(mission) {
mission.objectives.forEach(function(objective) {
delete objective["value"];
@@ -230,37 +220,34 @@ define('views/scoresheet',[
$window.alert('no team selected, do so first');
return $q.reject(new Error('no team selected, do so first'));
}
+ var scoresheet = angular.copy($scope.field);
+ scoresheet.stage = $scope.stage;
+ scoresheet.round = $scope.round;
+ scoresheet.team = $scope.team;
+ scoresheet.table = $scope.table;
+ scoresheet.referee = $scope.referee;
+ scoresheet.signature = $scope.signature;
- var data = angular.copy($scope.field);
- data.uniqueId = $scope.uniqueId;
- data.team = $scope.team;
- data.stage = $scope.stage;
- data.round = $scope.round;
- // data.table = $scope.settings.table;
- data.table = $scope.table;
- data.referee = $scope.referee;
- data.signature = $scope.signature;
- data.score = $scope.score();
-
- var fn = [
- 'score',
- data.stage.id,
- 'round' + data.round,
- 'table' + data.table,
- 'team' + data.team.number,
- data.uniqueId
- ].join('_')+'.json';
+ scoresheet.score = $scope.score();
+ var score = $score(scoresheet);
+ score.calcFilename();
- return $fs.write("scoresheets/" + fn,data).then(function() {
+ return $scores.create(scoresheet, score).then(function() {
log('result saved');
$scope.clear();
- $window.alert('Thanks for submitting a score of ' +
- data.score +
- ' points for team (' + data.team.number + ') ' + data.team.name +
- ' in ' + data.stage.name + ' ' + data.round + '.'
- );
- }, function(err) {
- $window.alert('Error submitting score: ' + String(err));
+ message = `Thanks for submitting a score of ${scoresheet.score} points for team (${scoresheet.team.number})` +
+ ` ${scoresheet.team.name} in ${scoresheet.stage.name} ${scoresheet.round}.`;
+ $window.alert(message);
+ }).catch(function(err) {
+ log(`Error: ${err}`);
+ $scope.clear();
+ message = `Thanks for submitting a score of ${scoresheet.score} points for team (${scoresheet.team.number})` +
+ ` ${scoresheet.team.name} in ${scoresheet.stage.name} ${scoresheet.round}.` + `
+Notice: the score could not be sent to the server. ` +
+ `This might be caused by poor network conditions. ` +
+ `The score is thereafore save on your device, and will be sent when it's possible.` +
+ `Current number of scores actions waiting to be sent: ${$scores.pendingActions()}`
+ $window.alert(message);
throw err;
});
};
diff --git a/src/views/dialogs.html b/src/views/dialogs.html
index b3e34e47..2b30493d 100644
--- a/src/views/dialogs.html
+++ b/src/views/dialogs.html
@@ -186,20 +186,20 @@
file_download Export naar USB
-
+