Compare commits
6 Commits
feat/rotat
...
bde0efa167
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bde0efa167 | ||
|
|
3ca88d9e2f | ||
|
|
bdd6de5fbe | ||
|
|
8493e742e9 | ||
|
|
2999d8eee7 | ||
|
|
c4a2307530 |
@@ -2,9 +2,15 @@
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
<nav>
|
||||
<ul ngbNav [activeId]="route.fragment | async" class="nav-tabs custom-navbar bg-body-secondary">
|
||||
<li ngbNavItem="/edit" class="custom-navitem"><a ngbNavLink routerLink="/edit" routerLinkActive="active"><i class="bi bi-pencil-square"></i>{{ data.getPlayers().length }}</a></li>
|
||||
<li ngbNavItem="/basic" class="custom-navitem"><a ngbNavLink routerLink="/basic" routerLinkActive="active"><i class="bi bi-shuffle"></i></a></li>
|
||||
<li ngbNavItem="/rotations" class="custom-navitem"><a ngbNavLink routerLink="/rotations" routerLinkActive="active"><i class="bi bi-arrow-repeat"></i></a></li>
|
||||
<ul ngbNav [activeId]="activeId" class="nav-tabs custom-navbar bg-body-secondary">
|
||||
<li ngbNavItem="/" class="custom-navitem"><a ngbNavLink routerLink="" routerLinkActive="active">
|
||||
<i class="bi bi-pencil-square"></i>{{ data.getPlayers().length }}</a>
|
||||
</li>
|
||||
<li ngbNavItem="/basic.t" class="custom-navitem"><a ngbNavLink routerLink="/basic.t" routerLinkActive="active">
|
||||
<i class="bi bi-shuffle"></i></a>
|
||||
</li>
|
||||
<li ngbNavItem="/rotations.t" class="custom-navitem"><a ngbNavLink routerLink="/rotations.t" routerLinkActive="active">
|
||||
<i class="bi bi-arrow-repeat"></i></a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
@@ -22,7 +22,6 @@ tr{
|
||||
overflow-y: auto;
|
||||
}
|
||||
.custom-navbar{
|
||||
height: 3rem;
|
||||
width: 100vw;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
@@ -34,5 +33,3 @@ tr{
|
||||
text-align: center; /* Center the content of each item */
|
||||
flex: 1;
|
||||
}
|
||||
.nav-link.active{
|
||||
}
|
||||
@@ -1,31 +1,39 @@
|
||||
import { Component, inject, OnInit} from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { RouterOutlet, ActivatedRoute, RouterLink } from '@angular/router';
|
||||
import { RouterOutlet, ActivatedRoute, RouterLink, Router, NavigationEnd } from '@angular/router';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { filter, take } from 'rxjs';
|
||||
import { ScreenBasicComponent } from "./screen-basic/screen-basic.component";
|
||||
import { ScreenRotationsComponent } from './screen-rotations/screen-rotations.component';
|
||||
import { Player } from './model';
|
||||
import { ScreenEditComponent } from './screen-edit/screen-edit.component';
|
||||
import { DataService } from './data.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent, RouterLink],
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RouterLink],
|
||||
templateUrl: './app.component.html',
|
||||
styleUrl: './app.component.less'
|
||||
})
|
||||
export class AppComponent implements OnInit {
|
||||
title = 'vb';
|
||||
data = inject(DataService);
|
||||
activeId = '/';
|
||||
|
||||
constructor(public route: ActivatedRoute){}
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
){}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.router.events
|
||||
.pipe(filter(event => event instanceof NavigationEnd))
|
||||
.subscribe(() => {
|
||||
this.activeId = this.router.url;
|
||||
});
|
||||
// process query params
|
||||
this.route.queryParams.pipe(
|
||||
filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
|
||||
// Only proceed if params are not empty
|
||||
filter(params => Object.keys(params).length > 0),
|
||||
take(1)
|
||||
).subscribe(params => {
|
||||
if (params['names']){
|
||||
|
||||
@@ -2,16 +2,18 @@ import { Routes } from '@angular/router';
|
||||
import { ScreenBasicComponent } from './screen-basic/screen-basic.component';
|
||||
import { ScreenEditComponent } from './screen-edit/screen-edit.component';
|
||||
import { ScreenRotationsComponent } from './screen-rotations/screen-rotations.component';
|
||||
import { AppComponent } from './app.component';
|
||||
|
||||
export const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
children: [
|
||||
{ path: '', redirectTo: 'edit', pathMatch: 'full' },
|
||||
{ path: 'edit', component: ScreenEditComponent },
|
||||
{ path: 'basic', component: ScreenBasicComponent },
|
||||
{ path: 'rotations', component: ScreenRotationsComponent }
|
||||
{ path: '', component: ScreenEditComponent },
|
||||
/* IMPORTANT: all routes have to include a `.` (dot)
|
||||
this is a workaround used in `sw.js`
|
||||
to allow hosting services on the same subdomain as this PWA
|
||||
*/
|
||||
{ path: 'basic.t', component: ScreenBasicComponent },
|
||||
{ path: 'rotations.t', component: ScreenRotationsComponent }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
@@ -6,6 +6,7 @@ import { Player } from './model';
|
||||
})
|
||||
export class DataService {
|
||||
private players: Player[] = [];
|
||||
teams: Player[][] = [];
|
||||
|
||||
setPlayers(players: Player[]){
|
||||
for (let player of players){
|
||||
|
||||
@@ -21,12 +21,17 @@ export class Player{
|
||||
this.setter = setter;
|
||||
this.libero = libero;
|
||||
}
|
||||
serialize(): string[] {
|
||||
const values = 'OOOO'
|
||||
return [this.name, values];
|
||||
getRoles(): string[] {
|
||||
const roles = [];
|
||||
if (this.outside){roles.push('OH')}
|
||||
if (this.middle){roles.push('M')}
|
||||
if (this.opposite){roles.push('OPP')}
|
||||
if (this.setter){roles.push('S')}
|
||||
if (this.libero){roles.push('L')}
|
||||
return roles;
|
||||
}
|
||||
|
||||
valueOf(): string{
|
||||
toString(): string{
|
||||
return this.name;
|
||||
}
|
||||
static deSerialize(name: string, values: string): Player{
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (team of teamsArray; track $index) {
|
||||
@for (team of data.teams; track $index) {
|
||||
<tr>
|
||||
<td style="text-wrap: wrap;">{{ team.length | number }}</td>
|
||||
<td class="wrap-cell">{{ team }}</td>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
// Original Team Generation Screen for arbitrary size and number of teams
|
||||
import { Component, inject} from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { RouterOutlet, ActivatedRoute } from '@angular/router';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { Player } from '../model';
|
||||
@@ -10,7 +9,7 @@ import { DataService } from '../data.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-screen-basic',
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule],
|
||||
imports: [NgbModule, CommonModule, FormsModule],
|
||||
templateUrl: './screen-basic.component.html',
|
||||
styleUrl: './screen-basic.component.less'
|
||||
})
|
||||
@@ -19,7 +18,6 @@ export class ScreenBasicComponent {
|
||||
numTeamsSelectorValue = "2";
|
||||
numTeamsSelected = 2;
|
||||
nTeamsValue = "4";
|
||||
teamsArray: string[][] = [];
|
||||
|
||||
onButtonGenerate(): void{
|
||||
if(this.numTeamsSelectorValue === 'n'){
|
||||
@@ -40,10 +38,10 @@ export class ScreenBasicComponent {
|
||||
let n = localPlayers[index];
|
||||
localPlayers.splice(index,1);
|
||||
let team = iterator.next().value;
|
||||
team.push(n.name);
|
||||
team.push(n);
|
||||
|
||||
}
|
||||
this.teamsArray = teams;
|
||||
this.data.teams = teams;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -19,7 +19,10 @@
|
||||
<ul class="list-group mb-3">
|
||||
@for (player of data.getPlayers(); track $index) {
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<a (click)="openPlayerModal(player)" style="display: block; cursor: pointer; flex-grow: 1; text-align: left;">{{ player.name }}</a>
|
||||
<div (click)="openPlayerModal(player)" class="player-content">
|
||||
<div class="text-start">{{ player.name }}</div>
|
||||
<div class="text-end">{{ player.getRoles() }}</div>
|
||||
</div>
|
||||
<button (click)="removeItem(player)" class="btn btn-secondary btn-sm p-0 ms-2" style="width: 24px; height: 24px" >
|
||||
<i class="bi bi-x"></i>
|
||||
</button>
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
.player-content{
|
||||
cursor: pointer;
|
||||
flex-grow: 1;
|
||||
text-align: left;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
// Team Generation Screen respecting volleyball roles as defined by `../model/Player`
|
||||
import { Component, inject, Input } from '@angular/core';
|
||||
import { Component, inject, OnInit } from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { Player } from '../model';
|
||||
import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap';
|
||||
@@ -11,8 +11,13 @@ import { DataService } from '../data.service';
|
||||
templateUrl: './screen-rotations.component.html',
|
||||
styleUrl: './screen-rotations.component.less'
|
||||
})
|
||||
export class ScreenRotationsComponent {
|
||||
export class ScreenRotationsComponent implements OnInit{
|
||||
data = inject(DataService);
|
||||
ngOnInit(): void {
|
||||
|
||||
}
|
||||
// https://de.wikipedia.org/wiki/Volleyball#Spielpositionen
|
||||
// we want 2 outside, 1 opp, 1 set and either 2*middle or middle + libero
|
||||
|
||||
get OutsidePlayers(): Player[] {
|
||||
return this.data.getPlayers().filter(player => player.outside);
|
||||
|
||||
@@ -9,7 +9,7 @@ html, body {
|
||||
body {
|
||||
margin:3em auto;
|
||||
font-family: Roboto, "Helvetica Neue", sans-serif;
|
||||
padding:0 .5em;
|
||||
padding:.5em auto;
|
||||
}
|
||||
h1,h2,h3{
|
||||
line-height:1.2;
|
||||
|
||||
Reference in New Issue
Block a user