28 Commits

Author SHA1 Message Date
eneller
b6d34ce262 wip: rotations accordion 2026-01-31 17:12:37 +01:00
eneller
764ce43138 refactor: basic screen 2026-01-31 16:29:11 +01:00
eneller
1bc97df0da feat: deduplicated player adding 2026-01-31 15:52:06 +01:00
eneller
5408a8d9b6 central players list 2026-01-31 00:37:32 +01:00
eneller
665cb25d34 feat: modal 2026-01-30 23:15:42 +01:00
eneller
3b8e5145c3 wip: player modal 2026-01-30 22:51:09 +01:00
eneller
51414f5a99 refactor: extract randomizer to component 2026-01-30 22:03:48 +01:00
eneller
7e7313916b refactor: query params 2026-01-28 14:24:35 +01:00
eneller
c66040f51f build: sonarqube 2025-08-05 09:55:45 +02:00
eneller
3bf3ab9096 bump version number 2025-06-28 16:00:26 +02:00
eneller
cf4bc99816 Revert "fix: try prefetch installMode"
This reverts commit 51f650352e.
2025-06-26 14:01:38 +02:00
eneller
aa718a512d fix: try removing client hydration 2025-06-25 21:10:18 +02:00
eneller
51f650352e fix: try prefetch installMode 2025-05-23 18:07:31 +02:00
eneller
c22b305fcb chore: update angular/core 2025-04-23 13:07:33 +02:00
eneller
5d5a616702 chore: update angular/cdk 2025-04-23 13:06:45 +02:00
eneller
8afc50b459 chore: update angular/cli 2025-04-23 13:06:18 +02:00
eneller
2c27570e2b minor refactor 2025-04-23 12:42:39 +02:00
eneller
e023ee2453 chore: audit fix 2025-03-27 15:24:05 +01:00
eneller
8b2be9b5d1 feat: padding 2025-03-23 21:46:29 +01:00
eneller
544aac895a fix: remove css 2025-03-23 21:04:23 +01:00
eneller
6845f9afd3 fix: use ng searchparams
use ng ActivatedRoute replacing window.location.search
2025-03-23 20:57:47 +01:00
eneller
df43802b61 chore: npm upgrade 2025-03-23 20:33:32 +01:00
eneller
1936c50465 chore: update angular/cdk 2025-03-23 20:31:15 +01:00
eneller
d8670f653c chore: update angular/core 2025-03-23 20:29:17 +01:00
eneller
e5a5f7f60e chore: update angular/cli 2025-03-23 20:28:45 +01:00
eneller
33496a7ebd fix: sidescrolling 2025-03-23 20:26:36 +01:00
eneller
884734b23e chore: audit fix 2025-03-13 00:01:21 +01:00
eneller
29633a94c0 feat: better table formatting 2025-03-12 22:57:53 +01:00
26 changed files with 3091 additions and 2582 deletions

261
.gitignore vendored
View File

@@ -1,42 +1,245 @@
# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files. # Created by https://www.toptal.com/developers/gitignore/api/angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
# Edit at https://www.toptal.com/developers/gitignore?templates=angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
# Compiled output ### Angular ###
/dist ## Angular ##
/tmp # compiled output
/out-tsc dist/
/bazel-out tmp/
app/**/*.js
app/**/*.js.map
# Node # dependencies
/node_modules node_modules/
npm-debug.log bower_components/
yarn-error.log
# IDEs and editors # IDEs and editors
.idea/ .idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# Visual Studio Code # misc
.sass-cache/
connect.lock/
coverage/
libpeerconnection.log/
npm-debug.log
testem.log
typings/
.angular/
# e2e
e2e/*.js
e2e/*.map
# System Files
.DS_Store/
### Bazel ###
# gitignore template for Bazel build system
# website: https://bazel.build/
# Ignore all bazel-* symlinks. There is no full list since this can change
# based on the name of the directory bazel is cloned into.
/bazel-*
# Directories for the Bazel IntelliJ plugin containing the generated
# IntelliJ project files and plugin configuration. Seperate directories are
# for the IntelliJ, Android Studio and CLion versions of the plugin.
/.ijwb/
/.aswb/
/.clwb/
### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
*.lcov
# nyc test coverage
.nyc_output
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories
jspm_packages/
# Snowpack dependency directory (https://snowpack.dev/)
web_modules/
# TypeScript cache
*.tsbuildinfo
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Optional stylelint cache
.stylelintcache
# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local
# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache
# Next.js build output
.next
out
# Nuxt.js build / generate output
.nuxt
dist
# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public
# vuepress build output
.vuepress/dist
# vuepress v2.x temp and cache directory
.temp
# Docusaurus cache and generated files
.docusaurus
# Serverless directories
.serverless/
# FuseBox cache
.fusebox/
# DynamoDB Local files
.dynamodb/
# TernJS port file
.tern-port
# Stores VSCode versions used for testing VSCode extensions
.vscode-test
# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
### Node Patch ###
# Serverless Webpack directories
.webpack/
# Optional stylelint cache
# SvelteKit build / generate output
.svelte-kit
### Sass ###
*.css.map
*.sass.map
*.scss.map
### SonarQube ###
# SonarQube ignore files.
#
# https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner
# Sonar Scanner working directories
.sonar/
.sonarqube/
.scannerwork/
# http://www.sonarlint.org/commandline/
# SonarLint working directories, configuration files (including credentials)
.sonarlint/
### VisualStudioCode ###
.vscode/* .vscode/*
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
!.vscode/launch.json !.vscode/launch.json
!.vscode/extensions.json !.vscode/extensions.json
.history/* !.vscode/*.code-snippets
# Miscellaneous # Local History for Visual Studio Code
/.angular/cache .history/
.sass-cache/
/connect.lock # Built Visual Studio Code Extensions
/coverage *.vsix
/libpeerconnection.log
testem.log ### VisualStudioCode Patch ###
/typings # Ignore all local history of files
.history
.ionide
### yarn ###
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.yarn/*
!.yarn/releases
!.yarn/patches
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
# if you are NOT using Zero-installs, then:
# comment the following lines
!.yarn/cache
# and uncomment the following lines
# .pnp.*
# End of https://www.toptal.com/developers/gitignore/api/angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
# System files
.DS_Store
Thumbs.db

4701
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "vb", "name": "vb",
"version": "0.0.0", "version": "1.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
@@ -12,31 +12,33 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^19.0.5", "@angular/animations": "^19.2.7",
"@angular/cdk": "~19.0.1", "@angular/cdk": "~19.2.10",
"@angular/common": "^19.0.5", "@angular/common": "^19.2.7",
"@angular/compiler": "^19.0.5", "@angular/compiler": "^19.2.7",
"@angular/core": "^19.0.5", "@angular/core": "^19.2.7",
"@angular/forms": "^19.0.5", "@angular/forms": "^19.2.7",
"@angular/platform-browser": "^19.0.5", "@angular/platform-browser": "^19.2.7",
"@angular/platform-browser-dynamic": "^19.0.5", "@angular/platform-browser-dynamic": "^19.2.7",
"@angular/platform-server": "^19.0.5", "@angular/platform-server": "^19.2.7",
"@angular/router": "^19.0.5", "@angular/router": "^19.2.7",
"@angular/service-worker": "^19.0.5", "@angular/service-worker": "^19.2.7",
"@angular/ssr": "^19.0.6", "@angular/ssr": "^19.2.9",
"@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",
"express": "^4.18.2", "express": "^4.18.2",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"sonarqube-scanner": "^4.3.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.15.0" "zone.js": "~0.15.0"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^19.0.6", "@angular-devkit/build-angular": "^19.2.9",
"@angular/cli": "^19.0.6", "@angular/cli": "^19.2.9",
"@angular/compiler-cli": "^19.0.5", "@angular/compiler-cli": "^19.2.7",
"@angular/localize": "^19.0.5", "@angular/localize": "^19.2.7",
"@sonar/scan": "^4.3.0",
"@types/express": "^4.17.17", "@types/express": "^4.17.17",
"@types/jasmine": "~5.1.0", "@types/jasmine": "~5.1.0",
"@types/node": "^18.18.0", "@types/node": "^18.18.0",

View File

@@ -1,63 +1,5 @@
<style>
*{
text-align: center;
}
</style>
<main class="main"> <main class="main">
<div class="row justify-content-md-center"> <app-screen-rotations [players]="players"></app-screen-rotations>
<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">
<thead>
<tr>
<th scope="col">Size</th>
<th scope="col">Names</th>
</tr>
</thead>
<tbody>
@for (team of teamsArray; track $index) {
<tr>
<td>{{ team.length | number }}</td>
<td>{{ team }}</td>
</tr>
}
</tbody>
</table>
</div>
</main> </main>
<router-outlet /> <router-outlet />

View File

@@ -0,0 +1,18 @@
html, body{
max-width: 100%;
overflow-x: hidden;
}
*{
text-align: center;
}
.custom-table {
//table-layout: fixed;
max-width: 100%;
}
tr{
padding-right: .2em;
}
.wrap-cell{
word-break: break-all;
white-space: normal;
}

View File

@@ -1,69 +1,37 @@
import { AfterViewInit, Component, OnInit} from '@angular/core'; import { Component, OnInit} from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { RouterOutlet, ActivatedRoute } from '@angular/router'; 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 { 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';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule], imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent],
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';
playerNamesValue = ""; players : Player[] = [];
numTeamsSelectorValue = "2";
numTeamsSelected = 2;
nTeamsValue = "4";
teamsArray: string[][] = [];
displayedColumns = ["teamCount", "teamNames"];
constructor(private activatedRoute: ActivatedRoute){} constructor(private activatedRoute: ActivatedRoute){}
ngOnInit(): void { ngOnInit(): void {
//consiedr using Angular's ActivatedRoute here instead this.activatedRoute.queryParams.pipe(
const params = new URLSearchParams(window.location.search); filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
const names = params.get('names')?.replaceAll(',', '\n'); take(1)
if (names) this.playerNamesValue = names; ).subscribe(params => {
if (params['names']){
this.players = 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 names = 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
names = [...new Set(names)];
var teams = Array.from({ length: this.numTeamsSelected }, () => []);
var 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++;
}
}
var iterator = iter(teams);
for(let i =0; i < nameslen; i++){
var index = Math.floor(Math.random()* names.length);
var n = names[index];
names.splice(index,1);
var team = iterator.next().value;
team.push(n);
}
this.teamsArray = teams;
}
} }

View File

@@ -2,12 +2,11 @@ import { ApplicationConfig, provideZoneChangeDetection, isDevMode } from '@angul
import { provideRouter } from '@angular/router'; import { provideRouter } from '@angular/router';
import { routes } from './app.routes'; import { routes } from './app.routes';
import { provideClientHydration, withEventReplay } from '@angular/platform-browser';
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async'; import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
import { provideServiceWorker } from '@angular/service-worker'; import { provideServiceWorker } from '@angular/service-worker';
export const appConfig: ApplicationConfig = { export const appConfig: ApplicationConfig = {
providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), provideClientHydration(withEventReplay()), provideAnimationsAsync('noop'), provideServiceWorker('./sw.js', { providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), provideAnimationsAsync('noop'), provideServiceWorker('./sw.js', {
enabled: !isDevMode(), enabled: !isDevMode(),
registrationStrategy: 'registerWhenStable:30000' registrationStrategy: 'registerWhenStable:30000'
})] })]

View 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>

View 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();
});
});

View 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
View 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];
}
valueOf(): 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
}
}

View 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 teamsArray; track $index) {
<tr>
<td style="text-wrap: wrap;">{{ team.length | number }}</td>
<td class="wrap-cell">{{ team }}</td>
</tr>
}
</tbody>
</table>
</div>

View 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();
});
});

View File

@@ -0,0 +1,48 @@
// Original Team Generation Screen for arbitrary size and number of teams
import { Component, Input, OnInit} 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';
@Component({
selector: 'app-screen-basic',
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule],
templateUrl: './screen-basic.component.html',
styleUrl: './screen-basic.component.less'
})
export class ScreenBasicComponent {
@Input() players!: Player[];
numTeamsSelectorValue = "2";
numTeamsSelected = 2;
nTeamsValue = "4";
teamsArray: string[][] = [];
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[] = 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

@@ -0,0 +1,30 @@
<div class="justify-content-md-center">
<h1>Players: {{ players.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 players; track $index) {
<li class="list-group-item">
<a (click)="openPlayerModal(player)" style="display: block; cursor: pointer;">{{ player.name }}</a>
</li>
}
</ul>
</div>
</div>

View 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();
});
});

View File

@@ -0,0 +1,63 @@
import { Component, 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';
@Component({
selector: 'app-screen-edit',
imports: [FormsModule, NgbAlert],
templateUrl: './screen-edit.component.html',
styleUrl: './screen-edit.component.less'
})
export class ScreenEditComponent {
@Input() players!: Player[];
@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 (Player.isNew(newPlayer, this.players)){
this.players.push(newPlayer);
this.newItem = '';
}
else{
this.setAlertMessage(newPlayer.name);
}
}
}
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.`);
}
}

View File

@@ -0,0 +1,65 @@
<div class="justify-content-md-center">
<h1>Rotations</h1>
<div ngbAccordion>
<div ngbAccordionItem>
<h2 ngbAccordionHeader>
<button ngbAccordionButton>Outside</button>
</h2>
<div ngbAccordionCollapse>
<div ngbAccordionBody>
@for (player of outsidePlayers; track $index) {
{{ player.name }}
}
</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

@@ -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();
});
});

View File

@@ -0,0 +1,30 @@
// Team Generation Screen respecting volleyball roles as defined by `../model/Player`
import { Component, 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';
@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 {
@Input() players!: Player[];
get outsidePlayers(): Player[] {
return this.players.filter(player => !player.outside);
}
get middlePlayers(): Player[] {
return this.players.filter(player => player.middle);
}
get oppositePlayers(): Player[] {
return this.players.filter(player => player.opposite);
}
get SetterPlayers(): Player[] {
return this.players.filter(player => player.setter);
}
get LiberoPlayers(): Player[] {
return this.players.filter(player => player.libero);
}
}

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

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

View File

@@ -1,4 +1,17 @@
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
html, body { height: 100%; } html, body {
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; } height: 100%;
max-width: 100%;
overflow-x: hidden;
text-align: center;
}
body {
margin:3em auto;
font-family: Roboto, "Helvetica Neue", sans-serif;
padding:0 .5em;
}
h1,h2,h3{
line-height:1.2;
letter-spacing: -2%;
}