latest work #20

Merged
philipp merged 233 commits from dev into main 2020-12-09 18:49:33 +00:00
2 changed files with 10 additions and 3 deletions
Showing only changes of commit f32291d714 - Show all commits

View File

@ -1,4 +1,4 @@
import { Entity, PrimaryGeneratedColumn, Column } from "typeorm"; import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from "typeorm";
import { import {
IsBoolean, IsBoolean,
IsInt, IsInt,
@ -34,7 +34,7 @@ export class ScanStation {
*/ */
@Column() @Column()
@IsNotEmpty() @IsNotEmpty()
//TODO: Relation @ManyToOne(() => Track, track => track.stations)
track: Track; track: Track;
/** /**

View File

@ -1,4 +1,4 @@
import { Entity, PrimaryGeneratedColumn, Column } from "typeorm"; import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
import { import {
IsInt, IsInt,
IsNotEmpty, IsNotEmpty,
@ -6,6 +6,7 @@ import {
IsPositive, IsPositive,
IsString, IsString,
} from "class-validator"; } from "class-validator";
import { ScanStation } from "./ScanStation";
/** /**
* Defines a track of given length. * Defines a track of given length.
@ -35,4 +36,10 @@ export class Track {
@IsInt() @IsInt()
@IsPositive() @IsPositive()
distance: number; distance: number;
/**
* Used to link scan stations to track.
*/
@OneToMany(() => ScanStation, station => station.track)
stations: ScanStation[];
} }