Merge branch 'master' of nielandt.be:/opt/git/bananarace

This commit is contained in:
Joachim Nielandt 2015-09-17 00:09:42 +02:00
commit 4bbd081de6
7 changed files with 394 additions and 309 deletions

View File

@ -7,9 +7,8 @@
<!-- but may lead to some differences in layout. --> <!-- but may lead to some differences in layout. -->
<html ng-app="bananaraceApp" lang="nl"> <html ng-app="bananaraceApp" lang="nl">
<head> <head>
<!-- <meta http-equiv="content-type" content="text/html; charset=UTF-8"> --> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<!-- enable bootstrap --> <!-- enable bootstrap -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@ -64,15 +63,21 @@
<!-- enable mobile --> <!-- enable mobile -->
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
</head> </head>
<body> <body>
<!-- the navbar on top ... --> <!-- the navbar on top ... -->
<nav class="navbar navbar-default navbar-fixed-top" ng-controller="NavCtrl"> <nav class="navbar navbar-default navbar-fixed-top" ng-controller="NavCtrl">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="">Laaionhead Racing</a> <a class="navbar-brand" href="">Laaionhead Racing</a>
</div> </div>
@ -88,12 +93,14 @@
<a href="#/championship/{{getActiveRace().idchampionship}}/poule/{{getActiveRace().tier}}/{{getActiveRace().poule}}/race/{{getActiveRace().idrace}}/drives">Actieve race: {{getActiveRace().idrace}}</a> <a href="#/championship/{{getActiveRace().idchampionship}}/poule/{{getActiveRace().tier}}/{{getActiveRace().poule}}/race/{{getActiveRace().idrace}}/drives">Actieve race: {{getActiveRace().idrace}}</a>
</li> </li>
</ul> </ul>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
</nav> </nav>
<!-- the main view div... here's where the partials are served --> <!-- the main view div... here's where the partials are served -->
<div ng-view></div> <div class="container-fluid">
<div ng-view></div>
</div>
</body> </body>
</html> </html>

View File

@ -1,20 +1,20 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="#/championships/">Kampioenschappen</a></li> <li><a href="#/championships/">Kampioenschappen</a></li>
<li><a href="#/championship/{{currentChampionship}}/poules">Poules voor {{currentChampionship}}</a></li> <li><a href="#/championship/{{currentChampionship}}/poules">Poules voor {{currentChampionship}}</a></li>
<li class="active">Races in poule/tier {{currentPoule}}/{{currentTier}}</li> <li class="active">Races in poule/tier {{currentPoule}}/{{currentTier}}</li>
</ol> </ol>
</div></div> </div></div>
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Races</h3> <h3 class="panel-title">Races</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<table class="table"> <table class="table table-condensed table-striped">
<tr><th>Team</th><th>Raceid</th><th>Totaaltijd</th><th>Ritten</th><th>Acties</th></tr> <tr><th>Team</th><th>Raceid</th><th>Totaaltijd</th><th>Ritten</th><th>Acties</th></tr>
<tr ng-repeat="race in racesInPoule"> <tr ng-repeat="race in racesInPoule">
<td>{{race.name}}</td> <td>{{race.name}}</td>
@ -42,9 +42,9 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Voeg race toe</h3> <h3 class="panel-title">Voeg race toe</h3>
@ -56,19 +56,19 @@
<div class="panel-heading">Met een team uit de poule...</div> <div class="panel-heading">Met een team uit de poule...</div>
<div class="panel-body"> <div class="panel-body">
<div class="list-group"> <div class="list-group">
<a href="" class="list-group-item" ng-repeat="team in teamsInPoule" ng-click="setSelectedTeam(team)" ng-class="{active: selectedTeam==team}">{{team.name}}</a> <a href="" class="list-group-item list-group-item-sm" ng-repeat="team in teamsInPoule" ng-click="setSelectedTeam(team)" ng-class="{active: selectedTeam==team}">{{team.name}}</a>
</div> </div>
<button type="button" class="btn btn-default" ng-click="addRace(newrace);" ng-disabled="selectedTeam == null" title="Maak een nieuwe race aan voor het geselecteerde team.">Maak nieuwe race</button> <button type="button" class="btn btn-success" ng-click="addRace(newrace);" ng-disabled="selectedTeam == null" title="Maak een nieuwe race aan voor het geselecteerde team.">Maak nieuwe race</button>
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Met alle teams...</div> <div class="panel-heading">Met alle teams...</div>
<div class="panel-body"> <div class="panel-body">
<button type="button" class="btn btn-default" ng-disabled="teamsInPoule.length == 0" ng-click="addRaceForAllteams();" title="Maak nieuwe races aan voor alle bovenstaande teams.">Maak race voor elk team</button> <button type="button" class="btn btn-success" ng-disabled="teamsInPoule.length == 0" ng-click="addRaceForAllteams();" title="Maak nieuwe races aan voor alle bovenstaande teams.">Maak race voor elk team</button>
</div> </div>
</div> </div>
</div><!-- end row --> </div><!-- end row -->
</div> </div>
</div> </div>
</div> </div>

View File

@ -4,7 +4,7 @@
<li class="active">Team in poule/tier {{currentPoule}}/{{currentTier}}</li> <li class="active">Team in poule/tier {{currentPoule}}/{{currentTier}}</li>
</ol> </ol>
<div class="row"> <div class="row">
<!-- linker panel --> <!-- linker panel -->
<div class="col-md-6"> <div class="col-md-6">
@ -41,4 +41,4 @@
</div><!-- panel body --> </div><!-- panel body -->
</div> </div>
</div> </div>
</div><!-- end row --> </div><!-- end row -->

View File

@ -4,9 +4,29 @@
</ol> </ol>
<div class="row"> <div class="row">
<div class="visible-sm-block visible-xs-block col-sm-12 col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Voeg poule toe</h3>
</div>
<div class="panel-body">
<form class="form-inline">
<div class="form-group form-group-sm">
<label for="tierInput">Tier</label>
<input type="text" class="form-control" id="tierInput" aria-describedby="sizing-addon2" ng-model="newpoule.tier" style="width:50px"/>
</div>
<div class="form-group form-group-sm">
<label for="pouleInput">Poule</label>
<input type="text" class="form-control" id="pouleInput" aria-describedby="sizing-addon2" ng-model="newpoule.poule" style="width:50px"/>
</div>
<button type="button" class="btn btn-sm btn-default btn-success" ng-click="addPoule(newpoule)">Toevoegen</button>
</form>
</div>
</div>
</div>
<div class="col-md-6"> <div class="col-md-7 col-xs-12">
<div class="panel panel-default" ng-show="poules.length > 0"> <div class="panel panel-default" ng-show="poules.length > 0">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Poules</h3> <h3 class="panel-title">Poules</h3>
</div> </div>
@ -30,27 +50,26 @@
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-5 hidden-sm hidden-xs">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Voeg poule toe</h3> <h3 class="panel-title">Voeg poule toe</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="input-group"> <form class="form-inline">
<span class="input-group-addon" id="sizing-addon2">Tier</span> <div class="form-group form-group-sm">
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newpoule.tier"> <label for="tierInput">Tier</label>
<input type="text" class="form-control" id="tierInput" aria-describedby="sizing-addon2" ng-model="newpoule.tier" style="width:50px">
</div>
<div class="form-group form-group-sm">
<label for="pouleInput">Poule</label>
<input type="text" class="form-control" id="pouleInput" aria-describedby="sizing-addon2" ng-model="newpoule.poule" style="width:50px"/>
</div>
<button type="button" class="btn btn-sm btn-default btn-success" ng-click="addPoule(newpoule)">Toevoegen</button>
</form>
</div> </div>
<div class="input-group">
<span class="input-group-addon" id="sizing-addon2">Poule</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newpoule.poule">
</div> </div>
<button type="button" class="btn btn-default" ng-click="addPoule(newpoule);">Voeg toe!</button>
</div> </div>
</div>
</div>

View File

@ -7,41 +7,61 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="visible-sm-block visible-xs-block col-sm-12 col-xs-12">
<div class="panel panel-default" ng-show="drivers.length > 0"> <div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Voeg chauffeur toe</h3>
</div>
<div class="panel-body">
<div class="input-group input-group-sm">
<span class="input-group-addon" id="sizing-addon2">Naam</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newdriver.name">
<span class="input-group-btn">
<button type="button" class="btn btn-success" ng-click="addDriver(newdriver);">Voeg toe!</button>
</span>
</div>
</div>
</div>
</div>
<div class="col-md-7 col-xs-12">
<div class="panel panel-default" ng-show="drivers.length > 0">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Drivers</h3> <h3 class="panel-title">Drivers</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<table class="table"> <table class="table table-condensed table-striped">
<tr><th>Naam</th><th>Acties</th></tr> <tr>
<th>Naam</th>
<th>Acties</th>
</tr>
<tr ng-repeat="driver in drivers"> <tr ng-repeat="driver in drivers">
<td>{{driver.name}}</td> <td>{{driver.name}}</td>
<td> <td>
<a class="btn btn-danger btn-sm" ng-click="deleteDriver(driver);"> <a class="btn btn-danger btn-sm" ng-click="deleteDriver(driver);">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span> <span class="glyphicon glyphicon-remove" aria-hidden="true" tooltip="Verwijderen!"></span>
</a> </a>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-5 hidden-sm hidden-xs">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Voeg chauffeur toe</h3> <h3 class="panel-title">Voeg chauffeur toe</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="input-group"> <div class="input-group input-group-sm">
<span class="input-group-addon" id="sizing-addon2">Naam</span> <span class="input-group-addon" id="sizing-addon2">Naam</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newdriver.name"> <input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newdriver.name">
<span class="input-group-btn">
<button type="button" class="btn btn-success" ng-click="addDriver(newdriver);">Voeg toe!</button>
</span>
</div>
</div>
</div> </div>
<button type="button" class="btn btn-default" ng-click="addDriver(newdriver);">Voeg toe!</button>
</div> </div>
</div> </div>
</div>
</div>

View File

@ -3,33 +3,57 @@
<li class="active">Overzicht kampioenschap {{currentChampionship}}</li> <li class="active">Overzicht kampioenschap {{currentChampionship}}</li>
</ol> </ol>
<div class="panel panel-default"> <div class="row">
<div class="panel-heading"> <div class="visible-sm-block visible-xs-block col-sm-12 col-xs-12">
<h3 class="panel-title">Teams</h3> <div class="panel panel-default">
</div>
<div class="panel-body">
<table class="table">
<tr><th>Naam</th><th>Acties</th></tr>
<tr ng-repeat="team in teams">
<td>{{team.name}}</td>
<td>
<a class="btn btn-sm" ng-class="{'btn-warning':team.drivercount>0 && team.drivercount!=2, 'btn-success':team.drivercount==2, 'btn-danger':team.drivercount==0}" href="#/championship/{{team.idchampionship}}/team/{{team.idteam}}/drivers">Bekijk chauffeurs <span class="badge">{{team.drivercount}}</span></a>
<a class="btn btn-danger btn-sm" ng-click="deleteTeam(team)"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></td>
</tr>
</table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Voeg team toe</h3> <h3 class="panel-title">Voeg team toe</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="input-group"> <div class="input-group input-group-sm">
<span class="input-group-addon" id="sizing-addon2">Naam</span> <span class="input-group-addon" id="sizing-addon2">Naam</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newteam.name"> <input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newteam.name">
<span class="input-group-btn">
<button type="button" class="btn btn-success" ng-click="addTeam(newteam);">Toevoegen</button>
</span>
</div>
</div>
</div>
</div> </div>
<button type="button" class="btn btn-default" ng-click="addTeam(newteam);">Voeg toe!</button> <div class="col-md-7 col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Teams</h3>
</div>
<div class="panel-body">
<table class="table table-condensed table-striped">
<tr><th>Naam</th><th>Acties</th></tr>
<tr ng-repeat="team in teams">
<td>{{team.name}}</td>
<td>
<a class="btn btn-sm" ng-class="{'btn-warning':team.drivercount>0 && team.drivercount!=2, 'btn-info':team.drivercount==2, 'btn-danger':team.drivercount==0}" href="#/championship/{{team.idchampionship}}/team/{{team.idteam}}/drivers">Bekijk chauffeurs <span class="badge">{{team.drivercount}}</span></a>
<a class="btn btn-danger btn-sm" ng-click="deleteTeam(team)"><span class="glyphicon glyphicon-remove" aria-hidden="true" tooltip="Verwijderen!"></span></a></td>
</tr>
</table>
</div>
</div>
</div>
<div class="col-md-5 hidden-sm hidden-xs">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Voeg team toe</h3>
</div>
<div class="panel-body">
<div class="input-group input-group-sm">
<span class="input-group-addon" id="sizing-addon2">Naam</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newteam.name">
<span class="input-group-btn">
<button type="button" class="btn btn-success" ng-click="addTeam(newteam);">Toevoegen</button>
</span>
</div>
</div>
</div>
</div> </div>
</div> </div>

View File

@ -2,9 +2,24 @@
<li class="active">Kampioenschappen</li> <li class="active">Kampioenschappen</li>
</ol> </ol>
<div class="container-fluid"> <div class="row">
<div class="row"> <div class="visible-sm-block visible-xs-block col-sm-12 col-xs-12">
<div class="col-md-8 col-xs-6"> <div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Voeg kampioenschap toe</h3>
</div>
<div class="panel-body">
<div class="input-group input-group-sm">
<span class="input-group-addon" id="sizing-addon2">Naam</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newchampionship.name">
<span class="input-group-btn">
<button type="button" class="btn btn-default btn-success" ng-click="addChampionship(newchampionship);">Toevoegen</button>
</span>
</div>
</div>
</div>
</div>
<div class="col-md-7 col-xs-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Kampioenschappen</h3> <h3 class="panel-title">Kampioenschappen</h3>
@ -18,7 +33,7 @@
<a class="btn btn-info btn-sm" href="#/championship/{{championship.idchampionship}}/poules">Bekijk poules</a> <a class="btn btn-info btn-sm" href="#/championship/{{championship.idchampionship}}/poules">Bekijk poules</a>
<a class="btn btn-info btn-sm" href="#/championship/{{championship.idchampionship}}/teams">Bekijk teams</a> <a class="btn btn-info btn-sm" href="#/championship/{{championship.idchampionship}}/teams">Bekijk teams</a>
<a class="btn btn-info btn-sm" href="#/championship/{{championship.idchampionship}}/overview">Overzicht</a> <a class="btn btn-info btn-sm" href="#/championship/{{championship.idchampionship}}/overview">Overzicht</a>
<button class="btn btn-danger btn-sm" ng-click="deleteChampionship(championship);"> <button class="btn btn-danger btn-sm" ng-click="deleteChampionship(championship);" tooltip="Verwijderen!">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span> <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</button> </button>
</td> </td>
@ -27,18 +42,18 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4 col-xs-6"> <div class="col-md-5 hidden-sm hidden-xs">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Voeg kampioenschap toe</h3> <h3 class="panel-title">Voeg kampioenschap toe</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="input-group"> <div class="input-group input-group-sm">
<span class="input-group-addon" id="sizing-addon2">Naam</span> <span class="input-group-addon" id="sizing-addon2">Naam</span>
<input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newchampionship.name"> <input type="text" class="form-control" aria-describedby="sizing-addon2" ng-model="newchampionship.name">
</div> <span class="input-group-btn">
<button type="button" class="btn btn-success" ng-click="addChampionship(newchampionship)">Toevoegen</button>
<button type="button" class="btn btn-default" ng-click="addChampionship(newchampionship);">Voeg toe!</button> </span>
</div> </div>
</div> </div>
</div> </div>