CS-46X/server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CS-46X:48fb5d0d9b721c48b3682020ea7b48743c3a80d5
Branches Tags
CS-46X:master
..
compare: CS-46X:630ef001cc8af4f2253a6a625a7879052d35a1ca
Branches Tags
CS-46X:master

No commits in common. "48fb5d0d9b721c48b3682020ea7b48743c3a80d5" and "630ef001cc8af4f2253a6a625a7879052d35a1ca" have entirely different histories.
48fb5d0d9b ... 630ef001cc

3 changed files with 1 additions and 30 deletions
Show Stats Expand all files Collapse all files

BIN
fgs/.model.py.swo
View File

Binary file not shown.

25
fgs/model.py
View File

@ -33,31 +33,6 @@ class StimulusActivation(db.Model):
voltage_level = db.Column(db.Integer)
datetime = db.Column(db.DateTime)
class BoundingBox(db.Model):
id = db.Column(db.Integer, primary_key=True)
collar_id = db.Column(db.Integer, db.ForeignKey('collar.id'))
coord0x = db.Column(db.Float(precision=10))
coord0y = db.Column(db.Float(precision=10))
coord1x = db.Column(db.Float(precision=10))
coord1y = db.Column(db.Float(precision=10))
coord2x = db.Column(db.Float(precision=10))
coord2y = db.Column(db.Float(precision=10))
coord3x = db.Column(db.Float(precision=10))
coord3y = db.Column(db.Float(precision=10))
coord4x = db.Column(db.Float(precision=10))
coord4y = db.Column(db.Float(precision=10))
coord5x = db.Column(db.Float(precision=10))
coord5y = db.Column(db.Float(precision=10))
coord6x = db.Column(db.Float(precision=10))
coord6y = db.Column(db.Float(precision=10))
coord7x = db.Column(db.Float(precision=10))
coord7y = db.Column(db.Float(precision=10))
coord8x = db.Column(db.Float(precision=10))
coord8y = db.Column(db.Float(precision=10))
coord9x = db.Column(db.Float(precision=10))
coord9y = db.Column(db.Float(precision=10))
class User(db.Model):
id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String)

6
fgs/views.py
View File

@ -89,8 +89,4 @@ def collar_detail(id):
order_by(StimulusActivation.datetime.desc())
n_stimulus = stimulus_points.count()
boundary = BoundingBox.query.filter_by(collar_id=collar.id).\
order_by(DataPoint.datetime.desc()).\
first()
return jsonify({'id': collar.id, 'name': collar.name, 'stimilus': n_stimulus, 'boundary': boundary })
return jsonify({'id': collar.id, 'name': collar.name, 'stimulus': n_stimulus })