it-as
/
li-dance-backoffice
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into Anmeldeformular

This commit is contained in:
Artur Savitskiy 2024-04-26 14:39:27 +02:00
parent 4a2dbb799e 65b5fb8a90
commit 7b691f3f9a
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/app/app-routing.module.ts
View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes, provideRouter, withComponentInputBinding } from '@angular/router';
import { StudentListComponent } from './components/students/student-list/student-list.component'; import { StudentListComponent } from './components/students/student-list/student-list.component';
import { VisitsComponent } from './components/visits/visits.component'; import { VisitsComponent } from './components/visits/visits.component';
import { VisitsDatetimeComponent } from './components/visits/visits-datetime/visits-datetime.component'; import { VisitsDatetimeComponent } from './components/visits/visits-datetime/visits-datetime.component';
@ -17,5 +17,6 @@ const routes: Routes = [
@NgModule({ @NgModule({
imports: [RouterModule.forRoot(routes)], imports: [RouterModule.forRoot(routes)],
exports: [RouterModule], exports: [RouterModule],
providers: [provideRouter(routes, withComponentInputBinding())]
}) })
export class AppRoutingModule {} export class AppRoutingModule {}

26
frontend/src/app/components/visits/visits.component.ts
View File

@ -1,5 +1,5 @@
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { Component, OnDestroy, OnInit } from '@angular/core'; import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { MatTableDataSource } from '@angular/material/table'; import { MatTableDataSource } from '@angular/material/table';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
@ -16,14 +16,17 @@ import { VisitsService } from 'src/app/services/visits/visits.service';
templateUrl: './visits.component.html', templateUrl: './visits.component.html',
styleUrls: ['./visits.component.scss'], styleUrls: ['./visits.component.scss'],
}) })
export class VisitsComponent implements OnInit, OnDestroy { export class VisitsComponent implements OnInit {
@Input()
public date!: string;
@Input()
public time!: string;
public loading: boolean = true; public loading: boolean = true;
public courseVisit?: CourseVisit; public courseVisit?: CourseVisit;
public dataSource = new MatTableDataSource<StudentVisit>(); public dataSource = new MatTableDataSource<StudentVisit>();
public addedStudent?: Student; public addedStudent?: Student;
private routerSubscription?: Subscription;
private courseDate: Date = new Date(); private courseDate: Date = new Date();
public constructor( public constructor(
@ -33,13 +36,9 @@ export class VisitsComponent implements OnInit, OnDestroy {
) {} ) {}
public ngOnInit() { public ngOnInit() {
this.routerSubscription = this.route.params.subscribe(params => { if (this.date?.length == 8 && this.time?.length >= 3) {
const date: string = params['date']; const fulltime = this.time.padStart(4, '0');
const time: string = params['time']; const datetime = `${this.date.substring(0, 4)}-${this.date.substring(4, 6)}-${this.date.substring(6, 8)} ${fulltime.substring(0, 2)}:${fulltime.substring(2, 4)}:00`;
if (date?.length == 8 && time?.length >= 3) {
const fulltime = time.padStart(4, '0');
const datetime = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)} ${fulltime.substring(0, 2)}:${fulltime.substring(2, 4)}:00`;
const dateobj = new Date(datetime); const dateobj = new Date(datetime);
if (dateobj) { if (dateobj) {
@ -48,11 +47,6 @@ export class VisitsComponent implements OnInit, OnDestroy {
} }
this.getData(); this.getData();
});
}
public ngOnDestroy() {
this.routerSubscription?.unsubscribe();
} }
public visit(studentVisit: StudentVisit): void { public visit(studentVisit: StudentVisit): void {