Compare commits
7 Commits
b6d34ce262
...
feat/prolo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ffda8468e7 | ||
|
|
bde0efa167 | ||
|
|
3ca88d9e2f | ||
|
|
bdd6de5fbe | ||
|
|
8493e742e9 | ||
|
|
2999d8eee7 | ||
|
|
c4a2307530 |
@@ -35,6 +35,7 @@
|
||||
],
|
||||
"styles": [
|
||||
"node_modules/bootstrap/dist/css/bootstrap.min.css",
|
||||
"node_modules/bootstrap-icons/font/bootstrap-icons.min.css",
|
||||
"src/styles.less"
|
||||
],
|
||||
"scripts": [],
|
||||
|
||||
36
package-lock.json
generated
36
package-lock.json
generated
@@ -23,9 +23,11 @@
|
||||
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"bootstrap": "^5.3.3",
|
||||
"bootstrap-icons": "^1.13.1",
|
||||
"express": "^4.18.2",
|
||||
"rxjs": "~7.8.0",
|
||||
"sonarqube-scanner": "^4.3.0",
|
||||
"swipl-wasm": "^7.0.5",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.15.0"
|
||||
},
|
||||
@@ -5314,6 +5316,12 @@
|
||||
"@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": {
|
||||
"version": "9.6.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
|
||||
@@ -6249,6 +6257,22 @@
|
||||
"@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": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
@@ -13611,6 +13635,18 @@
|
||||
"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": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
|
||||
|
||||
@@ -27,9 +27,11 @@
|
||||
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"bootstrap": "^5.3.3",
|
||||
"bootstrap-icons": "^1.13.1",
|
||||
"express": "^4.18.2",
|
||||
"rxjs": "~7.8.0",
|
||||
"sonarqube-scanner": "^4.3.0",
|
||||
"swipl-wasm": "^7.0.5",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.15.0"
|
||||
},
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
<main class="main">
|
||||
<app-screen-rotations [players]="players"></app-screen-rotations>
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
|
||||
<router-outlet />
|
||||
<nav>
|
||||
<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>
|
||||
@@ -16,3 +16,20 @@ tr{
|
||||
word-break: break-all;
|
||||
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;
|
||||
}
|
||||
@@ -1,34 +1,45 @@
|
||||
import { Component, OnInit} from '@angular/core';
|
||||
import { Component, inject, OnInit} from '@angular/core';
|
||||
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 { 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 { Player } from './util/model';
|
||||
import { DataService } from './data.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent],
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RouterLink],
|
||||
templateUrl: './app.component.html',
|
||||
styleUrl: './app.component.less'
|
||||
})
|
||||
export class AppComponent implements OnInit {
|
||||
title = 'vb';
|
||||
players : Player[] = [];
|
||||
data = inject(DataService);
|
||||
activeId = '/';
|
||||
|
||||
constructor(private activatedRoute: ActivatedRoute){}
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private router: Router
|
||||
){}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.activatedRoute.queryParams.pipe(
|
||||
filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
|
||||
this.router.events
|
||||
.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)
|
||||
).subscribe(params => {
|
||||
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))
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,3 +1,19 @@
|
||||
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 }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
16
src/app/data.service.spec.ts
Normal file
16
src/app/data.service.spec.ts
Normal 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
34
src/app/data.service.ts
Normal 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
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { Player} from '../model';
|
||||
import { Player} from '../util/model';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
@Component({
|
||||
|
||||
@@ -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,24 +1,23 @@
|
||||
// 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 { RouterOutlet, ActivatedRoute } from '@angular/router';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { Player } from '../model';
|
||||
import { iter } from '../util';
|
||||
import { Player } from '../util/model';
|
||||
import { assignPlayersRandomly, iter } from '../util/util';
|
||||
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'
|
||||
})
|
||||
export class ScreenBasicComponent {
|
||||
@Input() players!: Player[];
|
||||
data = inject(DataService);
|
||||
numTeamsSelectorValue = "2";
|
||||
numTeamsSelected = 2;
|
||||
nTeamsValue = "4";
|
||||
teamsArray: string[][] = [];
|
||||
|
||||
onButtonGenerate(): void{
|
||||
if(this.numTeamsSelectorValue === 'n'){
|
||||
@@ -28,21 +27,8 @@ export class ScreenBasicComponent {
|
||||
this.numTeamsSelected = Number(this.numTeamsSelectorValue);
|
||||
}
|
||||
|
||||
let teams = Array.from({ length: this.numTeamsSelected }, () => []);
|
||||
// clone array here
|
||||
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;
|
||||
let teams: Player[][]= Array.from({ length: this.numTeamsSelected }, () => []);
|
||||
this.data.teams = assignPlayersRandomly(this.data.getPlayers(),teams);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="justify-content-md-center">
|
||||
<h1>Players: {{ players.length }}</h1>
|
||||
<h1>Players: {{ data.getPlayers().length }}</h1>
|
||||
<div class="input-group mb-3">
|
||||
<input
|
||||
type="text"
|
||||
@@ -17,9 +17,15 @@
|
||||
}
|
||||
<div class="container mt-4">
|
||||
<ul class="list-group mb-3">
|
||||
@for (player of players; track $index) {
|
||||
<li class="list-group-item">
|
||||
<a (click)="openPlayerModal(player)" style="display: block; cursor: pointer;">{{ player.name }}</a>
|
||||
@for (player of data.getPlayers(); track $index) {
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<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>
|
||||
}
|
||||
</ul>
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
.player-content{
|
||||
cursor: pointer;
|
||||
flex-grow: 1;
|
||||
text-align: left;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
@@ -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 { Player } from '../model';
|
||||
import { Player } from '../util/model';
|
||||
import { ModalRotationsComponent } from '../modal-rotations/modal-rotations.component';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { Subject } from 'rxjs/internal/Subject';
|
||||
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||
import { debounceTime, tap } from 'rxjs/operators';
|
||||
import { DataService } from '../data.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-screen-edit',
|
||||
@@ -14,7 +15,7 @@ import { debounceTime, tap } from 'rxjs/operators';
|
||||
styleUrl: './screen-edit.component.less'
|
||||
})
|
||||
export class ScreenEditComponent {
|
||||
@Input() players!: Player[];
|
||||
data = inject(DataService);
|
||||
@ViewChild('selfClosingAlert', { static: false })selfClosingAlert!: NgbAlert;
|
||||
private _message$ = new Subject<string>();
|
||||
newItem: string = "";
|
||||
@@ -34,15 +35,18 @@ export class ScreenEditComponent {
|
||||
const name = this.newItem.trim()
|
||||
if (name) {
|
||||
let newPlayer = new Player(name);
|
||||
if (Player.isNew(newPlayer, this.players)){
|
||||
this.players.push(newPlayer);
|
||||
if(this.data.addPlayer(newPlayer)){
|
||||
this.newItem = '';
|
||||
return
|
||||
}
|
||||
else{
|
||||
this.setAlertMessage(newPlayer.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
removeItem(player: Player){
|
||||
this.data.removePlayer(player);
|
||||
}
|
||||
|
||||
openPlayerModal(player: Player){
|
||||
const modalRef = this.modalService.open(ModalRotationsComponent);
|
||||
|
||||
@@ -1,65 +1,93 @@
|
||||
<div class="justify-content-md-center">
|
||||
<h1>Rotations</h1>
|
||||
<form>
|
||||
<button type="button" (click)="generateTeams()" class="btn btn-primary mb-3">Generate</button>
|
||||
</form>
|
||||
|
||||
<div ngbAccordion>
|
||||
<div ngbAccordionItem>
|
||||
<h2 ngbAccordionHeader>
|
||||
<button ngbAccordionButton>Outside</button>
|
||||
</h2>
|
||||
<div ngbAccordionCollapse>
|
||||
<div ngbAccordionBody>
|
||||
@for (player of outsidePlayers; track $index) {
|
||||
<div ngbAccordionItem [collapsed]="false">
|
||||
<h2 ngbAccordionHeader>
|
||||
<button ngbAccordionButton>Libero: {{ LiberoPlayers.length }}</button>
|
||||
</h2>
|
||||
<div ngbAccordionCollapse>
|
||||
<div ngbAccordionBody>
|
||||
<ng-template>
|
||||
@for (player of LiberoPlayers; track $index) {
|
||||
{{ player.name }}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</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 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>
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
// 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 { Player } from '../model';
|
||||
import { Player } from '../util/model';
|
||||
import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { DataService } from '../data.service';
|
||||
import { solveRotations } from '../util/solver';
|
||||
|
||||
@Component({
|
||||
selector: 'app-screen-rotations',
|
||||
@@ -10,21 +12,33 @@ import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordio
|
||||
templateUrl: './screen-rotations.component.html',
|
||||
styleUrl: './screen-rotations.component.less'
|
||||
})
|
||||
export class ScreenRotationsComponent {
|
||||
@Input() players!: Player[];
|
||||
get outsidePlayers(): Player[] {
|
||||
return this.players.filter(player => !player.outside);
|
||||
export class ScreenRotationsComponent{
|
||||
data = inject(DataService);
|
||||
|
||||
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[] {
|
||||
return this.players.filter(player => player.opposite);
|
||||
get MiddlePlayers(): Player[] {
|
||||
return this.data.getPlayers().filter(player => player.middle);
|
||||
}
|
||||
get OppositePlayers(): Player[] {
|
||||
return this.data.getPlayers().filter(player => player.opposite);
|
||||
}
|
||||
get SetterPlayers(): Player[] {
|
||||
return this.players.filter(player => player.setter);
|
||||
return this.data.getPlayers().filter(player => player.setter);
|
||||
}
|
||||
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
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
export function* iter(list: any[]){
|
||||
let index = 0;
|
||||
while(true){
|
||||
yield list[index % list.length];
|
||||
index++;
|
||||
}
|
||||
}
|
||||
@@ -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{
|
||||
44
src/app/util/rotations.pl
Normal file
44
src/app/util/rotations.pl
Normal 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 A∩B = ∅
|
||||
|
||||
|
||||
|
||||
s(s).
|
||||
oh(oh).
|
||||
oh(oh2).
|
||||
opp(opp).
|
||||
l(l).
|
||||
m(m).
|
||||
11
src/app/util/solver.ts
Normal file
11
src/app/util/solver.ts
Normal 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
21
src/app/util/util.ts
Normal 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;
|
||||
}
|
||||
@@ -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