Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da553a8f8d | ||
|
|
32473901d6 | ||
|
|
84320f3a67 | ||
|
|
cd30ba1ce6 | ||
|
|
1fb619d4ec | ||
|
|
0fd09c22a2 | ||
|
|
12ed412226 | ||
|
|
7fd1c1c6e7 | ||
|
|
4e85d3a993 | ||
|
|
a2fe4c2637 |
@@ -124,29 +124,22 @@ $(document).ready(function(){
|
||||
//Adding Background for Gradient
|
||||
if(!$('.menu-hider').length){$('#page').append('<div class="menu-hider"><div>');}
|
||||
|
||||
var menuOpened = function() {
|
||||
log('[tpl] Menu opened', history.state);
|
||||
if ((history.state === null) || (history.state.menu !== 'opened')) {
|
||||
history.pushState({ menu: 'opened' }, '');
|
||||
log('[tpl] state pushed');
|
||||
}
|
||||
}
|
||||
var menuClosed = function() {
|
||||
log('[tpl] Menu closed', history.state);
|
||||
if ((history.state !== null) && (history.state.menu === 'opened')) {
|
||||
history.back();
|
||||
log('[tpl] history.back')
|
||||
}
|
||||
}
|
||||
history.pushState(null, '');
|
||||
log('[tpl] state pushed');
|
||||
|
||||
/*Menu Extender Function*/
|
||||
$.fn.showMenu = function() {$(this).addClass('menu-active'); $('#footer-bar').addClass('footer-menu-hidden');setTimeout(function(){$('.menu-hider').addClass('menu-active');},250);$('body').addClass('modal-open');menuOpened();};
|
||||
$.fn.hideMenu = function() {$(this).removeClass('menu-active'); $('#footer-bar').removeClass('footer-menu-hidden');$('.menu-hider').removeClass('menu-active menu-active-clear');$('body').removeClass('modal-open');menuClosed();};
|
||||
$.fn.showMenu = function() {$(this).addClass('menu-active'); $('#footer-bar').addClass('footer-menu-hidden');setTimeout(function(){$('.menu-hider').addClass('menu-active');},250);$('body').addClass('modal-open');};
|
||||
$.fn.hideMenu = function() {$(this).removeClass('menu-active'); $('#footer-bar').removeClass('footer-menu-hidden');$('.menu-hider').removeClass('menu-active menu-active-clear');$('body').removeClass('modal-open');};
|
||||
|
||||
window.onpopstate = function(event) {
|
||||
log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state));
|
||||
if ((event.state === null) || (event.state.menu !== 'opened')) {
|
||||
var menuOpened = $('body').hasClass('modal-open');
|
||||
log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state) + ', menuOpened:' + menuOpened);
|
||||
if (menuOpened) {
|
||||
$('.menu').hideMenu();
|
||||
log('Menu hidden');
|
||||
} else {
|
||||
log('history.back');
|
||||
history.back();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -209,7 +202,6 @@ $(document).ready(function(){
|
||||
if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX(-100%)");}
|
||||
}
|
||||
menuActivate();
|
||||
menuOpened();
|
||||
});
|
||||
|
||||
//Allows clicking even if menu is loaded externally.
|
||||
@@ -221,7 +213,6 @@ $(document).ready(function(){
|
||||
menuHider.css('transform','translate(0,0)');
|
||||
$('#footer-bar').removeClass('footer-menu-hidden');
|
||||
$('body').removeClass('modal-open');
|
||||
menuClosed();
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
@@ -566,6 +566,30 @@ var onAfterSync = function() {
|
||||
updateNewsBadge();
|
||||
}
|
||||
|
||||
function sendErrorReport() {
|
||||
alert('FEHLERBERICHT\nEs wird jetzt ein Fehlerbericht an die Entwickler geschickt.\nBitte stelle sicher, dass Du mit dem Internet verbunden bist und drücke dann auf OK.');
|
||||
$.ajax({
|
||||
url: QUERY_URL + 'error_report',
|
||||
method: 'POST',
|
||||
data: {
|
||||
errors: consoleOutput,
|
||||
device: navigator.userAgent,
|
||||
version: '<?php echo PWA_VERSION; ?>'
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 0) {
|
||||
alert('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Fehlerbericht zu senden');
|
||||
} else {
|
||||
alert('Beim Senden ist ein unbekannter Fehler aufgetreten. Bitte versuche es noch einmal');
|
||||
}
|
||||
},
|
||||
success: function (data, status, xhr) {
|
||||
alert('Wir leiten Dich jetzt zum erstellten Fehlerbericht um, sodass Du ggf. weitere Informationen ergänzen kannst.');
|
||||
location.href = 'https://github.com/ostertun/RegattenApp/issues/' + data.issueNumber;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add console opener to preloader
|
||||
var addConsoleOpenerToPreloader = function() {
|
||||
addConsoleOpenerToPreloader = function(){};
|
||||
@@ -580,30 +604,34 @@ var addConsoleOpenerToPreloader = function() {
|
||||
button.style.right = 0;
|
||||
button.innerHTML = 'Fehlerbericht senden';
|
||||
button.onclick = function(){
|
||||
alert('FEHLERBERICHT\nEs wird jetzt ein Fehlerbericht an die Entwickler geschickt.\nBitte stelle sicher, dass Du mit dem Internet verbunden bist und drücke dann auf OK.');
|
||||
$.ajax({
|
||||
url: QUERY_URL + 'error_report',
|
||||
method: 'POST',
|
||||
data: {
|
||||
errors: consoleOutput,
|
||||
device: navigator.userAgent,
|
||||
version: '<?php echo PWA_VERSION; ?>'
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 0) {
|
||||
alert('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Fehlerbericht zu senden');
|
||||
} else {
|
||||
alert('Beim Senden ist ein unbekannter Fehler aufgetreten. Bitte versuche es noch einmal');
|
||||
}
|
||||
},
|
||||
success: function (data, status, xhr) {
|
||||
alert('Wir leiten Dich jetzt zum erstellten Fehlerbericht um, sodass Du ggf. weitere Informationen ergänzen kannst.');
|
||||
location.href = 'https://github.com/ostertun/RegattenApp/issues/' + data.issueNumber;
|
||||
}
|
||||
});
|
||||
sendErrorReport();
|
||||
return false;
|
||||
}
|
||||
preloader.appendChild(button);
|
||||
$(button).hide();
|
||||
}
|
||||
addConsoleOpenerToPreloader();
|
||||
|
||||
function m2s_getLink(type, eventId) {
|
||||
switch (type) {
|
||||
case 'entrylist':
|
||||
return 'https://manage2sail.com/de-DE/event/' + eventId + '#!/entries';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
function ro_getLink(type, eventId) {
|
||||
switch (type) {
|
||||
case 'entrylist':
|
||||
return 'http://www.raceoffice.org/entrylist.php?eid=' + eventId;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
function extServiceGetLink(serviceName, type, eventId = '') {
|
||||
switch (serviceName) {
|
||||
case 'm2s':
|
||||
return m2s_getLink(type, eventId);
|
||||
case 'ro':
|
||||
return ro_getLink(type, eventId);
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -82,7 +82,8 @@
|
||||
// Regattas Menu
|
||||
$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Ergebnisse', '', 'html-id' => 'menu-item-results', 'icon' => 'fa-poll']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Bericht', '', 'html-id' => 'menu-item-bericht', 'icon' => 'fa-book']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
// Title
|
||||
$content = '<h1>Saison-Planung</h1>';
|
||||
$content .= $tpl->load('button', ['<i class="fas fa-list"></i> Saison-Planungen anderer', LINK_PRE . 'planning_list', 'css-class' => 'mt-2 mb-2']);
|
||||
$content .= $tpl->load('button', ['<i class="fas fa-list"></i> 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> bearbeiten', LINK_PRE . 'planning_edit']);
|
||||
$content .= $tpl->load('button', ['<i class="fas fa-edit"></i> 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']);
|
||||
@@ -30,7 +30,8 @@
|
||||
$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= $tpl->load('menu/item-icon', ['Status bearbeiten', '#', 'html-id' => 'menu-item-status', 'icon' => 'fa-edit']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Ergebnisse', '', 'html-id' => 'menu-item-results', 'icon' => 'fa-poll']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Bericht', '', 'html-id' => 'menu-item-bericht', 'icon' => 'fa-book']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
$sp['title'] = 'Saison-Planungen - Regatten.net ' . $_CLASS['name'];
|
||||
$sp['backbutton'] = 'planning';
|
||||
$sp['backbutton'] = true;
|
||||
$sp['activenav'] = 5;
|
||||
|
||||
// Title
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
$sp['title'] = 'Saison-Planung - Regatten.net ' . $_CLASS['name'];
|
||||
$sp['backbutton'] = 'planning_list';
|
||||
$sp['backbutton'] = true;
|
||||
$sp['activenav'] = 5;
|
||||
|
||||
// Title
|
||||
@@ -22,7 +22,8 @@
|
||||
// Menu
|
||||
$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Ergebnisse', '', 'html-id' => 'menu-item-results', 'icon' => 'fa-poll']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Bericht', '', 'html-id' => 'menu-item-bericht', 'icon' => 'fa-book']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
// Menu
|
||||
$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
|
||||
$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
|
||||
$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Ergebnisse', '', 'html-id' => 'menu-item-results', 'icon' => 'fa-poll']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Bericht', '', 'html-id' => 'menu-item-bericht', 'icon' => 'fa-book']);
|
||||
$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
|
||||
|
||||
@@ -211,7 +211,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="360">
|
||||
<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="400">
|
||||
<div class="menu-title"><h1>Entwickler-Optionen</h1><p class="color-highlight">Version <?php echo PWA_VERSION; ?></p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
|
||||
<div class="divider divider-margins mb-n2"></div>
|
||||
<div class="content">
|
||||
@@ -231,11 +231,16 @@
|
||||
<span>Reset Cache</span>
|
||||
<i class="fa fa-angle-right"></i>
|
||||
</a>
|
||||
<a href="https://github.com/ostertun/RegattenApp/issues">
|
||||
<a href="https://github.com/ostertun/RegattenApp/issues/new">
|
||||
<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
|
||||
<span>Problem melden</span>
|
||||
<i class="fa fa-angle-right"></i>
|
||||
</a>
|
||||
<a href="#" onclick="sendErrorReport(); return false;" class="menu-close">
|
||||
<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
|
||||
<span>Fehlerbericht senden</span>
|
||||
<i class="fa fa-angle-right"></i>
|
||||
</a>
|
||||
<a href="#" onclick="mobileConsole.displayConsole(); return false;" class="border-0 menu-close">
|
||||
<i class="fa font-14 fa-terminal rounded-s bg-highlight color-white"></i>
|
||||
<span>Console anzeigen</span>
|
||||
|
||||
@@ -68,12 +68,28 @@ async function onRegattaClicked(id) {
|
||||
|
||||
// Planning
|
||||
if ((plannings.length > 0) && (dateTo >= today)) {
|
||||
$('#menu-item-plannings').show();
|
||||
$('#badge-regatta-plannings').text(plannings.length);
|
||||
$('#menu-item-plannings').attr('href', LINK_PRE + 'regatta_plan?regatta=' + regatta['id']);
|
||||
$('#menu-item-plannings').show();
|
||||
} else {
|
||||
$('#menu-item-plannings').hide();
|
||||
}
|
||||
|
||||
// Entrylist
|
||||
var extServiceData;
|
||||
try {
|
||||
extServiceData = JSON.parse(regatta.extServiceData);
|
||||
} catch {
|
||||
extServiceData = {};
|
||||
}
|
||||
if ((regatta.extService !== null) && ('entryCount' in extServiceData)) {
|
||||
$('#badge-regatta-entrylist').text(extServiceData.entryCount);
|
||||
$('#menu-item-entrylist').attr('href', extServiceGetLink(regatta.extService, 'entrylist', extServiceData.eventId)); // TODO
|
||||
$('#menu-item-entrylist').show();
|
||||
} else {
|
||||
$('#menu-item-entrylist').hide();
|
||||
}
|
||||
|
||||
// Results
|
||||
if (regatta['results'] == '1') {
|
||||
$('#menu-item-results').show();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -69,6 +69,8 @@ async function planningSwitchChanged() {
|
||||
|
||||
var sailorIsSteuermann;
|
||||
var sailors = [];
|
||||
var knownIds = [];
|
||||
var known = [];
|
||||
|
||||
async function sailorSelected(sid) {
|
||||
$('#menu-sailor').hideMenu();
|
||||
@@ -103,8 +105,12 @@ async function sailorSelected(sid) {
|
||||
},
|
||||
success: async function (data, status, xhr) {
|
||||
await sync();
|
||||
planningEdit(rid);
|
||||
hideLoader();
|
||||
if ((sid === null) || (sid in knownIds)) {
|
||||
planningEdit(rid);
|
||||
hideLoader();
|
||||
} else {
|
||||
location.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -118,6 +124,11 @@ async function sailorsSearch() {
|
||||
item += '</a>';
|
||||
$('#menu-sailor').find('.content').find('.list-group').append(item);
|
||||
}
|
||||
if ($('#input-edit-search').val().length == 0) {
|
||||
known.forEach(function (entry) {
|
||||
$('#menu-sailor').find('.content').find('.list-group').append(entry);
|
||||
});
|
||||
}
|
||||
if ($('#input-edit-search').val().length >= 3) {
|
||||
sailors.forEach(function (entry) {
|
||||
if (search($('#input-edit-search').val(), entry.keywords)) {
|
||||
@@ -125,18 +136,30 @@ async function sailorsSearch() {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
var item = '<p class="item-sailor-search">Gib mindestens 3 Zeichen ein</p>';
|
||||
var item = '<p class="item-sailor-search">Zum Suchen mindestens 3 Zeichen eingeben</p>';
|
||||
$('#menu-sailor').find('.content').find('.list-group').append(item);
|
||||
}
|
||||
}
|
||||
|
||||
async function initSailors() {
|
||||
sailors = [];
|
||||
known = [];
|
||||
var plannings = await dbGetDataIndex('plannings', 'user', USER_ID);
|
||||
knownIds = {};
|
||||
for (var p in plannings) {
|
||||
p = plannings[p];
|
||||
if (p.steuermann !== null) knownIds[p.steuermann] = true;
|
||||
var crew = p.crew.split(',');
|
||||
for (var c in crew) {
|
||||
c = crew[c];
|
||||
if (c != '') knownIds[c] = true;
|
||||
}
|
||||
}
|
||||
var dbSailors = await dbGetData('sailors');
|
||||
dbSailors.sort(function(a,b){
|
||||
return a.name.localeCompare(b.name);
|
||||
});
|
||||
for (s in dbSailors) {
|
||||
for (var s in dbSailors) {
|
||||
var item = '<a class="item-sailor-search" onclick="sailorSelected(' + dbSailors[s].id + ')">';
|
||||
item += '<span>' + dbSailors[s].name + '</span>';
|
||||
item += '<i class="fa fa-angle-right"></i>';
|
||||
@@ -145,6 +168,7 @@ async function initSailors() {
|
||||
keywords: [dbSailors[s].name],
|
||||
content: item
|
||||
});
|
||||
if (dbSailors[s].id in knownIds) known.push(item);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
|
||||
define('PWA_VERSION', '1.11.2');
|
||||
define('PWA_VERSION', '1.11.3');
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user