From f8259a6bfddaad4d2f548a8a41774016b77f6247 Mon Sep 17 00:00:00 2001
From: Eljakim Herrewijnen <e.herrewijnen@gmail.com>
Date: Sun, 18 Sep 2022 15:11:54 +0200
Subject: [PATCH] Changed the way flask is run

---
 __pycache__/flaskapp.cpython-38.pyc | Bin 0 -> 806 bytes
 __pycache__/flaskapp.cpython-39.pyc | Bin 0 -> 792 bytes
 __pycache__/main.cpython-39.pyc     | Bin 0 -> 1381 bytes
 __pycache__/plots.cpython-39.pyc    | Bin 0 -> 1365 bytes
 flaskapp.py                         |  14 ++---
 main.py                             |  78 +++++++++++++++++++---------
 plots.py                            |   6 +--
 templates/index.html                |   3 +-
 8 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 __pycache__/flaskapp.cpython-38.pyc
 create mode 100644 __pycache__/flaskapp.cpython-39.pyc
 create mode 100644 __pycache__/main.cpython-39.pyc
 create mode 100644 __pycache__/plots.cpython-39.pyc

diff --git a/__pycache__/flaskapp.cpython-38.pyc b/__pycache__/flaskapp.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..af8f8e448c885d0e62f982da1592c7ada99b6b13
GIT binary patch
literal 806
zcmZuv&u`N(6t?3yO|y0@h|5k4PDDb>hR{w3A%@^qA;u43A)&N(OFAcxY-d`l?zCO^
zKXga_B}<$*@h|Mea|%+CaP*$-_nz~<@3TMj`w4<^_W0rW2S(_p-)s&7n-^f_3pkEA
zmZ-!GmjMef5|{^<m=TB*8J3h$>}x_9u}IKM#5(ORF1sv&YO>nm^ak^Ycdihe>+zU(
zuMq3=@C2pFFX({Mz|q$-H>Yk#i;4^V)rzu~xfP4;w_44_*zOIRQs^SZZtJ+1O@x-k
z%-G>A&c^-^e}_j-!H&Vq5jcxhm;>UQ-~ufH@h-Z+Fo!S)Hdv7*UP2Bd8*&O55${|R
zz!eW&GF9C0LR7{sx=#)c4>E9vi~Fx~+mw4nb*6-V^ie5or+GCsTp3dcoi29Q`2Lql
z3LtmB|IL<?k(m;nw=Jv`tW%Uzp4&X7E*MYT;Ek{+&BzmfIsYtj?MN*x3u~#Y_8e2<
zLSOIjxx@4CNN+>%_CcnVve_TWOt#i6n|NvSy56tnj<yhDFHidhNDs&G^#VPB*gsmr
z9{FCamOg9Itkv=w`x^(9$nZT}2<2kbOo0o59**dyYSC=C9XRZwcTM$4jPAnP1mF<X
z_rRyyjJ5!^54PmAuW{6qH9GX`Xp|dq^i+G??oOFopOeK182Ocp*0c7M7}ct=qUF<e
h*Z|^H(k+_!S*ds<#dCQ7$ar=GF9TQvV#GM<{s#0+!IA&~

literal 0
HcmV?d00001

diff --git a/__pycache__/flaskapp.cpython-39.pyc b/__pycache__/flaskapp.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..af9ad2a549247547dfea926e190d03f55b9853ba
GIT binary patch
literal 792
zcmZuv&5qMB5cW@!rs?ngXs^Ht_0nDtrxjXMX^#~GBqU!}PVI(t?Iv;@1gpL6o{;t(
z;K&Q`Furo)752o~sYE4k<ncE%&dfJ6=A%)DV4a;lU;o4i{qoA;qM%&BZf-#cB(Orv
zpG09z7}1nbj3g2C4zmdCk&1P~65QSGv7Sus5KF_KeVwsE@Wg7UM{FE$q9%IErVu6i
zb|iY=u}DS#9zncgk%_@QVkZK>L$l#;V1QOL;^Irin`<{Qawnv@vQpQITX{2nW2&uO
z+o!8mOH<CU8!XH1MjBOa8w={>vMgF7mwfk$H?NBVOi5>Y#EZ2Lf4E{$mav;K2n(eP
z0%gz#3S^?yO;$qo&-0H~D@M1K^u%mwm1MnA7lK<p!^XGo2Qqy)f_QwkFjZw2d#25z
zqq^Amig;bm>n|=2fd@V_0fC6|_#b)^7z4dy02Xa=AV?pG?`oj<zWjQEkmn_2-WD#Z
zD`P>WkjPQf?*8)Xkbep;dE4$j$b1U8%a4u6vr|XP%Ef`H@x(%L#y7{swW@4mJSCUp
zypb<oII`ZjBh9UMsWOMkJaWnYq_wi_$$>xT>uVTjGv9+NUKGa9fDI4F#tvg{!aPml
qZ^fo+tqi>ig#TMydaf(cD)|cDI%>{9q<D%`JcONqgpZ^+i~az<mAfJU

literal 0
HcmV?d00001

diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..88ded3b5ea9c0865adbe2786b9ed7a1629149e8b
GIT binary patch
literal 1381
zcmZ8hOK%%D5awfdwOXxY$teP-KwGsJK|moDMUJwNHf@St>;U#@fnq_6^mgrig`@)8
zSe+d75FiEm52R!N60be^+?!7wuIgG1g_-4WhQs+dAH}-e0Kqsu7%hJH5c<m+yTbwF
z1&DeNiX)CQ6m7pa!eEn(<TRqW6FIpXx!C$>=H;!(Z{|+c&VwkxNKnza#Zf52b(gyv
z%st+EhhU{A!iz5Vd7B3b;hhhJhrHW(_C$yGE{XgNBKmxf_xa!hfvorhjrZ@M9&|LO
z#(kABb!oaeyA-h$swxX5OiPM4OQG}_o4r?QvXtT_E8a5oU6R0(w_Uo&(}hj5J1`h8
zL6k+_97T?9E@tPY%!h2D)3P`mO{=Wbld4EY!(8ZJOMW=2N~K5hSz1&}J=E8gI2>tl
zrANbp<uK<=vya?rd6uUT@Rnsui1^o>|B0jzCqJtD&!)00_4KtYFT_Ht>CrM5GM(lu
zEhg2qajdszD<+^2k+z{X?f+^t^rs(Bjr02W<P?y%wgs#I;cmeW7o@?xhKWYEXoYID
z#=QA$=n89cK{<hTJl77Vw|GUk!`*kNCO<$MSG4ha;OE-a9#}2jdWP2i2CduN-{4yU
zF^&#u*lTy!c-^T<O*ha|9o9C7qr2<g2CdxMS?|?A67ckEcRkoxugBZ97w^{|v_Cky
zvyGA+P<I^E!kQ1mUIdUCoq(tVPzhl9r4JY^BIxRd{6XG0kcUWnb9di@8WZD5R`4<h
z^1wGOG%S(HHwIrlc0;xy)C99EReDk8)%+RQe}kZ#gN7BetX!~6%_ol`GPHXf%Yl3R
z^-Vj?St6!DpYaoE%ZxgV^B4$V6G+QD<89kyT&N@whUTm??s--+9XXbY##LITu%@ak
z)rMxGFpk}B!d<o-l9s0R{k0bA=i{hdNdOhY!IIiT{6y%6ea6pII1pGnZbkGwO(KU~
zr79v<AlEAL7R}o+Ub)o3Z{t5avybjY4k7J6i2589A|CFM0Q**xPjN^>nEN=uA@*<+
zYy3F2JdWej^!<~j2QC+9%LKrbQjZ660D0tBpe%fN=hF7JDZja>=!=|bi#totCTDDM
zDGIJ0CNWDAX?ZQb1QiW-LIETEB{a8hYp{<rjw8ydDsm;D6wNEz)=1^D*a6zS&V~j4
eEHC*o6LWi;>M1CIM?L{~A@wN$rF|Sc_3=MD#$8PS

literal 0
HcmV?d00001

diff --git a/__pycache__/plots.cpython-39.pyc b/__pycache__/plots.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5bc26365ce7eec3780a781e3deff3d0ce5f3e152
GIT binary patch
literal 1365
zcmZuw&2H2%5VoD4O}D$SMHT9*v`8EfInd?A1%!YC1q7>#MMy+Qk%`?UyV)ezUQk!d
ziE`w`Q}9Z;a^e*@G2^sVD0Sq?j6MFwo^OVCyKMsF+U@Jf50{W%Xf%fd#(kLjItW1o
z%}7M;pGA&fk-JBPBith*+^;P11Rask`whNixVXBTP7b8fH=jzS<mYsf%lvtfbMt}c
zJBj|3pj&gC2D=5T(guo{bPlMXf*sMwtwTW=Pxwb9@<mGo@NbC~2-~h!>wsB0(I#OH
zWYj&FyD;??5KFowF)?()jDz69`R>4qD+mC&!{2z|54{tzDA3ciRK;gqIa-#XSGC8A
z3mIprHWe#H6e!6>49}_Bd#@fmdK|xaHhK*^I%JirWp<!^0Q*VQDq?OAR8g40zA7d%
zF?ukZ&!kERWmXuyQyx}99H)6|;<yFg8W<sj`gF10c-hX0OM>}285jg@`$PeXfk%F&
zhEAD!2Rb{^mt?|l3fhO&DeIFj&JsQW+7i6Mc9-x8rw^n~L4NU;@LAhKdqji}6I0b1
zF1AL=hoZ<PoU0peib9z&&&OI6TBlNli_35L^t|=0`bFljl;><mYx|IvLddb4r9#L|
z$f)~@mnGmQwyK_lPUYfh;KeAl0xu4Ig~eR8^!z<$w{j09SJ5hv09I^`3&+N>3$Ry%
zYD-ToItbF+lV()oJUo00I2U16;})SCbe;B`9__Kkl_oJ~k0cb`j|b{lR+gX(pa3ak
z0u<3Ym2?ON<CQASjjfoF+Si=DmzzqXH{rOp1x^>e<_&Q3pR&LTIxUM0Fd!y$aUUW>
z7n5(6eoG}AF8VdpIedi7X1H>)A_?94Vm&}pYak+j4_o5D6kgorSu)SKkuRl4dA<$4
z^{v@rvw7<?e#0=pKFIk@#&Ok-<5?l*8S0%l{y67Zy`uuWKo`X&6zeE1qrgsU2qaBm
zwy;Muo(gCu2s(jdS3|$@OP&j^6*gVv<?|VIBFoD<0-kK3S#Vn-!QJ{|_mEnR-~kPo
G%l-nNB0|~#

literal 0
HcmV?d00001

diff --git a/flaskapp.py b/flaskapp.py
index 3116568..1f75b6e 100644
--- a/flaskapp.py
+++ b/flaskapp.py
@@ -1,21 +1,17 @@
+import io
 from flask import Flask, render_template
 app = Flask("Project Numeri")
 from plots import Cijferlijst
 import base64
 cf = Cijferlijst()
 import matplotlib.pyplot as plt
+from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
+from matplotlib.figure import Figure
 
 @app.route('/')
 def index():
-    
-    data = cf.GetSubjectByYear("godsdienst", "2010/2011")
-    x = data['Datum invoer(Voortgangsdossier)']
-    y = data['Cijfer(Voortgangsdossier)']
-    plt.plot(x,y)
-
     return render_template('index.html', title="joe", imgdata=None)
 
+
 def RunWeb():
-    app.run(debug=True)
-
-
+    app.run(debug=True, port=5002)
diff --git a/main.py b/main.py
index 4c94fb3..d302f3f 100644
--- a/main.py
+++ b/main.py
@@ -1,30 +1,58 @@
-from flaskapp import *
-from plots import Cijferlijst
+# based on https://gist.github.com/rduplain/1641344
+ 
+import random
+import io
+ 
+from flask import Flask, make_response, request
+from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
+from matplotlib.figure import Figure
+ 
+app = Flask(__name__)
 
-import matplotlib.pyplot as plt
-from datetime import datetime
-import matplotlib.dates as mdates
+@app.route('/')
+def root() :
+    return "<form action='/plot.png' method='post'><input type='text' name='data'><input type='submit' value='submit'>"
 
-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]
+@app.route('/plot.png', methods = ['GET', 'POST'])
+def plot() :
+    fig = Figure()
+    axis = fig.add_subplot(1, 1, 1)
+ 
+    if request.method == 'GET' :
+        xs = range(100)
+        ys = [random.randint(1, 50) for x in xs]
     
-    y = data['Cijfer(Voortgangsdossier)']
-    y = [float(line.replace(",", ".")) for line in y]
+    if request.method == 'POST' :
+        ys = map( float, request.form['data'].strip().split(',') )
+        xs = range(len(ys))
 
-    # p = plt.scatter(x,y)
-    plt.gca().xaxis.set_major_formatter(mdates.DateFormatter('%m/%d/%Y'))
-    # plt.gca().xaxis.set_major_locator(mdates.DayLocator())
-    plt.scatter(x,y)
-    plt.gcf().autofmt_xdate()
-    # plt.show()
-    # plt.plot(range(5))
+    axis.plot(xs, ys)
+    canvas = FigureCanvas(fig)
+    output = io.BytesIO()
+    canvas.print_png(output)
+    response = make_response(output.getvalue())
+    response.mimetype = 'image/png'
+    return response
 
-    # plt.xlim(0, 10)
-    # plt.ylim(0, 10)
-    # cf.CalculateMedian()
-    RunWeb()
\ No newline at end of file
+ 
+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
diff --git a/plots.py b/plots.py
index 0264c7e..fe5ca09 100644
--- a/plots.py
+++ b/plots.py
@@ -20,17 +20,13 @@ class Cijferlijst:
             #filter period and rapport
             rapports =  select_subject[select_subject['Cijfertype(Voortgangsdossier)'] != "Periodegemiddelde"]
             return rapports[rapports ['Cijfertype(Voortgangsdossier)'] != "Rapportcijfer"]
-
         else:
             return False
 
             
-    
     def iets(self):
         print(self.grade_list)
     
     def CalculateMedian(self, subject, year):
         # Calculates average for all scores without weight!
-        Grades = self.ps['Cijfer(Voortgangsdossier)'].loc[:]
-        print("blub")
-
+        Grades = self.ps['Cijfer(Voortgangsdossier)'].loc[:]
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index cadb24c..989b5f4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,7 +7,6 @@
   </head>
   <body>
     <h1>{{title}}</h1>
-
-    <img src="data:image/png;base64,{house.image}" alt="img_data"  id="imgslot"/>
+    <img src="/" alt="img_data"  id="imgplot"/>
   </body>
 </html>
\ No newline at end of file