Skip to content
Snippets Groups Projects
Commit 15aa99aa authored by L4168's avatar L4168
Browse files

moved task to task.entity

parent 674871a6
No related branches found
No related tags found
3 merge requests!59Development to master,!31Development,!23Faction tasks + Piirto
......@@ -8,9 +8,8 @@ import {
} from 'typeorm';
import { GameEntity } from './game.entity';
import { Game_PersonEntity } from './game.entity';
import { MapDrawingEntity } from './coordinate.entity';
//Faction, PowerUp, Faction_powerUp, FP_History, Score, Task
//Faction, PowerUp, Faction_powerUp, FP_History, Score
@Entity('Faction')
export class FactionEntity {
......@@ -70,17 +69,3 @@ export class ScoreEntity {
@ManyToOne(type => FactionEntity, factionName => factionName.factionId)
faction: FactionEntity;
}
@Entity('Task')
export class TaskEntity {
@PrimaryGeneratedColumn('uuid') taskId: string;
@Column({ type: 'text' }) taskName: string;
@Column({ type: 'text' }) taskDescription: string;
@Column({ type: 'text' }) taskWinner: string;
@Column({ type: 'bool' }) taskIsActive: boolean;
@ManyToOne(type => FactionEntity, faction => faction.factionId)
faction: FactionEntity;
/* @ManyToOne(type => PersonEntity, person => person.tasks)
person: PersonEntity; */
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment