Working on manual payout GUI
This commit is contained in:
parent
4f6116fc5b
commit
9c1b334fe8
7 changed files with 68 additions and 5 deletions
|
|
@ -22,7 +22,8 @@ class SeasonsController extends Controller
|
||||||
|
|
||||||
$seasons = DB::table('seasons')->get();
|
$seasons = DB::table('seasons')->get();
|
||||||
$currentSeason=Season::getCurrent();
|
$currentSeason=Season::getCurrent();
|
||||||
$active_user_count = sizeof( User::getActives() );
|
$users = User::getActives();
|
||||||
|
$active_user_count = sizeof( $users );
|
||||||
|
|
||||||
$currentSeasonId=-1;
|
$currentSeasonId=-1;
|
||||||
if ($currentSeason) {
|
if ($currentSeason) {
|
||||||
|
|
@ -30,7 +31,7 @@ class SeasonsController extends Controller
|
||||||
$payouts = Quota::getPayouts();
|
$payouts = Quota::getPayouts();
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('seasons.index', compact('seasons','currentSeason','active_user_count','quotas','payouts'));
|
return view('seasons.index', compact('seasons','currentSeason','active_user_count','quotas','payouts', 'users'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function create() {
|
public function create() {
|
||||||
|
|
|
||||||
10
pfosten/app/ManualPayout.php
Normal file
10
pfosten/app/ManualPayout.php
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class ManualPayout extends Model
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
@ -20,7 +20,7 @@ class CreateQuotasTable extends Migration
|
||||||
$table->integer('season_id')->default(0);
|
$table->integer('season_id')->default(0);
|
||||||
$table->string('name',100);
|
$table->string('name',100);
|
||||||
$table->integer('order')->default(0);
|
$table->integer('order')->default(0);
|
||||||
$table->integer('prc')->default(0);
|
$table->float('prc')->default(0);
|
||||||
|
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,6 @@ class CreateMatchesTable extends Migration
|
||||||
*/
|
*/
|
||||||
public function down()
|
public function down()
|
||||||
{
|
{
|
||||||
Schema::dropIfExists('league_matches');
|
Schema::dropIfExists('leagues_matches');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -142,11 +142,27 @@
|
||||||
<a class="btn btn-primary" href="/league_settings/season={{$currentSeason->id}}">Liga bearbeiten</a>
|
<a class="btn btn-primary" href="/league_settings/season={{$currentSeason->id}}">Liga bearbeiten</a>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
<div class="form-group" >
|
<div class="form-group" style="width:650px;" >
|
||||||
<h4>
|
<h4>
|
||||||
<label style="float:left; width:200px;">Liga 1, Platz 1:</label>
|
<label style="float:left; width:200px;">Liga 1, Platz 1:</label>
|
||||||
<input type="text" class="form-control" id="liga_platz1" name="liga_platz1" value="{{ $quotas['Liga Platz 1'] }}" style="float:left; width:75px;"required>
|
<input type="text" class="form-control" id="liga_platz1" name="liga_platz1" value="{{ $quotas['Liga Platz 1'] }}" style="float:left; width:75px;"required>
|
||||||
|
|
||||||
|
<span class="dropdown" id="dropdown1">
|
||||||
|
<button id="btn_winner" onclick="toggleDropdown('dropdown_winner'); return false;" class="dropbtn">Sieger festlegen</button>
|
||||||
|
<div id="dropdown_winner" class="dropdown-content">
|
||||||
|
@foreach($users as $user)
|
||||||
|
<a onclick="setWinner('{{$user->id}}',{{$user->name}});return false;" >{{$user->name}}</a>
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<label style="float:left"> % = {{$payouts['liga_platz1']}} €</label>
|
<label style="float:left"> % = {{$payouts['liga_platz1']}} €</label>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<p> </p>
|
<p> </p>
|
||||||
|
|
||||||
<label style="float:left; width:200px;">Liga 1, Platz 2:</label>
|
<label style="float:left; width:200px;">Liga 1, Platz 2:</label>
|
||||||
|
|
@ -195,4 +211,36 @@
|
||||||
|
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<script>
|
||||||
|
|
||||||
|
function setWinner($user_id, $user_name, $elem_name="btn_winner") {
|
||||||
|
var global_winner_id = document.getElementById($elem_winner).innerHTML=$roundname;
|
||||||
|
}
|
||||||
|
|
||||||
|
// When the user clicks on the button,toggle between hiding and showing the dropdown content
|
||||||
|
function toggleDropdown($elementName) {
|
||||||
|
document.getElementById($elementName).classList.toggle("show");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close the dropdown menu if the user clicks outside of it
|
||||||
|
window.onclick = function(event) {
|
||||||
|
if (!event.target.matches('.dropbtn')) {
|
||||||
|
|
||||||
|
var dropdowns = document.getElementsByClassName("dropdown-content");
|
||||||
|
var i;
|
||||||
|
for (i = 0; i < dropdowns.length; i++) {
|
||||||
|
var openDropdown = dropdowns[i];
|
||||||
|
if (openDropdown.classList.contains('show')) {
|
||||||
|
openDropdown.classList.remove('show');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
event.cancelBubble=true;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
@ -37,6 +37,7 @@ return array(
|
||||||
'App\\Leagues\\LeagueMember' => $baseDir . '/app/Leagues/LeagueMember.php',
|
'App\\Leagues\\LeagueMember' => $baseDir . '/app/Leagues/LeagueMember.php',
|
||||||
'App\\Leagues\\Match' => $baseDir . '/app/Leagues/Match.php',
|
'App\\Leagues\\Match' => $baseDir . '/app/Leagues/Match.php',
|
||||||
'App\\Mail\\RoundmailMailer' => $baseDir . '/app/Mail/RoundmailMailer.php',
|
'App\\Mail\\RoundmailMailer' => $baseDir . '/app/Mail/RoundmailMailer.php',
|
||||||
|
'App\\ManualPayout' => $baseDir . '/app/ManualPayout.php',
|
||||||
'App\\Payment' => $baseDir . '/app/Payment.php',
|
'App\\Payment' => $baseDir . '/app/Payment.php',
|
||||||
'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
|
'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
|
||||||
'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
|
'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
|
||||||
|
|
@ -63,6 +64,7 @@ return array(
|
||||||
'Collective\\Html\\HtmlServiceProvider' => $vendorDir . '/laravelcollective/html/src/HtmlServiceProvider.php',
|
'Collective\\Html\\HtmlServiceProvider' => $vendorDir . '/laravelcollective/html/src/HtmlServiceProvider.php',
|
||||||
'CreateGamesTable' => $baseDir . '/database/migrations/2017_06_19_112641_create_games_table.php',
|
'CreateGamesTable' => $baseDir . '/database/migrations/2017_06_19_112641_create_games_table.php',
|
||||||
'CreateLeaguesTable' => $baseDir . '/database/migrations/2017_09_08_095721_create_leagues_table.php',
|
'CreateLeaguesTable' => $baseDir . '/database/migrations/2017_09_08_095721_create_leagues_table.php',
|
||||||
|
'CreateManualPayoutsTable' => $baseDir . '/database/migrations/2018_01_15_140815_create_manual_payouts_table.php',
|
||||||
'CreateMatchesTable' => $baseDir . '/database/migrations/2017_09_08_095740_create_matches_table.php',
|
'CreateMatchesTable' => $baseDir . '/database/migrations/2017_09_08_095740_create_matches_table.php',
|
||||||
'CreatePasswordResetsTable' => $baseDir . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
|
'CreatePasswordResetsTable' => $baseDir . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
|
||||||
'CreatePaymentsTable' => $baseDir . '/database/migrations/2017_06_19_112638_create_payments_table.php',
|
'CreatePaymentsTable' => $baseDir . '/database/migrations/2017_06_19_112638_create_payments_table.php',
|
||||||
|
|
|
||||||
2
pfosten/vendor/composer/autoload_static.php
vendored
2
pfosten/vendor/composer/autoload_static.php
vendored
|
|
@ -309,6 +309,7 @@ class ComposerStaticInita19fb0695e1b61b4feeb3cc3fbdd2feb
|
||||||
'App\\Leagues\\LeagueMember' => __DIR__ . '/../..' . '/app/Leagues/LeagueMember.php',
|
'App\\Leagues\\LeagueMember' => __DIR__ . '/../..' . '/app/Leagues/LeagueMember.php',
|
||||||
'App\\Leagues\\Match' => __DIR__ . '/../..' . '/app/Leagues/Match.php',
|
'App\\Leagues\\Match' => __DIR__ . '/../..' . '/app/Leagues/Match.php',
|
||||||
'App\\Mail\\RoundmailMailer' => __DIR__ . '/../..' . '/app/Mail/RoundmailMailer.php',
|
'App\\Mail\\RoundmailMailer' => __DIR__ . '/../..' . '/app/Mail/RoundmailMailer.php',
|
||||||
|
'App\\ManualPayout' => __DIR__ . '/../..' . '/app/ManualPayout.php',
|
||||||
'App\\Payment' => __DIR__ . '/../..' . '/app/Payment.php',
|
'App\\Payment' => __DIR__ . '/../..' . '/app/Payment.php',
|
||||||
'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
|
'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
|
||||||
'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
|
'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
|
||||||
|
|
@ -335,6 +336,7 @@ class ComposerStaticInita19fb0695e1b61b4feeb3cc3fbdd2feb
|
||||||
'Collective\\Html\\HtmlServiceProvider' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlServiceProvider.php',
|
'Collective\\Html\\HtmlServiceProvider' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlServiceProvider.php',
|
||||||
'CreateGamesTable' => __DIR__ . '/../..' . '/database/migrations/2017_06_19_112641_create_games_table.php',
|
'CreateGamesTable' => __DIR__ . '/../..' . '/database/migrations/2017_06_19_112641_create_games_table.php',
|
||||||
'CreateLeaguesTable' => __DIR__ . '/../..' . '/database/migrations/2017_09_08_095721_create_leagues_table.php',
|
'CreateLeaguesTable' => __DIR__ . '/../..' . '/database/migrations/2017_09_08_095721_create_leagues_table.php',
|
||||||
|
'CreateManualPayoutsTable' => __DIR__ . '/../..' . '/database/migrations/2018_01_15_140815_create_manual_payouts_table.php',
|
||||||
'CreateMatchesTable' => __DIR__ . '/../..' . '/database/migrations/2017_09_08_095740_create_matches_table.php',
|
'CreateMatchesTable' => __DIR__ . '/../..' . '/database/migrations/2017_09_08_095740_create_matches_table.php',
|
||||||
'CreatePasswordResetsTable' => __DIR__ . '/../..' . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
|
'CreatePasswordResetsTable' => __DIR__ . '/../..' . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
|
||||||
'CreatePaymentsTable' => __DIR__ . '/../..' . '/database/migrations/2017_06_19_112638_create_payments_table.php',
|
'CreatePaymentsTable' => __DIR__ . '/../..' . '/database/migrations/2017_06_19_112638_create_payments_table.php',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue