popravljena koda za ocenjevanje
parent
05e513aba5
commit
8f9e883ade
93
app.py
93
app.py
|
@ -1,4 +1,5 @@
|
||||||
import os
|
import os
|
||||||
|
from textwrap import indent
|
||||||
from flask import Flask, redirect, render_template, session, request, url_for
|
from flask import Flask, redirect, render_template, session, request, url_for
|
||||||
from datetime import date
|
from datetime import date
|
||||||
|
|
||||||
|
@ -45,54 +46,100 @@ def create_app(test_config=None):
|
||||||
def index():
|
def index():
|
||||||
return 'redirecting' # meče skoz nazaj na login TODO
|
return 'redirecting' # meče skoz nazaj na login TODO
|
||||||
|
|
||||||
|
@app.route('/deck/beta', methods=["GET", "POST"])
|
||||||
|
def deck2():
|
||||||
|
if request.method == 'POST':
|
||||||
|
pass
|
||||||
|
|
||||||
|
return render_template("deck/index.html")
|
||||||
|
|
||||||
|
|
||||||
#@login_required
|
#@login_required
|
||||||
@app.route('/deck/index', methods=["GET", "POST"])
|
@app.route('/deck/index', methods=["GET", "POST"])
|
||||||
def deck():
|
def deck():
|
||||||
if 'user_id' in session:
|
if not 'user_id' in session:
|
||||||
|
return index()
|
||||||
|
|
||||||
user_id = session['user_id']
|
user_id = session['user_id']
|
||||||
username = session['username']
|
username = session['username']
|
||||||
|
|
||||||
#pokliče na bazo, da dobi str card idjev, ga spremeni v list in srevira karte po idjih
|
#pokliče na bazo, da dobi str card idjev, ga spremeni v list in srevira karte po idjih
|
||||||
deck_object = dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.completed == False).first()
|
deck_query = dbsession.query(Deck).filter(Deck.owner_id == user_id)
|
||||||
|
deck_object = deck_query.filter(Deck.completed == False).first()
|
||||||
|
# @TODO: ce deck, ne obstaja, kaj naj zaj jas?
|
||||||
|
|
||||||
deck_id = deck_object.id
|
deck_id = deck_object.id
|
||||||
# tu je treba preiti na current card
|
|
||||||
current_card = deck_object.current_card
|
|
||||||
print(current_card)
|
|
||||||
d = deck_object.cards_by_id.split(",")
|
|
||||||
|
|
||||||
if current_card < len(d):
|
|
||||||
card = dbsession.query(Card).filter(Card.id == d[current_card]).first()
|
|
||||||
dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.id == deck_id).update({'current_card': current_card+1})
|
|
||||||
else:
|
|
||||||
dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.id == deck_id).update({'completed': True})
|
|
||||||
dbsession.commit()
|
|
||||||
return redirect(url_for("menu.index"))
|
|
||||||
|
|
||||||
|
# Smo oddali obrazec?
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
|
card_id = request.form.get('card_id', None)
|
||||||
|
if not card_id:
|
||||||
|
raise Exception("card_id je nujen!")
|
||||||
|
|
||||||
|
|
||||||
|
submit_card = dbsession.query(Card).get(card_id)
|
||||||
|
# @TODO preveri, ali je card del trenutnega decka!
|
||||||
|
|
||||||
|
# Ali damo share? Potem nastavi na share in ponovi obrazec
|
||||||
|
share = request.form.get("share", None)
|
||||||
|
if share:
|
||||||
|
print(share)
|
||||||
|
# @TODO logika za share!
|
||||||
|
|
||||||
|
# Če ne, gre za rate!
|
||||||
|
else:
|
||||||
rate = request.form.get('rate', None) #je to nevarno??
|
rate = request.form.get('rate', None) #je to nevarno??
|
||||||
print(rate)
|
print(rate)
|
||||||
|
|
||||||
|
if not rate:
|
||||||
|
raise Exception("manjka rate info!")
|
||||||
|
|
||||||
|
|
||||||
if rate == "Yes":
|
if rate == "Yes":
|
||||||
dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': 1})
|
submit_card.interest_rate = 1
|
||||||
|
|
||||||
elif rate == "Maybe":
|
elif rate == "Maybe":
|
||||||
k = 0.5
|
k = 0.5
|
||||||
dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)})
|
print(submit_card)
|
||||||
|
submit_card.interest_rate= abs(submit_card.interest_rate*k)
|
||||||
|
|
||||||
elif rate == "No":
|
elif rate == "No":
|
||||||
k = 0.1
|
k = 0.1
|
||||||
dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)})
|
submit_card.interest_rate = abs(submit_card.interest_rate*k)
|
||||||
|
|
||||||
if request.form.get("share", None): #to ne sme spremeniti karte
|
# zaporedno število trenutnega carda v decku
|
||||||
print("share")
|
next_card = deck_object.current_card + 1
|
||||||
|
|
||||||
#dbsession.query(Card).filter(Card.id == card.id).update({'last_review': date()})
|
# Ali je deck končan?
|
||||||
|
if next_card >= deck_object.number_of_cards:
|
||||||
|
deck_object.completed = True
|
||||||
dbsession.commit()
|
dbsession.commit()
|
||||||
return render_template("deck/index.html", username=username, card = card) # no idea kaj se tu dogaja...
|
return redirect(url_for("menu.index"))
|
||||||
else:
|
|
||||||
return index()
|
|
||||||
|
|
||||||
|
deck_object.current_card = next_card
|
||||||
|
dbsession.commit()
|
||||||
|
#dbsession.query(Card).filter(Card.id == card.id).update({'last_review': date()})
|
||||||
|
|
||||||
|
# Loudamo naslednjo karto v decku
|
||||||
|
show_card_index = deck_object.current_card
|
||||||
|
show_card_id = deck_object.cards_by_id.split(",")[show_card_index]
|
||||||
|
show_card = dbsession.query(Card).get(show_card_id)
|
||||||
|
|
||||||
|
if not show_card:
|
||||||
|
raise Exception("Ne najdem naslednje karte")
|
||||||
|
|
||||||
|
# Prikaži obrazec
|
||||||
|
return render_template("deck/index.html", username=username, card=show_card)
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/share_button", methods=["GET", "POST"])
|
||||||
|
def share_button():
|
||||||
|
userid = session["user_id"]
|
||||||
|
username = session["username"]
|
||||||
|
card_number = session["card_number"]
|
||||||
|
|
||||||
|
print("share!!!")
|
||||||
|
return redirect(url_for("deck"))
|
||||||
|
|
||||||
@app.route('/logout')
|
@app.route('/logout')
|
||||||
def logout():
|
def logout():
|
||||||
|
|
|
@ -11,11 +11,13 @@
|
||||||
<canvas id="pdf-doc"></canvas>
|
<canvas id="pdf-doc"></canvas>
|
||||||
|
|
||||||
<form method="post">
|
<form method="post">
|
||||||
<button input type="submit" name="rate" data-cardtitle=card[title] value="Yes" accesskey="1">Yes</button> <!--ti keyi so alt+shit+key...-->
|
<input type="hidden" name="card_id" value="{{ card['id'] }}">
|
||||||
<button input type="submit" name="rate" value="Maybe" accesskey="2">Maybe</button>
|
|
||||||
<button input type="submit" name="rate" value="No" accesskey="3">No</button>
|
<button type="submit" name="rate" value="Yes" accesskey="1">Yes</button> <!--ti keyi so alt+shit+key...-->
|
||||||
|
<button type="submit" name="rate" value="Maybe" accesskey="2">Maybe</button>
|
||||||
|
<button type="submit" name="rate" value="No" accesskey="3">No</button>
|
||||||
|
<button style="margin-top: 1rem" type="submit" name="share" value="share">Share</button>
|
||||||
</form>
|
</form>
|
||||||
<button input type="submit" name="share" value="share">Share</button>
|
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ url_for('static', filename='js/pdf.js') }}"></script>
|
<script type="text/javascript" src="{{ url_for('static', filename='js/pdf.js') }}"></script>
|
||||||
|
|
Loading…
Reference in New Issue