From 21faffb1507d5ae3b6e8d1fa44a64f5a6ea65856 Mon Sep 17 00:00:00 2001 From: Jonathan Herrewijnen Date: Fri, 30 Sep 2022 18:45:45 +0200 Subject: [PATCH] Added forms to select subject or course --- __pycache__/main.cpython-39.pyc | Bin 644 -> 875 bytes __pycache__/plots.cpython-39.pyc | Bin 818 -> 839 bytes main.py | 37 ++++++++++++------------------- plots.py | 5 +++-- templates/index.html | 24 ++++++++++++-------- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc index c544e39d5feb84410125841e85411f8d6043710c..4109b3603f8bb5b8a735566d41d3450d9cddadb0 100644 GIT binary patch delta 513 zcmXv~J#Q2-5cT+W_k4T%am$wgMNptfSp|Wp=pcfMCP507o7L$&5W+gUvK{Gy5~aAb zDNfr`Tq=GF1ts1703^gOpksW2v1UAaGxO%z7vb+Ho2F^Z$S`_7`yMQ_4OlI=pPg$V z1u(@_P>*yh$Ll<-6P?O*okN|;3`5KpASXCk6)L&{HB{n)5pn}3hlHrn2T<`PS7Vi| z@tc^d^b%Ho&Tv0Fkvd?ijC+BbV;u>AJ0=yQWd3QgruxAoNF z^5@Qmf`uRAyPxBaRGdFKaJnwRM8wg(fXC-UeNw$|j7|x#+*5OtQ0#-Zd;9PF7LD$p zQFi8Q|IIgge@$-hP;l%J6x?HH?3Ate6+45|>%D#8aPG>138_m4epMeHw=J5Io1EsQkJOTPW!J~azSi102&x;Y()2N}d80e=C; C=5&n! delta 311 zcmW+vOG?B*5KVO^lW!;Lh^V-6#6_3^@dn~Ta5FC4^(F+n6iqUT-N`}(70lMfkPFOQ z!83RTLHY*bCG1QUy!WW8SMP7wT4745XXyHRp5FYJi|_#2#pLuA3~um2?i4Qb*4oPb zB4EK#?MQC5|gwPb^yx)P>) zey@_-`@2RU)&C{wQ-}yUMvh?Ay^xdclZ;{5eUsxuTknLcK{-h>PYX;EW~NoeEKxQ! YYS-AD?Cuz{JML!N>LeR;Ffcp@agYHskmCTv#d#C8gQZfLQ+b;iqxe$!7VxLA zFJw&NNa1W@0E!4qoRrJ_i&1~G0;3Egqts+uCKV+Cpf(UL<^vK8%xsJtjC@RNKrF&o z1QOR2oZQS*Xdnb+-r|Ul&r8frjgP;@oLEqBi?t}fv?LX*sz?ebk3>jMR%BLWW#VAt GU<3fz)FPb# diff --git a/main.py b/main.py index 2d7ae8d..9e3badf 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,7 @@ import random from io import BytesIO import base64 -from flask import Flask, make_response, request +from flask import Flask, make_response, request, render_template from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas from matplotlib.figure import Figure import plots @@ -11,27 +11,18 @@ import plots app = Flask(__name__) @app.route('/') -def plot_figure(): - return plots.plot() +def my_form(): + return render_template('index.html') + +@app.route('/', methods=['POST']) +def my_form_post(): + text = request.form['text'] + processed_text = text.upper() + return processed_text + +# @app.route('/') +# def plot_figure(): +# return plots.plot() if __name__ == '__main__': - app.run(debug=True, port=5002) - -# from flaskapp import * -# from plots import Cijferlijst - -# import matplotlib.pyplot as plt -# from datetime import datetime -# import matplotlib.dates as mdates - -# if __name__ == "__main__": -# cf = Cijferlijst() -# data = cf.GetSubjectByYear("godsdienst", "2010/2011") - -# #Get dates and convert them to actual dates -# x = data['Datum invoer(Voortgangsdossier)'] -# x = [datetime.strptime(date, "%d-%m-%Y") for date in x] - -# y = data['Cijfer(Voortgangsdossier)'] -# y = [float(line.replace(",", ".")) for line in y] -# RunWeb() \ No newline at end of file + app.run(debug=True, port=5002) \ No newline at end of file diff --git a/plots.py b/plots.py index 75ef879..7664ecc 100644 --- a/plots.py +++ b/plots.py @@ -7,7 +7,9 @@ from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas from matplotlib.figure import Figure import base64 -app = Flask(__name__) +# app = Flask(__name__) +GRADE_LIST = "Cijfers-HerrewijnenJonathan.csv" +print(GRADE_LIST) def plot(): # Generate the figure **without using pyplot**. @@ -25,7 +27,6 @@ def plot(): # import pandas as pd # import numpy as np -# GRADE_LIST = "Cijfers-HerrewijnenJonathan.csv" # class Cijferlijst: # def __init__(self, grade_list=GRADE_LIST): diff --git a/templates/index.html b/templates/index.html index 989b5f4..e79fa63 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,12 +1,18 @@ - - - - - - -

{{title}}

- img_data - + + + + + +
+ + +
+ + +

{{title}}

+ img_data + + \ No newline at end of file