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

Planning: keep year

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
server/content/planning.php
View File

@@ -6,9 +6,9 @@
// Title // Title
$content = '<h1>Saison-Planung</h1>'; $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 .= '<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']); $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']); $sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-loggedin']);

2
server/content/planning_edit.php
View File

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

2
server/content/planning_list.php
View File

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

2
server/content/planning_view.php
View File

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

7
server/scripts/planning.js
View File

@@ -114,11 +114,14 @@ var siteScript = async function() {
$('#switch-status-bezahlt').parent().parent().click(planningSwitchChanged); $('#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(); today = getToday();
var selectedYear = $('#select-year').val();
var minDate = parseDate(selectedYear + '-01-01'); var minDate = parseDate(selectedYear + '-01-01');
var maxDate = parseDate(selectedYear + '-12-31'); var maxDate = parseDate(selectedYear + '-12-31');
var regattas = await dbGetRegattasRange(minDate, maxDate); var regattas = await dbGetRegattasRange(minDate, maxDate);

2
server/scripts/planning_list.js
View File

@@ -1,7 +1,7 @@
async function onUserClicked(id) { async function onUserClicked(id) {
var user = await dbGetData('users', id); var user = await dbGetData('users', id);
if (user !== null) { 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();
} }
} }

6
server/scripts/planning_view.js
View File

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