// No frameworks, no compilers, no npm, just JavaScript. :-)
let global_json;
+let global_filters = [];
-addEventListener('hashchange', () => { process_matches(global_json); });
+addEventListener('hashchange', () => { process_matches(global_json, global_filters); });
+addEventListener('click', possibly_close_menu);
fetch('ultimate.json')
.then(response => response.json())
- .then(response => { global_json = response; process_matches(global_json); });
+ .then(response => { global_json = response; process_matches(global_json, global_filters); });
-function attribute_player_time(player, to, from) {
+function attribute_player_time(player, to, from, offense) {
+ let delta_time;
if (player.on_field_since > from) {
// Player came in while play happened (without a stoppage!?).
- player.playing_time_ms += to - player.on_field_since;
+ delta_time = to - player.on_field_since;
} else {
- player.playing_time_ms += to - from;
+ delta_time = to - from;
+ }
+ player.playing_time_ms += delta_time;
+ if (offense === true) {
+ player.offensive_playing_time_ms += delta_time;
+ } else if (offense === false) {
+ player.defensive_playing_time_ms += delta_time;
}
}
-function take_off_field(player, t, live_since) {
- if (live_since === null) {
- // Play isn't live, so nothing to do.
- } else {
- attribute_player_time(player, t, live_since);
- }
- if (player.on_field_since !== null) { // Just a safeguard; out without in should never happen.
- player.field_time_ms += t - player.on_field_since;
+function take_off_field(player, t, live_since, offense, keep) {
+ if (keep) {
+ if (live_since === null) {
+ // Play isn't live, so nothing to do.
+ } else {
+ attribute_player_time(player, t, live_since, offense);
+ }
+ if (player.on_field_since !== null) { // Just a safeguard; out without in should never happen.
+ player.field_time_ms += t - player.on_field_since;
+ }
}
player.on_field_since = null;
}
function add_cell(tr, element_type, text) {
let element = document.createElement(element_type);
element.textContent = text;
- if (element_type === 'th') {
+ tr.appendChild(element);
+ return element;
+}
+
+function add_th(tr, text, colspan) {
+ let element = add_cell(tr, 'th', text);
+ if (colspan > 0) {
+ element.setAttribute('colspan', colspan);
+ } else {
element.setAttribute('colspan', '3');
}
- tr.appendChild(element);
return element;
}
return element;
}
+function add_3cell_with_filler_ci(tr, text, cls) {
+ let element = add_3cell(tr, text, cls);
+
+ let svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+ svg.classList.add('fillerci');
+ svg.setAttribute('width', ci_width);
+ svg.setAttribute('height', ci_height);
+ element.appendChild(svg);
+
+ return element;
+}
+
function add_3cell_ci(tr, ci) {
- console.log(ci);
if (isNaN(ci.val)) {
- add_3cell(tr, 'N/A');
- return; // FIXME: some SVG padding needed
+ add_3cell_with_filler_ci(tr, 'N/A');
+ return;
}
let text;
text = ci.val.toFixed(2);
}
let element = add_3cell(tr, text);
- let to_x = (val) => { return width * (val - ci.min) / (ci.max - ci.min); };
+ let to_x = (val) => { return ci_width * (val - ci.min) / (ci.max - ci.min); };
// Container.
- const width = 100;
- const height = 20;
let svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
- svg.classList.add('ci');
- svg.setAttribute('width', width);
- svg.setAttribute('height', height);
+ if (ci.inverted === true) {
+ svg.classList.add('invertedci');
+ } else {
+ svg.classList.add('ci');
+ }
+ svg.setAttribute('width', ci_width);
+ svg.setAttribute('height', ci_height);
// The good (green) and red (bad) ranges.
let s0 = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
s0.classList.add('range');
s0.classList.add('s0');
s0.setAttribute('width', to_x(ci.desired));
- s0.setAttribute('height', height);
+ s0.setAttribute('height', ci_height);
s0.setAttribute('x', '0');
let s1 = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
s1.classList.add('range');
s1.classList.add('s1');
- s1.setAttribute('width', width - to_x(ci.desired));
- s1.setAttribute('height', height);
+ s1.setAttribute('width', ci_width - to_x(ci.desired));
+ s1.setAttribute('height', ci_height);
s1.setAttribute('x', to_x(ci.desired));
// Confidence bar.
let bar = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
bar.classList.add('bar');
bar.setAttribute('width', to_x(ci.upper_ci) - to_x(ci.lower_ci));
- bar.setAttribute('height', height / 3);
+ bar.setAttribute('height', ci_height / 3);
bar.setAttribute('x', to_x(ci.lower_ci));
- bar.setAttribute('y', height / 3);
+ bar.setAttribute('y', ci_height / 3);
// Marker line for average.
let marker = document.createElementNS('http://www.w3.org/2000/svg', 'line');
marker.classList.add('marker');
marker.setAttribute('x1', to_x(ci.val));
marker.setAttribute('x2', to_x(ci.val));
- marker.setAttribute('y1', height / 6);
- marker.setAttribute('y2', height * 5 / 6);
+ marker.setAttribute('y1', ci_height / 6);
+ marker.setAttribute('y2', ci_height * 5 / 6);
svg.appendChild(s0);
svg.appendChild(s1);
element.appendChild(svg);
}
-function process_matches(json) {
+function process_matches(json, filters) {
let players = {};
for (const player of json['players']) {
players[player['player_id']] = {
'interceptions': 0,
'points_played': 0,
'playing_time_ms': 0,
+ 'offensive_playing_time_ms': 0,
+ 'defensive_playing_time_ms': 0,
'field_time_ms': 0,
// For efficiency.
players['globals'] = {
'points_played': 0,
'playing_time_ms': 0,
+ 'offensive_playing_time_ms': 0,
+ 'defensive_playing_time_ms': 0,
'field_time_ms': 0,
'offensive_points_completed': 0,
let globals = players['globals'];
for (const match of json['matches']) {
+ if (!keep_match(match['match_id'], filters)) {
+ continue;
+ }
+
let our_score = 0;
let their_score = 0;
let handler = null;
let prev_handler = null;
let live_since = null;
- let offense = null;
+ let offense = null; // True/false/null (unknown).
let puller = null;
let pull_started = null;
let last_pull_was_ours = null; // Effectively whether we're playing an O or D point (not affected by turnovers).
let p = players[e['player']];
// Sub management
+ let keep = keep_event(players, filters);
if (type === 'in' && p.on_field_since === null) {
p.on_field_since = t;
+ if (!keep && keep_event(players, filters)) {
+ // A player needed for the filters went onto the field,
+ // so pretend people walked on right now (to start their
+ // counting time).
+ for (const [q,p2] of Object.entries(players)) {
+ if (p2.on_field_since !== null) {
+ p2.on_field_since = t;
+ }
+ }
+ }
} else if (type === 'out') {
- take_off_field(p, t, live_since);
+ take_off_field(p, t, live_since, offense, keep);
+ if (keep && !keep_event(players, filters)) {
+ // A player needed for the filters went off the field,
+ // so we need to attribute time for all the others.
+ // Pretend they walked off and then immediately on again.
+ //
+ // TODO: We also need to take care of this to get the globals right.
+ for (const [q,p2] of Object.entries(players)) {
+ if (p2.on_field_since !== null) {
+ take_off_field(p2, t, live_since, offense, keep);
+ p2.on_field_since = t;
+ }
+ }
+ }
}
+ keep = keep_event(players, filters); // Recompute after in/out.
+
// Liveness management
if (type === 'pull' || type === 'their_pull' || type === 'restart') {
live_since = t;
continue;
}
if (type !== 'stoppage' && p.last_point_seen !== point_num) {
- // In case the player did nothing this point,
- // not even subbing in.
- p.last_point_seen = point_num;
- ++p.points_played;
+ if (keep) {
+ // In case the player did nothing this point,
+ // not even subbing in.
+ p.last_point_seen = point_num;
+ ++p.points_played;
+ }
+ }
+ if (keep) attribute_player_time(p, t, live_since, offense);
+
+ if (type !== 'stoppage') {
+ if (keep) {
+ if (last_pull_was_ours === true) { // D point.
+ ++p.defensive_points_completed;
+ if (type === 'goal') {
+ ++p.defensive_points_won;
+ }
+ } else if (last_pull_was_ours === false) { // O point.
+ ++p.offensive_points_completed;
+ if (type === 'goal') {
+ ++p.offensive_points_won;
+ }
+ }
+ }
}
- attribute_player_time(p, t, live_since);
+ }
+ if (keep) {
if (type !== 'stoppage') {
+ // Update globals.
+ ++globals.points_played;
if (last_pull_was_ours === true) { // D point.
- ++p.defensive_points_completed;
+ ++globals.defensive_points_completed;
if (type === 'goal') {
- ++p.defensive_points_won;
+ ++globals.defensive_points_won;
}
} else if (last_pull_was_ours === false) { // O point.
- ++p.offensive_points_completed;
+ ++globals.offensive_points_completed;
if (type === 'goal') {
- ++p.offensive_points_won;
+ ++globals.offensive_points_won;
}
}
}
- }
-
- if (type !== 'stoppage') {
- // Update globals.
- ++globals.points_played;
- if (last_pull_was_ours === true) { // D point.
- ++globals.defensive_points_completed;
- if (type === 'goal') {
- ++globals.defensive_points_won;
- }
- } else if (last_pull_was_ours === false) { // O point.
- ++globals.offensive_points_completed;
- if (type === 'goal') {
- ++globals.offensive_points_won;
+ if (live_since !== null) {
+ globals.playing_time_ms += t - live_since;
+ if (offense === true) {
+ globals.offensive_playing_time_ms += t - live_since;
+ } else if (offense === false) {
+ globals.defensive_playing_time_ms += t - live_since;
}
}
}
- if (live_since !== null) {
- globals.playing_time_ms += t - live_since;
- }
live_since = null;
}
// Point count management
if (p !== undefined && type !== 'out' && p.last_point_seen !== point_num) {
- p.last_point_seen = point_num;
- ++p.points_played;
+ if (keep) {
+ p.last_point_seen = point_num;
+ ++p.points_played;
+ }
}
if (type === 'goal' || type === 'their_goal') {
++point_num;
if (type === 'pull') {
puller = e['player'];
pull_started = t;
- ++p.pulls;
+ if (keep) ++p.pulls;
} else if (type === 'in' || type === 'out' || type === 'stoppage' || type === 'restart' || type === 'unknown' || type === 'set_defense' || type === 'set_offense') {
// No effect on pull.
} else if (type === 'pull_landed' && puller !== null) {
- players[puller].pull_times.push(t - pull_started);
+ if (keep) players[puller].pull_times.push(t - pull_started);
} else if (type === 'pull_oob' && puller !== null) {
- ++players[puller].oob_pulls;
+ if (keep) ++players[puller].oob_pulls;
} else {
// Not pulling (if there was one, we never recorded its outcome, but still count it).
puller = pull_started = null;
}
- // Offense/defense management (TODO: use it for actual counting)
+ // Offense/defense management
+ let last_offense = offense;
if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop') {
offense = false;
} else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') {
offense = true;
}
+ if (last_offense !== offense && live_since !== null) {
+ // Switched offense/defense status, so attribute this drive as needed,
+ // and update live_since to take that into account.
+ if (keep) {
+ for (const [q,p] of Object.entries(players)) {
+ if (p.on_field_since === null) {
+ continue;
+ }
+ attribute_player_time(p, t, live_since, last_offense);
+ }
+ globals.playing_time_ms += t - live_since;
+ if (offense === true) {
+ globals.offensive_playing_time_ms += t - live_since;
+ } else if (offense === false) {
+ globals.defensive_playing_time_ms += t - live_since;
+ }
+ }
+ live_since = t;
+ }
+
if (type === 'pull') {
last_pull_was_ours = true;
} else if (type === 'their_pull') {
// Event management
if (type === 'catch' || type === 'goal') {
if (handler !== null) {
- ++players[handler].num_throws;
- ++p.catches;
+ if (keep) {
+ ++players[handler].num_throws;
+ ++p.catches;
+ }
}
- ++p.touches;
+ if (keep) ++p.touches;
if (type === 'goal') {
- if (prev_handler !== null) {
- ++players[prev_handler].hockey_assists;
- }
- if (handler !== null) {
- ++players[handler].assists;
+ if (keep) {
+ if (prev_handler !== null) {
+ ++players[prev_handler].hockey_assists;
+ }
+ if (handler !== null) {
+ ++players[handler].assists;
+ }
+ ++p.goals;
}
- ++p.goals;
handler = prev_handler = null;
} else {
// Update hold history.
handler = e['player'];
}
} else if (type === 'throwaway') {
- ++p.num_throws;
- ++p.throwaways;
+ if (keep) {
+ ++p.num_throws;
+ ++p.throwaways;
+ }
handler = prev_handler = null;
} else if (type === 'drop') {
- ++p.drops;
+ if (keep) ++p.drops;
handler = prev_handler = null;
} else if (type === 'defense') {
- ++p.defenses;
+ if (keep) ++p.defenses;
} else if (type === 'interception') {
- ++p.interceptions;
- ++p.defenses;
- ++p.touches;
+ if (keep) {
+ ++p.interceptions;
+ ++p.defenses;
+ ++p.touches;
+ }
prev_handler = null;
handler = e['player'];
} else if (type === 'offensive_soft_plus' || type === 'offensive_soft_minus' || type === 'defensive_soft_plus' || type === 'defensive_soft_minus') {
- ++p[type];
+ if (keep) ++p[type];
} else if (type !== 'in' && type !== 'out' && type !== 'pull' &&
type !== 'their_goal' && type !== 'stoppage' && type !== 'restart' && type !== 'unknown' &&
type !== 'set_defense' && type !== 'goal' && type !== 'throwaway' &&
}
// Add field time for all players still left at match end.
- for (const [q,p] of Object.entries(players)) {
- if (p.on_field_since !== null && last_goal !== null) {
- p.field_time_ms += last_goal - p.on_field_since;
+ const keep = keep_event(players, filters);
+ if (keep) {
+ for (const [q,p] of Object.entries(players)) {
+ if (p.on_field_since !== null && last_goal !== null) {
+ p.field_time_ms += last_goal - p.on_field_since;
+ }
+ }
+ if (game_started !== null && last_goal !== null) {
+ globals.field_time_ms += last_goal - game_started;
+ }
+ if (live_since !== null && last_goal !== null) {
+ globals.playing_time_ms += last_goal - live_since;
+ if (offense === true) {
+ globals.offensive_playing_time_ms += last_goal - live_since;
+ } else if (offense === false) {
+ globals.defensive_playing_time_ms += last_goal - live_since;
+ }
}
- }
- if (game_started !== null && last_goal !== null) {
- globals.field_time_ms += last_goal - game_started;
- }
- if (live_since !== null && last_goal !== null) {
- globals.playing_time_ms += last_goal - live_since;
}
}
// https://en.wikipedia.org/wiki/1.96#History
const z = 1.959964;
+const ci_width = 100;
+const ci_height = 20;
+
function make_binomial_ci(val, num, z) {
let avg = val / num;
return ci;
}
+// Ds, throwaways and drops can happen multiple times per point,
+// so they are Poisson distributed.
+//
+// Modified Wald (recommended by http://www.ine.pt/revstat/pdf/rs120203.pdf
+// since our rates are definitely below 2 per point).
+function make_poisson_ci(val, num, z, inverted)
+{
+ let low = (val == 0) ? 0.0 : ((val - 0.5) - Math.sqrt(val - 0.5)) / num;
+ let high = (val == 0) ? -Math.log(0.025) / num : ((val + 0.5) + Math.sqrt(val + 0.5)) / num;
+
+ // Fix the signs so that we don't get -0.00.
+ low = Math.max(low, 0.0);
+
+ // The display range of 0 to 0.25 is fairly arbitrary. So is the desired 0.05 per point.
+ let avg = val / num;
+ return {
+ 'val': avg,
+ 'lower_ci': low,
+ 'upper_ci': high,
+ 'min': 0.0,
+ 'max': 0.25,
+ 'desired': 0.05,
+ 'inverted': inverted,
+ };
+}
+
function make_table_general(players) {
let rows = [];
{
let header = document.createElement('tr');
- add_cell(header, 'th', 'Player');
- add_cell(header, 'th', '+/-');
- add_cell(header, 'th', 'Soft +/-');
- add_cell(header, 'th', 'O efficiency');
- add_cell(header, 'th', 'D efficiency');
- add_cell(header, 'th', 'Points played');
+ add_th(header, 'Player');
+ add_th(header, '+/-');
+ add_th(header, 'Soft +/-');
+ add_th(header, 'O efficiency');
+ add_th(header, 'D efficiency');
+ add_th(header, 'Points played');
rows.push(header);
}
let rows = [];
{
let header = document.createElement('tr');
- add_cell(header, 'th', 'Player');
- add_cell(header, 'th', 'Goals');
- add_cell(header, 'th', 'Assists');
- add_cell(header, 'th', 'Hockey assists');
- add_cell(header, 'th', 'Throws');
- add_cell(header, 'th', 'Throwaways');
- add_cell(header, 'th', '%OK');
- add_cell(header, 'th', 'Catches');
- add_cell(header, 'th', 'Drops');
- add_cell(header, 'th', '%OK');
- add_cell(header, 'th', 'Soft +/-');
+ add_th(header, 'Player');
+ add_th(header, 'Goals');
+ add_th(header, 'Assists');
+ add_th(header, 'Hockey assists');
+ add_th(header, 'Throws');
+ add_th(header, 'Throwaways');
+ add_th(header, '%OK');
+ add_th(header, 'Catches');
+ add_th(header, 'Drops');
+ add_th(header, '%OK');
+ add_th(header, 'Soft +/-', 6);
rows.push(header);
}
let rows = [];
{
let header = document.createElement('tr');
- add_cell(header, 'th', 'Player');
- add_cell(header, 'th', 'Ds');
- add_cell(header, 'th', 'Pulls');
- add_cell(header, 'th', 'OOB pulls');
- add_cell(header, 'th', 'Avg. hang time (IB)');
- add_cell(header, 'th', 'Soft +/-');
+ add_th(header, 'Player');
+ add_th(header, 'Ds');
+ add_th(header, 'Pulls');
+ add_th(header, 'OOB pulls');
+ add_th(header, 'OOB%');
+ add_th(header, 'Avg. hang time (IB)');
+ add_th(header, 'Soft +/-', 6);
rows.push(header);
}
for (const [q,p] of Object.entries(players)) {
let avg_time = 1e-3 * sum_time / p.pulls;
let oob_pct = 100 * p.oob_pulls / p.pulls;
+ let ci_oob = make_binomial_ci(p.oob_pulls, p.pulls, z);
+ ci_oob.format = 'percentage';
+ ci_oob.desired = 0.2; // Arbitrary.
+ ci_oob.inverted = true;
+
let row = document.createElement('tr');
add_3cell(row, p.name, 'name'); // TODO: number?
add_3cell(row, p.defenses);
add_3cell(row, p.pulls);
- if (p.pulls === 0) {
- add_3cell(row, 'N/A');
- } else {
- add_3cell(row, p.oob_pulls + ' (' + oob_pct.toFixed(0) + '%)');
- }
+ add_3cell(row, p.oob_pulls);
+ add_3cell_ci(row, ci_oob);
if (p.pulls > p.oob_pulls) {
add_3cell(row, avg_time.toFixed(1) + ' sec');
} else {
let rows = [];
{
let header = document.createElement('tr');
- add_cell(header, 'th', 'Player');
- add_cell(header, 'th', 'Points played');
- add_cell(header, 'th', 'Time played');
- add_cell(header, 'th', 'Time on field');
- add_cell(header, 'th', 'O points');
- add_cell(header, 'th', 'D points');
+ add_th(header, 'Player');
+ add_th(header, 'Points played');
+ add_th(header, 'Time played');
+ add_th(header, 'O time');
+ add_th(header, 'D time');
+ add_th(header, 'Time on field');
+ add_th(header, 'O points');
+ add_th(header, 'D points');
rows.push(header);
}
add_3cell(row, p.name, 'name'); // TODO: number?
add_3cell(row, p.points_played);
add_3cell(row, Math.floor(p.playing_time_ms / 60000) + ' min');
+ add_3cell(row, Math.floor(p.offensive_playing_time_ms / 60000) + ' min');
+ add_3cell(row, Math.floor(p.defensive_playing_time_ms / 60000) + ' min');
add_3cell(row, Math.floor(p.field_time_ms / 60000) + ' min');
add_3cell(row, p.offensive_points_completed);
add_3cell(row, p.defensive_points_completed);
add_3cell(row, '');
add_3cell(row, globals.points_played);
add_3cell(row, Math.floor(globals.playing_time_ms / 60000) + ' min');
+ add_3cell(row, Math.floor(globals.offensive_playing_time_ms / 60000) + ' min');
+ add_3cell(row, Math.floor(globals.defensive_playing_time_ms / 60000) + ' min');
add_3cell(row, Math.floor(globals.field_time_ms / 60000) + ' min');
add_3cell(row, globals.offensive_points_completed);
add_3cell(row, globals.defensive_points_completed);
let rows = [];
{
let header = document.createElement('tr');
- add_cell(header, 'th', 'Player');
- add_cell(header, 'th', 'Goals');
- add_cell(header, 'th', 'Assists');
- add_cell(header, 'th', 'Hockey assists');
- add_cell(header, 'th', 'Ds');
- add_cell(header, 'th', 'Throwaways');
- add_cell(header, 'th', 'Drops');
- add_cell(header, 'th', 'Touches');
+ add_th(header, 'Player');
+ add_th(header, 'Goals');
+ add_th(header, 'Assists');
+ add_th(header, 'Hockey assists');
+ add_th(header, 'Ds');
+ add_th(header, 'Throwaways');
+ add_th(header, 'Drops');
+ add_th(header, 'Touches');
rows.push(header);
}
let touches = 0;
for (const [q,p] of Object.entries(players)) {
if (q === 'globals') continue;
+
+ // Can only happen once per point, so these are binomials.
+ let ci_goals = make_binomial_ci(p.goals, p.points_played, z);
+ let ci_assists = make_binomial_ci(p.assists, p.points_played, z);
+ let ci_hockey_assists = make_binomial_ci(p.hockey_assists, p.points_played, z);
+ // Arbitrarily desire at least 10% (not everybody can score or assist).
+ ci_goals.desired = 0.1;
+ ci_assists.desired = 0.1;
+ ci_hockey_assists.desired = 0.1;
+
let row = document.createElement('tr');
add_3cell(row, p.name, 'name'); // TODO: number?
+ add_3cell_ci(row, ci_goals);
+ add_3cell_ci(row, ci_assists);
+ add_3cell_ci(row, ci_hockey_assists);
+ add_3cell_ci(row, make_poisson_ci(p.defenses, p.points_played, z));
+ add_3cell_ci(row, make_poisson_ci(p.throwaways, p.points_played, z, true));
+ add_3cell_ci(row, make_poisson_ci(p.drops, p.points_played, z, true));
if (p.points_played > 0) {
- add_3cell(row, p.goals == 0 ? 0 : (p.goals / p.points_played).toFixed(2));
- add_3cell(row, p.assists == 0 ? 0 : (p.assists / p.points_played).toFixed(2));
- add_3cell(row, p.hockey_assists == 0 ? 0 : (p.hockey_assists / p.points_played).toFixed(2));
- add_3cell(row, p.defenses == 0 ? 0 : (p.defenses / p.points_played).toFixed(2));
- add_3cell(row, p.throwaways == 0 ? 0 : (p.throwaways / p.points_played).toFixed(2));
- add_3cell(row, p.drops == 0 ? 0 : (p.drops / p.points_played).toFixed(2));
add_3cell(row, p.touches == 0 ? 0 : (p.touches / p.points_played).toFixed(2));
} else {
add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
}
rows.push(row);
let row = document.createElement('tr');
add_3cell(row, '');
if (globals.points_played > 0) {
- add_3cell(row, goals == 0 ? 0 : (goals / globals.points_played).toFixed(2));
- add_3cell(row, assists == 0 ? 0 : (assists / globals.points_played).toFixed(2));
- add_3cell(row, hockey_assists == 0 ? 0 : (hockey_assists / globals.points_played).toFixed(2));
- add_3cell(row, defenses == 0 ? 0 : (defenses / globals.points_played).toFixed(2));
- add_3cell(row, throwaways == 0 ? 0 : (throwaways / globals.points_played).toFixed(2));
- add_3cell(row, drops == 0 ? 0 : (drops / globals.points_played).toFixed(2));
+ add_3cell_with_filler_ci(row, goals == 0 ? 0 : (goals / globals.points_played).toFixed(2));
+ add_3cell_with_filler_ci(row, assists == 0 ? 0 : (assists / globals.points_played).toFixed(2));
+ add_3cell_with_filler_ci(row, hockey_assists == 0 ? 0 : (hockey_assists / globals.points_played).toFixed(2));
+ add_3cell_with_filler_ci(row, defenses == 0 ? 0 : (defenses / globals.points_played).toFixed(2));
+ add_3cell_with_filler_ci(row, throwaways == 0 ? 0 : (throwaways / globals.points_played).toFixed(2));
+ add_3cell_with_filler_ci(row, drops == 0 ? 0 : (drops / globals.points_played).toFixed(2));
add_3cell(row, touches == 0 ? 0 : (touches / globals.points_played).toFixed(2));
} else {
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
- add_3cell(row, 'N/A');
+ add_3cell_with_filler_ci(row, 'N/A');
+ add_3cell_with_filler_ci(row, 'N/A');
+ add_3cell_with_filler_ci(row, 'N/A');
+ add_3cell_with_filler_ci(row, 'N/A');
+ add_3cell_with_filler_ci(row, 'N/A');
+ add_3cell_with_filler_ci(row, 'N/A');
add_3cell(row, 'N/A');
}
rows.push(row);
return rows;
}
+
+function open_filter_menu() {
+ document.getElementById('filter-submenu').style.display = 'none';
+
+ let menu = document.getElementById('filter-add-menu');
+ menu.style.display = 'block';
+ menu.replaceChildren();
+
+ // Place the menu directly under the “click to add” label;
+ // we don't anchor it since that label will move around
+ // and the menu shouldn't.
+ let rect = document.getElementById('filter-click-to-add').getBoundingClientRect();
+ menu.style.left = rect.left + 'px';
+ menu.style.top = (rect.bottom + 10) + 'px';
+
+ add_menu_item(menu, 0, 'match', 'Match (any)');
+ add_menu_item(menu, 1, 'player_any', 'Player on field (any)');
+ add_menu_item(menu, 2, 'player_all', 'Player on field (all)');
+ // add_menu_item(menu, 'Formation played (any)');
+}
+
+function add_menu_item(menu, menu_idx, filter_type, title) {
+ let item = document.createElement('div');
+ item.classList.add('option');
+ item.appendChild(document.createTextNode(title));
+
+ let arrow = document.createElement('div');
+ arrow.classList.add('arrow');
+ arrow.textContent = '▸';
+ item.appendChild(arrow);
+
+ menu.appendChild(item);
+
+ item.addEventListener('click', (e) => { show_submenu(menu_idx, null, filter_type); });
+}
+
+function show_submenu(menu_idx, pill, filter_type) {
+ let submenu = document.getElementById('filter-submenu');
+ let subitems = [];
+ const filter = find_filter(filter_type);
+
+ let choices = [];
+ if (filter_type === 'match') {
+ for (const match of global_json['matches']) {
+ choices.push({
+ 'title': match['description'],
+ 'id': match['match_id']
+ });
+ }
+ } else if (filter_type === 'player_any' || filter_type === 'player_all') {
+ for (const player of global_json['players']) {
+ choices.push({
+ 'title': player['name'],
+ 'id': player['player_id']
+ });
+ }
+ }
+
+ for (const choice of choices) {
+ let label = document.createElement('label');
+
+ let subitem = document.createElement('div');
+ subitem.classList.add('option');
+
+ let check = document.createElement('input');
+ check.setAttribute('type', 'checkbox');
+ check.setAttribute('id', 'choice' + choice.id);
+ if (filter !== null && filter.elements.has(choice.id)) {
+ check.setAttribute('checked', 'checked');
+ }
+ check.addEventListener('change', (e) => { checkbox_changed(e, filter_type, choice.id); });
+
+ subitem.appendChild(check);
+ subitem.appendChild(document.createTextNode(choice.title));
+
+ label.appendChild(subitem);
+ subitems.push(label);
+ }
+ submenu.replaceChildren(...subitems);
+ submenu.style.display = 'block';
+
+ if (pill !== null) {
+ let rect = pill.getBoundingClientRect();
+ submenu.style.top = (rect.bottom + 10) + 'px';
+ submenu.style.left = rect.left + 'px';
+ } else {
+ // Position just outside the selected menu.
+ let rect = document.getElementById('filter-add-menu').getBoundingClientRect();
+ submenu.style.top = (rect.top + menu_idx * 35) + 'px';
+ submenu.style.left = (rect.right - 1) + 'px';
+ }
+}
+
+// Find the right filter, if it exists.
+function find_filter(filter_type) {
+ for (let f of global_filters) {
+ if (f.type === filter_type) {
+ return f;
+ }
+ }
+ return null;
+}
+
+function checkbox_changed(e, filter_type, id) {
+ let filter = find_filter(filter_type);
+ if (e.target.checked) {
+ // See if we must add a new filter to the list.
+ if (filter === null) {
+ filter = {
+ 'type': filter_type,
+ 'elements': new Set([ id ]),
+ };
+ filter.pill = make_filter_pill(filter);
+ global_filters.push(filter);
+ document.getElementById('filters').appendChild(filter.pill);
+ } else {
+ filter.elements.add(id);
+ let new_pill = make_filter_pill(filter);
+ document.getElementById('filters').replaceChild(new_pill, filter.pill);
+ filter.pill = new_pill;
+ }
+ } else {
+ filter.elements.delete(id);
+ if (filter.elements.size === 0) {
+ document.getElementById('filters').removeChild(filter.pill);
+ global_filters = global_filters.filter(f => f !== filter);
+ } else {
+ let new_pill = make_filter_pill(filter);
+ document.getElementById('filters').replaceChild(new_pill, filter.pill);
+ filter.pill = new_pill;
+ }
+ }
+
+ process_matches(global_json, global_filters);
+}
+
+function make_filter_pill(filter) {
+ let pill = document.createElement('div');
+ pill.classList.add('filter-pill');
+ let text;
+ if (filter.type === 'match') {
+ text = 'Match: ';
+
+ // See if there's a common prefix.
+ let num_matches = filter.elements.size;
+ let common_prefix = null;
+ if (num_matches > 1) {
+ for (const match_id of filter.elements) {
+ let desc = find_match(match_id)['description'];
+ if (common_prefix === null) {
+ common_prefix = desc;
+ } else {
+ common_prefix = find_common_prefix(common_prefix, desc);
+ }
+ }
+ if (common_prefix.length < 3) {
+ common_prefix = null;
+ }
+ }
+
+ if (common_prefix !== null) {
+ text += common_prefix + '(';
+ }
+
+ let first = true;
+ let sorted_match_id = Array.from(filter.elements).sort((a, b) => a - b);
+ for (const match_id of sorted_match_id) {
+ if (!first) {
+ text += ', ';
+ }
+ let desc = find_match(match_id)['description'];
+ if (common_prefix === null) {
+ text += desc;
+ } else {
+ text += desc.substr(common_prefix.length);
+ }
+ first = false;
+ }
+
+ if (common_prefix !== null) {
+ text += ')';
+ }
+ } else if (filter.type === 'player_any') {
+ text = 'Player (any): ';
+ let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
+ let first = true;
+ for (const player_id of sorted_players) {
+ if (!first) {
+ text += ', ';
+ }
+ text += find_player(player_id)['name'];
+ first = false;
+ }
+ } else if (filter.type === 'player_all') {
+ text = 'Players: ';
+ let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
+ let first = true;
+ for (const player_id of sorted_players) {
+ if (!first) {
+ text += ' AND ';
+ }
+ text += find_player(player_id)['name'];
+ first = false;
+ }
+ }
+
+ let text_node = document.createElement('span');
+ text_node.innerText = text;
+ text_node.addEventListener('click', (e) => show_submenu(null, pill, filter.type));
+ pill.appendChild(text_node);
+
+ pill.appendChild(document.createTextNode(' '));
+
+ let delete_node = document.createElement('span');
+ delete_node.innerText = '✖';
+ delete_node.addEventListener('click', (e) => {
+ // Delete this filter entirely.
+ document.getElementById('filters').removeChild(pill);
+ global_filters = global_filters.filter(f => f !== filter);
+ process_matches(global_json, global_filters);
+
+ let add_menu = document.getElementById('filter-add-menu');
+ let add_submenu = document.getElementById('filter-submenu');
+ add_menu.style.display = 'none';
+ add_submenu.style.display = 'none';
+ });
+ pill.appendChild(delete_node);
+ pill.style.cursor = 'pointer';
+
+ return pill;
+}
+
+function find_common_prefix(a, b) {
+ let ret = '';
+ for (let i = 0; i < Math.min(a.length, b.length); ++i) {
+ if (a[i] === b[i]) {
+ ret += a[i];
+ } else {
+ break;
+ }
+ }
+ return ret;
+}
+
+function find_match(match_id) {
+ for (const match of global_json['matches']) {
+ if (match['match_id'] === match_id) {
+ return match;
+ }
+ }
+ return null;
+}
+
+function find_player(player_id) {
+ for (const player of global_json['players']) {
+ if (player['player_id'] === player_id) {
+ return player;
+ }
+ }
+ return null;
+}
+
+function player_pos(player_id) {
+ let i = 0;
+ for (const player of global_json['players']) {
+ if (player['player_id'] === player_id) {
+ return i;
+ }
+ ++i;
+ }
+ return null;
+}
+
+function keep_match(match_id, filters) {
+ for (const filter of filters) {
+ if (filter.type === 'match') {
+ return filter.elements.has(match_id);
+ }
+ }
+ return true;
+}
+
+function keep_event(players, filters) {
+ for (const filter of filters) {
+ if (filter.type === 'player_any') {
+ for (const p of Array.from(filter.elements)) {
+ if (players[p].on_field_since !== null) {
+ return true;
+ }
+ }
+ return false;
+ } else if (filter.type === 'player_all') {
+ for (const p of Array.from(filter.elements)) {
+ if (players[p].on_field_since === null) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+ return true;
+}
+
+function possibly_close_menu(e) {
+ if (e.target.closest('#filter-click-to-add') === null &&
+ e.target.closest('#filter-add-menu') === null &&
+ e.target.closest('#filter-submenu') === null &&
+ e.target.closest('.filter-pill') === null) {
+ let add_menu = document.getElementById('filter-add-menu');
+ let add_submenu = document.getElementById('filter-submenu');
+ add_menu.style.display = 'none';
+ add_submenu.style.display = 'none';
+ }
+}
projects / pkanalytics / blobdiff