Final Roundmail system, show users with missing tips/jokers in playerlist as well.

This commit is contained in:
Torsten 2017-08-24 11:47:16 +02:00
parent 6d7ee1a47c
commit 70e28110cb
19 changed files with 3700 additions and 66 deletions

View file

@ -2,18 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Test</title>
<title>{{ $topic }}</title>
</head>
<body>
<h1>Rundmail Test</h1>
<h3>Um nicht alle Spieler mit Spam zu belästigen, sende ich die Test-Rundmails in den nächsten Tagen</h3>
<h3>an Euch Administratoren (Volker Geissler, Wilfried Moitzheim, Michael Schmitz).</h3>
<p>&nbsp;</p>
<h3>Seid tapfer, ich belästige euch mit dem Test-Spam nur für ein paar Tage ;-)</h3>
<p>&nbsp;</p>
<h3>Wenn diese Auto-Mails vor unleserlichen Sonderzeichen nur so strotzen, lasst es mich wissen: torsten.schneider@programmschmiede.de</h3>
<p>&nbsp;</p>
<h3>-Torsten.</h3>
<h4>{!! $mail_message !!}</h4>
</body>
</html>

View file

@ -8,8 +8,9 @@
<a class="lead" href="/">Start</a> &nbsp; &nbsp; &nbsp;
@if (Auth::user()->admin)
<a class="lead" href="/seasons">Saison</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/rounds#{{\App\Round::getClosestRoundToNow()}}">Runden</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/rounds#{{\App\Round::getFirstIncompleteRound()}}">Runden</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/users">Spieler</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/roundmails">Rundmail</a> &nbsp; &nbsp; &nbsp;
@endif
<a class="lead" href="/users/show_payouts">Quoten</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/tipps">Tipps</a> &nbsp; &nbsp; &nbsp;

View file

@ -4,17 +4,24 @@
<section class="jumbotron text-center container">
<!-- <div class="container"> -->
<span class="lead col-md-10" >Rundmails</span><a class="lead col-md-2" href="/roundmails/show/-1">Neue Rundmail</a>
<span class="lead col-md-10" >Rundmails</span><a class="lead col-md-2" href="/roundmails/show/-1">Neue Rundmail</a>
<p>&nbsp;</p>
<p>&nbsp;</p>
<div class="col-md-10">
<h4>(Neue Rundmail erstellen)</h4>
<h4>(Datum-sortierte Liste der letzten Themen)</h4>
<h4>(Mail-Liste)</h4>
</div>
<div class="col-md-10">
<table>
@foreach($mails as $mail )
<tr>
<!-- </div> -->
<td style='width:200px;'>{{ $mail['send_date'] }}</td>
<td style='width:400px;'> <a href='/roundmails/show/{{ $mail['id'] }}'>{{ $mail['topic'] }} </a></td>
<td style='width:200px;'> {{ $mail['sender'] }}</td>
</tr>
@endforeach
</table>
</div>
<!-- </div> -->
</section>

View file

@ -7,26 +7,23 @@
<p>&nbsp;</p>
<form method="POST" action="/roundmails/send" class="text-center col-md-12">
{{ csrf_field() }}
<div class="col-md-12">
<label class="col-md-2" style="width:200px;">Datum der Mail</label>
<input class="col-md-8" style="width:400px" value="xxxxxxx" readonly></input>
<input class="col-md-8" style="width:400px" id="send_date" name="send_date" value="{{ $send_date }}" readonly></input>
</div>
<div class="col-md-12">
<label class="col-md-2" style="width:200px;">Versender:</label>
<input class="col-md-8" style="width:400px" id="sender_name" name="sender_name" value="{{ $sender_name }}" readonly></input>
</div>
<p>&nbsp;</p>
<div class="col-md-12">
<label class="col-md-2" style="width:200px;">Thema:</label>
<input class="col-md-8" style="width:400px" name="topic" value="">
<input class="col-md-8" style="width:400px" id="topic" name="topic" value="{{ $topic }}">
</div>
@ -35,7 +32,7 @@
<label>Empfänger:</label>
<p>&nbsp;</p>
<textarea id="recipients" name="recipients" class="form-control" style="min-height:150px;height:auto;">dummy@doof.de</textarea>
<textarea id="recipients" name="recipients" class="form-control" style="min-height:150px;height:auto;">{{ $recipients }}</textarea>
<p>&nbsp;</p>
@ -46,17 +43,21 @@
<button onClick="setAdminRecipient(); return false;">Alle Administatoren</button>&nbsp;
<button onClick="setActiveRecipient(); return false;">Alle aktiven Spieler</button>&nbsp;
<button onClick="setInactiveRecipient(); return false;">Alle inaktiven Spieler (keine Zahlung)</button>&nbsp;
<button onClick="setMissingRecipient(); return false;">Alle Spieler mit fehlenden Eingaben</button>&nbsp;
<button onClick="setMissingTippRecipient(); return false;">Alle Spieler mit fehlenden Tipps</button>&nbsp;
<button onClick="setMissingJokerRecipient(); return false;">Alle Spieler mit fehlenden Jokern</button>&nbsp;
<p>&nbsp;</p>
<label>Nachricht</label>
<textarea name="message" class="form-control" style="min-height:250px;height:auto;">I am a message text</textarea>
<textarea id="message" name="message" class="form-control" style="min-height:250px;height:auto;">{{$mail_message}}</textarea>
<input type="hidden" id="user_id" name="user_id" value="{{ $user_id }}">
<p></p>
<div class="form-group">
<button type="submit" class="btn btn-primary">Senden</button>
@if (!$viewmode)
<button type="submit" class="btn btn-primary">Senden</button>
@else
<a href="/roundmails" style="font-size: 24px;">Zurück</a>
@endif
</div>
</form>
@ -80,10 +81,16 @@
elem.innerHTML = "{{ $inactiveMailList }}";
}
function setMissingRecipient()
function setMissingTippRecipient()
{
var elem = document.getElementById("recipients");
elem.innerHTML = "{{ $missingMailList }}";
elem.innerHTML = "{{ $missingTippMailList }}";
}
function setMissingJokerRecipient()
{
var elem = document.getElementById("recipients");
elem.innerHTML = "{{ $missingJokerMailList }}";
}
</script>

View file

@ -4,24 +4,28 @@
<section class="jumbotron text-center container">
<!-- <div class="container"> -->
<div class="lead col-md-8" >{{$active_user_count}} aktive Spieler:</div>
<div class="lead col-md-8" >aktive Spieler: {{ $total_user_count }} , davon bezahlt: {{$active_user_count}}</div>
<p>&nbsp;</p>
<div class="col-md-12">
<table class="table-bordered" >
<tr class="table-bordered">
<td class="table-bordered col-std-4">Name</td>
<td class="table-bordered col-std-2">Name</td>
<td class="table-bordered col-std-2">&nbsp;Saison bezahlt&nbsp;</td>
<td class="table-bordered col-std-4">&nbsp;E-Mail Adresse&nbsp;</td>
<td class="table-bordered col-std-2">&nbsp;E-Mail Adresse&nbsp;</td>
<td class="table-bordered col-std-2">Status</td>
<td class="table_bordered col-std-2">Tipps</td>
<td class="table_bordered col-std-2">Joker</td>
</tr>
@foreach($users as $user)
<tr>
<td class="table-bordered col-md-4" >&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->name }}&nbsp;</a></td>
<td class="table-bordered">{{ App\User::is_season_paid($user->id) }}</td>
<td>{{ $user->email }}</td>
<td class="table-bordered">&nbsp;{{ ($user->admin ? "Administrator":"Spieler") }}&nbsp;</td>
<td class="table-bordered">&nbsp; {{ ($user->admin ? "Administrator":"Spieler") }}&nbsp;</td>
<td class="table-bordered" style="color:#bfd7d8;background-color:{{$user->tippStyling}};">&nbsp;{{ $user->missingTippText }}&nbsp;</td>
<td class="table-bordered" style="color:#bfd7d8;background-color:{{$user->jokerStyling}};">&nbsp;{{ $user->missingJokerText }}&nbsp;</td>
</tr>
@endforeach