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

Merge branch 'feature/RA-4-notifications-ignore-my-regattas' into develop

Browse Source
This commit is contained in:
ostertun
2020-10-02 01:24:16 +02:00
parent e74ffa9a70 6a5d06325d
commit 99b624ff92
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/scripts/regatten.js.php
View File

@@ -342,10 +342,16 @@ async function updatePushSwitches() {
if ($('#switch-pushes').prop('checked')) { if ($('#switch-pushes').prop('checked')) {
$('#p-pushes-info').show(); $('#p-pushes-info').show();
$('.a-switch-pushes-channel').show(); $('.a-switch-pushes-channel-all').show();
$('.a-switch-pushes-channel-my').show();
if (!isLoggedIn()) {
$('.a-switch-pushes-channel-my').find('div').remove();
$('.a-switch-pushes-channel-my').find('.badge').text('nicht angemeldet');
}
} else { } else {
$('#p-pushes-info').hide(); $('#p-pushes-info').hide();
$('.a-switch-pushes-channel').hide(); $('.a-switch-pushes-channel-all').hide();
$('.a-switch-pushes-channel-my').hide();
} }
} }
@@ -437,7 +443,8 @@ var initRegatten = function() {
// Pushes // Pushes
$('#a-switch-pushes').click(pushesSubscribeClicked); $('#a-switch-pushes').click(pushesSubscribeClicked);
$('.a-switch-pushes-channel').click(pushesChannelClicked); $('.a-switch-pushes-channel-all').click(pushesChannelClicked);
$('.a-switch-pushes-channel-my').click(pushesChannelClicked);
} }
var onServiceWorkerLoaded = function() { var onServiceWorkerLoaded = function() {

15
server/page/menus.php
View File

@@ -154,7 +154,7 @@
(meine) bezieht sich auf die Regatten, die in Deiner Saison-Planung sind,<br> (meine) bezieht sich auf die Regatten, die in Deiner Saison-Planung sind,<br>
(alle) informiert Dich &uuml;ber alle Regatten (alle) informiert Dich &uuml;ber alle Regatten
</p> </p>
<a href="#" data-trigger-switch="switch-pushes-news" class="pb-2 a-switch-pushes-channel"> <a href="#" data-trigger-switch="switch-pushes-news" class="pb-2 a-switch-pushes-channel-all">
<i class="fa font-14 fa-newspaper rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-newspaper rounded-s bg-highlight color-white"></i>
<span>Neuigkeiten</span> <span>Neuigkeiten</span>
<div class="custom-control scale-switch ios-switch"> <div class="custom-control scale-switch ios-switch">
@@ -162,15 +162,16 @@
<label class="custom-control-label" for="switch-pushes-news"></label> <label class="custom-control-label" for="switch-pushes-news"></label>
</div> </div>
</a> </a>
<a href="#" data-trigger-switch="switch-pushes-regatta-changed-my" class="pb-2 a-switch-pushes-channel"> <a href="#" data-trigger-switch="switch-pushes-regatta-changed-my" class="pb-2 a-switch-pushes-channel-my">
<i class="fa font-14 fa-calendar-check rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-calendar-check rounded-s bg-highlight color-white"></i>
<span>Regatta verschoben (meine)</span> <span>Regatta verschoben (meine)</span>
<span class="badge bg-red2-dark color-white"></span>
<div class="custom-control scale-switch ios-switch"> <div class="custom-control scale-switch ios-switch">
<input type="checkbox" class="ios-input" id="switch-pushes-regatta-changed-my"> <input type="checkbox" class="ios-input" id="switch-pushes-regatta-changed-my">
<label class="custom-control-label" for="switch-pushes-regatta-changed-my"></label> <label class="custom-control-label" for="switch-pushes-regatta-changed-my"></label>
</div> </div>
</a> </a>
<a href="#" data-trigger-switch="switch-pushes-regatta-changed-all" class="pb-2 a-switch-pushes-channel"> <a href="#" data-trigger-switch="switch-pushes-regatta-changed-all" class="pb-2 a-switch-pushes-channel-all">
<i class="fa font-14 fa-calendar-check rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-calendar-check rounded-s bg-highlight color-white"></i>
<span>Regatta verschoben (alle)</span> <span>Regatta verschoben (alle)</span>
<div class="custom-control scale-switch ios-switch"> <div class="custom-control scale-switch ios-switch">
@@ -178,15 +179,16 @@
<label class="custom-control-label" for="switch-pushes-regatta-changed-all"></label> <label class="custom-control-label" for="switch-pushes-regatta-changed-all"></label>
</div> </div>
</a> </a>
<a href="#" data-trigger-switch="switch-pushes-result-ready-my" class="pb-2 a-switch-pushes-channel"> <a href="#" data-trigger-switch="switch-pushes-result-ready-my" class="pb-2 a-switch-pushes-channel-my">
<i class="fa font-14 fa-poll rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-poll rounded-s bg-highlight color-white"></i>
<span>Ergebnisse verf&uuml;gbar (meine)</span> <span>Ergebnisse verf&uuml;gbar (meine)</span>
<span class="badge bg-red2-dark color-white"></span>
<div class="custom-control scale-switch ios-switch"> <div class="custom-control scale-switch ios-switch">
<input type="checkbox" class="ios-input" id="switch-pushes-result-ready-my"> <input type="checkbox" class="ios-input" id="switch-pushes-result-ready-my">
<label class="custom-control-label" for="switch-pushes-result-ready-my"></label> <label class="custom-control-label" for="switch-pushes-result-ready-my"></label>
</div> </div>
</a> </a>
<a href="#" data-trigger-switch="switch-pushes-result-ready-all" class="pb-2 a-switch-pushes-channel"> <a href="#" data-trigger-switch="switch-pushes-result-ready-all" class="pb-2 a-switch-pushes-channel-all">
<i class="fa font-14 fa-poll rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-poll rounded-s bg-highlight color-white"></i>
<span>Ergebnisse verf&uuml;gbar (alle)</span> <span>Ergebnisse verf&uuml;gbar (alle)</span>
<div class="custom-control scale-switch ios-switch"> <div class="custom-control scale-switch ios-switch">
@@ -194,9 +196,10 @@
<label class="custom-control-label" for="switch-pushes-result-ready-all"></label> <label class="custom-control-label" for="switch-pushes-result-ready-all"></label>
</div> </div>
</a> </a>
<a href="#" data-trigger-switch="switch-pushes-meldeschluss" class="pb-2 a-switch-pushes-channel"> <a href="#" data-trigger-switch="switch-pushes-meldeschluss" class="pb-2 a-switch-pushes-channel-my">
<i class="fa font-14 fa-file-signature rounded-s bg-highlight color-white"></i> <i class="fa font-14 fa-file-signature rounded-s bg-highlight color-white"></i>
<span>Melde-Erinnerungen</span> <span>Melde-Erinnerungen</span>
<span class="badge bg-red2-dark color-white"></span>
<div class="custom-control scale-switch ios-switch"> <div class="custom-control scale-switch ios-switch">
<input type="checkbox" class="ios-input" id="switch-pushes-meldeschluss"> <input type="checkbox" class="ios-input" id="switch-pushes-meldeschluss">
<label class="custom-control-label" for="switch-pushes-meldeschluss"></label> <label class="custom-control-label" for="switch-pushes-meldeschluss"></label>