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

Merge branch 'release/v_1.11.5'

Browse Source
This commit is contained in:
ostertun
2020-12-24 11:08:35 +01:00
parent 8aa3e3ccb6 c983a1702f
commit 4dfa2d7bd5
10 changed files with 160 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/scripts/custom.js.php
View File

@@ -223,7 +223,7 @@ $(document).ready(function(){
//Disabling & Enabling Dark Transitions in Dark Mode to Speed up Performance. //Disabling & Enabling Dark Transitions in Dark Mode to Speed up Performance.
function allowTransitions(){$('body').find('#transitions-remove').remove();} function allowTransitions(){$('body').find('#transitions-remove').remove();}
function removeTransitions(){$('body').append('<style id="transitions-remove">.btn, .header, #footer-bar, .menu-box, .menu-active{transition:all 0ms ease!important;}</style>'); setTimeout(function(){allowTransitions();},10);} function removeTransitions(){$('body').append('<style id="transitions-remove">.btn, .header, #footer-bar, .menu-box, .menu-active{transition:all 0ms ease!important;}</style>'); setTimeout(function(){allowTransitions();},10);}
/* DARK MODE DISABLED
//Dark Mode //Dark Mode
var darkSwitch = $('[data-toggle-theme-switch], [data-toggle-theme], [data-toggle-theme-switch] input, [data-toggle-theme] input'); var darkSwitch = $('[data-toggle-theme-switch], [data-toggle-theme], [data-toggle-theme-switch] input, [data-toggle-theme] input');
$('[data-toggle-theme], [data-toggle-theme-switch]').on('click',function(){ $('[data-toggle-theme], [data-toggle-theme-switch]').on('click',function(){
@@ -265,10 +265,6 @@ $(document).ready(function(){
if($('body').hasClass('detect-theme')){setColorScheme();} if($('body').hasClass('detect-theme')){setColorScheme();}
$('.detect-dark-mode').on('click',function(){ $('body').addClass('detect-theme'); setColorScheme(); return false;}); $('.detect-dark-mode').on('click',function(){ $('body').addClass('detect-theme'); setColorScheme(); return false;});
$('.disable-auto-dark-mode').on('click',function(){ $('body').removeClass('detect-theme'); $(this).remove(); return false;}); $('.disable-auto-dark-mode').on('click',function(){ $('body').removeClass('detect-theme'); $(this).remove(); return false;});
*/
eraseCookie('sticky_light_mode');
eraseCookie('sticky_dark_mode');
// END
log('[tpl] init other ui elements'); log('[tpl] init other ui elements');

4
server/page/menus.php
View File

@@ -92,12 +92,11 @@
</div> </div>
</div> </div>
<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="260"> <div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="310">
<div class="menu-title"><h1>Einstellungen</h1><p class="color-highlight">&nbsp;</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div> <div class="menu-title"><h1>Einstellungen</h1><p class="color-highlight">&nbsp;</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
<div class="divider divider-margins mb-n2"></div> <div class="divider divider-margins mb-n2"></div>
<div class="content"> <div class="content">
<div class="list-group list-custom-small"> <div class="list-group list-custom-small">
<?php if (false) { /* DARK MODE DISABLED (set menu height to 310) */ ?>
<a href="#" data-toggle-theme data-trigger-switch="switch-dark" class="pb-2"> <a href="#" data-toggle-theme data-trigger-switch="switch-dark" class="pb-2">
<i class="fa font-14 fa-moon rounded-s bg-dark1-dark color-white"></i> <i class="fa font-14 fa-moon rounded-s bg-dark1-dark color-white"></i>
<span>Dark Mode</span> <span>Dark Mode</span>
@@ -106,7 +105,6 @@
<label class="custom-control-label" for="switch-dark"></label> <label class="custom-control-label" for="switch-dark"></label>
</div> </div>
</a> </a>
<?php } ?>
<a href="#" data-menu="menu-login" class="show-notloggedin"> <a href="#" data-menu="menu-login" class="show-notloggedin">
<i class="fa font-14 fa-sign-in-alt rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-sign-in-alt rounded-s bg-highlight color-white"></i>
<span>Login</span> <span>Login</span>

2
server/page/wrapper.php
View File

@@ -18,7 +18,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="<?php echo SERVER_ADDR; ?>/client/app/icons/icon-192x192.png"> <link rel="apple-touch-icon" sizes="180x180" href="<?php echo SERVER_ADDR; ?>/client/app/icons/icon-192x192.png">
</head> </head>
<body class="theme-light" data-background="none" data-highlight="blue2"><?php /* DARK MODE DISABLED: set class to "detect-theme" */ ?> <body class="detect-theme" data-background="none" data-highlight="blue2">
<div id="preloader"><div class="spinner-border color-highlight" role="status"></div></div> <div id="preloader"><div class="spinner-border color-highlight" role="status"></div></div>

55
server/scripts/index.js
View File

@@ -189,6 +189,23 @@ var siteScript = async function() {
if (regatta.special.substr(0, 1) == '#') { if (regatta.special.substr(0, 1) == '#') {
regatta.special = '* ' + regatta.special.substr(1); regatta.special = '* ' + regatta.special.substr(1);
} }
// replace placeholders
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', value);
}
list += '<div>' + regatta['special'] + '</div>'; list += '<div>' + regatta['special'] + '</div>';
// Icons // Icons
@@ -259,7 +276,7 @@ var siteScript = async function() {
var regattas = await dbGetRegattasRange(minDate, maxDate); var regattas = await dbGetRegattasRange(minDate, maxDate);
i = 0; i = 0;
while (i < regattas.length) { while (i < regattas.length) {
if (regattas.length < 1) { if (regattas[i].length < 1) {
regattas.splice(i, 1); regattas.splice(i, 1);
} else { } else {
i ++; i ++;
@@ -297,6 +314,23 @@ var siteScript = async function() {
if (regatta.special.substr(0, 1) == '#') { if (regatta.special.substr(0, 1) == '#') {
regatta.special = '* ' + regatta.special.substr(1); regatta.special = '* ' + regatta.special.substr(1);
} }
// replace placeholders
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', value);
}
list += '<div>' + regatta['special'] + '</div>'; list += '<div>' + regatta['special'] + '</div>';
// Icons // Icons
@@ -371,7 +405,7 @@ var siteScript = async function() {
var regattas = await dbGetRegattasRange(minDate, maxDate); var regattas = await dbGetRegattasRange(minDate, maxDate);
i = 0; i = 0;
while (i < regattas.length) { while (i < regattas.length) {
if (regattas.length < 1) { if (regattas[i].length < 1) {
regattas.splice(i, 1); regattas.splice(i, 1);
} else { } else {
i ++; i ++;
@@ -412,6 +446,23 @@ var siteScript = async function() {
if (regatta.special.substr(0, 1) == '#') { if (regatta.special.substr(0, 1) == '#') {
regatta.special = '* ' + regatta.special.substr(1); regatta.special = '* ' + regatta.special.substr(1);
} }
// replace placeholders
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', value);
}
list += '<div>' + regatta['special'] + '</div>'; list += '<div>' + regatta['special'] + '</div>';
// Icons // Icons

29
server/scripts/onRegattaClicked.js
View File

@@ -6,15 +6,38 @@ async function onRegattaClicked(id) {
var dateTo = parseDate(regatta['date']); var dateTo = parseDate(regatta['date']);
dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta['length']) - 1, 0)); dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta['length']) - 1, 0));
var text = [];
var specialFields = await dbGetClassProp('special-fields'); var specialFields = await dbGetClassProp('special-fields');
if (specialFields === null) specialFields = {}; if (specialFields === null) specialFields = {};
if (regatta.special.substr(0, 1) == '#') { if (regatta.special.substr(0, 1) == '#') {
regatta.special = regatta.special.substr(1); regatta.special = regatta.special.substr(1);
if (typeof specialFields[regatta.special] !== 'undefined') { if (typeof specialFields[regatta.special] !== 'undefined') {
$('#menu-item-special').text(specialFields[regatta.special]); text.push(specialFields[regatta.special]);
} else {
$('#menu-item-special').text('ERROR');
} }
}
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
var year = parseDate(regatta.date).getFullYear();
year = year - value + 1;
text.push('Jahrgänge ' + year + ' und jünger');
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', '');
}
if (text.length > 0) {
text.sort();
for (i in text) {
text[i] = $('<div />').text(text[i]).html();
}
$('#menu-item-special').html(text.join('<br>'));
$('#menu-item-special').show(); $('#menu-item-special').show();
} else { } else {
$('#menu-item-special').hide(); $('#menu-item-special').hide();

17
server/scripts/planning.js
View File

@@ -224,6 +224,23 @@ var siteScript = async function() {
if (entry.special.substr(0, 1) == '#') { if (entry.special.substr(0, 1) == '#') {
entry.special = '* ' + entry.special.substr(1); entry.special = '* ' + entry.special.substr(1);
} }
// replace placeholders
var pos;
while ((pos = entry.special.indexOf('$')) >= 0) {
var pos2 = entry.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = entry.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
entry.special = entry.special.replace('$' + key + '$', value);
}
row.content += '<div>' + entry['special'] + '</div>'; row.content += '<div>' + entry['special'] + '</div>';
// Icons // Icons

17
server/scripts/planning_edit.js
View File

@@ -439,6 +439,23 @@ var siteScript = async function() {
if (entry.special.substr(0, 1) == '#') { if (entry.special.substr(0, 1) == '#') {
entry.special = '* ' + entry.special.substr(1); entry.special = '* ' + entry.special.substr(1);
} }
// replace placeholders
var pos;
while ((pos = entry.special.indexOf('$')) >= 0) {
var pos2 = entry.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = entry.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
entry.special = entry.special.replace('$' + key + '$', value);
}
row.content += '<div>' + entry['special'] + '</div>'; row.content += '<div>' + entry['special'] + '</div>';
// Club // Club

17
server/scripts/planning_view.js
View File

@@ -167,6 +167,23 @@ var siteScript = async function() {
if (entry.special.substr(0, 1) == '#') { if (entry.special.substr(0, 1) == '#') {
entry.special = '* ' + entry.special.substr(1); entry.special = '* ' + entry.special.substr(1);
} }
// replace placeholders
var pos;
while ((pos = entry.special.indexOf('$')) >= 0) {
var pos2 = entry.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = entry.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
entry.special = entry.special.replace('$' + key + '$', value);
}
row.content += '<div>' + entry['special'] + '</div>'; row.content += '<div>' + entry['special'] + '</div>';
// Club // Club

28
server/scripts/regattas.js
View File

@@ -162,6 +162,27 @@ var siteScript = async function() {
entry.special = 'ERROR'; entry.special = 'ERROR';
} }
} }
// replace placeholders
var pos;
while ((pos = entry.special.indexOf('$')) >= 0) {
var pos2 = entry.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = entry.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
var year = parseDate(entry.date).getFullYear();
year = year - value + 1;
var text = 'Jahrgänge ' + year + ' und jünger';
value = 'U-' + value;
specialShown[value] = text;
} else {
break;
}
entry.special = entry.special.replace('$' + key + '$', value);
}
row.content += '<div>' + entry.special + '</div>'; row.content += '<div>' + entry.special + '</div>';
// Icons // Icons
@@ -239,9 +260,12 @@ var siteScript = async function() {
rows.push(null); rows.push(null);
} }
if (Object.keys(specialShown).length > 0) { var specialKeys = Object.keys(specialShown);
if (specialKeys.length > 0) {
specialKeys.sort();
var specialText = ''; var specialText = '';
for (key in specialShown) { for (i in specialKeys) {
var key = specialKeys[i];
specialText += '* ' + key + ': ' + specialShown[key] + '<br>'; specialText += '* ' + key + ': ' + specialShown[key] + '<br>';
} }
$('#card-special').find('p').html(specialText); $('#card-special').find('p').html(specialText);

2
server/version.php
View File

@@ -1,5 +1,5 @@
<?php <?php
define('PWA_VERSION', '1.11.4h2'); define('PWA_VERSION', '1.11.5');
?> ?>