add swipl-wasm

package-lock.json

@@ -27,6 +27,7 @@
         "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"
       },
@@ -5315,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",
@@ -13628,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",

package.json

@@ -31,6 +31,7 @@
     "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"
   },

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 { Player } from './util/model';
 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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Player } from './model';
+import { Player } from './util/model';
 
 @Injectable({
   providedIn: 'root'
@@ -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/modal-rotations/modal-rotations.component.ts

@@ -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({

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,40 +1,34 @@
 // 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 { Player } from '../util/model';
+import { assignPlayersRandomly, iter } from '../util/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{
-    
-    let teams = Array.from({ length: this.data.numTeams }, () => []);
-    // 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);
-
+    if(this.numTeamsSelectorValue === 'n'){
+      this.numTeamsSelected  = Number(this.nTeamsValue);
     }
-    this.data.teams = teams;
+    else{
+      this.numTeamsSelected = Number(this.numTeamsSelectorValue);
+    }
+    
+    let teams: Player[][]= Array.from({ length: this.numTeamsSelected }, () => []);
+    this.data.teams = assignPlayersRandomly(this.data.getPlayers(),teams);
   }
 
 }

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-edit/screen-edit.component.ts

@@ -1,6 +1,6 @@
 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';

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

@@ -1,5 +1,9 @@
 <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 [collapsed]="false">
 		<h2 ngbAccordionHeader>
@@ -71,5 +75,19 @@
 			</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>

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

@@ -1,9 +1,10 @@
 // Team Generation Screen respecting volleyball roles as defined by `../model/Player`
-import { Component, inject, 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',
@@ -11,9 +12,15 @@ import { DataService } from '../data.service';
   templateUrl: './screen-rotations.component.html',
   styleUrl: './screen-rotations.component.less'
 })
-export class ScreenRotationsComponent {
+export class ScreenRotationsComponent{
   data = inject(DataService);
 
+  async generateTeams(){
+    const teamCount = Math.floor(this.data.getPlayers().length / 6);
+    solveRotations();
+
+  }
+
   get OutsidePlayers(): Player[] {
     return this.data.getPlayers().filter(player => player.outside);
   }
@@ -29,4 +36,9 @@ export class ScreenRotationsComponent {
   get LiberoPlayers(): Player[] {
     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
+      );
+  }
 }

src/app/util.ts

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

src/app/util/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/util/rotations.pl

@@ -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).

src/app/util/solver.ts

@@ -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;
+}

src/app/util/util.ts

@@ -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;
+}