Compare commits
4 Commits
7e7313916b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66fff4ee07 | ||
|
|
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": [],
|
||||
|
||||
17
package-lock.json
generated
17
package-lock.json
generated
@@ -23,6 +23,7 @@
|
||||
"@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",
|
||||
@@ -6249,6 +6250,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",
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
"@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",
|
||||
|
||||
@@ -1,59 +1,10 @@
|
||||
<main class="main">
|
||||
<div class="row justify-content-md-center">
|
||||
<h1>Please select the number of teams:</h1>
|
||||
<div class="btn-toolbar mb-3 col justify-content-center" role="toolbar">
|
||||
<div class="btn-group me-2" id="numTeamsSelector" role="group"
|
||||
value="2">
|
||||
<input value="2" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio1" autocomplete="off" checked>
|
||||
<label class="btn btn-outline-primary" for="btnradio1">Two</label>
|
||||
|
||||
<input value="3" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio2" autocomplete="off">
|
||||
<label class="btn btn-outline-primary" for="btnradio2">Three</label>
|
||||
|
||||
<input value="n" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio3" autocomplete="off">
|
||||
<label class="btn btn-outline-primary" for="btnradio3">n</label>
|
||||
</div>
|
||||
<div *ngIf="numTeamsSelectorValue === 'n'" id="nTeamsText" class="col-md-auto">
|
||||
<label for="nTeamsField">n Teams</label>
|
||||
<input type="number" pattern="\d*" [(ngModel)]="nTeamsValue" id="nTeamsField" class="form-control" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form>
|
||||
<div class="container">
|
||||
<label for="playerNames">Names</label>
|
||||
<textarea [(ngModel)]="playerNamesValue"
|
||||
class="form-control mb-3"
|
||||
rows="18"
|
||||
cols="30"
|
||||
style="text-align: left;"
|
||||
name="playerNames"
|
||||
#playerNames
|
||||
id="playerNames"
|
||||
></textarea>
|
||||
</div>
|
||||
<button type="button" (click)="onButtonGenerate(playerNames.value)" class="btn btn-primary">Generate</button>
|
||||
</form>
|
||||
|
||||
<table class="table table-striped custom-table">
|
||||
<caption *ngIf="duplicateNames.length >0">Removed: {{ duplicateNames }}</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Size</th>
|
||||
<th scope="col">Names</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (team of teamsArray; track $index) {
|
||||
<tr>
|
||||
<td style="text-wrap: wrap;">{{ team.length | number }}</td>
|
||||
<td class="wrap-cell">{{ team }}</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
|
||||
<router-outlet />
|
||||
<nav>
|
||||
<ul ngbNav [activeId]="route.fragment | async" 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>
|
||||
@@ -15,4 +15,21 @@ tr{
|
||||
.wrap-cell{
|
||||
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,77 +1,40 @@
|
||||
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 } 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],
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent, RouterLink],
|
||||
templateUrl: './app.component.html',
|
||||
styleUrl: './app.component.less'
|
||||
})
|
||||
export class AppComponent implements OnInit {
|
||||
title = 'vb';
|
||||
playerNamesValue = "";
|
||||
numTeamsSelectorValue = "2";
|
||||
numTeamsSelected = 2;
|
||||
nTeamsValue = "4";
|
||||
teamsArray: string[][] = [];
|
||||
duplicateNames: string[] = [];
|
||||
data = inject(DataService);
|
||||
|
||||
constructor(private activatedRoute: ActivatedRoute){}
|
||||
constructor(public route: ActivatedRoute){}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.activatedRoute.queryParams.pipe(
|
||||
this.route.queryParams.pipe(
|
||||
filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
|
||||
take(1)
|
||||
).subscribe(params => {
|
||||
const names = params['names']?.replaceAll(',', '\n');
|
||||
if (names) {
|
||||
this.playerNamesValue = names;
|
||||
if (params['names']){
|
||||
this.data.setPlayers(
|
||||
params['names'].split(',').map((name: string) => new Player(name))
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
onButtonGenerate(textinput: string): void{
|
||||
if(this.numTeamsSelectorValue === 'n'){
|
||||
this.numTeamsSelected = Number(this.nTeamsValue);
|
||||
}
|
||||
else{
|
||||
this.numTeamsSelected = Number(this.numTeamsSelectorValue);
|
||||
}
|
||||
let nameslist = this.playerNamesValue
|
||||
.split('\n')
|
||||
.map(function(str){return str.trim();})
|
||||
.filter(function(str){return str}); // boolean interpretation is same as non-empty
|
||||
// remove duplicates by using a Set
|
||||
let namesset = new Set(nameslist);
|
||||
let names = [...namesset];
|
||||
|
||||
|
||||
let teams = Array.from({ length: this.numTeamsSelected }, () => []);
|
||||
let playersPerTeam = Math.floor(names.length / this.numTeamsSelected);
|
||||
|
||||
let nameslen = names.length;
|
||||
function* iter(list: any[]){
|
||||
let index = 0;
|
||||
while(true){
|
||||
yield list[index % list.length];
|
||||
index++;
|
||||
}
|
||||
}
|
||||
let iterator = iter(teams);
|
||||
for(let i =0; i < nameslen; i++){
|
||||
let index = Math.floor(Math.random()* names.length);
|
||||
let n = names[index];
|
||||
names.splice(index,1);
|
||||
let team = iterator.next().value;
|
||||
team.push(n);
|
||||
|
||||
}
|
||||
this.teamsArray = teams;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
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 },
|
||||
{ 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 './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
|
||||
}
|
||||
}
|
||||
73
src/app/modal-rotations/modal-rotations.component.html
Normal file
73
src/app/modal-rotations/modal-rotations.component.html
Normal file
@@ -0,0 +1,73 @@
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">{{ player.name }}</h4>
|
||||
<button
|
||||
type="button"
|
||||
class="btn-close"
|
||||
(click)="activeModal.dismiss()"
|
||||
aria-label="Close"
|
||||
></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form>
|
||||
<div class="form-check">
|
||||
<input
|
||||
class="form-check-input"
|
||||
type="checkbox"
|
||||
[(ngModel)]="player.outside"
|
||||
name="outside"
|
||||
id="outside"
|
||||
/>
|
||||
<label class="form-check-label" for="outside">Outside</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input
|
||||
class="form-check-input"
|
||||
type="checkbox"
|
||||
[(ngModel)]="player.middle"
|
||||
name="middle"
|
||||
id="middle"
|
||||
/>
|
||||
<label class="form-check-label" for="middle">Middle</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input
|
||||
class="form-check-input"
|
||||
type="checkbox"
|
||||
[(ngModel)]="player.opposite"
|
||||
name="opposite"
|
||||
id="opposite"
|
||||
/>
|
||||
<label class="form-check-label" for="opposite">Opposite</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input
|
||||
class="form-check-input"
|
||||
type="checkbox"
|
||||
[(ngModel)]="player.setter"
|
||||
name="setter"
|
||||
id="setter"
|
||||
/>
|
||||
<label class="form-check-label" for="setter">Setter</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input
|
||||
class="form-check-input"
|
||||
type="checkbox"
|
||||
[(ngModel)]="player.libero"
|
||||
name="libero"
|
||||
id="libero"
|
||||
/>
|
||||
<label class="form-check-label" for="libero">Libero</label>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
(click)="savePlayer(); activeModal.close()"
|
||||
>
|
||||
Save
|
||||
</button>
|
||||
</div>
|
||||
|
||||
23
src/app/modal-rotations/modal-rotations.component.spec.ts
Normal file
23
src/app/modal-rotations/modal-rotations.component.spec.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ModalRotationsComponent } from './modal-rotations.component';
|
||||
|
||||
describe('ModalRotationsComponent', () => {
|
||||
let component: ModalRotationsComponent;
|
||||
let fixture: ComponentFixture<ModalRotationsComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ModalRotationsComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ModalRotationsComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
21
src/app/modal-rotations/modal-rotations.component.ts
Normal file
21
src/app/modal-rotations/modal-rotations.component.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { Player} from '../model';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
@Component({
|
||||
selector: 'app-modal-rotations',
|
||||
imports: [FormsModule],
|
||||
templateUrl: './modal-rotations.component.html',
|
||||
styleUrl: './modal-rotations.component.less'
|
||||
})
|
||||
export class ModalRotationsComponent {
|
||||
@Input() player!: Player;
|
||||
|
||||
constructor(public activeModal: NgbActiveModal) {}
|
||||
|
||||
savePlayer() {
|
||||
// You can emit an event or handle the save logic here
|
||||
this.activeModal.close(this.player);
|
||||
}
|
||||
}
|
||||
42
src/app/model.ts
Normal file
42
src/app/model.ts
Normal file
@@ -0,0 +1,42 @@
|
||||
export class Player{
|
||||
name: string;
|
||||
outside: boolean;
|
||||
middle: boolean;
|
||||
opposite: boolean; // dia
|
||||
setter: boolean;
|
||||
libero: boolean;
|
||||
|
||||
constructor(
|
||||
name:string,
|
||||
outside: boolean = false,
|
||||
middle: boolean = false,
|
||||
opposite: boolean = false, // dia
|
||||
setter: boolean = false,
|
||||
libero: boolean = false,
|
||||
){
|
||||
this.name = name;
|
||||
this.outside = outside;
|
||||
this.middle = middle;
|
||||
this.opposite = opposite;
|
||||
this.setter = setter;
|
||||
this.libero = libero;
|
||||
}
|
||||
serialize(): string[] {
|
||||
const values = 'OOOO'
|
||||
return [this.name, values];
|
||||
}
|
||||
|
||||
toString(): string{
|
||||
return this.name;
|
||||
}
|
||||
static deSerialize(name: string, values: string): Player{
|
||||
return new Player(name);
|
||||
}
|
||||
static isNew(newplayer:Player, players: Player[]): boolean {
|
||||
const seen = new Set<string>(players.map(p => p.name));
|
||||
if (seen.has(newplayer.name)){
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
}
|
||||
42
src/app/screen-basic/screen-basic.component.html
Normal file
42
src/app/screen-basic/screen-basic.component.html
Normal file
@@ -0,0 +1,42 @@
|
||||
<div class="justify-content-md-center">
|
||||
<div class="btn-toolbar mb-3 col justify-content-center" role="toolbar">
|
||||
<div class="btn-group me-2" id="numTeamsSelector" role="group"
|
||||
value="2">
|
||||
<input value="2" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio1" autocomplete="off" checked>
|
||||
<label class="btn btn-outline-primary" for="btnradio1">Two</label>
|
||||
|
||||
<input value="3" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio2" autocomplete="off">
|
||||
<label class="btn btn-outline-primary" for="btnradio2">Three</label>
|
||||
|
||||
<input value="n" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio3" autocomplete="off">
|
||||
<label class="btn btn-outline-primary" for="btnradio3">n</label>
|
||||
</div>
|
||||
<div *ngIf="numTeamsSelectorValue === 'n'" id="nTeamsText" class="col-md-auto">
|
||||
<label for="nTeamsField">n Teams</label>
|
||||
<input type="number" pattern="\d*" [(ngModel)]="nTeamsValue" id="nTeamsField" class="form-control" >
|
||||
</div>
|
||||
</div>
|
||||
<h1>Random Teams</h1>
|
||||
|
||||
<form>
|
||||
<button type="button" (click)="onButtonGenerate()" class="btn btn-primary">Generate</button>
|
||||
</form>
|
||||
|
||||
<table class="table table-striped custom-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Size</th>
|
||||
<th scope="col">Names</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (team of data.teams; track $index) {
|
||||
<tr>
|
||||
<td style="text-wrap: wrap;">{{ team.length | number }}</td>
|
||||
<td class="wrap-cell">{{ team }}</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
0
src/app/screen-basic/screen-basic.component.less
Normal file
0
src/app/screen-basic/screen-basic.component.less
Normal file
23
src/app/screen-basic/screen-basic.component.spec.ts
Normal file
23
src/app/screen-basic/screen-basic.component.spec.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ScreenBasicComponent } from './screen-basic.component';
|
||||
|
||||
describe('ScreenBasicComponent', () => {
|
||||
let component: ScreenBasicComponent;
|
||||
let fixture: ComponentFixture<ScreenBasicComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ScreenBasicComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ScreenBasicComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
48
src/app/screen-basic/screen-basic.component.ts
Normal file
48
src/app/screen-basic/screen-basic.component.ts
Normal file
@@ -0,0 +1,48 @@
|
||||
// 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';
|
||||
import { iter } from '../util';
|
||||
import { DataService } from '../data.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-screen-basic',
|
||||
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule],
|
||||
templateUrl: './screen-basic.component.html',
|
||||
styleUrl: './screen-basic.component.less'
|
||||
})
|
||||
export class ScreenBasicComponent {
|
||||
data = inject(DataService);
|
||||
numTeamsSelectorValue = "2";
|
||||
numTeamsSelected = 2;
|
||||
nTeamsValue = "4";
|
||||
|
||||
onButtonGenerate(): void{
|
||||
if(this.numTeamsSelectorValue === 'n'){
|
||||
this.numTeamsSelected = Number(this.nTeamsValue);
|
||||
}
|
||||
else{
|
||||
this.numTeamsSelected = Number(this.numTeamsSelectorValue);
|
||||
}
|
||||
|
||||
let teams = Array.from({ length: this.numTeamsSelected }, () => []);
|
||||
// clone array here
|
||||
let localPlayers: Player[] = this.data.getPlayers();
|
||||
|
||||
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);
|
||||
|
||||
}
|
||||
this.data.teams = teams;
|
||||
}
|
||||
|
||||
}
|
||||
33
src/app/screen-edit/screen-edit.component.html
Normal file
33
src/app/screen-edit/screen-edit.component.html
Normal file
@@ -0,0 +1,33 @@
|
||||
<div class="justify-content-md-center">
|
||||
<h1>Players: {{ data.getPlayers().length }}</h1>
|
||||
<div class="input-group mb-3">
|
||||
<input
|
||||
type="text"
|
||||
[(ngModel)]="newItem"
|
||||
class="form-control"
|
||||
placeholder="Enter a name..."
|
||||
(keyup.enter)="addItem()"
|
||||
/>
|
||||
<button class="btn btn-primary" type="button" (click)="addItem()" >
|
||||
<i class="bi bi-plus-lg"></i> Add
|
||||
</button>
|
||||
</div>
|
||||
@if (alertMessage) {
|
||||
<ngb-alert #selfClosingAlert type="danger" (closed)="alertMessage = ''">{{ alertMessage }}</ngb-alert>
|
||||
}
|
||||
<div class="container mt-4">
|
||||
<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>
|
||||
<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>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
0
src/app/screen-edit/screen-edit.component.less
Normal file
0
src/app/screen-edit/screen-edit.component.less
Normal file
23
src/app/screen-edit/screen-edit.component.spec.ts
Normal file
23
src/app/screen-edit/screen-edit.component.spec.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ScreenEditComponent } from './screen-edit.component';
|
||||
|
||||
describe('ScreenEditComponent', () => {
|
||||
let component: ScreenEditComponent;
|
||||
let fixture: ComponentFixture<ScreenEditComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ScreenEditComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ScreenEditComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
67
src/app/screen-edit/screen-edit.component.ts
Normal file
67
src/app/screen-edit/screen-edit.component.ts
Normal file
@@ -0,0 +1,67 @@
|
||||
import { Component, inject, Input, ViewChild } from '@angular/core';
|
||||
import { NgbAlert, NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { Player } from '../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',
|
||||
imports: [FormsModule, NgbAlert],
|
||||
templateUrl: './screen-edit.component.html',
|
||||
styleUrl: './screen-edit.component.less'
|
||||
})
|
||||
export class ScreenEditComponent {
|
||||
data = inject(DataService);
|
||||
@ViewChild('selfClosingAlert', { static: false })selfClosingAlert!: NgbAlert;
|
||||
private _message$ = new Subject<string>();
|
||||
newItem: string = "";
|
||||
alertMessage = '';
|
||||
|
||||
constructor(private modalService: NgbModal) {
|
||||
this._message$
|
||||
.pipe(
|
||||
takeUntilDestroyed(),
|
||||
tap((message) => (this.alertMessage = message)),
|
||||
debounceTime(5000),
|
||||
)
|
||||
.subscribe(() => this.selfClosingAlert?.close());
|
||||
}
|
||||
|
||||
addItem() {
|
||||
const name = this.newItem.trim()
|
||||
if (name) {
|
||||
let newPlayer = new Player(name);
|
||||
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);
|
||||
modalRef.componentInstance.player = player;
|
||||
/*
|
||||
modalRef.result.then((updatedPlayer) => {
|
||||
// Handle the updated player data if needed
|
||||
console.log('Player updated:', updatedPlayer);
|
||||
}).catch((error) => {
|
||||
console.log('Modal dismissed');
|
||||
});
|
||||
*/
|
||||
}
|
||||
public setAlertMessage(s: string) {
|
||||
this._message$.next(`"${s}" already exists. Please choose a unique name.`);
|
||||
}
|
||||
|
||||
}
|
||||
75
src/app/screen-rotations/screen-rotations.component.html
Normal file
75
src/app/screen-rotations/screen-rotations.component.html
Normal file
@@ -0,0 +1,75 @@
|
||||
<div class="justify-content-md-center">
|
||||
<h1>Rotations</h1>
|
||||
<div ngbAccordion>
|
||||
<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 }}
|
||||
}
|
||||
</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>
|
||||
</div>
|
||||
23
src/app/screen-rotations/screen-rotations.component.spec.ts
Normal file
23
src/app/screen-rotations/screen-rotations.component.spec.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ScreenRotationsComponent } from './screen-rotations.component';
|
||||
|
||||
describe('ScreenRotationsComponent', () => {
|
||||
let component: ScreenRotationsComponent;
|
||||
let fixture: ComponentFixture<ScreenRotationsComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ScreenRotationsComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ScreenRotationsComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
32
src/app/screen-rotations/screen-rotations.component.ts
Normal file
32
src/app/screen-rotations/screen-rotations.component.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
// Team Generation Screen respecting volleyball roles as defined by `../model/Player`
|
||||
import { Component, inject, Input } 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';
|
||||
import { DataService } from '../data.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-screen-rotations',
|
||||
imports: [FormsModule, NgbAccordionButton, NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionToggle, NgbAccordionBody, NgbAccordionCollapse,],
|
||||
templateUrl: './screen-rotations.component.html',
|
||||
styleUrl: './screen-rotations.component.less'
|
||||
})
|
||||
export class ScreenRotationsComponent {
|
||||
data = inject(DataService);
|
||||
|
||||
get OutsidePlayers(): Player[] {
|
||||
return this.data.getPlayers().filter(player => player.outside);
|
||||
}
|
||||
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.data.getPlayers().filter(player => player.setter);
|
||||
}
|
||||
get LiberoPlayers(): Player[] {
|
||||
return this.data.getPlayers().filter(player => player.libero);
|
||||
}
|
||||
}
|
||||
7
src/app/util.ts
Normal file
7
src/app/util.ts
Normal file
@@ -0,0 +1,7 @@
|
||||
export function* iter(list: any[]){
|
||||
let index = 0;
|
||||
while(true){
|
||||
yield list[index % list.length];
|
||||
index++;
|
||||
}
|
||||
}
|
||||
@@ -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