diff --git a/app.py b/app.py index eea54e7..bf45553 100644 --- a/app.py +++ b/app.py @@ -1,9 +1,20 @@ from collections import UserList import os +from sqlalchemy import case + from auth import login_required, bp as auth_bp -from deck import deck, bp as deck_bp -from flask import Flask, render_template, session +from deck import get_deck, bp as deck_bp +from flask import Flask, render_template, session, request + +from create_db import Card +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from config import CONFIG + +engine = create_engine(CONFIG['DB_CONNECTION']) +dbsessionmaker = sessionmaker(bind=engine) +dbsession = dbsessionmaker() def create_app(test_config=None): @@ -27,23 +38,43 @@ def create_app(test_config=None): except OSError: pass - # a simple page that says hello @app.route('/') @login_required def index(): return 'redirecting' # meče skoz nazaj na login TODO - @app.route('/deck', methods=["GET", "POST"]) #@login_required + @app.route('/deck/index', methods=("GET", "POST")) def deck(): if 'user_id' in session: user_id = session['user_id'] username = session['username'] - return render_template("deck/index.html", username=username) + d = get_deck(user_id) + + for card in d: #TODO to ne dela, nevem kako renderat zapooredno kartic + if request.method == 'POST': + rate = request.form['rate'] + cardtitle = request + print(rate) + if rate == "Yes": + k = 1 + elif rate == "Maybe": + k = 0.5 + elif rate == "No": + k = 0.1 + + + print(card.id) + print(user_id) + dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1 + dbsession.commit() + render_template("deck/index.html", username=username, card = card) + return render_template("deck/index.html", username=username, card = card) # no idea kaj se tu dogaja... else: return index() - + + @app.route('/logout') def logout(): session.pop("user_id", None) diff --git a/templates/base.html b/templates/base.html index c02ff7a..70e12e2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,8 +4,8 @@