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

Merge branch 'release/V_1.11.4'

Browse Source
This commit is contained in:
ostertun
2020-12-07 16:48:32 +01:00
parent 004280f3ea 08ab714a54
commit 6699498432
7 changed files with 82 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/scripts/database.js
View File

@@ -397,6 +397,33 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
}); });
} }
function dbGetCurrentYear() {
return new Promise(async function (resolve) {
var date = new Date();
var year = date.getFullYear();
if (date.getMonth() == 11) {
year ++; // In DECEMBER show next year
} else {
// if there are no more regattas until end of the year, show next year
var regattas = dbGetRegattasRange(parseDate(date.getDate() + '.' + (date.getMonth() + 1) + '.' + year), parseDate('31.12.' + year));
if (regattas.length == 0) {
year ++;
}
}
var years = await dbGetData('years');
years.sort(function (a, b) {
if (a['year'] > b['year']) return -1;
if (a['year'] < b['year']) return 1;
return 0;
});
for (id in years) {
if (years[id].year < year) year = years[id].year;
if (years[id].year == year) break;
}
resolve(year);
});
}
function dbSettingsGet(key) { function dbSettingsGet(key) {
return new Promise(function(resolve) { return new Promise(function(resolve) {
if (canUseLocalDB) { if (canUseLocalDB) {

14
server/scripts/planning.js
View File

@@ -74,11 +74,15 @@ function selectChange() {
} }
function initYear() { function initYear() {
var year = findGetParameter('year'); return new Promise(async function (resolve) {
if (year === null) year = new Date().getFullYear(); var year = findGetParameter('year');
if (year === null) year = await dbGetCurrentYear();
$('#select-year').html('<option value="' + year + '">' + year + '</option>'); $('#select-year').html('<option value="' + year + '">' + year + '</option>');
$('#select-year').val(year); $('#select-year').val(year);
resolve();
});
} }
var firstCall = true; var firstCall = true;
@@ -107,7 +111,7 @@ var siteScript = async function() {
if (firstCall) { if (firstCall) {
firstCall = false; firstCall = false;
initYear(); await initYear();
$('#select-year').change(selectChange); $('#select-year').change(selectChange);
$('#input-search').on('input', drawList); $('#input-search').on('input', drawList);
$('#switch-status-gemeldet').parent().parent().click(planningSwitchChanged); $('#switch-status-gemeldet').parent().parent().click(planningSwitchChanged);

14
server/scripts/planning_edit.js
View File

@@ -291,11 +291,15 @@ function selectChange() {
} }
function initYear() { function initYear() {
var year = findGetParameter('year'); return new Promise(async function (resolve) {
if (year === null) year = new Date().getFullYear(); var year = findGetParameter('year');
if (year === null) year = await dbGetCurrentYear();
$('#select-year').html('<option value="' + year + '">' + year + '</option>'); $('#select-year').html('<option value="' + year + '">' + year + '</option>');
$('#select-year').val(year); $('#select-year').val(year);
resolve();
});
} }
var firstCall = true; var firstCall = true;
@@ -324,7 +328,7 @@ var siteScript = async function() {
if (firstCall) { if (firstCall) {
firstCall = false; firstCall = false;
initYear(); await initYear();
$('#select-year').change(selectChange); $('#select-year').change(selectChange);
$('#input-search').on('input', drawList); $('#input-search').on('input', drawList);
$('#switch-planning-include').parent().parent().click(planningSwitchChanged); $('#switch-planning-include').parent().parent().click(planningSwitchChanged);

14
server/scripts/planning_list.js
View File

@@ -16,11 +16,15 @@ function selectChange() {
} }
function initYear() { function initYear() {
var year = findGetParameter('year'); return new Promise(async function (resolve) {
if (year === null) year = new Date().getFullYear(); var year = findGetParameter('year');
if (year === null) year = await dbGetCurrentYear();
$('#select-year').html('<option value="' + year + '">' + year + '</option>'); $('#select-year').html('<option value="' + year + '">' + year + '</option>');
$('#select-year').val(year); $('#select-year').val(year);
resolve();
});
} }
var firstCall = true; var firstCall = true;
@@ -47,7 +51,7 @@ var siteScript = async function() {
if (firstCall) { if (firstCall) {
firstCall = false; firstCall = false;
initYear(); await initYear();
$('#select-year').change(selectChange); $('#select-year').change(selectChange);
$('#input-search').on('input', drawList); $('#input-search').on('input', drawList);
} }

14
server/scripts/planning_view.js
View File

@@ -11,11 +11,15 @@ function selectChange() {
} }
function initYear() { function initYear() {
var year = findGetParameter('year'); return new Promise(async function (resolve) {
if (year === null) year = new Date().getFullYear(); var year = findGetParameter('year');
if (year === null) year = await dbGetCurrentYear();
$('#select-year').html('<option value="' + year + '">' + year + '</option>'); $('#select-year').html('<option value="' + year + '">' + year + '</option>');
$('#select-year').val(year); $('#select-year').val(year);
resolve();
});
} }
var firstCall = true; var firstCall = true;
@@ -60,7 +64,7 @@ var siteScript = async function() {
if (firstCall) { if (firstCall) {
firstCall = false; firstCall = false;
initYear(); await initYear();
$('#select-year').change(selectChange); $('#select-year').change(selectChange);
$('#input-search').on('input', drawList); $('#input-search').on('input', drawList);
} }

32
server/scripts/regattas.js
View File

@@ -29,22 +29,26 @@ function buttonShowPressed() {
} }
function initYear() { function initYear() {
var year = findGetParameter('year'); return new Promise(async function (resolve) {
if (year === null) year = new Date().getFullYear(); var year = findGetParameter('year');
if (year === null) year = await dbGetCurrentYear();
$('#select-year').html('<option value="' + year + '">' + year + '</option>'); $('#select-year').html('<option value="' + year + '">' + year + '</option>');
$('#select-year').val(year); $('#select-year').val(year);
if (year == "user") { if (year == "user") {
var from = findGetParameter('from'); var from = findGetParameter('from');
var to = findGetParameter('to'); var to = findGetParameter('to');
if (from === null) from = formatDate('Y-m-d') if (from === null) from = formatDate('Y-m-d')
if (to === null) to = formatDate('Y-m-d') if (to === null) to = formatDate('Y-m-d')
$('#input-from').val(from).trigger('focusin').trigger('focusout'); $('#input-from').val(from).trigger('focusin').trigger('focusout');
$('#input-to').val(to).trigger('focusin').trigger('focusout'); $('#input-to').val(to).trigger('focusin').trigger('focusout');
} }
selectChange(false); selectChange(false);
resolve();
});
} }
var firstCall = true; var firstCall = true;
@@ -68,7 +72,7 @@ async function drawList () {
var siteScript = async function() { var siteScript = async function() {
if (firstCall) { if (firstCall) {
firstCall = false; firstCall = false;
initYear(); await initYear();
$('#select-year').change(selectChange); $('#select-year').change(selectChange);
$('#button-show').click(buttonShowPressed); $('#button-show').click(buttonShowPressed);
$('#input-search').on('input', drawList); $('#input-search').on('input', drawList);

2
server/version.php
View File

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