Planning: keep year

This commit is contained in:
ostertun
2020-11-01 16:38:06 +01:00
parent 0fd09c22a2
commit 1fb619d4ec
7 changed files with 15 additions and 10 deletions

View File

@@ -6,9 +6,9 @@
// Title
$content = '<h1>Saison-Planung</h1>';
$content .= $tpl->load('button', ['<i class="fas fa-list"></i>&ensp;Saison-Planungen anderer', LINK_PRE . 'planning_list', 'css-class' => 'mt-2 mb-2']);
$content .= $tpl->load('button', ['<i class="fas fa-list"></i>&ensp;Saison-Planungen anderer', 'html-id' => 'a-list-plannings', 'css-class' => 'mt-2 mb-2']);
$content .= '<p class="mb-1"><b>Hinweis:</b> Diese Seite kannst nur Du sehen.<br>Wenn Du Deine Saison-Planung teilen möchtest, <a id="a-share-planning">klicke hier</a></p>';
$content .= $tpl->load('button', ['<i class="fas fa-edit"></i>&ensp;bearbeiten', LINK_PRE . 'planning_edit']);
$content .= $tpl->load('button', ['<i class="fas fa-edit"></i>&ensp;bearbeiten', 'html-id' => 'a-edit-planning']);
$content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']);
$sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-loggedin']);

View File

@@ -1,7 +1,7 @@
<?php
$sp['title'] = 'Saison-Planung bearbeiten - Regatten.net ' . $_CLASS['name'];
$sp['backbutton'] = 'planning';
$sp['backbutton'] = true;
$sp['activenav'] = 5;
// Title, Inputs

View File

@@ -1,7 +1,7 @@
<?php
$sp['title'] = 'Saison-Planungen - Regatten.net ' . $_CLASS['name'];
$sp['backbutton'] = 'planning';
$sp['backbutton'] = true;
$sp['activenav'] = 5;
// Title

View File

@@ -1,7 +1,7 @@
<?php
$sp['title'] = 'Saison-Planung - Regatten.net ' . $_CLASS['name'];
$sp['backbutton'] = 'planning_list';
$sp['backbutton'] = true;
$sp['activenav'] = 5;
// Title

View File

@@ -114,11 +114,14 @@ var siteScript = async function() {
$('#switch-status-bezahlt').parent().parent().click(planningSwitchChanged);
}
$('#a-share-planning').attr('href', LINK_PRE + 'planning_view?user=' + USER_ID);
var selectedYear = $('#select-year').val();
$('#a-share-planning').attr('href', LINK_PRE + 'planning_view?user=' + USER_ID + '&year=' + selectedYear);
$('#a-edit-planning').attr('href', LINK_PRE + 'planning_edit?year=' + selectedYear);
$('#a-list-plannings').attr('href', LINK_PRE + 'planning_list?year=' + selectedYear);
today = getToday();
var selectedYear = $('#select-year').val();
var minDate = parseDate(selectedYear + '-01-01');
var maxDate = parseDate(selectedYear + '-12-31');
var regattas = await dbGetRegattasRange(minDate, maxDate);

View File

@@ -1,7 +1,7 @@
async function onUserClicked(id) {
var user = await dbGetData('users', id);
if (user !== null) {
location.href = LINK_PRE + 'planning_view?user=' + user.id;
location.href = LINK_PRE + 'planning_view?user=' + user.id + '&year=' + $('#select-year').val();
}
}

View File

@@ -1,8 +1,10 @@
var userid;
function selectChange() {
var val = $('#select-year').val();
if (typeof siteScript === 'function') {
history.replaceState(null, '', '?year=' + val);
history.replaceState(null, '', '?user=' + userid + '&year=' + val);
showLoader();
siteScript();
}
@@ -35,7 +37,7 @@ async function drawList () {
}
var siteScript = async function() {
var userid = findGetParameter('user');
userid = findGetParameter('user');
var user = null;
if (userid !== null) {
user = await dbGetData('users', userid);