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

Show next year in regattas lists

Browse Source
This commit is contained in:
ostertun
2020-12-07 16:47:24 +01:00
parent 63a8d174d7
commit 44c962b7b3
6 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/scripts/planning.js
View File

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

14
server/scripts/planning_edit.js
View File

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

14
server/scripts/planning_list.js
View File

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

14
server/scripts/planning_view.js
View File

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

32
server/scripts/regattas.js
View File

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