From 1fb619d4ecc5fc7976531deac367c6e0ccc2a5e8 Mon Sep 17 00:00:00 2001
From: ostertun <github@ostertun.net>
Date: Sun, 1 Nov 2020 16:38:06 +0100
Subject: [PATCH] Planning: keep year

---
 server/content/planning.php      | 4 ++--
 server/content/planning_edit.php | 2 +-
 server/content/planning_list.php | 2 +-
 server/content/planning_view.php | 2 +-
 server/scripts/planning.js       | 7 +++++--
 server/scripts/planning_list.js  | 2 +-
 server/scripts/planning_view.js  | 6 ++++--
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/server/content/planning.php b/server/content/planning.php
index 0e5703f..8a62b93 100644
--- a/server/content/planning.php
+++ b/server/content/planning.php
@@ -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']);
diff --git a/server/content/planning_edit.php b/server/content/planning_edit.php
index 4ef708c..d816ed4 100644
--- a/server/content/planning_edit.php
+++ b/server/content/planning_edit.php
@@ -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
diff --git a/server/content/planning_list.php b/server/content/planning_list.php
index 4b814ba..358423d 100644
--- a/server/content/planning_list.php
+++ b/server/content/planning_list.php
@@ -1,7 +1,7 @@
 <?php
 
 	$sp['title'] = 'Saison-Planungen - Regatten.net ' . $_CLASS['name'];
-	$sp['backbutton'] = 'planning';
+	$sp['backbutton'] = true;
 	$sp['activenav'] = 5;
 
 	// Title
diff --git a/server/content/planning_view.php b/server/content/planning_view.php
index 8bb60d2..0c00e6b 100644
--- a/server/content/planning_view.php
+++ b/server/content/planning_view.php
@@ -1,7 +1,7 @@
 <?php
 
 	$sp['title'] = 'Saison-Planung - Regatten.net ' . $_CLASS['name'];
-	$sp['backbutton'] = 'planning_list';
+	$sp['backbutton'] = true;
 	$sp['activenav'] = 5;
 
 	// Title
diff --git a/server/scripts/planning.js b/server/scripts/planning.js
index c434b0d..6b8b155 100644
--- a/server/scripts/planning.js
+++ b/server/scripts/planning.js
@@ -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);
diff --git a/server/scripts/planning_list.js b/server/scripts/planning_list.js
index bfdd92a..afb7577 100644
--- a/server/scripts/planning_list.js
+++ b/server/scripts/planning_list.js
@@ -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();
 	}
 }
 
diff --git a/server/scripts/planning_view.js b/server/scripts/planning_view.js
index 7043b26..fe21f5f 100644
--- a/server/scripts/planning_view.js
+++ b/server/scripts/planning_view.js
@@ -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);