diff --git a/api/package.json b/api/package.json index 85678ac..7dbb42f 100644 --- a/api/package.json +++ b/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "2.0.0-beta-2", + "version": "2.0.0-beta-3", "description": "", "author": "", "private": true, diff --git a/api/src/log/log.entity.ts b/api/src/log/log.entity.ts index 4c9fe24..8d7a64f 100644 --- a/api/src/log/log.entity.ts +++ b/api/src/log/log.entity.ts @@ -1,5 +1,6 @@ import { PilotEntity } from 'src/pilot/pilot.entity'; import { TrackEntity } from 'src/track/track.entity'; +import { ColumnNumericTransformer } from 'src/transformers/columnNumeric.transformer'; import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, OneToMany } from 'typeorm'; @Entity({ name: 'logs' }) @@ -25,52 +26,131 @@ export class LogEntity { @Column() routeTo: string; - @Column() + @Column('numeric', { + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer() + }) durationOfFlight: number; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) singleEngineLand: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) simulatorAtd: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) landingsDay: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) landingsNight: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) groundTrainingReceived: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) flightTrainingReceived: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) crossCountry: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) night: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) solo: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) pilotInCommand: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) instrumentActual: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) instrumentSimulated: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) instrumentApproaches: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) instrumentHolds: number | null; - @Column({ nullable: true }) + @Column('numeric', { + nullable: true, + precision: 10, + scale: 1, + transformer: new ColumnNumericTransformer(), + }) instrumentNavTrack: number | null; @Column({ nullable: true }) diff --git a/api/src/transformers/columnNumeric.transformer.ts b/api/src/transformers/columnNumeric.transformer.ts new file mode 100644 index 0000000..7d86c1c --- /dev/null +++ b/api/src/transformers/columnNumeric.transformer.ts @@ -0,0 +1,9 @@ +export class ColumnNumericTransformer { + to(data: number): number { + return data; + } + + from (data: string): number { + return parseFloat(data); + } +} \ No newline at end of file diff --git a/client/package.json b/client/package.json index fe86830..ce1989f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "client", "private": true, - "version": "2.0.0-beta-2", + "version": "2.0.0-beta-3", "type": "module", "scripts": { "dev": "vite", diff --git a/package.json b/package.json index 2bf8483..9bbedbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@noahspan/flying", - "version": "2.0.0-beta-2", + "version": "2.0.0-beta-3", "scripts": { "start": "node api/dist/main", "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",