From fe08a2fd2ad83ff8293fe5a4e200cc57863935ff Mon Sep 17 00:00:00 2001
From: darthsandmann <kaiw@wb-mail.org>
Date: Thu, 19 Jan 2017 00:27:04 +0100
Subject: [PATCH] auswertung finished

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 Praktikum3/.DS_Store                          | Bin 6148 -> 6148 bytes
 Praktikum3/bt/.DS_Store                       | Bin 10244 -> 10244 bytes
 .../bt/app/__pycache__/error.cpython-36.pyc   | Bin 4866 -> 4826 bytes
 .../bt/app/__pycache__/eval.cpython-36.pyc    | Bin 971 -> 2422 bytes
 .../app/__pycache__/navigation.cpython-36.pyc | Bin 1051 -> 1051 bytes
 Praktikum3/bt/app/error.py                    |   4 -
 Praktikum3/bt/app/eval.py                     |  70 ++++++++++++++++--
 Praktikum3/bt/app/navigation.py               |   2 +-
 Praktikum3/bt/static/css/main.css             |   1 +
 Praktikum3/bt/static/js/app.js                |   9 +++
 Praktikum3/bt/templates/.DS_Store             | Bin 8196 -> 8196 bytes
 Praktikum3/bt/templates/katlist.tpl           |  25 +++++++
 Praktikum3/bt/templates/prolist.tpl           |  26 +++++++
 14 files changed, 124 insertions(+), 13 deletions(-)
 create mode 100755 Praktikum3/bt/templates/katlist.tpl
 create mode 100755 Praktikum3/bt/templates/prolist.tpl

diff --git a/.DS_Store b/.DS_Store
index 9389dda99e4383e45acd19e1dc4554670e4a76fc..25a1ba3358b0598a2db64478228d13af4aa6ff13 100644
GIT binary patch
delta 22
dcmZp1XmQx!D#B@KVPdJHU}j*x*-vB}Hvmd+1~32s

delta 22
dcmZp1XmQx!D#B@GU}37GU~Xu**-vB}Hvmcm1|<Lh

diff --git a/Praktikum3/.DS_Store b/Praktikum3/.DS_Store
index 77b5a8e77e0f03ccae04cb50d5b491fee314bebe..08cdf652e24ecf193e7ed1baf02f899bb8b733cc 100644
GIT binary patch
delta 22
dcmZoMXffDuf`!x2!o*TX!OXyX^F<b8VE|Bo273Si

delta 22
dcmZoMXffDuf`!w_z`|5V!Q9Yr^F<b8VE|AS25<lX

diff --git a/Praktikum3/bt/.DS_Store b/Praktikum3/bt/.DS_Store
index 651c2d1735a210ac2dde1283f5b07d6b54539fce..b0e8eb5af4488bf52e1f00f78240b104f33933b1 100644
GIT binary patch
delta 516
zcmZn(XbISmA<AiJVPdJHU}j)GxllBoar5MhqDqFMqGIBr5<*ha@dCn0iOJdNMfs(9
zDbD#h`9)4SrK#}({KXmh<(|p;c>zVKWtpkvlcmLW)kkCk1%flHQlrz0GE;&J5|cCY
z(v|H$Fn|H4vV#VMCBUEzVK6Xo2r!1^<>#dWB?BO0$`0O8Ne%{W21kZqh8TuIh6aY|
z42v1IG8|+$$MBfpE5m<AUPduSB}Q#V9Y#||b4CY7M@DsLMh`|$#vq7xCPt_+GEf>y
gF-A{jln~pzR6L1eVgvVPc7;UNkr@P&mx^Zr05c$LkN^Mx

delta 545
zcmZn(XbISmAv*btfY;>7BEmeG$z=seIr&Kp42=6GUldi+5EB)b5S5gYl8F}(PD)J9
zPA|$Y%}a64&&e-x$|+5a$V|@93(l-covb3Zt3F<Uzc?em+!H7kP?TDhnOYv5UX+;<
zT#%TYnU}6?|A7GvlpO+K3=IfFfI%6;U|>*o2s!{}a|keo<mKn3a&js=ctd457_=E2
z8N3*R88R5k8TuGzF|1+O!Elt}7Q-8cZ;aL~jAD#RjM|JQjJAySj2?`Ej6sYcjFF5{
rjL{GSm>8i3$wFx;#h5aAf{57WS>j0?o7oi-Sx3VI6dsdjiN^x~VH<Xt

diff --git a/Praktikum3/bt/app/__pycache__/error.cpython-36.pyc b/Praktikum3/bt/app/__pycache__/error.cpython-36.pyc
index ba6700d63908506bee2558698dfa354116db15c5..4a2e475f7095739e47fff9553041d27827007214 100644
GIT binary patch
delta 178
zcmZotyQRu$%*)Gl{7!v@`$o<j9-ku&3=AoZDGZs6wahg@I-98|qJ$xZshN?Hp@u1i
z8OS%NVaQ_4VrpinVNPMRVJJKR6lVd7dw|865#p0?@+dP_P5#RhGC7j>m6{UJXa;5u
zCLm<wU=#phCIMz1AkBw>Oq&b&<}flUZRQiOVq|og>?ydEF@ExU!3IW|$pu1_059h#
An*aa+

delta 195
zcmcbm+N8#5%*)HgJFh-s=0?sOo|GpH3=Aa<HB8Nnj3Am3M5i#OFk~{;GS>j<Y^I`u
z5{4A8d<|0yGm!5A=QCt6W-&E0)G((o+AtK}0Lrrf<r8W^;>-x~$p?9q87EDC$`is4
zw1OFE#bgWK*8*BVs~MO$7&(~0ka4mupA3+@*^_S$Bcs~pXZ%)-j2@E}1(z}=Pd+Z#
Lz^E|ULue8J@(nJ(

diff --git a/Praktikum3/bt/app/__pycache__/eval.cpython-36.pyc b/Praktikum3/bt/app/__pycache__/eval.cpython-36.pyc
index 819f6197244fbb64f940ab340d757dd838da2ef5..a00997dc6a97ff3ee41eb1a0e08f24758c2f7c11 100644
GIT binary patch
literal 2422
zcmb7G&2QX96rZuZws*5h^VQHmsmeEtP!`b(hgB3o+Z<Xgl^O`L6j|P#N$UO1c!JVs
zBM!+K^~8byfGg@B!5MLyE2myKBGD7SH{P$LQKfn{&wd~C<~@6Uzu7zU^QFdrKmDMV
z8T*^fTppgcFtUdbf(hPXQGVwU7mjc{PS=gxt`~XTLR9Gbk<ZyS6P_rXGf|MinHz=B
zeGxzptX>rSF{^|xkdf72aL9^hmhQ_Z9jWdnI%y=CjGG;^{7Cg%vaM%r*B|t|gMLr;
zw461sK1lTb<pfPyV0^iF*uu!(hmZ`#v&a!Va;b@P7I`8N1>v9bs31Hl&y=wI!!*+<
zWv5A1(nWU%;~R|ZCWK~ZY{+7+9ea1RXYU2Ukc8JOzM_>)Ni^~X<G!MIYUV^^)E+Da
zvMh+kw7Ixn;l|5kXa6^*%5cB@y!u@xRaR{$X>~i*)!lnvS0AaQt<&~V_fEB;tI1$c
zl|Lq(jlokB#&Oz9bsWEoxtR~aoREk7WM$gb#yF<lq?YIkF(}x!_dA+R*{Or!rfld6
zUPG%b*5YW<5suZIk>*;>9cf;TJ>$m%M7itiE}r)qr(UiNy>)Dib#{ukO*z-uuwbJ%
z;fK#ge{nkTA=+;{>X*ENJUWjY`tSv?c<}4vm#{iCfA62uV455L0JT})5YZxpg)%-L
zuTBy9D$lq=x3l&OGg0-d4|9svj~>TeUGkT#A6?m6U!6a9A%7Ve=i4r-_*pDm%5<&9
z4xfv~tE{{1P-EQRMRnM8OLgN3z{vRdj*EiPMvF?*{bjsf(v`-m152hj$bps$Q*KZ2
z1+A20ibA8gQIJ&@reQXZpXo#&WhOk319c?#wF#tZC%v9F<vhnIpxBU^Om%voE1sg=
zW&$M>5f6@45t=GNR6;dJ9tRcp)Jfbop_2Ohqywz1*h!;eOlew(@$;1|Tyil_vF`T0
zoe%MleF?!Fk9)wu0{xt2zR1fwm#eTW@>RYDdE5Th_?mN@pDf_@jd)-KsVt}oU(|RU
zn^GKi`{JlW&*eBiJW4tvPauy6{Y(nAfOQq|&P-{9X+`y^0OBnSi_*~b+%T}VCTx?7
zNMsA+4d@G$_<H(UMZU}QHKr}k(w6-~iU`5XgPjtc?<gWC`-x`yv8_;}J5(i691+gR
z%Cw3r=!RM+?z42W`G$0(-Jx^FIT4Kmcw3^``}YFP0C=F8!Wc9)cKp|bB>uQSF$EC9
zuT$vPKvCma1l|cuiE=P3<+NraV5b~^PIJ66k7!^-c;v&3DKU`-ViH9Q|68JTDH23+
z*b?QdtbqR32>SDNbq%jmEkZ;^yn1=iSE*D>WW>>qW2ZenC{v-XlX;B<?LT#c#5#$$
zAx8LA?~vhB2vZoSw5KaU{^{xPQ*^qhTM!W?&R0uCRGcX4J&LfKeY)cb3K2&38N>`C
zozPjdh$JMIEgDxX8VQLvfkbq48Hwrxq)>!!^%04WNxU9#pCII0j4|Mx&{t%ul#JKP
z`aKgipGc*i(lJW(L;pu|IMBAXhjoq#zu#!drnYFc8D<)tbZf#|&JUY};fy#h1Tt<c
HEq?Vssx%D4

literal 971
zcmb7C!A{&T5VhkZn{L^qqKB%7ii%sLic|t|0aYsy+C!@q60}9RSRr=R>}EH?_Ev=p
z2l_MolCPZl3q5tl>9Rqh6}2?aGxm7i(~P%zz3%$e)#+Y`kXzDPKKKJLy$v9Upe0G0
zou+h1geTY!BAE29S;`>xMF4T&Vqef>5{EzGB^l+2i{*hc0MoAlBuS|tsV8X4ntG|<
z)JX#oLWPd)9;xa>p$*T=lbpgET)3khfN9hz2qe?d4S@BvEWaoQrw)F-Nj_?+bTY|`
zWLTKw^WlDSq_T-ACiCf5a%PgOt`qq!D>v&48*yID3d8v;tc_}kclmrNVsmkSPYmWc
zF<o#B8B^n3V+ZIcX4W6;YGwm5pVrz&N}5ku$*Y(uRK66d0thV|9-eG~v!L#`sNrf9
zhbVEDO(o~H%lWht^Ai0P&d=vr`RAr1zt@$PLWRhIs#-*@H^`<?_X{wMX%X{T6u7e-
z!n=h@1F%Pr?0se)Ju)Zj;a)iHJ4lQQa16`B|33x=|C^`?;R(QBD6vz!U<=BAi?V6I
zdWt1h5PArGgnxH=6;j@UwY!XGao|MRDE}&zx`5voR%c_G8#e=mDGyD}MtjZF-{Bye
KqF%K2?B#D>8m|8U

diff --git a/Praktikum3/bt/app/__pycache__/navigation.cpython-36.pyc b/Praktikum3/bt/app/__pycache__/navigation.cpython-36.pyc
index 6c15a3aef07ac49e3ec1c58acede2bcc9323da91..05e0fff0a235bc547f6047a3ba5cf9198316cc8b 100644
GIT binary patch
delta 39
xcmV+?0NDSV2%887GYt(25&5wO+5!XG2Wyk#0=@wilkEc+leq&N0TPqe14Z<P45a`7

delta 39
vcmbQuF`I+Un3tDJt$rihEhgqD_T<Trnf5V?On%EOK6xjz45Q%WYs{_y-0lmu

diff --git a/Praktikum3/bt/app/error.py b/Praktikum3/bt/app/error.py
index 1d02958..6fa757f 100644
--- a/Praktikum3/bt/app/error.py
+++ b/Praktikum3/bt/app/error.py
@@ -261,8 +261,6 @@ class Fehler_cl(object):
    #-------------------------------------------------------
    def GET(self, id=None, type=None):
    #-------------------------------------------------------
-      print(type)
-      print(id)
       retVal_o = {
          'data': None
       }
@@ -270,7 +268,6 @@ class Fehler_cl(object):
          # Anforderung der Liste
          print('true')
          if type == 'erkannt':
-            print('true')
             retVal_o['data'] = self.db_o.readErkannt_px()
          elif type == 'behoben':
             retVal_o['data'] = self.db_o.readBehoben_px()
@@ -287,7 +284,6 @@ class Fehler_cl(object):
          retVal_o['katfehler'] = self.dbKatFehler_o.read_px()
          retVal_o['katursache'] = self.dbKatUrsache_o.read_px()
 
-      print(retVal_o)
       return retVal_o
 
    #-------------------------------------------------------
diff --git a/Praktikum3/bt/app/eval.py b/Praktikum3/bt/app/eval.py
index 99d3b1b..66521be 100644
--- a/Praktikum3/bt/app/eval.py
+++ b/Praktikum3/bt/app/eval.py
@@ -3,7 +3,7 @@
 import json
 
 import cherrypy
-#from .database import SourceDatabase_cl, EvaluatedDatabase_cl
+from .database import FehlerDatabase_cl, ProjektDatabase_cl, KomponenteDatabase_cl, KatfehlerDatabase_cl
 # Method-Dispatching!
 
 # Übersicht Anforderungen / Methoden
@@ -28,12 +28,43 @@ class ProList_cl(object):
    #-------------------------------------------------------
    def __init__(self):
    #-------------------------------------------------------
-      pass
+      self.dbFehler_o = FehlerDatabase_cl()
+      self.dbProjekt_o = ProjektDatabase_cl()
+      self.dbKomponente_o = KomponenteDatabase_cl()
 
    #-------------------------------------------------------
-   def GET(self):
+   def GET(self, id=None):
    #-------------------------------------------------------
-      return json.dumps(retVal_o)
+      data_o = {}
+      retVal_o = {}
+      retVal_o['data'] = {}
+      data_o['Fehler'] = self.dbFehler_o.read_px()
+      data_o['Projekt'] = self.dbProjekt_o.read_px()
+      data_o['Komponente'] = self.dbKomponente_o.read_px()
+
+      for projektid in data_o['Projekt']:
+         projekt = data_o['Projekt'][projektid]['name']
+         retVal_o['data'][projekt] = 'None'
+         for komponente in data_o['Komponente']:
+            if retVal_o['data'][projekt] == 'None':
+               retVal_o['data'][projekt] = {}
+            if data_o['Komponente'][komponente]['projektid'] == projektid:
+               for fehler in data_o['Fehler']:
+                  retVal_o['data'][projekt][fehler] = 'None'
+                  if data_o['Fehler'][fehler]['komponenteid'] == komponente:
+                     if retVal_o['data'][projekt][fehler] == 'None':
+                        retVal_o['data'][projekt][fehler] = {}
+                     retVal_o['data'][projekt][fehler]['fehlername'] = data_o['Fehler'][fehler]['name']
+                     retVal_o['data'][projekt][fehler]['projektname'] = data_o['Projekt'][projektid]['name']
+                     retVal_o['data'][projekt][fehler]['komponentename'] = data_o['Komponente'][komponente]['name']
+                     if data_o['Fehler'][fehler]['status'] != 'geprueft':
+                        retVal_o['data'][projekt][fehler]['fehlerstatus'] = 'erkannt'
+                     else:
+                        retVal_o['data'][projekt][fehler]['fehlerstatus'] = 'beseitigt'
+      return retVal_o
+
+
+
 
 
 
@@ -49,16 +80,39 @@ class KatList_cl(object):
 #----------------------------------------------------------
 
    exposed = True # gilt für alle Methoden
-
    #-------------------------------------------------------
    def __init__(self):
    #-------------------------------------------------------
-      pass
+      self.dbFehler_o = FehlerDatabase_cl()
+      self.dbKatFehler_o = KatfehlerDatabase_cl()
 
    #-------------------------------------------------------
-   def GET(self):
+   def GET(self, id=None):
    #-------------------------------------------------------
-      return json.dumps(retVal_o)
+      data_o = {}
+      retVal_o = {}
+      retVal_o['data'] = {}
+      data_o['Fehler'] = self.dbFehler_o.read_px()
+      data_o['Kategorie'] = self.dbKatFehler_o.read_px()
+
+      print(data_o)
+
+      for kategorieid in data_o['Kategorie']:
+         kategorie = data_o['Kategorie'][kategorieid]['name']
+         retVal_o['data'][kategorie] = 'None'
+         for fehler in data_o['Fehler']:
+            if retVal_o['data'][kategorie] == 'None':
+               retVal_o['data'][kategorie] = {}
+               retVal_o['data'][kategorie][fehler] = 'None'
+            if data_o['Fehler'][fehler]['katfehlerid'] == kategorieid:
+               if retVal_o['data'][kategorie][fehler] == 'None':
+                  retVal_o['data'][kategorie][fehler] = {}
+               retVal_o['data'][kategorie][fehler]['fehlername'] = data_o['Fehler'][fehler]['name']
+               if data_o['Fehler'][fehler]['status'] != 'geprueft':
+                  retVal_o['data'][kategorie][fehler]['fehlerstatus'] = 'erkannt'
+               else:
+                  retVal_o['data'][kategorie][fehler]['fehlerstatus'] = 'beseitigt'
+      return retVal_o
 
 
 # EOF
\ No newline at end of file
diff --git a/Praktikum3/bt/app/navigation.py b/Praktikum3/bt/app/navigation.py
index 0e30ed9..b93dbac 100755
--- a/Praktikum3/bt/app/navigation.py
+++ b/Praktikum3/bt/app/navigation.py
@@ -41,7 +41,7 @@ class Navigation_cl(object):
          {'action': 'katfehler'   , 'text': 'Pflege Fehler-Kategorien'},
          {'action': 'katursache'   , 'text': 'Pflege Fehlerursachen-Kategorien'},
          {'action': 'prolist'   , 'text': 'Auswertung Projekte/Fehler'},
-         {'action': 'catlist'   , 'text': 'Auswertung Kategorien/Fehler'}
+         {'action': 'katlist'   , 'text': 'Auswertung Kategorien/Fehler'}
       ]
 
       return json.dumps(retVal_o)
diff --git a/Praktikum3/bt/static/css/main.css b/Praktikum3/bt/static/css/main.css
index 9cc1266..47a7c6d 100755
--- a/Praktikum3/bt/static/css/main.css
+++ b/Praktikum3/bt/static/css/main.css
@@ -135,6 +135,7 @@ body {
    border: 1px solid;
    border-collapse: collapse;
    margin:auto;
+   margin-bottom: 50px;
 }
 
 #idList th {
diff --git a/Praktikum3/bt/static/js/app.js b/Praktikum3/bt/static/js/app.js
index cc3fbc8..048bdd0 100755
--- a/Praktikum3/bt/static/js/app.js
+++ b/Praktikum3/bt/static/js/app.js
@@ -45,6 +45,9 @@ APP.Application_cl = class {
       this.detailFehlerSw_o   = new APP.DetailView_cl('fehler', '/fehler/', 'fehlerswdetail.tpl');
       this.detailFehlerQsp_o   = new APP.DetailView_cl('fehler', '/fehler/', 'fehlerqspdetail.tpl');
 
+      this.listPro_o     = new APP.ListView_cl('prolist', '/prolist/', 'prolist.tpl');
+      this.listKat_o     = new APP.ListView_cl('katlist', '/katlist/', 'katlist.tpl');
+
       // this.listSources_o     = new APP.ListView_cl('source', '/source/', 'sourceslist.tpl');
       // this.detailSources_o   = new APP.SourceDetailView_cl('source', '/source/', 'sourcedetail.tpl');
       // this.listEvaluated_o   = new APP.ListView_cl('evaluated', '/evaluated/', 'evaluatedlist.tpl');
@@ -154,6 +157,12 @@ APP.Application_cl = class {
             // Detailformular im Content-Bereich anzeigen
             self_opl.setContent_p(self_opl.detailFehlerQsp_o, data_apl[1]);
             break;
+         case 'prolist':
+            self_opl.setContent_p(self_opl.listPro_o, data_apl[1]);
+            break;
+         case 'katlist':
+            self_opl.setContent_p(self_opl.listKat_o, data_apl[1]);
+            break;
          default:
             console.warn('[Application_cl] unbekannte app-Notification: '+data_apl[0]);
             break;
diff --git a/Praktikum3/bt/templates/.DS_Store b/Praktikum3/bt/templates/.DS_Store
index 018f4b6e660e5866272fea66b1ea84fbd741fc4b..9da351f7c06d06675002aaa74e708f6a01b9523e 100644
GIT binary patch
delta 84
zcmZp1XmOa}&nU7nU^hRb$YvgatBma24A~5c3?-8VMC8~QKQk~eR&2f|co8ICz)-}H
g4-sz#i_Z}@XWUqJf@w3m#5b176GfahmK|jR0L6(I1ONa4

delta 43
zcmZp1XmOa}&nUDpU^hRb&}JTitBjk)g^n?978cQA+<ckGgn2W&#5b0W73|CaFpv#!

diff --git a/Praktikum3/bt/templates/katlist.tpl b/Praktikum3/bt/templates/katlist.tpl
new file mode 100755
index 0000000..7f86a50
--- /dev/null
+++ b/Praktikum3/bt/templates/katlist.tpl
@@ -0,0 +1,25 @@
+<!-- Template -->
+<div id="idListContent" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      Auswertung Kategorien
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+      @var rowsKategorie_o = context['data'];@ 
+      @for var keyKategorie_s in rowsKategorie_o@
+         @var rowsFehler_o = context['data'][keyKategorie_s];@ 
+         <table id="idList">
+            <caption>#keyKategorie_s#</caption>
+            <tr class="listheader"><th>Name</th><th>Status</th></tr>
+
+            @for var keyFehler_s in rowsFehler_o@
+               @if rowsFehler_o[keyFehler_s] != 'None'@
+                  <td>#rowsFehler_o[keyFehler_s]['fehlername']#</td>
+                  <td>#rowsFehler_o[keyFehler_s]['fehlerstatus']#</td>
+               @endif@
+            @endfor@
+         </table>
+      @endfor@
+   </div>
+</div>
+
+<!-- EOF -->
\ No newline at end of file
diff --git a/Praktikum3/bt/templates/prolist.tpl b/Praktikum3/bt/templates/prolist.tpl
new file mode 100755
index 0000000..988e4b0
--- /dev/null
+++ b/Praktikum3/bt/templates/prolist.tpl
@@ -0,0 +1,26 @@
+<!-- Template -->
+<div id="idListContent" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      Auswertung Projekte
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+      @var rowsProjekt_o = context['data'];@ 
+      @for var keyProjekt_s in rowsProjekt_o@
+         @var rowsFehler_o = context['data'][keyProjekt_s];@ 
+         <table id="idList">
+            <caption>#keyProjekt_s#</caption>
+            <tr class="listheader"><th>Name</th><th>Komponente</th><th>Status</th></tr>
+
+            @for var keyFehler_s in rowsFehler_o@
+               @if rowsFehler_o[keyFehler_s] != 'None'@
+                  <td>#rowsFehler_o[keyFehler_s]['fehlername']#</td>
+                  <td>#rowsFehler_o[keyFehler_s]['komponentename']#</td>
+                  <td>#rowsFehler_o[keyFehler_s]['fehlerstatus']#</td>
+               @endif@
+            @endfor@
+         </table>
+      @endfor@
+   </div>
+</div>
+
+<!-- EOF -->
\ No newline at end of file