From 7fd361938236c71ac037e4818dce8a9bbf97afa7 Mon Sep 17 00:00:00 2001 From: Claude Brisson Date: Tue, 30 Jan 2024 16:51:38 +0100 Subject: [PATCH] Rank gives rating if not updated manually before --- view-webapp/src/main/webapp/js/tour-pairing.inc.js | 2 -- .../src/main/webapp/js/tour-registration.inc.js | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/view-webapp/src/main/webapp/js/tour-pairing.inc.js b/view-webapp/src/main/webapp/js/tour-pairing.inc.js index ae9b0b9..f362268 100644 --- a/view-webapp/src/main/webapp/js/tour-pairing.inc.js +++ b/view-webapp/src/main/webapp/js/tour-pairing.inc.js @@ -160,12 +160,10 @@ onLoad(()=>{ updatePairable(); }); window.on('unload', e => { - console.log(store('unpairablesScroll')) store('pairablesScroll', $('#pairables')[0].scrollTop); store('unpairablesScroll', $('#unpairables')[0].scrollTop); store('pairedScroll', $('#paired')[0].scrollTop); }); - console.log(store('unpairablesScroll')) setTimeout(() => { if (store.has('pairablesScroll')) $('#pairables')[0].scrollTop = store('pairablesScroll'); if (store.has('unpairablesScroll')) $('#unpairables')[0].scrollTop = store('unpairablesScroll'); diff --git a/view-webapp/src/main/webapp/js/tour-registration.inc.js b/view-webapp/src/main/webapp/js/tour-registration.inc.js index 9961ee6..674c67f 100644 --- a/view-webapp/src/main/webapp/js/tour-registration.inc.js +++ b/view-webapp/src/main/webapp/js/tour-registration.inc.js @@ -3,6 +3,7 @@ let searchTimer = undefined; let resultTemplate; let searchResult; let searchHighlight; +let manualRating; function initSearch() { let needle = $('#needle')[0].value.trim(); @@ -315,6 +316,17 @@ onLoad(() => { else tr.removeClass('hidden'); }); }); + manualRating = ($('#player input[name="rating"]')[0].value !== ''); + $('#player input[name="rating"]').on('input', e=>{ + manualRating = true; + }); + $('#player select[name="rank"]').on('input', e=>{ + let rank = e.target.value; + let ratingCtl = $('#player input[name="rating"]')[0]; + if (!manualRating) { + ratingCtl.value = 2050 + 100 * rank; + } + }); $('#filter-box i').on('click', e => { $('#filter')[0].value = ''; $('tbody > tr').removeClass('hidden'); @@ -329,7 +341,6 @@ onLoad(() => { if (store('macmahonGroups')) { modal('macmahon-groups'); } - // mac mahon groups... $('#under-to-top').on('click', e => { let players = $('#under-group .selected').map(item => (