feat: show roles in edit list

src/app/app.component.html

@@ -2,9 +2,15 @@
     <router-outlet></router-outlet>
 </main>
 <nav>
-  <ul ngbNav [activeId]="route.fragment | async" class="nav-tabs custom-navbar bg-body-secondary">
-    <li ngbNavItem="" 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 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>

src/app/app.component.ts

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

src/app/data.service.ts

@@ -7,7 +7,6 @@ import { Player } from './model';
 export class DataService {
   private players: Player[] = [];
   teams: Player[][] = [];
-  numTeams: number = 2;
 
   setPlayers(players: Player[]){
     for (let player of players){

src/app/model.ts

@@ -21,9 +21,14 @@ 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;
   }
   
   toString(): string{

src/app/radio-nteams/radio-nteams.component.html

@@ -1,16 +0,0 @@
-<div class="btn-toolbar mb-3 col justify-content-center" role="toolbar">
-<div class="btn-group me-2" id="numTeamsSelector" role="group">
-  <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=0 [(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 !==2 && numTeamsSelectorValue !==3" 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>

src/app/radio-nteams/radio-nteams.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { RadioNteamsComponent } from './radio-nteams.component';
-
-describe('RadioNteamsComponent', () => {
-  let component: RadioNteamsComponent;
-  let fixture: ComponentFixture<RadioNteamsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RadioNteamsComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(RadioNteamsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/radio-nteams/radio-nteams.component.ts

@@ -1,19 +0,0 @@
-import { Component, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { DataService } from '../data.service';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { CommonModule } from '@angular/common';
-
-@Component({
-  selector: 'app-radio-nteams',
-  imports: [FormsModule, NgbModule, CommonModule],
-  templateUrl: './radio-nteams.component.html',
-  styleUrl: './radio-nteams.component.less'
-})
-export class RadioNteamsComponent {
-  data = inject(DataService);
-  numTeamsSelectorValue = 2;
-  numTeamsSelected = 2;
-  nTeamsValue = "4";
-
-}

src/app/screen-basic/screen-basic.component.html

@@ -1,5 +1,21 @@
   <div class="justify-content-md-center">
-    <app-radio-nteams></app-radio-nteams>
+    <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>

src/app/screen-basic/screen-basic.component.ts

@@ -1,26 +1,33 @@
 // 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';
-import { RadioNteamsComponent } from '../radio-nteams/radio-nteams.component';
 
 @Component({
   selector: 'app-screen-basic',
-  imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RadioNteamsComponent],
+  imports: [NgbModule, 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.data.numTeams }, () => []);
+    let teams = Array.from({ length: this.numTeamsSelected }, () => []);
     // clone array here
     let localPlayers: Player[] = this.data.getPlayers();
 

src/app/screen-edit/screen-edit.component.html

@@ -19,7 +19,10 @@
   <ul class="list-group mb-3">
       @for (player of data.getPlayers(); track $index) {
         <li class="list-group-item d-flex justify-content-between">
-            <a (click)="openPlayerModal(player)" style="display: block; cursor: pointer; flex-grow: 1; text-align: left;">{{ player.name }}</a>
+            <div (click)="openPlayerModal(player)" class="player-content">
+              <div class="text-start">{{ player.name }}</div>
+              <div class="text-end">{{ player.getRoles() }}</div>
+            </div>
             <button (click)="removeItem(player)" class="btn btn-secondary btn-sm p-0 ms-2" style="width: 24px; height: 24px" >
               <i class="bi bi-x"></i>
             </button>

src/app/screen-edit/screen-edit.component.less

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

src/app/screen-rotations/screen-rotations.component.ts

@@ -1,5 +1,5 @@
 // Team Generation Screen respecting volleyball roles as defined by `../model/Player`
-import { Component, inject, Input } from '@angular/core';
+import { Component, inject, OnInit } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Player } from '../model';
 import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap';
@@ -11,8 +11,13 @@ import { DataService } from '../data.service';
   templateUrl: './screen-rotations.component.html',
   styleUrl: './screen-rotations.component.less'
 })
-export class ScreenRotationsComponent {
+export class ScreenRotationsComponent implements OnInit{
   data = inject(DataService);
+  ngOnInit(): void {
+    
+  }
+  // https://de.wikipedia.org/wiki/Volleyball#Spielpositionen
+  // we want 2 outside, 1 opp, 1 set and either 2*middle or middle + libero
 
   get OutsidePlayers(): Player[] {
     return this.data.getPlayers().filter(player => player.outside);