7 Commits

Author SHA1 Message Date
eneller
ffda8468e7 add swipl-wasm 2026-04-05 21:34:56 +02:00
eneller
bde0efa167 feat: show roles in edit list 2026-03-27 08:26:43 +01:00
eneller
3ca88d9e2f fix: nav jumping on page reload 2026-03-27 07:41:05 +01:00
eneller
bdd6de5fbe fix: pwa and external interop 2026-03-27 06:47:40 +01:00
eneller
8493e742e9 refactor: remove player list workaround 2026-02-01 12:01:42 +01:00
eneller
2999d8eee7 fix: prettier navbar 2026-02-01 10:49:21 +01:00
eneller
c4a2307530 feat: 3 screens for rotations
commit 563116331f
Author: eneller <erikneller@gmx.de>
Date:   Sun Feb 1 10:28:19 2026 +0100

    fix: edit list items

commit 1946c599be
Author: eneller <erikneller@gmx.de>
Date:   Sun Feb 1 10:19:16 2026 +0100

    fix: minor misc ui and data

commit 7c7762515b
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 23:02:01 2026 +0100

    feat: navbar

commit aaa0ab0638
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 21:05:23 2026 +0100

    feat: remove players

commit 4082932095
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 20:36:49 2026 +0100

    feat: dataservice

commit b6d34ce262
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 17:12:37 2026 +0100

    wip: rotations accordion

commit 764ce43138
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 16:29:11 2026 +0100

    refactor: basic screen

commit 1bc97df0da
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 15:52:06 2026 +0100

    feat: deduplicated player adding

commit 5408a8d9b6
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 00:31:01 2026 +0100

    central players list

commit 665cb25d34
Author: eneller <erikneller@gmx.de>
Date:   Fri Jan 30 23:15:16 2026 +0100

    feat: modal

commit 3b8e5145c3
Author: eneller <erikneller@gmx.de>
Date:   Fri Jan 30 22:51:09 2026 +0100

    wip: player modal

commit 51414f5a99
Author: eneller <erikneller@gmx.de>
Date:   Fri Jan 30 22:03:48 2026 +0100

    refactor: extract randomizer to component
2026-02-01 10:40:05 +01:00
23 changed files with 395 additions and 132 deletions

View File

@@ -35,6 +35,7 @@
], ],
"styles": [ "styles": [
"node_modules/bootstrap/dist/css/bootstrap.min.css", "node_modules/bootstrap/dist/css/bootstrap.min.css",
"node_modules/bootstrap-icons/font/bootstrap-icons.min.css",
"src/styles.less" "src/styles.less"
], ],
"scripts": [], "scripts": [],

36
package-lock.json generated
View File

@@ -23,9 +23,11 @@
"@ng-bootstrap/ng-bootstrap": "^18.0.0", "@ng-bootstrap/ng-bootstrap": "^18.0.0",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
"bootstrap-icons": "^1.13.1",
"express": "^4.18.2", "express": "^4.18.2",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"sonarqube-scanner": "^4.3.0", "sonarqube-scanner": "^4.3.0",
"swipl-wasm": "^7.0.5",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.15.0" "zone.js": "~0.15.0"
}, },
@@ -5314,6 +5316,12 @@
"@types/node": "*" "@types/node": "*"
} }
}, },
"node_modules/@types/emscripten": {
"version": "1.41.5",
"resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.41.5.tgz",
"integrity": "sha512-cMQm7pxu6BxtHyqJ7mQZ2kXWV5SLmugybFdHCBbJ5eHzOo6VhBckEgAT3//rP5FwPHNPeEiq4SmQ5ucBwsOo4Q==",
"license": "MIT"
},
"node_modules/@types/eslint": { "node_modules/@types/eslint": {
"version": "9.6.1", "version": "9.6.1",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -6249,6 +6257,22 @@
"@popperjs/core": "^2.11.8" "@popperjs/core": "^2.11.8"
} }
}, },
"node_modules/bootstrap-icons": {
"version": "1.13.1",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz",
"integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/twbs"
},
{
"type": "opencollective",
"url": "https://opencollective.com/bootstrap"
}
],
"license": "MIT"
},
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -13611,6 +13635,18 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/swipl-wasm": {
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/swipl-wasm/-/swipl-wasm-7.0.5.tgz",
"integrity": "sha512-3J6NYJq+G5xepS4zCTh15fdS9An0D/zqOLpF9l6y20nPEZcOagZ0v8Vt2IclPn4njFFL1LmgsBfHqjxZjkFYPA==",
"license": "BSD-2-Clause",
"dependencies": {
"@types/emscripten": "^1.41.5"
},
"bin": {
"swipl-generate": "dist/bin/index.js"
}
},
"node_modules/symbol-observable": { "node_modules/symbol-observable": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",

View File

@@ -27,9 +27,11 @@
"@ng-bootstrap/ng-bootstrap": "^18.0.0", "@ng-bootstrap/ng-bootstrap": "^18.0.0",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
"bootstrap-icons": "^1.13.1",
"express": "^4.18.2", "express": "^4.18.2",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"sonarqube-scanner": "^4.3.0", "sonarqube-scanner": "^4.3.0",
"swipl-wasm": "^7.0.5",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.15.0" "zone.js": "~0.15.0"
}, },

View File

@@ -1,5 +1,16 @@
<main class="main"> <main class="main">
<app-screen-rotations [players]="players"></app-screen-rotations> <router-outlet></router-outlet>
</main> </main>
<nav>
<router-outlet /> <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>

View File

@@ -15,4 +15,21 @@ tr{
.wrap-cell{ .wrap-cell{
word-break: break-all; word-break: break-all;
white-space: normal; white-space: normal;
}
.main{
margin-bottom: 5rem;
padding: 1rem;
overflow-y: auto;
}
.custom-navbar{
width: 100vw;
position: fixed;
bottom: 0;
display: flex;
justify-content: space-around; /* Distribute items evenly */
z-index: 1000;
}
.custom-navitem{
text-align: center; /* Center the content of each item */
flex: 1;
} }

View File

@@ -1,34 +1,45 @@
import { Component, OnInit} from '@angular/core'; import { Component, inject, OnInit} from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { RouterOutlet, ActivatedRoute } from '@angular/router'; import { RouterOutlet, ActivatedRoute, RouterLink, Router, NavigationEnd } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { filter, take } from 'rxjs'; import { filter, take } from 'rxjs';
import { ScreenBasicComponent } from "./screen-basic/screen-basic.component"; import { Player } from './util/model';
import { ScreenRotationsComponent } from './screen-rotations/screen-rotations.component'; import { DataService } from './data.service';
import { Player } from './model';
import { ScreenEditComponent } from './screen-edit/screen-edit.component';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent], imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RouterLink],
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrl: './app.component.less' styleUrl: './app.component.less'
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
title = 'vb'; title = 'vb';
players : Player[] = []; data = inject(DataService);
activeId = '/';
constructor(private activatedRoute: ActivatedRoute){} constructor(
private route: ActivatedRoute,
private router: Router
){}
ngOnInit(): void { ngOnInit(): void {
this.activatedRoute.queryParams.pipe( this.router.events
filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty .pipe(filter(event => event instanceof NavigationEnd))
.subscribe(() => {
this.activeId = this.router.url;
});
// process query params
this.route.queryParams.pipe(
// Only proceed if params are not empty
filter(params => Object.keys(params).length > 0),
take(1) take(1)
).subscribe(params => { ).subscribe(params => {
if (params['names']){ if (params['names']){
this.players = params['names'].split(',').map((name: string) => new Player(name)); this.data.setPlayers(
params['names'].split(',').map((name: string) => new Player(name))
);
} }
}); });
} }

View File

@@ -1,3 +1,19 @@
import { Routes } from '@angular/router'; 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';
export const routes: Routes = []; export const routes: Routes = [
{
path: '',
children: [
{ 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 }
]
}
];

View File

@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { DataService } from './data.service';
describe('DataService', () => {
let service: DataService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(DataService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});

34
src/app/data.service.ts Normal file
View File

@@ -0,0 +1,34 @@
import { Injectable } from '@angular/core';
import { Player } from './util/model';
@Injectable({
providedIn: 'root'
})
export class DataService {
private players: Player[] = [];
teams: Player[][] = [];
setPlayers(players: Player[]){
for (let player of players){
this.addPlayer(player);
}
}
addPlayer(player: Player): boolean{
if (player.name.trim() && Player.isNew(player, this.players)){
this.players.push(player);
return true
}
return false
}
removePlayer(player: Player){
const index = this.players.indexOf(player);
if (index !== -1) {
this.players.splice(index, 1);
}
}
getPlayers(): Player[] {
let clone =Object.assign([],this.players);
return clone
}
}

View File

@@ -1,6 +1,6 @@
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { Player} from '../model'; import { Player} from '../util/model';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
@Component({ @Component({

View File

@@ -30,7 +30,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@for (team of teamsArray; track $index) { @for (team of data.teams; track $index) {
<tr> <tr>
<td style="text-wrap: wrap;">{{ team.length | number }}</td> <td style="text-wrap: wrap;">{{ team.length | number }}</td>
<td class="wrap-cell">{{ team }}</td> <td class="wrap-cell">{{ team }}</td>

View File

@@ -1,24 +1,23 @@
// Original Team Generation Screen for arbitrary size and number of teams // Original Team Generation Screen for arbitrary size and number of teams
import { Component, Input, OnInit} from '@angular/core'; import { Component, inject} from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { RouterOutlet, ActivatedRoute } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Player } from '../model'; import { Player } from '../util/model';
import { iter } from '../util'; import { assignPlayersRandomly, iter } from '../util/util';
import { DataService } from '../data.service';
@Component({ @Component({
selector: 'app-screen-basic', selector: 'app-screen-basic',
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule], imports: [NgbModule, CommonModule, FormsModule],
templateUrl: './screen-basic.component.html', templateUrl: './screen-basic.component.html',
styleUrl: './screen-basic.component.less' styleUrl: './screen-basic.component.less'
}) })
export class ScreenBasicComponent { export class ScreenBasicComponent {
@Input() players!: Player[]; data = inject(DataService);
numTeamsSelectorValue = "2"; numTeamsSelectorValue = "2";
numTeamsSelected = 2; numTeamsSelected = 2;
nTeamsValue = "4"; nTeamsValue = "4";
teamsArray: string[][] = [];
onButtonGenerate(): void{ onButtonGenerate(): void{
if(this.numTeamsSelectorValue === 'n'){ if(this.numTeamsSelectorValue === 'n'){
@@ -28,21 +27,8 @@ export class ScreenBasicComponent {
this.numTeamsSelected = Number(this.numTeamsSelectorValue); this.numTeamsSelected = Number(this.numTeamsSelectorValue);
} }
let teams = Array.from({ length: this.numTeamsSelected }, () => []); let teams: Player[][]= Array.from({ length: this.numTeamsSelected }, () => []);
// clone array here this.data.teams = assignPlayersRandomly(this.data.getPlayers(),teams);
let localPlayers: Player[] = Object.assign([],this.players);
let nameslen = localPlayers.length;
let iterator = iter(teams);
for(let i =0; i < nameslen; i++){
let index = Math.floor(Math.random()* localPlayers.length);
let n = localPlayers[index];
localPlayers.splice(index,1);
let team = iterator.next().value;
team.push(n.name);
}
this.teamsArray = teams;
} }
} }

View File

@@ -1,5 +1,5 @@
<div class="justify-content-md-center"> <div class="justify-content-md-center">
<h1>Players: {{ players.length }}</h1> <h1>Players: {{ data.getPlayers().length }}</h1>
<div class="input-group mb-3"> <div class="input-group mb-3">
<input <input
type="text" type="text"
@@ -17,9 +17,15 @@
} }
<div class="container mt-4"> <div class="container mt-4">
<ul class="list-group mb-3"> <ul class="list-group mb-3">
@for (player of players; track $index) { @for (player of data.getPlayers(); track $index) {
<li class="list-group-item"> <li class="list-group-item d-flex justify-content-between">
<a (click)="openPlayerModal(player)" style="display: block; cursor: pointer;">{{ 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>
</li> </li>
} }
</ul> </ul>

View File

@@ -0,0 +1,7 @@
.player-content{
cursor: pointer;
flex-grow: 1;
text-align: left;
display: flex;
justify-content: space-between;
}

View File

@@ -1,11 +1,12 @@
import { Component, Input, ViewChild } from '@angular/core'; import { Component, inject, Input, ViewChild } from '@angular/core';
import { NgbAlert, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbAlert, NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { Player } from '../model'; import { Player } from '../util/model';
import { ModalRotationsComponent } from '../modal-rotations/modal-rotations.component'; import { ModalRotationsComponent } from '../modal-rotations/modal-rotations.component';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { Subject } from 'rxjs/internal/Subject'; import { Subject } from 'rxjs/internal/Subject';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { debounceTime, tap } from 'rxjs/operators'; import { debounceTime, tap } from 'rxjs/operators';
import { DataService } from '../data.service';
@Component({ @Component({
selector: 'app-screen-edit', selector: 'app-screen-edit',
@@ -14,7 +15,7 @@ import { debounceTime, tap } from 'rxjs/operators';
styleUrl: './screen-edit.component.less' styleUrl: './screen-edit.component.less'
}) })
export class ScreenEditComponent { export class ScreenEditComponent {
@Input() players!: Player[]; data = inject(DataService);
@ViewChild('selfClosingAlert', { static: false })selfClosingAlert!: NgbAlert; @ViewChild('selfClosingAlert', { static: false })selfClosingAlert!: NgbAlert;
private _message$ = new Subject<string>(); private _message$ = new Subject<string>();
newItem: string = ""; newItem: string = "";
@@ -34,15 +35,18 @@ export class ScreenEditComponent {
const name = this.newItem.trim() const name = this.newItem.trim()
if (name) { if (name) {
let newPlayer = new Player(name); let newPlayer = new Player(name);
if (Player.isNew(newPlayer, this.players)){ if(this.data.addPlayer(newPlayer)){
this.players.push(newPlayer);
this.newItem = ''; this.newItem = '';
return
} }
else{ else{
this.setAlertMessage(newPlayer.name); this.setAlertMessage(newPlayer.name);
} }
} }
} }
removeItem(player: Player){
this.data.removePlayer(player);
}
openPlayerModal(player: Player){ openPlayerModal(player: Player){
const modalRef = this.modalService.open(ModalRotationsComponent); const modalRef = this.modalService.open(ModalRotationsComponent);

View File

@@ -1,65 +1,93 @@
<div class="justify-content-md-center"> <div class="justify-content-md-center">
<h1>Rotations</h1> <h1>Rotations</h1>
<form>
<button type="button" (click)="generateTeams()" class="btn btn-primary mb-3">Generate</button>
</form>
<div ngbAccordion> <div ngbAccordion>
<div ngbAccordionItem> <div ngbAccordionItem [collapsed]="false">
<h2 ngbAccordionHeader> <h2 ngbAccordionHeader>
<button ngbAccordionButton>Outside</button> <button ngbAccordionButton>Libero: {{ LiberoPlayers.length }}</button>
</h2> </h2>
<div ngbAccordionCollapse> <div ngbAccordionCollapse>
<div ngbAccordionBody> <div ngbAccordionBody>
@for (player of outsidePlayers; track $index) { <ng-template>
@for (player of LiberoPlayers; track $index) {
{{ player.name }} {{ player.name }}
} }
</div> </ng-template>
</div> </div>
</div>
</div>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Setter: {{ SetterPlayers.length }}</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>
@for (player of SetterPlayers; track $index) {
{{ player.name }}
}
</ng-template>
</div>
</div>
</div>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Opposite: {{ OppositePlayers.length }}</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>
@for (player of OppositePlayers; track $index) {
{{ player.name }}
}
</ng-template>
</div>
</div>
</div>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Middle: {{ MiddlePlayers.length }}</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>
@for (player of MiddlePlayers; track $index) {
{{ player.name }}
}
</ng-template>
</div>
</div>
</div>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Outside: {{ OutsidePlayers.length}}</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>
@for (player of OutsidePlayers; track $index) {
{{ player.name }}
}
</ng-template>
</div>
</div>
</div>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>No Role: {{ NoRolePlayers.length }}</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>
@for (player of NoRolePlayers; track $index) {
{{ player.name }}
}
</ng-template>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div ngbAccordion>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Middle</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>Content for the first item</ng-template>
</div>
</div>
</div>
</div>
<div ngbAccordion>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Opposite</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>Content for the first item</ng-template>
</div>
</div>
</div>
</div>
<div ngbAccordion>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Setter</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>Content for the first item</ng-template>
</div>
</div>
</div>
</div>
<div ngbAccordion>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Libero</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
<ng-template>Content for the first item</ng-template>
</div>
</div>
</div>
</div>
</div>

View File

@@ -1,8 +1,10 @@
// Team Generation Screen respecting volleyball roles as defined by `../model/Player` // Team Generation Screen respecting volleyball roles as defined by `../model/Player`
import { Component, Input } from '@angular/core'; import { Component, inject } from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { Player } from '../model'; import { Player } from '../util/model';
import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap'; import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap';
import { DataService } from '../data.service';
import { solveRotations } from '../util/solver';
@Component({ @Component({
selector: 'app-screen-rotations', selector: 'app-screen-rotations',
@@ -10,21 +12,33 @@ import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordio
templateUrl: './screen-rotations.component.html', templateUrl: './screen-rotations.component.html',
styleUrl: './screen-rotations.component.less' styleUrl: './screen-rotations.component.less'
}) })
export class ScreenRotationsComponent { export class ScreenRotationsComponent{
@Input() players!: Player[]; data = inject(DataService);
get outsidePlayers(): Player[] {
return this.players.filter(player => !player.outside); async generateTeams(){
const teamCount = Math.floor(this.data.getPlayers().length / 6);
solveRotations();
} }
get middlePlayers(): Player[] {
return this.players.filter(player => player.middle); get OutsidePlayers(): Player[] {
return this.data.getPlayers().filter(player => player.outside);
} }
get oppositePlayers(): Player[] { get MiddlePlayers(): Player[] {
return this.players.filter(player => player.opposite); return this.data.getPlayers().filter(player => player.middle);
}
get OppositePlayers(): Player[] {
return this.data.getPlayers().filter(player => player.opposite);
} }
get SetterPlayers(): Player[] { get SetterPlayers(): Player[] {
return this.players.filter(player => player.setter); return this.data.getPlayers().filter(player => player.setter);
} }
get LiberoPlayers(): Player[] { get LiberoPlayers(): Player[] {
return this.players.filter(player => player.libero); return this.data.getPlayers().filter(player => player.libero);
}
get NoRolePlayers(): Player[] {
return this.data.getPlayers().filter(
player => !player.outside && !player.middle && !player.opposite && !player.setter && !player.libero
);
} }
} }

View File

@@ -1,7 +0,0 @@
export function* iter(list: any[]){
let index = 0;
while(true){
yield list[index % list.length];
index++;
}
}

View File

@@ -21,12 +21,17 @@ export class Player{
this.setter = setter; this.setter = setter;
this.libero = libero; this.libero = libero;
} }
serialize(): string[] { getRoles(): string[] {
const values = 'OOOO' const roles = [];
return [this.name, values]; 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; return this.name;
} }
static deSerialize(name: string, values: string): Player{ static deSerialize(name: string, values: string): Player{

44
src/app/util/rotations.pl Normal file
View File

@@ -0,0 +1,44 @@
% https://de.wikipedia.org/wiki/Volleyball#Spielpositionen
% we want 2 outside, 1 opp, 1 set and either 2*middle or middle + libero
teams(0).
number_of_teams(X,Result):- Result is floor(X/6).
libero(tom).
libero(anh).
:-style_check(-discontiguous).
players(_/X):- X=:=1.
% introduce abbreviations used for s(etter), oh (outside hitter), opp(osite), l(ibero), m(iddle)
s(_) :- member(1, [0]).
oh(_) :- member(1, [0]).
opp(_) :- member(1, [0]).
l(_) :- member(1, [0]).
m(_) :- member(1, [0]).
team(List):-
findall(X, (member(X, List),s(X)),Setters),
length(Setters,1),
findall(X, (member(X, List),oh(X)),Outsides),
length(Outsides,2),
findall(X, (member(X, List),opp(X)),Opposites),
length(Opposites,1),
% require either 2 middles or 1+1 libero.
(findall(X, (member(X, List),m(X)),Middles),
length(Middles, 2)
;
(findall(X, (member(X, List),m(X)),Middles),
length(Middles,1),
findall(X, (member(X,List), l(X)),Liberos),
length(Liberos,1)
)
).
% TODO require all sets to be AB =
s(s).
oh(oh).
oh(oh2).
opp(opp).
l(l).
m(m).

11
src/app/util/solver.ts Normal file
View File

@@ -0,0 +1,11 @@
import SWIPL from 'swipl-wasm';
export async function solveRotations(){
const swipl = await SWIPL({ arguments: ["-q"] });
const q = swipl.prolog.query("member(X, [a, b, c]).").once() as PrologResult;
console.log(q.X);
}
interface PrologResult {
X: string;
}

21
src/app/util/util.ts Normal file
View File

@@ -0,0 +1,21 @@
import { Player } from "./model";
export function* iter(list: any[]){
let index = 0;
while(true){
yield list[index % list.length];
index++;
}
}
export function assignPlayersRandomly(players: Player[], teams: Player[][]){
let nameslen = players.length;
let iterator = iter(teams);
for(let i =0; i < nameslen; i++){
let index = Math.floor(Math.random()* players.length);
let n = players[index];
players.splice(index,1);
let team = iterator.next().value;
team.push(n);
}
return teams;
}

View File

@@ -9,7 +9,7 @@ html, body {
body { body {
margin:3em auto; margin:3em auto;
font-family: Roboto, "Helvetica Neue", sans-serif; font-family: Roboto, "Helvetica Neue", sans-serif;
padding:0 .5em; padding:.5em auto;
} }
h1,h2,h3{ h1,h2,h3{
line-height:1.2; line-height:1.2;