From a572a80cae7af4b382746d38a1b84350372e8145 Mon Sep 17 00:00:00 2001
From: darthsandmann <kaiw@wb-mail.org>
Date: Thu, 17 Nov 2016 13:55:22 +0100
Subject: [PATCH] fast fertig

---
 .../__pycache__/application.cpython-35.pyc    | Bin 7739 -> 7769 bytes
 Praktikum2/ppm1/app/application.py            |   8 +++++---
 Praktikum2/ppm1/data/Angebote/26.json         |  13 +++++++++++++
 Praktikum2/ppm1/data/Angebote/last.json       |   2 +-
 Praktikum2/ppm1/data/Lehrender/last.json      |   2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 Praktikum2/ppm1/data/Angebote/26.json

diff --git a/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc b/Praktikum2/ppm1/app/__pycache__/application.cpython-35.pyc
index e74ac054b0ecf1f9e45f8b9622e1176872658f10..ae068d72d89d9a4482403c3031fb343288e502db 100644
GIT binary patch
delta 1995
zcmZ`)OKe+J5WV+({dq6(vmGbS=Q%&x7-&+37Wy%zRa1fhCA1E58yZ!neh{Z7X|7G=
z1Y4<;6%u4KY{~)&u?Q@X2p|<yiO+&c2(hTtO)b;~Qa3EvRssnzb6-AA5K`WF?wz@F
z=ggeBxt+P62_|eiWPN(*;>u?5H+AG0##n{10%tYO3JP0O87GagYYGzwSdFnc&ej;q
zlBPhPmNHaf<0+WZo;3rgFg*evYDXZecH4oovkS$mUT-L^2pd}Tqt-!mC~ML!1n2c(
zJ_t8-w@0P>);P<im5CMO+)}=TXEYgDnDDEf=238hF-P;zG)ys!tr$JVeY8C?T>dm9
z%yph5KlsM9`54^6brfC=9ON%UJ+RJQ=yTfbMyQ-$^8C!E;BfGLBZ{$vJQy$vUdgL?
zm*GM14}KMX4&C4tcrkp+`4N2x^L7C^ycd3ARiV6-HH9jcsUQleB@szMW7kwBHdsYt
zdkkpf6@A-t&Y)`g{>i$^b}coPC3mb8SHT-JI!6&G6_Y7*0XSx*x?%)?qeusZi9ZeV
zf|oCxDV2l^MQhZMb{9Uj`Wy$%%lMT$P%y>jaMv2Yuz~s>bVbJMoS~%dBepH0Oe0xW
zSapUnnNunIv6)GBSz(xcU1QbLtfrv>X6&xBSynS-C6GL*WA-vy60v0#vn;oGg5?O4
z?7hUKGsNt#vuS-o48v_ZWt$R}7{M$N(eL&!w$f=i=EQO1UHr-k6cWtEmX{{)q5dB*
zl3{qSY?Oq7w@@*O;kZVIW4o@<7I|TUTOm|<*wVj><=)Pd%o_H>chnelTMmgXhvXJR
zOF`f15}wpq!9bSaIb-LX$<`FVjRtiRjTk1I4onDY*0eF^Rr1A>Na8{avr{OaLbYK$
zUleb7^CE(abfBp$G=tMYYWunQiddcwjeC_b?~VN1r3#kp`&M^El0e3DDQIX%gh?Yh
z+{CX;Mp?>GWYSqeeNQQ2CeohsS%CE;ChRf;2}_mSEgdefJhVsk@}~m}vxOU3BF8}D
zHYRWYe~Ap*MiV9%9!1iR|8L4&nB3?1m8lpq<rkdsNv!d9PV%MVMCIl*DQ(OJ`+|Qy
z6y)vh8e!Biu`N5?b-L}Jl<IQ|0YG|c@RtKzgZ1cuW@B*JjHTdS^f><xT4HlN4a>33
zqc+bi){xuV042BmM$7rlV)2lP^r)_D)f+0d9|K>BuVCOte1Kp2>Yup9-Aih2@qv<?
zza#mjNdGCLdW+MDX)u%^|4$MFdcTe+;Y@ocJWTv~xL?mLZfH4z(0pe)Iw4MCr9_6r
z2@=F95d*a&!w<me4mU-`o({hv^3`Jb`fR@J?ID>9)s9jBxpd)+j?WyLyKnI;<6V9W
zW|M!PJcPRc4ry6@Y6ZPHX;lPiJ4HfLaUTJD(7-r+)cGZ*a=z=x2n~1hsp&v|{!Q=o
zg^IVIyM5>xgs;0cj_=$o25@iB#k=(1ckv*4#^HnR*H(v6YZzYj`a;<gtrS2WY9p<k
zL??-E61^n)Njyg4NfZs!KUokhv_+r=VUVLGh^&IjB?zdXlm*?~gazh%dPmJRvn^n#
nZDEp8UFup}C}>)`6|o|%am%vCt)LYa^dB%C5<~Dq&pZDDw`XY%

delta 1969
zcmZuyU1*zC7(VCw%YV}*O`4=>lCGQEhql#r1v`twt!q(BE6qiubIf4Axn^0rp2XVK
zgieays6}>$7rjvg5ru)Bq65A1!rctTpPL2QrHF#COBtxod%mVWL+JPRob#Ud_j%rv
zJ7Zsu`Qo9F|4Z5b{KS^;SAA`qF;-)&#95uQlE&6`#_NogIV)qsu)#577c?e@87Xu+
z&C|*tlXcGW(C2M^dewijSaV)p6qk?Xn%r-jA_V8c1JU%%I>pjcm5OMiU2xJ_a0D(-
z$)}BepC4z;Z08}_FplzG`HY#%QV?64UiF?lzc~Mrlk?lgt~=2oo5o1n5tvmiW$cG>
zw>iKcgK=gM$*VL~B|B-7JL}YPu>xm%a)YxsOj~}Kigq>)2kJ-3t#`-m&*mK-mDjBd
zAC<SQ4W5#xJvlxp>z)mq2fT;*j2!lESXo$zoV?}D@Pho!`%Z6^4pJnjKvx8?YFZ_y
z;?$h8@|y1teon6Wukcr|2A(v&fKtu`9$r&mB<mW%GFH==yGo+hC4*hinb>4Co$XUV
z$7?86*(A#*q2%6AHgI)EQ`gz9mTqf^ppzYWAXqJ?l|Ax)ARFnVv^j+BRVa$A90?9t
z>NqPe27AL1C}G2@aR{c#_k)v<Y+^OfSc8)!_Misxi$BG%WJ6;sXDDJ>li5(>tm4`D
znIZOq#u_GTSgdZclCC&6!RnSO8vMgrVF`yxlrgq6!3s<LtU&22B5uQt;<t%uo6}-Y
zz8A`RtyTfwh6Z?6-U~e*jv>#t@KvcE<bJH}*%P<0qTH27#8CambN~WivOOJW8U_L=
z%+e9vLNZh#&5Zn|?Evrt|J)o%ZJ@<yg<27aYNkw8-=}K$fYx^NVQH|Er3%EqmYs*K
zYc4t_0R&et$lKm&LCMcq<4&zOUvbGc$kqVcFwUFS#JsrZEQoe&Y|rle%=u^>Pc78M
z<vIVPQyX{A6<?{;grYDpe=c}ZIG9h@FGkOYLlw)7p)T%cwMgO$VP8#~kW9PUK4YMl
zOupFORdA6<O9=g4Hh_$1VXJ>GLk#zfn&vVe-PtZ)SC5XOYTmY{MM{3(e$Z>Su>H5)
zKBDIB|I$k%mFxJb^a26y*^bE*1w0-E_uiB!MS!=Du%O+}9w~#Qt-bucBOSV_tsK`V
zS%9O<j)>&C{3z0AG7jhRgJ?$n85!kU@=&zQ)AHTu)(GQ;rA07Tjb#ga7h1PEbPC*~
zSNC;e<%$l#;d!}p6`t>P_L);UdFJty9FF~!nbHeOKWc@A?-a2#Wj1N8e8n*@FgqT1
z&0_M0cpHy>em5TE;h0%i+B6DO2gQ|tcjb7eOeMznVOdCIQq;$}z;mLwGGD!PzF2j@
zA9~6023$)FS?X=e%G-%g!d*DMiLbf}fyTa>y#K@iR_c1w$QPF#LGOgEyDZ9)PQ4)y
z5GVu1KTLj;x`7-PyN`xwLU*j>XWc#K0i1Z`Pu(An?nDp=$=}`p%D3Xd0|5@<W<=gd
zpI)=EYFf_9rNycv!sI|1(JLkrB)UoTkmx1RN8%w8{SZx$YgtmiW-7LzT-6AOG_9y9
yf(jCpvY^O&eg)*)Jvq}G^TvE~tEVd-4u-?gU?4aV^aTTge$Z^cu;tyJ*Zu?5@NYc;

diff --git a/Praktikum2/ppm1/app/application.py b/Praktikum2/ppm1/app/application.py
index 4accc55..528176a 100644
--- a/Praktikum2/ppm1/app/application.py
+++ b/Praktikum2/ppm1/app/application.py
@@ -32,7 +32,6 @@ class Application_cl(object):
     def category(self, cat=None):
     #-------------------------------------------------------
         print("Category: ", cat, "\n")
-        self.db.ReadAll()
         if(cat==None):
             return self.GenerateIndex()
         else:
@@ -43,7 +42,6 @@ class Application_cl(object):
     def choice(self):
     #-------------------------------------------------------
         print("Choice \n")
-        self.db.ReadAll()
         return self.GenerateListChoice()
     @cherrypy.expose
 
@@ -51,7 +49,6 @@ class Application_cl(object):
     def eval(self, cat):
     #-------------------------------------------------------
         print("Eval \n")
-        self.db.ReadAll()
         self.db.CheckDates()
         return self.GenerateListEval(cat)
     @cherrypy.expose
@@ -123,6 +120,7 @@ class Application_cl(object):
     #-------------------------------------------------------
     def GenerateList(self, category):
     #-------------------------------------------------------
+        self.db.ReadAll()
         data = {}
         data['content'] = {}
         data['headings'] = {}
@@ -138,6 +136,7 @@ class Application_cl(object):
     #-------------------------------------------------------
     def GenerateListChoice(self):
     #-------------------------------------------------------
+        self.db.ReadAll()
         data = {}
         data['content'] = {}
         offerings = self.db.data['Angebote']
@@ -153,6 +152,7 @@ class Application_cl(object):
     #-------------------------------------------------------
     def GenerateDetail(self, category, id=None):
     #-------------------------------------------------------
+        self.db.ReadAll()
         data = {}
         data['category'] = category
         print("Detail",category,id)
@@ -172,6 +172,7 @@ class Application_cl(object):
     #-------------------------------------------------------
     def GenerateDetailChoice(self, id):
     #-------------------------------------------------------
+        self.db.ReadAll()
         data = {}
         data['id'] = id
         data = self.db.data['Angebote'][id]
@@ -183,6 +184,7 @@ class Application_cl(object):
     #-------------------------------------------------------
     def GenerateListEval(self, cat):
     #-------------------------------------------------------
+        self.db.ReadAll()
         data = {}
         Studenten = self.db.data['Studenten']
         Lehrender = self.db.data['Lehrender']
diff --git a/Praktikum2/ppm1/data/Angebote/26.json b/Praktikum2/ppm1/data/Angebote/26.json
new file mode 100644
index 0000000..f2fd625
--- /dev/null
+++ b/Praktikum2/ppm1/data/Angebote/26.json
@@ -0,0 +1,13 @@
+{
+   "id": "26",
+   "ZeitraumVon": "02.02.2019",
+   "Firma": "Apple",
+   "Student": "10",
+   "Beschreibung": "Beschreibung",
+   "Name": "Name",
+   "Lehrender": "5",
+   "Firmenbetreuer": "Firmenbetreuer3",
+   "Voraussetzungen": "Kein",
+   "Status": "aktuell",
+   "ZeitraumBis": "02.02.2020"
+}
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Angebote/last.json b/Praktikum2/ppm1/data/Angebote/last.json
index 410b14d..978b4e8 100644
--- a/Praktikum2/ppm1/data/Angebote/last.json
+++ b/Praktikum2/ppm1/data/Angebote/last.json
@@ -1 +1 @@
-25
\ No newline at end of file
+26
\ No newline at end of file
diff --git a/Praktikum2/ppm1/data/Lehrender/last.json b/Praktikum2/ppm1/data/Lehrender/last.json
index 301160a..ca7bf83 100644
--- a/Praktikum2/ppm1/data/Lehrender/last.json
+++ b/Praktikum2/ppm1/data/Lehrender/last.json
@@ -1 +1 @@
-8
\ No newline at end of file
+13
\ No newline at end of file