Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Cache if regatta has results

Browse Source
This commit is contained in:
ostertun
2020-10-14 13:37:47 +02:00
parent 3b71f3d707
commit ce42f87227
4 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/scripts/index.js
View File

@@ -273,12 +273,6 @@ var siteScript = async function() {
var maxDate = getToday(); var maxDate = getToday();
maxDate.setDate(maxDate.getDate() - 1); maxDate.setDate(maxDate.getDate() - 1);
var regattas = await dbGetRegattasRange(minDate, maxDate); var regattas = await dbGetRegattasRange(minDate, maxDate);
var regattaResults = [];
for (id in regattas) {
var entry = regattas[id];
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
regattaResults[entry['id']] = (results.length > 0);
}
regattas.sort(function(a,b){ regattas.sort(function(a,b){
return b.date.localeCompare(a.date); return b.date.localeCompare(a.date);
}); });
@@ -323,7 +317,7 @@ var siteScript = async function() {
icons.push('<i class="fas fa-book"></i>'); icons.push('<i class="fas fa-book"></i>');
if (regatta['canceled'] == '1') { if (regatta['canceled'] == '1') {
icons.push('<i class="fas fa-times color-red2-dark"></i>'); icons.push('<i class="fas fa-times color-red2-dark"></i>');
} else if (regattaResults[regatta['id']]) { } else if (regatta['results'] == '1') {
icons.push('<i class="fas fa-poll"></i>'); icons.push('<i class="fas fa-poll"></i>');
} }
list += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>'; list += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>';

3
server/scripts/onRegattaClicked.js
View File

@@ -61,8 +61,7 @@ async function onRegattaClicked(id) {
} }
// Results // Results
var results = await dbGetDataIndex('results', 'regatta', regatta['id']); if (regatta['results'] == '1') {
if (results.length > 0) {
$('#menu-item-results').show(); $('#menu-item-results').show();
$('#menu-item-results').attr('href', LINK_PRE + 'result?regatta=' + regatta['id']); $('#menu-item-results').attr('href', LINK_PRE + 'result?regatta=' + regatta['id']);
} else { } else {

8
server/scripts/planning.js
View File

@@ -137,12 +137,6 @@ var siteScript = async function() {
regattas.splice(i, 1); regattas.splice(i, 1);
} }
} }
var regattaResults = [];
for (id in regattas) {
var entry = regattas[id];
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
regattaResults[entry['id']] = (results.length > 0);
}
var years = await dbGetData('years'); var years = await dbGetData('years');
years.sort(function (a, b) { years.sort(function (a, b) {
@@ -262,7 +256,7 @@ var siteScript = async function() {
icons.push('<i class="fas fa-book"></i>'); icons.push('<i class="fas fa-book"></i>');
if (entry['canceled'] == '1') { if (entry['canceled'] == '1') {
icons.push('<i class="fas fa-times color-red2-dark"></i>'); icons.push('<i class="fas fa-times color-red2-dark"></i>');
} else if (regattaResults[entry['id']]) { } else if (entry['results'] == '1') {
icons.push('<i class="fas fa-poll"></i>'); icons.push('<i class="fas fa-poll"></i>');
} }
if (entry.planning.gemeldet == '1') { if (entry.planning.gemeldet == '1') {

8
server/scripts/regattas.js
View File

@@ -79,12 +79,6 @@ var siteScript = async function() {
var minDate = parseDate($('#input-from').val()); var minDate = parseDate($('#input-from').val());
var maxDate = parseDate($('#input-to').val()); var maxDate = parseDate($('#input-to').val());
var regattas = await dbGetRegattasRange(minDate, maxDate); var regattas = await dbGetRegattasRange(minDate, maxDate);
var regattaResults = [];
for (id in regattas) {
var entry = regattas[id];
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
regattaResults[entry['id']] = (results.length > 0);
}
var selectedYear = $('#select-year').val(); var selectedYear = $('#select-year').val();
@@ -196,7 +190,7 @@ var siteScript = async function() {
icons.push('<i class="fas fa-book"></i>'); icons.push('<i class="fas fa-book"></i>');
if (entry['canceled'] == '1') { if (entry['canceled'] == '1') {
icons.push('<i class="fas fa-times color-red2-dark"></i>'); icons.push('<i class="fas fa-times color-red2-dark"></i>');
} else if (regattaResults[entry['id']]) { } else if (entry['results'] == '1') {
icons.push('<i class="fas fa-poll"></i>'); icons.push('<i class="fas fa-poll"></i>');
} }
row.content += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>'; row.content += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>';