X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=js%2Findex.js;h=649e44c359f421a16bb182682fa8c2bbb81ecfe2;hb=ade10194c01dcf4a71fc92f055d5dc53ac555e0e;hp=944a51b2a548b796465e981ffbc168f96a4863b9;hpb=7a00c4090c05f7c5f9d9b1b49bcf749b90f95c06;p=westcastle.git

diff --git a/js/index.js b/js/index.js
index 944a51b..649e44c 100644
--- a/js/index.js
+++ b/js/index.js
@@ -21,7 +21,7 @@ new Vue({
 					<div id="inactive">
 						<p>Absents</p>
 						<table class="list">
-							<tr v-for="p in sortedPlayers" v-if="!p.available" @click="toggleAvailability(p.index)">
+							<tr v-for="p in sortedPlayers" v-if="!p.available && p.nom!=''" @click="toggleAvailability(p.index)">
 								<td>{{ p.prenom }}</td>
 								<td>{{ p.nom }}</td>
 							</tr>
@@ -46,57 +46,49 @@ new Vue({
 			},
 		},
 		'my-ranking': {
-			props: ['players'],
-			data: function() {
-				return {
-					sortMethod: "score",
-				};
-			},
+			props: ['players','sortByScore','rankPeople'],
 			template: `
 				<div id="ranking">
 					<table class="ranking">
 						<tr class="title">
 							<th>Rang</th>
 							<th>Joueur</th>
-							<th @click="sortMethod='score'" class="scoring" :class="{active: sortMethod=='score'}">Score</th>
-							<th @click="sortMethod='pdt'" class="scoring" :class="{active: sortMethod=='pdt'}">PdT</th>
+							<th>Points</th>
+							<th>Mini-pts</th>
 						</tr>
-						<tr v-for="(p,i) in sortedPlayers">
-							<td>{{ i+1 }}</td>
+						<tr v-for="p in sortedPlayers">
+							<td>{{ p.rank }}</td>
 							<td>{{ p.prenom }} {{ p.nom }}</td>
-							<td>{{ p.score }}</td>
 							<td>{{ p.pdt }}</td>
+							<td>{{ p.session }}</td>
 						</tr>
 					</table>
 				</div>
 			`,
 			computed: {
 				sortedPlayers: function() {
-					let sortFunc = this.sortMethod == "score"
-						? this.sortByScore
-						: this.sortByPdt;
-					return this.players
-						.map( p => { return p; }) //to not alter original array
-						.sort(sortFunc);
-				},
-			},
-			methods: {
-				sortByScore: function(a,b) {
-					return b.score - a.score;
-				},
-				sortByPdt: function(a,b) {
-					return b.pdt - a.pdt;
+					let res = this.rankPeople();
+					// Add rank information (taking care of ex-aequos)
+					let rank = 1;
+					for (let i=0; i<res.length; i++)
+					{
+						if (i==0 || this.sortByScore(res[i],res[i-1]) == 0)
+							res[i].rank = rank;
+						else //strictly lower scoring
+							res[i].rank = ++rank;
+					}
+					return res;
 				},
 			},
 		},
 		'my-pairings': {
-			props: ['players'],
+			props: ['players','sortByScore'],
 			data: function() {
 				return {
 					unpaired: [],
 					tables: [], //array of arrays of players indices
-					scores: [], //scores for each table (3 or 4 players)
-					pdts: [], //"points de table" for each table (3 or 4 players)
+					pdts: [], //"points de table" for each table
+					sessions: [], //"mini-points" for each table
 					currentIndex: -1, //table index for scoring
 				};
 			},
@@ -104,17 +96,13 @@ new Vue({
 				<div id="pairings">
 					<div v-show="currentIndex < 0">
 						<button class="block btn" @click="shuffle()">Appariement</button>
-						<div class="pairing" v-for="(table,index) in tables" :class="{scored: scores[index].length > 0}"
+						<div class="pairing" v-for="(table,index) in tables" :class="{scored: pdts[index].length > 0}"
 								@click="showScoreForm(table,index)">
 							<p>Table {{ index+1 }}</p>
 							<table>
 								<tr v-for="(i,j) in table">
-									<td>{{ players[i].prenom }} {{ players[i].nom }}</td>
-									<td class="score"><span v-show="pdts[index].length > 0">{{ pdts[index][j] }}</span></td>
-								</tr>
-								<tr v-if="table.length < 4">
-									<td>&nbsp;</td>
-									<td>&nbsp;</td>
+									<td :class="{toto: players[i].prenom=='Toto'}">{{ players[i].prenom }} {{ players[i].nom }}</td>
+									<td class="score"><span v-show="sessions[index].length > 0">{{ sessions[index][j] }}</span></td>
 								</tr>
 							</table>
 						</div>
@@ -128,8 +116,10 @@ new Vue({
 					<div id="scoreInput" v-if="currentIndex >= 0">
 						<table>
 							<tr v-for="(index,i) in tables[currentIndex]">
-								<td>{{ players[tables[currentIndex][i]].prenom }} {{ players[tables[currentIndex][i]].nom }}</td>
-								<td><input type="text" v-model="pdts[currentIndex][i]" value="0"/></td>
+								<td :class="{toto: players[tables[currentIndex][i]].prenom=='Toto'}">
+									{{ players[tables[currentIndex][i]].prenom }} {{ players[tables[currentIndex][i]].nom }}
+								</td>
+								<td><input type="text" v-model="sessions[currentIndex][i]" value="0"/></td>
 							</tr>
 						</table>
 						<div class="button-container">
@@ -144,7 +134,7 @@ new Vue({
 					// Simple case first: 4 by 4
 					let tables = [];
 					let currentTable = [];
-					let ordering = _.shuffle(_.range(this.players.length)); //TODO: take scores into account?
+					let ordering = _.shuffle(_.range(this.players.length));
 					for (let i=0; i<ordering.length; i++)
 					{
 						if ( ! this.players[ordering[i]].available )
@@ -177,36 +167,41 @@ new Vue({
 						else
 							this.unpaired = currentTable;
 					}
+					// Ensure that all tables have 4 players
+					tables.forEach( t => {
+						if (t.length < 4)
+							t.push(0); //index of "Toto", ghost player
+					});
 					this.tables = tables;
-					this.scores = tables.map( t => { return []; }); //empty scores
 					this.pdts = tables.map( t => { return []; }); //empty pdts
+					this.sessions = tables.map( t => { return []; }); //empty sessions
 				},
 				shuffle: function() {
 					this.doPairings();
 				},
 				showScoreForm: function(table,index) {
-					if (this.scores[index].length > 0)
+					if (this.pdts[index].length > 0)
 						return; //already scored
-					this.scores[index] = _.times(table.length, _.constant(0));
 					this.pdts[index] = _.times(table.length, _.constant(0));
+					this.sessions[index] = _.times(table.length, _.constant(0));
 					this.currentIndex = index;
 				},
 				setScore: function() {
-					let sortedPdts = this.pdts[this.currentIndex]
+					let sortedSessions = this.sessions[this.currentIndex]
 						.map( (s,i) => { return {value:s, index:i}; })
 						.sort( (a,b) => { return parseInt(b.value) - parseInt(a.value); });
-					let scores = [4, 2, 1, 0]; //TODO: biased for 3-players tables. TODO: ex-aequos ?!
+					let pdts = [4, 2, 1, 0]; //TODO: ex-aequos ?!
 					for (let i=0; i<this.tables[this.currentIndex].length; i++)
 					{
-						this.players[this.tables[this.currentIndex][sortedPdts[i].index]].score += scores[i];
-						this.players[this.tables[this.currentIndex][i]].pdt += parseInt(this.pdts[this.currentIndex][i]);
+						this.players[this.tables[this.currentIndex][sortedSessions[i].index]].pdt += pdts[i];
+						this.players[this.tables[this.currentIndex][i]].session += parseInt(this.sessions[this.currentIndex][i]);
 					}
 					this.currentIndex = -1;
 					this.writeScoreToDb();
 				},
 				resetScore: function() {
-					this.scores[this.currentIndex] = [];
 					this.pdts[this.currentIndex] = [];
+					this.sessions[this.currentIndex] = [];
 					this.currentIndex = -1;
 				},
 				writeScoreToDb: function()
@@ -215,8 +210,9 @@ new Vue({
 					xhr.open("POST", "scripts/rw_players.php");
 					xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
 					let orderedPlayers = this.players
+						.slice(1) //discard Toto
 						.map( p => { return Object.assign({}, p); }) //deep (enough) copy
-						.sort( (a,b) => { return b.score - a.score; });
+						.sort(this.sortByScore);
 					xhr.send("players="+encodeURIComponent(JSON.stringify(orderedPlayers)));
 				},
 			},
@@ -230,14 +226,32 @@ new Vue({
 			{
 				let players = JSON.parse(xhr.responseText);
 				players.forEach( p => {
-					p.score = !!p.score ? parseInt(p.score) : 0;
 					p.pdt = !!p.pdt ? parseInt(p.pdt) : 0;
+					p.session = !!p.session ? parseInt(p.session) : 0;
 					p.available = !!p.available ? p.available : 1; //use integer for fputcsv PHP func
 				});
+				players.unshift({ //add ghost 4th player for 3-players tables
+					prenom: "Toto",
+					nom: "",
+					pdt: 0,
+					session: 0,
+					available: 0,
+				});
 				self.players = players;
 			}
 		};
 		xhr.open("GET", "scripts/rw_players.php", true);
 		xhr.send(null);
 	},
+	methods: {
+		rankPeople: function() {
+			return this.players
+				.slice(1) //discard Toto
+				.map( p => { return Object.assign({}, p); }) //to not alter original array
+				.sort(this.sortByScore);
+		},
+		sortByScore: function(a,b) {
+			return b.pdt - a.pdt + (Math.atan(b.session - a.session) / (Math.PI/2)) / 2;
+		},
+	},
 });