* fixed Number -> number primitive type
This commit is contained in:
parent
e969edb26c
commit
24cbc3454d
@ -16,7 +16,7 @@ export class SlideResolverService implements Resolve<Slide> {
|
|||||||
return this.getSlide(route.params['id']).toPromise();
|
return this.getSlide(route.params['id']).toPromise();
|
||||||
}
|
}
|
||||||
|
|
||||||
public getSlide(id: Number): Observable<Slide> {
|
public getSlide(id: number): Observable<Slide> {
|
||||||
return this.httpClient.get<Slide>(`${this.apiEndPoint}/${id}`);
|
return this.httpClient.get<Slide>(`${this.apiEndPoint}/${id}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ export class TeamResolverService implements Resolve<Team> {
|
|||||||
return this.getTeam(route.params['id']).toPromise();
|
return this.getTeam(route.params['id']).toPromise();
|
||||||
}
|
}
|
||||||
|
|
||||||
public getTeam(id: Number): Observable<Team> {
|
public getTeam(id: number): Observable<Team> {
|
||||||
return this.httpClient.get<Team>(`${this.apiEndPoint}/${id}`);
|
return this.httpClient.get<Team>(`${this.apiEndPoint}/${id}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,8 +40,8 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||||||
this.commitTrackerService.getTeamCommits(this.settings.team.members.map(member => member.signum));
|
this.commitTrackerService.getTeamCommits(this.settings.team.members.map(member => member.signum));
|
||||||
});
|
});
|
||||||
|
|
||||||
const timerSS = new Subject();
|
const timerSS = new Subject<number>();
|
||||||
this.slideshowTimer = timerSS.switchMap(period => TimerObservable.create(period))
|
this.slideshowTimer = timerSS.switchMap((period: number) => TimerObservable.create(period))
|
||||||
.subscribe(() => {
|
.subscribe(() => {
|
||||||
this.changeSlide(timerSS);
|
this.changeSlide(timerSS);
|
||||||
});
|
});
|
||||||
@ -50,7 +50,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||||||
this.autoSwitch = false;
|
this.autoSwitch = false;
|
||||||
this.router.events
|
this.router.events
|
||||||
.filter(event => event instanceof ActivationEnd)
|
.filter(event => event instanceof ActivationEnd)
|
||||||
.subscribe(event => {
|
.subscribe((event: ActivationEnd) => {
|
||||||
this.autoSwitch = !!event.snapshot.data.autoSwitchable;
|
this.autoSwitch = !!event.snapshot.data.autoSwitchable;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -61,7 +61,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||||||
this.slideshowTimer.unsubscribe();
|
this.slideshowTimer.unsubscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
private changeSlide(timer: Subject) {
|
private changeSlide(timer: Subject<number>) {
|
||||||
if (this.autoSwitch) {
|
if (this.autoSwitch) {
|
||||||
console.log('Slide should have changed here');
|
console.log('Slide should have changed here');
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,7 +12,7 @@ export class SettingsComponent implements OnInit {
|
|||||||
|
|
||||||
public teams: Array<Team> = [];
|
public teams: Array<Team> = [];
|
||||||
public selectedTeam: Team;
|
public selectedTeam: Team;
|
||||||
public slideInterval: Number;
|
public slideInterval: number;
|
||||||
|
|
||||||
constructor(private route: ActivatedRoute,
|
constructor(private route: ActivatedRoute,
|
||||||
private settingsService: SettingsService,
|
private settingsService: SettingsService,
|
||||||
|
|||||||
@ -5,11 +5,11 @@ export class Build {
|
|||||||
build: {
|
build: {
|
||||||
subBuild: Array<Build>;
|
subBuild: Array<Build>;
|
||||||
};
|
};
|
||||||
buildNumber: Number;
|
buildNumber: number;
|
||||||
duration: String;
|
duration: String;
|
||||||
icon: String;
|
icon: String;
|
||||||
jobName: String;
|
jobName: String;
|
||||||
parentBuildNumber: Number;
|
parentBuildNumber: number;
|
||||||
parentJobName: String;
|
parentJobName: String;
|
||||||
phaseName: String;
|
phaseName: String;
|
||||||
result: Result;
|
result: Result;
|
||||||
|
|||||||
@ -5,40 +5,40 @@ export class Commit {
|
|||||||
change_id: String;
|
change_id: String;
|
||||||
branch: String;
|
branch: String;
|
||||||
owner: String;
|
owner: String;
|
||||||
gerrit_change_number: Number;
|
gerrit_change_number: number;
|
||||||
gerrit_change_subject: String;
|
gerrit_change_subject: String;
|
||||||
gerrit_project: String;
|
gerrit_project: String;
|
||||||
gerrit_verified: Number;
|
gerrit_verified: number;
|
||||||
gerrit_code_review: Number;
|
gerrit_code_review: number;
|
||||||
gerrit_time: String;
|
gerrit_time: String;
|
||||||
|
|
||||||
cfl_id: Number;
|
cfl_id: number;
|
||||||
cfl_build_number: Number;
|
cfl_build_number: number;
|
||||||
cfl_timestamp: Number;
|
cfl_timestamp: number;
|
||||||
cfl_building: Number;
|
cfl_building: number;
|
||||||
cfl_duration: Number;
|
cfl_duration: number;
|
||||||
cfl_result: Result;
|
cfl_result: Result;
|
||||||
cfl_sub_builds: Build;
|
cfl_sub_builds: Build;
|
||||||
|
|
||||||
sfl_id: Number;
|
sfl_id: number;
|
||||||
sfl_build_number: Number;
|
sfl_build_number: number;
|
||||||
sfl_timestamp: Number;
|
sfl_timestamp: number;
|
||||||
sfl_building: Number;
|
sfl_building: number;
|
||||||
sfl_duration: Number;
|
sfl_duration: number;
|
||||||
sfl_result: Result;
|
sfl_result: Result;
|
||||||
sfl_sub_builds: Build;
|
sfl_sub_builds: Build;
|
||||||
sfl_fail_count: Number;
|
sfl_fail_count: number;
|
||||||
sfl_skip_count: Number;
|
sfl_skip_count: number;
|
||||||
sfl_total_count: Number;
|
sfl_total_count: number;
|
||||||
|
|
||||||
nfl_id: Number;
|
nfl_id: number;
|
||||||
nfl_build_number: Number;
|
nfl_build_number: number;
|
||||||
nfl_timestamp: Number;
|
nfl_timestamp: number;
|
||||||
nfl_building: Number;
|
nfl_building: number;
|
||||||
nfl_duration: Number;
|
nfl_duration: number;
|
||||||
nfl_result: Result;
|
nfl_result: Result;
|
||||||
nfl_sub_builds: Build;
|
nfl_sub_builds: Build;
|
||||||
nfl_fail_count: Number;
|
nfl_fail_count: number;
|
||||||
nfl_skip_count: Number;
|
nfl_skip_count: number;
|
||||||
nfl_total_count: Number;
|
nfl_total_count: number;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import { Location } from '@angular/common';
|
|||||||
@Injectable()
|
@Injectable()
|
||||||
export class SelfUpdaterService {
|
export class SelfUpdaterService {
|
||||||
|
|
||||||
private appRevision: Number = 0;
|
private appRevision: number = 0;
|
||||||
private initFailed = false;
|
private initFailed = false;
|
||||||
|
|
||||||
constructor(private httpClient: HttpClient,
|
constructor(private httpClient: HttpClient,
|
||||||
@ -23,8 +23,8 @@ export class SelfUpdaterService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private getDeployedRevision(): Observable<Number> {
|
private getDeployedRevision(): Observable<number> {
|
||||||
return this.httpClient.get<Number>(this.locationService.prepareExternalUrl('/revision.json'));
|
return this.httpClient.get<number>(this.locationService.prepareExternalUrl('/revision.json'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public checkAndReloadIfNecessary() {
|
public checkAndReloadIfNecessary() {
|
||||||
|
|||||||
@ -25,7 +25,7 @@ export class SettingsService {
|
|||||||
localStorage.setItem(SELECTED_TEAM_KEY, JSON.stringify(team));
|
localStorage.setItem(SELECTED_TEAM_KEY, JSON.stringify(team));
|
||||||
}
|
}
|
||||||
|
|
||||||
get slideInterval(): Number {
|
get slideInterval(): number {
|
||||||
try {
|
try {
|
||||||
const interval = JSON.parse(localStorage.getItem(SLIDE_INTERVAL_KEY));
|
const interval = JSON.parse(localStorage.getItem(SLIDE_INTERVAL_KEY));
|
||||||
return interval !== null ? interval : DEFAULT_SLIDE_INTERVAL;
|
return interval !== null ? interval : DEFAULT_SLIDE_INTERVAL;
|
||||||
@ -34,7 +34,7 @@ export class SettingsService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
set slideInterval(interval: Number) {
|
set slideInterval(interval: number) {
|
||||||
localStorage.setItem(SLIDE_INTERVAL_KEY, JSON.stringify(interval));
|
localStorage.setItem(SLIDE_INTERVAL_KEY, JSON.stringify(interval));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Team } from './team';
|
import { Team } from './team';
|
||||||
|
|
||||||
export class Slide {
|
export class Slide {
|
||||||
id: Number = null;
|
id: number = null;
|
||||||
title: String = '';
|
title: String = '';
|
||||||
team: Team = null;
|
team: Team = null;
|
||||||
slideData: String = '';
|
slideData: String = '';
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Member } from './member';
|
import { Member } from './member';
|
||||||
|
|
||||||
export class Team {
|
export class Team {
|
||||||
id: Number = null;
|
id: number = null;
|
||||||
name: String = '';
|
name: String = '';
|
||||||
members: Array<Member> = [];
|
members: Array<Member> = [];
|
||||||
isActive = false;
|
isActive = false;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user