There are no participants in your list.
To start using the Scrum Timer, please go to the
diff --git a/src/app/components/timer/timer.component.spec.ts b/src/app/components/timer/timer.component.spec.ts
index d1576b5..2152d17 100644
--- a/src/app/components/timer/timer.component.spec.ts
+++ b/src/app/components/timer/timer.component.spec.ts
@@ -16,10 +16,10 @@ describe('TimerComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
- TimerComponent
+ TimerComponent,
+ SecsPipe
],
imports: [RouterTestingModule.withRoutes([]),
- SecsPipe,
FormsModule],
providers: [
ParticipantService,
diff --git a/src/app/components/timer/timer.component.ts b/src/app/components/timer/timer.component.ts
index 9623def..a0f1e3f 100644
--- a/src/app/components/timer/timer.component.ts
+++ b/src/app/components/timer/timer.component.ts
@@ -1,5 +1,5 @@
import { SettingsService } from '../../services/settings/settings.service';
-import { Component, ElementRef, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Participant } from '../../models/Participant';
import { ParticipantService } from '../../services/participant/participant.service';
import { NavbarService } from '../../services/navbar/navbar.service';
@@ -10,13 +10,19 @@ import { ActivatedRoute } from '@angular/router';
selector: 'app-timer',
templateUrl: './timer.component.html',
styleUrls: ['./timer.component.css'],
+ // eslint-disable-next-line @angular-eslint/prefer-standalone
standalone: false
})
export class TimerComponent implements OnInit {
+ private activatedRoute = inject(ActivatedRoute);
+ private nav = inject(NavbarService);
+ public participantService = inject(ParticipantService);
+ public settingsService = inject(SettingsService);
+
timerSubscription: Subscription;
participantList: Participant[];
- absentParticipants: Participant[] = Array();
- doneParticipants: Participant[] = Array();
+ absentParticipants: Participant[] = [];
+ doneParticipants: Participant[] = [];
// variables for session
totalMaxTime = this.settingsService.getGlobalMaxTime();
@@ -39,13 +45,7 @@ export class TimerComponent implements OnInit {
currentElapsed = 0;
timerActive = false;
- constructor(
- private activatedRoute: ActivatedRoute,
- private nav: NavbarService,
- public participantService: ParticipantService,
- public settingsService: SettingsService
- ) {
- }
+
ngOnInit() {
this.participantList = this.participantService.getParticipants();
@@ -109,6 +109,7 @@ export class TimerComponent implements OnInit {
this.currentPercent = Math.round((this.currentElapsed / this.individualTime) * 100);
this.currentTotalElapsed = this.totalElapsed + this.currentElapsed;
this.totalTimePercent = Math.round(((this.totalElapsed + this.currentElapsed) / this.totalMaxTime) * 100) ;
+ console.log("timer: " + val);
});
this.timerActive = true;
@@ -179,8 +180,8 @@ export class TimerComponent implements OnInit {
*
* @param array
*/
- shuffle(array: any[]) {
- let currentIndex = array.length, temporaryValue: any, randomIndex: number;
+ shuffle(array: Participant[]) {
+ let currentIndex = array.length, temporaryValue: Participant, randomIndex: number;
// While there remain elements to shuffle...
while (0 !== currentIndex) {
diff --git a/src/app/models/Participant.ts b/src/app/models/Participant.ts
index 60074a3..8a9c326 100644
--- a/src/app/models/Participant.ts
+++ b/src/app/models/Participant.ts
@@ -5,7 +5,7 @@ export class Participant {
constructor(
public init: string,
public name: string,
- public time: number = 0
+ public time = 0
) { }
}
@@ -13,6 +13,7 @@ export class Participant {
providedIn: 'root',
})
export class ParticipantAdapter implements Adapter {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
adapt(item: any): Participant {
return new Participant(item.init, item.name, item.time);
}
diff --git a/src/app/models/adapter.ts b/src/app/models/adapter.ts
index 220da69..a323fe1 100644
--- a/src/app/models/adapter.ts
+++ b/src/app/models/adapter.ts
@@ -1,3 +1,4 @@
export interface Adapter {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
adapt(item: any): T;
}
diff --git a/src/app/pipes/secs.pipe.ts b/src/app/pipes/secs.pipe.ts
index deddc03..e6f9226 100644
--- a/src/app/pipes/secs.pipe.ts
+++ b/src/app/pipes/secs.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
name: 'secs',
- standalone: true,
+ standalone: false,
pure: true
})
export class SecsPipe implements PipeTransform {
diff --git a/src/app/services/participant/participant.service.spec.ts b/src/app/services/participant/participant.service.spec.ts
index f91d614..78db9e8 100644
--- a/src/app/services/participant/participant.service.spec.ts
+++ b/src/app/services/participant/participant.service.spec.ts
@@ -2,12 +2,12 @@ import { TestBed, inject } from '@angular/core/testing';
import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
import { ParticipantService } from './participant.service';
import { SettingsService } from '../settings/settings.service';
-import { Subscription } from 'rxjs';
-import { Participant } from '../../models/Participant';
+//import { Subscription } from 'rxjs';
+//import { Participant } from '../../models/Participant';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
describe('ParticipantService', () => {
- let service: ParticipantService;
+ //let service: ParticipantService;
let httpTestingController: HttpTestingController;
beforeEach(() => {
TestBed.configureTestingModule({
diff --git a/src/app/services/participant/participant.service.ts b/src/app/services/participant/participant.service.ts
index 1213321..b22dbc4 100644
--- a/src/app/services/participant/participant.service.ts
+++ b/src/app/services/participant/participant.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { Participant, ParticipantAdapter } from '../../models/Participant';
import { SettingsService } from '../settings/settings.service';
import { HttpClient } from '@angular/common/http';
@@ -9,8 +9,11 @@ import { map } from 'rxjs/operators';
export class ParticipantService {
participants!: Participant[];
lastSync: Date = new Date('2000-01-01T00:00:00.000Z');
+ public settings = inject(SettingsService);
+ private http = inject(HttpClient);
+ private adapter = inject(ParticipantAdapter);
- constructor(public settings: SettingsService, private http: HttpClient, private adapter: ParticipantAdapter) {
+ constructor() {
this.getLastSync();
}
@@ -88,7 +91,7 @@ export class ParticipantService {
// console.debug('Seconds since last sync: ' + durationSinceLastSync + ' syncing from ' + url + ' . . .');
return this.http
.get(url)
- .pipe(map((data: any[]) => data.map((item) => this.adapter.adapt(item))));
+ .pipe(map((data: string[]) => data.map((item) => this.adapter.adapt(item))));
} else {
console.error(new Error('not syncing'));
diff --git a/src/app/services/settings/settings.service.ts b/src/app/services/settings/settings.service.ts
index 65229d2..c7a8149 100644
--- a/src/app/services/settings/settings.service.ts
+++ b/src/app/services/settings/settings.service.ts
@@ -6,7 +6,7 @@ export class SettingsService {
private remoteParticipantList = '';
private jiraURL = '';
- constructor() { }
+ //constructor() { }
getGlobalMaxTime(): number {
if (localStorage.getItem('settings') === null) {
diff --git a/src/app/services/versioncheck/version-check.service.ts b/src/app/services/versioncheck/version-check.service.ts
index 9219a3d..42e2b23 100644
--- a/src/app/services/versioncheck/version-check.service.ts
+++ b/src/app/services/versioncheck/version-check.service.ts
@@ -1,14 +1,15 @@
import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { map } from 'rxjs/operators';
@Injectable({ providedIn: 'root' })
export class VersionCheckService {
private githubApiUrl = 'https://api.github.com/repos/JoSSte/ScrumTimer/releases/latest';
+ private http = inject(HttpClient);
- constructor(private http: HttpClient) {}
getLatestReleaseVersion() {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
return this.http.get(this.githubApiUrl).pipe(
map((release) => release.tag_name.replace(/^v/, '')) // Remove leading 'v' if exists
);