From d07c5c2597b7b2770f02c78b7c3fabadb25b9893 Mon Sep 17 00:00:00 2001 From: Kostanjevec Date: Sun, 5 Jun 2022 20:01:54 +0200 Subject: [PATCH] predhod iz global var indexa na current_card updateing iz deck db, nastal pa je problem, da prvo karto dva rejta --- app.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/app.py b/app.py index adf473a..b086b0a 100644 --- a/app.py +++ b/app.py @@ -4,7 +4,7 @@ import os from sqlalchemy import case from auth import login_required, bp as auth_bp -from deck import probabilistic_deck_generator, bp as deck_bp +from deck import bp as deck_bp from menu import bp as menu_bp from upload import bp as upload_bp from flask import Flask, redirect, render_template, session, request, url_for @@ -21,8 +21,6 @@ engine = create_engine(CONFIG['DB_CONNECTION']) dbsessionmaker = sessionmaker(bind=engine) dbsession = dbsessionmaker() -deck_index=-1 - def create_app(test_config=None): # create and configure the app app = Flask(__name__, instance_relative_config=True) @@ -54,39 +52,42 @@ def create_app(test_config=None): #@login_required @app.route('/deck/index', methods=("GET", "POST")) def deck(): - if 'user_id' in session: - global deck_index + if 'user_id' in session: user_id = session['user_id'] username = session['username'] #pokliče na bazo, da dobi str card idjev, ga spremeni v list in srevira karte po idjih - ids = dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.completed == False).first() - - d = ids.cards_by_id.split(",") + deck_object = dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.completed == False).first() + 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(",") - deck_index+=1 - if deck_index < len(d): - card = dbsession.query(Card).filter(Card.id == d[deck_index]).first() + if current_card < len(d): + card = dbsession.query(Card).filter(Card.id == d[current_card]).first() else: - deck_index =-1 + dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.id == deck_id).update({'completed': True}) + dbsession.commit() return redirect(url_for("menu.index")) if request.method == 'POST': rate = request.form.get('rate', None) #je to nevarno?? cardtitle = request print(rate) + if rate == "Yes": k = 1 dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': 1}) elif rate == "Maybe": k = 0.5 - dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1 + dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) + elif rate == "No": k = 0.1 - dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1 - - print(card.id) - print(user_id) + dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) + + dbsession.query(Deck).filter(Deck.owner_id == user_id, Deck.id == deck_id).update({'current_card': current_card+1}) dbsession.commit() return render_template("deck/index.html", username=username, card = card) # no idea kaj se tu dogaja... else: