reformated some code
This commit is contained in:
@@ -8,31 +8,39 @@ from backend import db
|
||||
|
||||
# This is the association table for the many-to-many relationship between
|
||||
# virtual commands and recorder commands.
|
||||
virtual_command_recorder_command_table = db.Table('virtual_command_recorder_command',
|
||||
db.Column('virtual_command_id', db.Integer,
|
||||
db.ForeignKey('virtual_command.id',
|
||||
onupdate="CASCADE",
|
||||
ondelete="CASCADE"),
|
||||
primary_key=True),
|
||||
db.Column('recorder_command_id', db.Integer,
|
||||
db.ForeignKey('recorder_command.id',
|
||||
onupdate="CASCADE",
|
||||
ondelete="CASCADE"),
|
||||
primary_key=True))
|
||||
virtual_command_recorder_command_table = db.Table(
|
||||
"virtual_command_recorder_command",
|
||||
db.Column(
|
||||
"virtual_command_id",
|
||||
db.Integer,
|
||||
db.ForeignKey("virtual_command.id", onupdate="CASCADE", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
),
|
||||
db.Column(
|
||||
"recorder_command_id",
|
||||
db.Integer,
|
||||
db.ForeignKey("recorder_command.id", onupdate="CASCADE", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
),
|
||||
)
|
||||
|
||||
# This is the association table for the many-to-many relationship between
|
||||
# virtual commands and recorder commands.
|
||||
virtual_command_recorder_table = db.Table('virtual_command_recorder',
|
||||
db.Column('virtual_command_id', db.Integer,
|
||||
db.ForeignKey('virtual_command.id',
|
||||
onupdate="CASCADE",
|
||||
ondelete="CASCADE"),
|
||||
primary_key=True),
|
||||
db.Column('recorder_id', db.Integer,
|
||||
db.ForeignKey('recorder.id',
|
||||
onupdate="CASCADE",
|
||||
ondelete="CASCADE"),
|
||||
primary_key=True))
|
||||
virtual_command_recorder_table = db.Table(
|
||||
"virtual_command_recorder",
|
||||
db.Column(
|
||||
"virtual_command_id",
|
||||
db.Integer,
|
||||
db.ForeignKey("virtual_command.id", onupdate="CASCADE", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
),
|
||||
db.Column(
|
||||
"recorder_id",
|
||||
db.Integer,
|
||||
db.ForeignKey("recorder.id", onupdate="CASCADE", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
class VirtualCommand(db.Model):
|
||||
@@ -41,16 +49,25 @@ class VirtualCommand(db.Model):
|
||||
name = db.Column(db.Unicode(63), unique=True, nullable=False)
|
||||
description = db.Column(db.Unicode(255), unique=False, nullable=True, default="")
|
||||
|
||||
recorders = db.relationship('Recorder', secondary=virtual_command_recorder_table,
|
||||
back_populates='virtual_commands')
|
||||
recorders = db.relationship(
|
||||
"Recorder",
|
||||
secondary=virtual_command_recorder_table,
|
||||
back_populates="virtual_commands",
|
||||
)
|
||||
|
||||
recorder_commands = db.relationship('RecorderCommand', secondary=virtual_command_recorder_command_table,
|
||||
back_populates='virtual_commands')
|
||||
recorder_commands = db.relationship(
|
||||
"RecorderCommand",
|
||||
secondary=virtual_command_recorder_command_table,
|
||||
back_populates="virtual_commands",
|
||||
)
|
||||
|
||||
# parent_virtual_command = db.relationship('VirtualCommand', back_populates='child_virtual_commands')
|
||||
parent_virtual_command_id = db.Column(db.Integer, db.ForeignKey('virtual_command.id'))
|
||||
child_virtual_commands = db.relationship('VirtualCommand',
|
||||
backref=backref('parent_virtual_command', remote_side=[id]))
|
||||
parent_virtual_command_id = db.Column(
|
||||
db.Integer, db.ForeignKey("virtual_command.id")
|
||||
)
|
||||
child_virtual_commands = db.relationship(
|
||||
"VirtualCommand", backref=backref("parent_virtual_command", remote_side=[id])
|
||||
)
|
||||
|
||||
command_order_string = db.Column(db.String)
|
||||
|
||||
@@ -91,5 +108,6 @@ class VirtualCommand(db.Model):
|
||||
return dict(id=self.id, name=self.name, description=self.description)
|
||||
|
||||
def toJSON(self):
|
||||
return json.dumps(self.to_dict(), default=lambda o: o.__dict__,
|
||||
sort_keys=True, indent=4)
|
||||
return json.dumps(
|
||||
self.to_dict(), default=lambda o: o.__dict__, sort_keys=True, indent=4
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user