Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
redl
redeleitsystem
Commits
45894dab
Commit
45894dab
authored
Nov 07, 2015
by
Robin Sonnabend
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed database modeling code
parent
f2067d25
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
17 deletions
+24
-17
models/database.py
models/database.py
+24
-17
No files found.
models/database.py
View file @
45894dab
...
...
@@ -39,6 +39,12 @@ class Event(db.Model):
__tablename__
=
"events"
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
name
=
db
.
Column
(
db
.
String
,
unique
=
True
)
def
__init__
(
self
,
name
):
self
.
name
=
name
def
__repr__
(
self
):
return
"<Event(id={}, name={})>"
.
format
(
self
.
id
,
self
.
name
)
class
Topic
(
db
.
Model
):
__tablename__
=
"topics"
...
...
@@ -49,15 +55,17 @@ class Topic(db.Model):
event
=
relationship
(
"Event"
,
backref
=
backref
(
"topics"
,
order_by
=
id
))
def
__init__
(
self
,
name
,
mode
):
def
__init__
(
self
,
name
,
mode
,
event_id
):
self
.
name
=
name
self
.
mode
=
mode
self
.
event_id
=
event_id
def
__repr__
(
self
):
return
"<
Event
(id={}, name='{}', mode='{}')>"
.
format
(
return
"<
Topic
(id={}, name='{}', mode='{}'
, event_id={}
)>"
.
format
(
self
.
id
,
self
.
name
,
self
.
mode
self
.
mode
,
self
.
event_id
)
...
...
@@ -68,15 +76,15 @@ class Speaker(db.Model):
event_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
"events.id"
),
nullable
=
False
)
event
=
relationship
(
"Event"
,
backref
=
backref
(
"speakers"
,
order_by
=
id
))
def
__init__
(
self
,
name
,
event
):
def
__init__
(
self
,
name
,
event
_id
):
self
.
name
=
name
self
.
event
=
event
self
.
event
_id
=
event
_id
def
__repr__
(
self
):
return
"<Speaker(id={}, name='{}', event={})>"
.
format
(
return
"<Speaker(id={}, name='{}', event
_id
={})>"
.
format
(
self
.
id
,
self
.
name
,
self
.
event
self
.
event
_id
)
...
...
@@ -85,27 +93,26 @@ class Statement(db.Model):
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
speaker_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
"speakers.id"
),
nullable
=
False
)
event_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
"events.id"
),
nullable
=
False
)
speaker
=
relationship
(
"Speaker"
,
backref
=
backref
(
"statements"
,
order_by
=
id
))
event
=
relationship
(
"Event"
,
backref
=
backref
(
"statements"
,
order_by
=
id
))
insertion_time
=
db
.
Column
(
db
.
DateTime
)
executed
=
db
.
Column
(
db
.
Boolean
)
execution_time
=
db
.
Column
(
db
.
DateTime
)
speaker
=
relationship
(
"Speaker"
,
backref
=
backref
(
"statements"
,
order_by
=
id
))
event
=
relationship
(
"Event"
,
backref
=
backref
(
"statements"
,
order_by
=
id
))
def
__init__
(
self
,
speaker
,
event
,
insertion_time
=
None
,
executed
=
False
,
execution_time
=
None
):
self
.
speaker
=
speaker
self
.
event
=
event
def
__init__
(
self
,
speaker
_id
,
event
_id
,
insertion_time
=
None
,
executed
=
False
,
execution_time
=
None
):
self
.
speaker
_id
=
speaker
_id
self
.
event
_id
=
event
_id
self
.
insertion_time
=
insertion_time
or
datetime
.
now
()
self
.
executed
=
executed
self
.
execution_time
=
execution_time
or
datetime
.
now
()
def
__repr__
(
self
):
return
"<Statement(id={}, speaker={}, event={}, insertion_time={}, executed={}, execution_time={})>"
.
format
(
return
"<Statement(id={}, speaker={}, event
_id={}, topic_id
={}, insertion_time={}, executed={}, execution_time={})>"
.
format
(
self
.
id
,
self
.
speaker
,
#
self.event,
self
.
topic
,
self
.
event
_id
,
self
.
topic
_id
,
self
.
insertion_time
,
self
.
executed
,
self
.
execution_time
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment