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

v_1.11.4h2 no_regattas_on_index

Browse Source
This commit is contained in:
ostertun
2020-12-11 17:27:44 +01:00
parent 053981175b
commit 748176159d
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/scripts/index.js
View File

@@ -145,7 +145,7 @@ var siteScript = async function() {
var planning = planningsDB[i];
for (j in regattas) {
var regatta = regattas[j];
if (regatta.id == planning.regatta) {
if ((regatta.id == planning.regatta) && (regatta.length > 0)) {
planning.regatta = regatta;
plannings.push(planning);
}
@@ -162,8 +162,6 @@ var siteScript = async function() {
var planning = plannings[i];
var regatta = planning.regatta;
if (regatta['length'] < 1) continue;
var club = null;
if (regatta['club'] != null)
club = await dbGetData('clubs', regatta['club']);
@@ -259,13 +257,19 @@ var siteScript = async function() {
var maxDate = getToday();
maxDate.setDate(maxDate.getDate() + 14);
var regattas = await dbGetRegattasRange(minDate, maxDate);
i = 0;
while (i < regattas.length) {
if (regattas.length < 1) {
regattas.splice(i, 1);
} else {
i ++;
}
}
if (regattas.length > 0) {
list = '';
for (i in regattas) {
var regatta = regattas[i];
if (regatta['length'] < 1) continue;
var club = null;
if (regatta['club'] != null)
club = await dbGetData('clubs', regatta['club']);
@@ -365,6 +369,14 @@ var siteScript = async function() {
var maxDate = getToday();
maxDate.setDate(maxDate.getDate() - 1);
var regattas = await dbGetRegattasRange(minDate, maxDate);
i = 0;
while (i < regattas.length) {
if (regattas.length < 1) {
regattas.splice(i, 1);
} else {
i ++;
}
}
regattas.sort(function(a,b){
return b.date.localeCompare(a.date);
});
@@ -373,8 +385,6 @@ var siteScript = async function() {
for (i in regattas) {
var regatta = regattas[i];
if (regatta['length'] < 1) continue;
var club = null;
if (regatta['club'] != null)
club = await dbGetData('clubs', regatta['club']);

2
server/version.php
View File

@@ -1,5 +1,5 @@
<?php
define('PWA_VERSION', '1.11.4h1');
define('PWA_VERSION', '1.11.4h2');
?>