Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ehasa-backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
WIMMA Lab 2019
Overflow
ehasa-backend
Commits
05626522
Commit
05626522
authored
5 years ago
by
L4072
Browse files
Options
Downloads
Patches
Plain Diff
More comments
parent
ef08fa11
No related branches found
No related tags found
3 merge requests
!59
Development to master
,
!54
Development to testing
,
!52
Commenting to Development
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/tracking/tracking.dto.ts
+0
-1
0 additions, 1 deletion
src/tracking/tracking.dto.ts
src/tracking/tracking.entity.ts
+1
-0
1 addition, 0 deletions
src/tracking/tracking.entity.ts
src/tracking/tracking.module.ts
+4
-0
4 additions, 0 deletions
src/tracking/tracking.module.ts
with
5 additions
and
1 deletion
src/tracking/tracking.dto.ts
+
0
−
1
View file @
05626522
import
{
Game_PersonEntity
}
from
'
../game/game.entity
'
;
import
{
Allow
,
ValidateNested
}
from
'
class-validator
'
;
import
{
Allow
,
ValidateNested
}
from
'
class-validator
'
;
import
{
GeoDTO
}
from
'
./geo.dto
'
;
import
{
GeoDTO
}
from
'
./geo.dto
'
;
import
{
Type
}
from
'
class-transformer
'
;
import
{
Type
}
from
'
class-transformer
'
;
...
...
This diff is collapsed.
Click to expand it.
src/tracking/tracking.entity.ts
+
1
−
0
View file @
05626522
...
@@ -9,6 +9,7 @@ export class TrackingEntity {
...
@@ -9,6 +9,7 @@ export class TrackingEntity {
@
Column
({
type
:
'
json
'
,
nullable
:
true
})
data
:
GeoDTO
[];
@
Column
({
type
:
'
json
'
,
nullable
:
true
})
data
:
GeoDTO
[];
@
Column
(
'
text
'
)
icon
:
string
;
@
Column
(
'
text
'
)
icon
:
string
;
// when the GamePerson is deleted it's tracking data is also deleted
@
ManyToOne
(
type
=>
Game_PersonEntity
,
person
=>
person
.
gamepersonId
,
{
@
ManyToOne
(
type
=>
Game_PersonEntity
,
person
=>
person
.
gamepersonId
,
{
onDelete
:
'
CASCADE
'
,
onDelete
:
'
CASCADE
'
,
})
})
...
...
This diff is collapsed.
Click to expand it.
src/tracking/tracking.module.ts
+
4
−
0
View file @
05626522
...
@@ -7,6 +7,10 @@ import { TrackingEntity } from './tracking.entity';
...
@@ -7,6 +7,10 @@ import { TrackingEntity } from './tracking.entity';
import
{
Game_PersonEntity
}
from
'
../game/game.entity
'
;
import
{
Game_PersonEntity
}
from
'
../game/game.entity
'
;
import
{
PersonEntity
}
from
'
../user/user.entity
'
;
import
{
PersonEntity
}
from
'
../user/user.entity
'
;
/////////////////////////////////////////////////////////////////////
/// Tracking ///
/// - contains everything to do with Tracking data. ///
/////////////////////////////////////////////////////////////////////
@
Module
({
@
Module
({
imports
:
[
imports
:
[
TypeOrmModule
.
forFeature
([
TrackingEntity
,
Game_PersonEntity
,
PersonEntity
]),
TypeOrmModule
.
forFeature
([
TrackingEntity
,
Game_PersonEntity
,
PersonEntity
]),
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment