From efacfe76ec3987bcd1abc567a0638e071fdd67c5 Mon Sep 17 00:00:00 2001
From: sessionm21 <sessionm@oregonstate.edu>
Date: Wed, 13 May 2020 06:54:04 +0100
Subject: [PATCH] add boundaries to model and view

---
 fgs/.model.py.swo | Bin 0 -> 12288 bytes
 fgs/model.py      |  25 +++++++++++++++++++++++++
 fgs/views.py      |   6 +++++-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 fgs/.model.py.swo

diff --git a/fgs/.model.py.swo b/fgs/.model.py.swo
new file mode 100644
index 0000000000000000000000000000000000000000..f8928cf926f46082e313640943a96d269329f656
GIT binary patch
literal 12288
zcmeI2Plyyp7{yCN)b(#LH$$*B%Jjfyc4o(2H^O4v1VKbra23oUO-*-gZ?QdHO?CCI
zqeKrm=8$+vjvf;5m`id=AR(uC%hg*VIR>%_LXP@sx_fqeMn~&lK&gTsGhO@DtEyMk
zU-j;Gr+MYv1!u0&A}DVW(*EM-PapiZlg#cQB;mU9`9;#z_d}}KI_-@OzM1f;l*u(F
zr<TKXsw)B(HIngd#tPaWS_iBH1`g~a?dewYy`x8*w+~)6XlFyM1J(iSfOWt+U>&dy
zSO=^F)`8c-0hMeck1>($;5^t?fDc=&1J(iSfOWt+U>&dySO=^F)&c8)b-+4c9e7O~
zpaCJjy@B8R-^7IQ|9|~AfQ<u$JOF=zd*B<e4wk@ia12a<`}+y`8U&yXCcxkO2>BKK
z0`7wAU=bVw8+!@)9sCG>0AB$QybJ!>L&#6yHVDBP@F6%2j)I4~3Hct}0*l}<*qA_H
z;7j0vDe!m~A%B27K!DTW0Qhq!+JjqQ5gY~^c*o&ia39<SpMy`pRWJ|U0f)dNc=H|j
z7Tf@{U<UL(!>29Q0qejk>VSii&@^2aGH~XdM2dt-)pJ9pyt01MNw-|p3DJ#okxXSW
zb~?W7C92`CFn={!cgtoC7W;U|$*t@5(Q>1#_f}}SQYTs<V9QRw*`P01hfWTLR6n)Z
z+o%WzT=cCapWby55VAO>k#g&s9dDh~m~M+nj`lv7!B(&OLglC{Gsa+pPU9mHW!>1t
zw@XU$ILwEW;k~e!cG<WXuGgoca4uFXWD;&k-lekVt+L+ylFV40_z~9BxeQs|)dl^k
zSve?QV5vXo4U3(P1XXS#na@)$;`vsyuquzgW)?qZs6S_@f6`F@q@n(-q5iC){*0mi
zjG_JsL;Vwm`fWq~wxRyCq5ia?e#=n5WvJgY)Nh*TM-i3Ym~?<U{;ZIUhw*vVb8EiP
z4H`VC6?gQQrq9YG3nGgHq^kvSt&&jk9Eg`+6(7xBAESN=^?8n46Op1J^CGs!qTy^(
zq_RO|)_sw{h$^nKU?gomGnYjo4$WHR=KarZUxJ%il%;2U#n&)L(LXRMSzMo<W%-Ph
z-^$OL$W+P$Ry&m+y~X8dTu>}s8CYIVj)r!qQVfSofBnk%O65};l`B-nm)D!2#qoNh
zHdvcMY`Iu@uzprh!V9>sDu-+_x8WVNAVkDyTpaf=v_mVC8P==p&~h5XL9hD8!yQX6
z3LdM<O|EwpHU{+){i8IWv}D=@5vMCWachHywcK#3ckal2Sy_{p@VtYED`dLL*m*Y*
TQWcMhWLb)?({PH)phKPj8<4`o

literal 0
HcmV?d00001

diff --git a/fgs/model.py b/fgs/model.py
index b47bc90..70812e6 100644
--- a/fgs/model.py
+++ b/fgs/model.py
@@ -33,6 +33,31 @@ 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)
diff --git a/fgs/views.py b/fgs/views.py
index e35ccaf..ffbdd66 100644
--- a/fgs/views.py
+++ b/fgs/views.py
@@ -88,4 +88,8 @@ def collar_detail(id):
             order_by(StimulusActivation.datetime.desc())
     n_stimulus = stimulus_points.count() 
 
-    return jsonify({'id': collar.id, 'name': collar.name, 'stimilus': n_stimulus })
+    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 })