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

7
server/scripts/planning.js
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);

2
server/scripts/planning_list.js
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();
}
}

6
server/scripts/planning_view.js
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);