Merge branch 'hotfix/fix_expenditures_approve' into develop

client/scripts/database.js

@@ -1343,7 +1343,14 @@ function resetDb() {
 		db.transaction('rankings', 'readwrite').objectStore('rankings').clear();
 		db.transaction('follows', 'readwrite').objectStore('follows').clear();
 		db.transaction('expenditures', 'readwrite').objectStore('expenditures').clear();
-		var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
+		var ta = db.transaction('update_times', 'readwrite');
+		ta.oncomplete = (event) => {
+			log('[db] resetDb: Transaction complete');
+		};
+		ta.onerror = (event) => {
+			log('[db] resetDb: Transaction failed');
+		};
+		var osUpdateTimes = ta.objectStore('update_times');
 		osUpdateTimes.put({ table: 'last_sync', time: 1 });
 		osUpdateTimes.put({ table: 'clubs', time: 0 });
 		osUpdateTimes.put({ table: 'boats', time: 0 });
@@ -1357,6 +1364,8 @@ function resetDb() {
 		osUpdateTimes.put({ table: 'news', time: 0 });
 		osUpdateTimes.put({ table: 'users', time: 0 });
 		osUpdateTimes.put({ table: 'expenditures', time: 0 });
+		osUpdateTimes.put({ table: 'loggedin', status: isLoggedIn() });
+		ta.commit();
 		log('[db] DB update times reset');
 		hideLoader();
 	}

client/scripts/regatten.js.php

@@ -320,7 +320,7 @@ function pushesSubscribe() {
 		applicationServerKey: applicationServerKey
 	})
 	.then(async function(subscription) {
-		log('[app] Subscription:', subscription);
+		log('[app] Subscription:', JSON.stringify(subscription));
 		if (await pushesUpdateServerSubscription(subscription, true)) {
 			log('[app] Subscription: Sent to server, updating UI');
 			dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);
@@ -346,7 +346,7 @@ function pushesUnSubscribe(silent = false) {
 	log('[app] Unsubscribing');
 	swRegistration.pushManager.getSubscription()
 	.then(async function(subscription) {
-		log('[app] Subscription:', subscription);
+		log('[app] Subscription:', JSON.stringify(subscription));
 		if (subscription) {
 			if (await pushesUpdateServerSubscription(subscription, false)) {
 				log('[app] Subscription: Removed from server');
@@ -374,7 +374,7 @@ function pushesUnSubscribe(silent = false) {
 
 function pushesUpdateServerSubscription(subscription, enabled) {
 	return new Promise(function(resolve){
-		log('[app] updateServer', enabled, subscription);
+		log('[app] updateServer', enabled, JSON.stringify(subscription));
 		$.ajax({
 			url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
 			type: 'POST',
@@ -477,7 +477,7 @@ function updatePushBadge() {
 		var dbSub = await dbSettingsGet('notify_endpoint_' + BOATCLASS);
 		var isSub = (subscription !== null);
 		log('[app] DB Subscription:', dbSub);
-		log('[app] Real Subscription:', subscription);
+		log('[app] Real Subscription:', JSON.stringify(subscription));
 		if (isSub) {
 			$('#badge-pushes').removeClass('bg-red2-dark').addClass('bg-green2-dark').text('AN');
 			if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);

client/scripts/strings.js.php

@@ -54,5 +54,5 @@ const strings = {
 		'Donnerstag',
 		'Freitag',
 		'Samstag'
-	],
+	]
 }

server/page/menus.php

@@ -57,7 +57,7 @@
 	</div>
 </div>
 
-<div id="menu-more" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="360" >
+<div id="menu-more" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="410" >
 	<div class="menu-title"><h1>Mehr</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="content">
@@ -260,7 +260,7 @@
 		<div class="input-style input-style-2 has-icon input-required">
 			<i class="input-icon fa fa-user color-theme"></i>
 			<span class="color-highlight">Benutzername</span>
-			<input id="input-login-username" class="form-control" type="name" placeholder="Benutzername" />
+			<input id="input-login-username" class="form-control" type="text" placeholder="Benutzername" />
 		</div>
 		<div class="input-style input-style-2 has-icon input-required">
 			<i class="input-icon fa fa-lock color-theme"></i>

server/scripts/expenditures-user.js

@@ -31,10 +31,10 @@ async function onListClicked(id) {
 	if (exp.approved == 0 && (exp.direction < 0) == (exp.canceled == 0)) {
 		$('#menu-item-approve').show();
 		$('#menu-item-approve').attr('onclick', 'expenditureAction("approve", ' + exp['id'] + ', "' + (exp.canceled == 1 ? 'Stornierung' : 'Ausgabe') + ' genehmigt")');
-		$('#menu-item-approve').text(exp.canceled == 1 ? 'Storno akzeptieren' : 'Akzeptieren');
+		$('#menu-item-approve').find('span').text(exp.canceled == 1 ? 'Storno akzeptieren' : 'Akzeptieren');
 		$('#menu-item-decline').show();
 		$('#menu-item-decline').attr('onclick', 'expenditureAction("decline", ' + exp['id'] + ', "Ausgabe ' + (exp.canceled == 1 ? 'erneut angefragt' : 'abgelehnt') + '")');
-		$('#menu-item-decline').text(exp.canceled == 1 ? 'Erneut anfragen' : 'Ablehnen');
+		$('#menu-item-decline').find('span').text(exp.canceled == 1 ? 'Erneut anfragen' : 'Ablehnen');
 	} else {
 		$('#menu-item-approve').hide();
 		$('#menu-item-decline').hide();

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.13h1');
+	define('PWA_VERSION', '1.13h6');
 
 ?>