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

Fix: wrong revision on content files / Blinking Icon in regattas list

Browse Source
This commit is contained in:
Timon Ostertun
2020-09-23 22:53:33 +02:00
parent b9a9cf6cf8
commit 062a7336ac
6 changed files with 66 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/scripts/regattas.js
View File

@@ -32,29 +32,21 @@ var rows = [];
var today;
async function drawTable () {
//setLoading(true, 'loading');
window.setTimeout(function () {
var list = '';
rows.forEach(function (entry) {
if (entry == null) {
list += '<div><div align="center" class="color-highlight"><b>Heute ist der ' + formatDate('d.m.Y', today) + '</b></div></div>';
//tbody += '<tr><td colspan="' + heuteLen + '" class="bg-highlight color-white">';
//tbody += 'Heute ist der ' + formatDate('d.m.Y', today);
//tbody += '</td></tr>';
} else if (search($('#input-search').val(), entry.keywords)) {
list += entry.content;
}
});
$('#div-regattas').html(list);
//setLoading(false, 'loading');
}, 0);
}
async function regattaClicked(id) {
var regatta = await dbGetData('regattas', id);
console.log(regatta);
$('#menu-regatta').find('.menu-title').find('p').text(regatta.name);
@@ -277,10 +269,32 @@ var siteScript = async function() {
if ((entry['meldung'] != '') && (dateTo >= today) && (entry['meldungOffen'] == '1')) {
var color = '';
if (entry['meldungSchluss'] != null) {
var ms = parseDate(entry['meldungSchluss']);
var diff = Math.round((ms - today) / 86400000);
if ((ms >= today) && (diff < 7))
color = ' color-red2-dark';
var planning = null;
if (isLoggedIn()) {
var plannings = await dbGetDataIndex('plannings', 'regatta', entry['id']);
for (id in plannings) {
if (plannings[id]['user'] == USER_ID) {
planning = plannings[id];
break;
}
}
}
if ((planning == null) || (planning['gemeldet'] == '0')) {
var ms = 0;
if (entry['meldungEarly'] != null) {
ms = parseDate(entry['meldungEarly']);
}
if (ms < today) {
ms = parseDate(entry['meldungSchluss']);
}
var diff = Math.round((ms - today) / 86400000);
if ((ms >= today) && (diff < 7)) {
color = ' color-red2-dark';
if (planning != null) {
color += ' fa-blink';
}
}
}
}
icons.push('<i class="fas fa-file-signature' + color + '"></i>');
}