Support splitting filters, instead of creating all of them manually.

diff --git a/ultimate.js b/ultimate.js
index 6c066bcfac8149330c26a8413b4a7237240a90e2..460884cef139b78477218de071188aa0780b6147 100644 (file)
--- a/ultimate.js
+++ b/ultimate.js
@@ -751,17 +751,54 @@ function calc_stats(json, filters) {
        return players;
 }
 
-function process_matches(json, filtersets) {
+function recursively_expand_filterset(filterset, base, result)
+{
+       if (result.length >= 100) {
+               return;
+       }
+       if (base.length == filterset.length) {
+               result.push(base);
+               return;
+       }
+       let filter = filterset[base.length];
+       if (filter.split) {
+               let elements = filter.elements;
+               if (elements.size === 0) {
+                       elements = filter.choices;
+               }
+               for (const element of elements) {
+                       let split_filter = {
+                               'type': filter.type,
+                               'elements': new Set([ element ]),
+                               'split': false,  // Not used.
+                       };
+                       recursively_expand_filterset(filterset, [...base, split_filter], result);
+               }
+       } else {
+               recursively_expand_filterset(filterset, [...base, filter], result);
+       }
+}
+
+function expand_filtersets(filtersets) {
+       if (filtersets.length === 0) {
+               return [[]];
+       }
+
+       let expanded = [];
+       for (const filterset of filtersets) {
+               recursively_expand_filterset(filterset, [], expanded);
+       }
+       return expanded;
+}
+
+function process_matches(json, unexpanded_filtersets) {
        let chosen_category = get_chosen_category();
        write_main_menu(chosen_category);
 
-       let filterset_values = Object.values(filtersets);
-       if (filterset_values.length === 0) {
-               filterset_values = [[]];
-       }
+       let filtersets = expand_filtersets(Object.values(unexpanded_filtersets));
 
        let rowsets = [];
-       for (const filter of filterset_values) {
+       for (const filter of filtersets) {
                let players = calc_stats(json, filter);
                let rows = [];
                if (chosen_category === 'general') {
@@ -781,9 +818,9 @@ function process_matches(json, filtersets) {
        }
 
        let merged_rows = [];
-       if (filterset_values.length > 1) {
+       if (filtersets.length > 1) {
                for (let i = 0; i < rowsets.length; ++i) {
-                       let marker = make_filter_marker(filterset_values[i]);
+                       let marker = make_filter_marker(filtersets[i]);
 
                        // Make filter header.
                        let tr = rowsets[i][0];
@@ -1646,6 +1683,11 @@ function show_submenu(filter_div, filterset, menu_idx, pill, filter_type) {
                }
        }
 
+       let choice_set = new Set();
+       for (const choice of choices) {
+               choice_set.add(choice.id);
+       }
+
        for (const choice of choices) {
                let label = document.createElement('label');
 
@@ -1658,7 +1700,7 @@ function show_submenu(filter_div, filterset, menu_idx, pill, filter_type) {
                if (filter !== null && filter.elements.has(choice.id)) {
                        check.setAttribute('checked', 'checked');
                }
-               check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, choice.id); });
+               check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, choice.id, choice_set); });
 
                subitem.appendChild(check);
                subitem.appendChild(document.createTextNode(choice.title));
@@ -1666,6 +1708,33 @@ function show_submenu(filter_div, filterset, menu_idx, pill, filter_type) {
                label.appendChild(subitem);
                subitems.push(label);
        }
+
+       // If meaningful (it's not for player_all, since all data for that would be
+       // the same anyway), show the split checkbox.
+       if (choices.length > 1 && filter_type !== 'player_all') {
+               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_split');
+               if (filter !== null && filter.split) {
+                       check.setAttribute('checked', 'checked');
+               }
+               check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, 'split', choice_set); });
+
+               subitem.appendChild(check);
+               let text_span = document.createElement('span');  // So that we can style its disabling later.
+               text_span.appendChild(document.createTextNode('Split'));
+               subitem.appendChild(text_span);
+               subitem.style.borderTop = '1px solid #ddd';
+
+               label.appendChild(subitem);
+               subitems.push(label);
+       }
+
        submenu.replaceChildren(...subitems);
        submenu.style.display = 'block';
 
@@ -1762,7 +1831,7 @@ function try_gc_filter_menus(cheap) {
        }
 }
 
-function checkbox_changed(filter_div, filterset, e, filter_type, id) {
+function checkbox_changed(filter_div, filterset, e, filter_type, id, choices) {
        let filter = find_filter(filterset, filter_type);
        let pills_div = filter_div.querySelector('.filters');
        if (e.target.checked) {
@@ -1776,19 +1845,34 @@ function checkbox_changed(filter_div, filterset, e, filter_type, id) {
                if (filter === null) {
                        filter = {
                                'type': filter_type,
-                               'elements': new Set([ id ]),
+                               'elements': new Set(),
+                               'choices': choices,
+                               'split': false,
                        };
+                       if (id === 'split') {
+                               filter.split = true;
+                       } else {
+                               filter.elements.add(id);
+                       }
                        filter.pill = make_filter_pill(filter_div, filterset, filter);
                        filterset.push(filter);
                        pills_div.appendChild(filter.pill);
                } else {
-                       filter.elements.add(id);
+                       if (id === 'split') {
+                               filter.split = true;
+                       } else {
+                               filter.elements.add(id);
+                       }
                        let new_pill = make_filter_pill(filter_div, filterset, filter);
                        pills_div.replaceChild(new_pill, filter.pill);
                        filter.pill = new_pill;
                }
        } else {
-               filter.elements.delete(id);
+               if (id === 'split') {
+                       filter.split = false;
+               } else {
+                       filter.elements.delete(id);
+               }
                if (filter.elements.size === 0) {
                        pills_div.removeChild(filter.pill);
                        inplace_filter(filterset, f => f !== filter);
@@ -1802,6 +1886,14 @@ function checkbox_changed(filter_div, filterset, e, filter_type, id) {
                        filter.pill = new_pill;
                }
        }
+       let choice_split = document.getElementById('choice_split');
+       if (filter.elements.size === 1) {
+               choice_split.nextSibling.style.opacity = 0.2;
+               choice_split.setAttribute('disabled', 'disabled');
+       } else {
+               choice_split.nextSibling.style.opacity = 1.0;
+               choice_split.removeAttribute('disabled');
+       }
 
        process_matches(global_json, global_filters);
 }
@@ -1919,6 +2011,9 @@ function make_filter_pill(filter_div, filterset, filter) {
                        first = false;
                }
        }
+       if (filter.split && filter.elements.size !== 1) {
+               text += ' (split)';
+       }
 
        let text_node = document.createElement('span');
        text_node.innerText = text;