ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allowed view prev/next to remember settings (fname, faces, distance)

Browse Source
This commit is contained in:
Damien De Paoli
2021-07-29 21:42:58 +10:00
parent dc35417933
commit 7926ab3455
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
files.py
View File

@@ -454,30 +454,44 @@ def move_files():
@app.route("/viewnext", methods=["GET","POST"]) @app.route("/viewnext", methods=["GET","POST"])
@login_required @login_required
def viewnext(): def viewnext():
sels={}
sels['fname']='true'
sels['faces']='true'
sels['distance']='true'
if request.method=="POST": if request.method=="POST":
id = request.form['current'] id = request.form['current']
eids=request.form['eids'] eids=request.form['eids']
sels['fname']=request.form['fname']
sels['faces']=request.form['faces']
sels['distance']=request.form['distance']
lst = eids.split(',') lst = eids.split(',')
new_id = lst[lst.index(id)+1] new_id = lst[lst.index(id)+1]
obj = Entry.query.join(File).filter(Entry.id==new_id).first() obj = Entry.query.join(File).filter(Entry.id==new_id).first()
# put locn data back into array format # put locn data back into array format
for face in obj.file_details.faces: for face in obj.file_details.faces:
face.locn = json.loads(face.locn) face.locn = json.loads(face.locn)
return render_template("viewer.html", obj=obj, eids=eids) return render_template("viewer.html", obj=obj, eids=eids, sels=sels )
@app.route("/viewprev", methods=["GET","POST"]) @app.route("/viewprev", methods=["GET","POST"])
@login_required @login_required
def viewprev(): def viewprev():
sels={}
sels['fname']='true'
sels['faces']='true'
sels['distance']='true'
if request.method=="POST": if request.method=="POST":
id = request.form['current'] id = request.form['current']
eids=request.form['eids'] eids=request.form['eids']
sels['fname']=request.form['fname']
sels['faces']=request.form['faces']
sels['distance']=request.form['distance']
lst = eids.split(',') lst = eids.split(',')
new_id = lst[lst.index(id)-1] new_id = lst[lst.index(id)-1]
obj = Entry.query.join(File).filter(Entry.id==new_id).first() obj = Entry.query.join(File).filter(Entry.id==new_id).first()
# put locn data back into array format # put locn data back into array format
for face in obj.file_details.faces: for face in obj.file_details.faces:
face.locn = json.loads(face.locn) face.locn = json.loads(face.locn)
return render_template("viewer.html", obj=obj, eids=eids) return render_template("viewer.html", obj=obj, eids=eids, sels=sels )
@app.route("/view/<id>", methods=["GET","POST"]) @app.route("/view/<id>", methods=["GET","POST"])
@login_required @login_required
@@ -491,7 +505,11 @@ def view_img(id):
eids=request.form['eids'] eids=request.form['eids']
else: else:
eids='' eids=''
return render_template("viewer.html", obj=obj, eids=eids) sels={}
sels['fname']='true'
sels['faces']='true'
sels['distance']='true'
return render_template("viewer.html", obj=obj, eids=eids, sels=sels )
# route called from front/end - if multiple images are being rotated, each rotation == a separate call # route called from front/end - if multiple images are being rotated, each rotation == a separate call
# to this route (and therefore a separate rotate job. Each reponse allows the f/e to check the # to this route (and therefore a separate rotate job. Each reponse allows the f/e to check the