Skip to content

Commit

Permalink
Active sessions view
Browse files Browse the repository at this point in the history
  • Loading branch information
maxbl4 committed Aug 12, 2023
1 parent 3d08807 commit 109db9b
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { ActiveTimingSessionsViewComponent } from './active-timing-sessions-view.component';

describe('ActiveTimingSessionsViewComponent', () => {
let component: ActiveTimingSessionsViewComponent;
let fixture: ComponentFixture<ActiveTimingSessionsViewComponent>;

beforeEach(() => {
TestBed.configureTestingModule({
declarations: [ActiveTimingSessionsViewComponent]
});
fixture = TestBed.createComponent(ActiveTimingSessionsViewComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { Component } from '@angular/core';
import {TimingSessionsService} from "@app/service/timingSessionsService";

@Component({
selector: 'app-active-timing-sessions-view',
template: `
<h3>Активные засечки</h3>
<table class="table table-bordered mt-3">
<thead>
<tr>
<td>Название</td>
<td>Начало</td>
<td>Конец</td>
<td>_</td>
</tr>
</thead>
<tbody>
<tr *ngFor="let s of ts.sessions">
<td><a [routerLink]="['timing', s.id]">{{s.name}}</a></td>
<td>{{s.startTime?.toFormat("HH:mm:ss")}}</td>
<td>{{s.stopTime?.toFormat("HH:mm:ss")}}</td>
</tr>
</tbody>
</table>
`,
styles: [
]
})
export class ActiveTimingSessionsViewComponent {
constructor(public ts: TimingSessionsService) {
}
}
4 changes: 4 additions & 0 deletions DataService/data-service-ui/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ import {TimingSessionViewComponent} from "@app/timing-session-view/timing-sessio
import {SessionViewComponent} from "@app/session-view/session-view.component";
import {EventViewComponent} from "@app/event-view/event-view.component";
import {OptionsViewComponent} from "@app/options-view/options-view.component";
import {
ActiveTimingSessionsViewComponent
} from "@app/active-timing-sessions-view/active-timing-sessions-view.component";

const routes: Routes = [
{path: '', pathMatch: 'prefix', redirectTo: 'main'},
{path: 'main', component: MainViewComponent},
{path: 'event/:eventId/session/:sessionId/timing/:timingSessionId', component: TimingSessionViewComponent},
{path: 'event/:eventId/session/:sessionId', component: SessionViewComponent},
{path: 'event/:eventId', component: EventViewComponent},
{path: 'active-timings', component: ActiveTimingSessionsViewComponent},
{path: 'options', component: OptionsViewComponent},
];

Expand Down
1 change: 1 addition & 0 deletions DataService/data-service-ui/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {TimingSessionsService} from "@app/service/timingSessionsService";
(click)="mobileQuery.matches ? sidenav.toggle() : false">
<mat-nav-list>
<a mat-list-item routerLinkActive="text-danger" routerLink="/main">Main</a>
<a mat-list-item routerLinkActive="text-danger" routerLink="/active-timings">Засечки</a>
<a mat-list-item routerLinkActive="text-danger" routerLink="/options">Options</a>
<mat-divider></mat-divider>
<a mat-list-item href="/files" (click)="goto('/files')">File Browser</a>
Expand Down
4 changes: 3 additions & 1 deletion DataService/data-service-ui/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {TimingSessionViewComponent} from "@app/timing-session-view/timing-sessio
import {OptionsViewComponent} from "@app/options-view/options-view.component";
import {OptionsService} from "@app/service/options.service";
import {TimingSessionsService} from "@app/service/timingSessionsService";
import { ActiveTimingSessionsViewComponent } from './active-timing-sessions-view/active-timing-sessions-view.component';

@NgModule({
declarations: [
Expand All @@ -42,7 +43,8 @@ import {TimingSessionsService} from "@app/service/timingSessionsService";
SessionViewComponent,
TimingSessionViewComponent,
TimingSessionAddDialogComponent,
OptionsViewComponent
OptionsViewComponent,
ActiveTimingSessionsViewComponent
],
imports: [
BrowserModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export class SessionViewComponent implements OnInit {
if (newTimingSession)
{
this.dataClient.startNewTimingSession(newTimingSession).subscribe(createdSessionId => {
console.log(createdSessionId);
this.router.navigate(['timing', createdSessionId], {relativeTo: this.route});
});
}
Expand Down

0 comments on commit 109db9b

Please sign in to comment.