From 1a415347c810a8a28836e28022ac12f1d33c6059 Mon Sep 17 00:00:00 2001
From: darthsandmann <kaiw@wb-mail.org>
Date: Tue, 17 Jan 2017 19:57:12 +0100
Subject: [PATCH] fehler begin

---
 .../bt/app/__pycache__/error.cpython-36.pyc   | Bin 3899 -> 4808 bytes
 Praktikum3/bt/app/error.py                    |  30 ++++++++++++++++--
 Praktikum3/bt/static/js/app.js                |  24 ++++++++++++++
 Praktikum3/bt/templates/.DS_Store             | Bin 6148 -> 8196 bytes
 Praktikum3/bt/templates/fehlerdetail.tpl      |  20 ++++++++++++
 Praktikum3/bt/templates/fehlerlist.tpl        |  27 ++++++++++++++++
 Praktikum3/bt/templates/fehlerqsdetail.tpl    |  20 ++++++++++++
 Praktikum3/bt/templates/fehlerswdetail.tpl    |  20 ++++++++++++
 8 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 Praktikum3/bt/templates/fehlerdetail.tpl
 create mode 100755 Praktikum3/bt/templates/fehlerlist.tpl
 create mode 100644 Praktikum3/bt/templates/fehlerqsdetail.tpl
 create mode 100644 Praktikum3/bt/templates/fehlerswdetail.tpl

diff --git a/Praktikum3/bt/app/__pycache__/error.cpython-36.pyc b/Praktikum3/bt/app/__pycache__/error.cpython-36.pyc
index c66344e2abc0a6cb9c9f5d3df2ae67ac85a8fc57..a9a32c6bbca6edacd485038e56e55cf0e65e936b 100644
GIT binary patch
literal 4808
zcmc&&OOF#r5T2K3+Fsl1U7pJ$A%r}f07fFp0ilEd3yMe_A{G)^N=9S%5d1bhvjQxW
z%W}*qmt6P($^XcYh~}CTe;|h_hkVsNo*5fkKw!yOT{BhP(_K|xcU6tgmP&=@ogcp)
zeW+=FYMINz^98h^2f{V3_q2w(>kXY7-0T^BvtjnFhSkqCa(%mD_nn5*XAP!n+~T=M
zS|fi|<2H95Y25J(J7!}AJmY!rdC3>S7x)VJ70H*lenYDkpI}9;{zM0@+R@%?UU=KT
z)APk;FZ7yT;Jd9}v=7p45qPaTepbA8Wx>c{e>5EUgK%c#!LNfa+o30#emk6<`oN8Q
zn}hIPyVadtvt^K8xae-8T|x^kf=u9;t|8XBK7nh_YlD-J=#ZR9B!?g|A^A9wu!*Kd
zPsnJi9%+%$=8=BpH?3+!cALAws24E~qut@CCyH1|lD|*YZU(*xYF)2gyV?$G-)vs2
zT^C+AY<IW&XKT%{=8Z-*Ux=YNJ$euoJl@$3!q2%oDv`z&5Y1$IL64ikbV0%vbxbcZ
z@B&(J4#d}hxz;ea-Y^M!U~BOb&vE;a-pFx>Ge~Tn=LOsyzQT*RGj74Ka#RFV3Kjsj
z)goBwqC0s~dXbC^wH<iU#X@*ZuU8F0Iz$$4y2Gj-S%KfXoq9p6QYUlW_MjcQF1D{0
z&~%zHroE9YczQabp5RAYo2Hg4U%>;%nr;1|0XzuDV-u~Tb#!P0gMsF8#ZUAd{h>KA
zF~$@ZLyVr7JBAuFF`%<ihq8dHYKnEt8acxE;Pm^_xm8Q-flw5vhY3Ht<@MZQWGj5<
z?J}=!Zk@r%pbP@A3}#f!A^<BJ<I0SA7?>EAqp@g<3^O(~D6eyKLvFhboYBX|Lu+Ej
z21t{^Sv!U}H()$AUK*CGE43}!l#xB~`o0@rlUnp7y8xCnIln!EK|YMG=9Il;fH*+p
z5RrpKlC7*jG_T*>`V8`brqCQ_GsD)4*r8?JfZ=lnWAI{wPvYe%lAN%FsX*0?(KCUb
zHL)^yS;{PN1TTuiAc++%Ah*N{X@E3k&I;@LS2wo4!z=+o49r-O5HrSWGkDRcM1KM+
z0qi&!iVkuoDmbv?#Qr%j45f9VEBAZ8($!3NnDY3XhW6#nFE+O}?_wRLqs5@1bn%`U
z9o0BGgLyh(5^pyuxNd*Qw|l<pMn%`XyY2Pj9>>2w8U{WWdoi`xAo2#0V?@ZT4B}EJ
zI=f;G<Q=qtM9j2ImMg5WBW$niX+fA=<f98{FCUCbF!ZL%8!sA-C~U}GUe%SOXWc7}
z|CyAG!_fYjrCw_s68oS>9EQYx(wpLYHUy~+vfwmI_<kWX7K9$!%BlBGzsA_3qDOp4
z<$<MB79Rp}l%AhE;K<GSE19??;LMr1`w>UHxzK=Ru|^)O-^qZvP_sUZ&nu2K;w{qh
z8Bs=__dgQd(hx&+TxRcNVvKkj!^H_A6c5C^L|!PAyoWb_LVG%tP|q%fl6+EQEGcR}
z!rIfKCNyMmV}_Qz=R#ZFosh|UJ}k)l%Cz_?3QFcO+z1;_QJFWdC55az6b=d3cyp$V
zg`APR!kgJ57GjE^Q3-P-rO{AOK$G*Pz@X4t8r%NCaOq$T1>^KLUQfL6tO!Q{P4n|h
zR9afcjB7Jg+Q{uz%$btQ#hfKMJLYndb7Ia0NA;RhmvJ&GbQ8x$rMp2t{Va%z!99F9
z#NPr@zB~OC!8^(KN0lj<k~k}>uvC0NgvwHJlE^8L=MTU(s^fr;|7`77MoA=p#<-OF
zeLf85@!BP{paYWe_){eyP_Se<n3L3&)RB})nn#&fc+8fRiQmsvCM$70C95L})#KIF
zv!|$b9G4RhDt<L}qY|vo_+QD^vLHxN#DWn14^V|NRlZRm9G7O68yB;Sp))}YbBrtV
z3yoLjmWgb&$V()dqXZ+BLer|&*3)06!p(p=pKKB^Z(){MFq3Nj`9NG=2v30{%w(e7
zHQ>ZqEU}B235vN>!2Uy0{WNp#SPB(A#npT{J$L_GdTo%FGWDnFwUX-fN>l6maOhuX
zX=*JL4zT0wu%I4%-dmkuIEWbjh!Nre{%(-}SkT`zGUv!7qjDLgF`2exj*=B=WDlDi
lzZJ@gUr?@=vo88vh}e1c_3;U%GNldj&@qP{to%^v{0k??xEKHc

literal 3899
zcmdT{O>Y}T7@m){J$CHiq-khMfl>;RMTsj_0;#G{2u&jdGLf1Tv=Ul2o-MVrj@?;X
zYNHL8<j9E&7k&U-_!ayJv{z330~`<so_E$+JFcS=(GR-Pyu0(UGw<_0?>swutx_rd
z>VEgthwn1>2OGN_Jg=Zc-@s_5dC1)K&RwpBmZ9iKS9ToN>EzrTXWG%ZL+0k!na=CN
zA=8DRa3EcUy3$3|i?&`wy`*PQpRx6l=C@g`{0OVC#v=|}lgYwoe*bQ8FAU60zwdAR
zQQ$Sh<SbeTCi0v2g7N0LTazQ3f@Z@-cZu=|O0)_S1Hz6l^P0y1af9t%K?_IA<*emA
zS|nON$XZm)($O)w>NFCTh?Y+H)n8amB>9&1qF$IN4OhKxFEm9gWX)gi*SDg;MD-oN
zRbOxQ>tC*|);Em5({JqzI@jvk{kq@l)dOR?X1Vt;DfzlRi29#uuU8?Dt1wI|UgE<d
z6gSk<q>iJD0Ir}!*I@z%c9<(PcO|g|MjTzyIh{Y`ZcZ1pB93%XmvArW8C}L*X$Qb&
zlQIIF1{2}lY!VrC(VZe`qgcj6pB*5Q9u~rDyipT|d`KL<?R9HBaiSo+JBos#R}$rU
zt=(4N^WH-(qUo5}BSy0Ymybp?GX5wDX==OjEj(zf+2Z>Gd=QTpW7cME4sQS$Y+g$1
zF+bq@GL{%4&1xT`V|gIbF|mNpq5)??S52B%Fl$mUfsdd+u)(c4h5~O2)T2z$zvG8q
zH_4~`PU4d5YnxXwGMa?}Swe}bEQ7FFu~$6?4+Aq`IU0*H4VYMBaGq<qWYca5JL@O0
z@5FKlz(PjNIS}UhuF^yB7Fe#4y6sR>Ciz{z6L=Al)S)Na1+pyU;-CjW0YKMsDc%|Q
zV;0D~O6Dw?ER|Cd<;K?L$7qk{VOT-smB{llGIW*;0G|Mi!P5a>!OKTXYT^=5!Kxgx
zC&8W*J7at~DJ-*u7tJ}C3`G;noq)muuuvvYI2&Kw-uxP~L?sw-rpm;a*qb}X7mdpN
zC$ciaE}=r|U^6kL0~u!)C&&<~*O{+62!qsDIm)m!;u9X`Z?1j5wz+m6>!dz93Le@J
zpE>4ZI*#^Wk#?Bn+e=EG*Xim(7<gV%_PqN8KOFWHf(N~B6lgPtsm&sp*T}q1=1npq
zPwW%zT|=q;4oXBdB^{}9r8#v$E!dtW8ncUHw1V>A#i#<HTdCTgR*gtDY?jw}8t4%y
zi-*AfKu!*2Xz|!m&sB#E?WCa$nKR@!>HD|@r3o@+H(L6BBp6eqhf;YIz2)bqJ*j#O
zH>usQB&5SlV9wL?zZM*uoIex969i`h=CfBEb73lgleETetltR0gw)I*=jSPFjd_E-
ze1gi@{r-FA+el*Q^fi_{V;W;FVz_yW3~8Wwo6M=C<TBp)9_4W<p`K?XCB^KFajHWN
zeWafxBYzW?p^VID%e+()!g0QvCLxs(oR?WX<_X>j@-YVS|0x~I<otwm%#L_@VY0EB
z`8AS_>d3FBDj9V0_>;ETW2X=5sm&x#JL>Kx3crQMJj8F5{S%{~M*CZ0>}kO6W%{%x
q`R;Z*X!h;V#gOP2nr7O$Cs8-jW7J1<s!5l}AJ{@covVIZZT|y&s+}_c

diff --git a/Praktikum3/bt/app/error.py b/Praktikum3/bt/app/error.py
index 455afe9..09a356e 100644
--- a/Praktikum3/bt/app/error.py
+++ b/Praktikum3/bt/app/error.py
@@ -3,7 +3,7 @@
 import json
 
 import cherrypy
-from .database import KatfehlerDatabase_cl, KatursacheDatabase_cl, FehlerDatabase_cl
+from .database import KatfehlerDatabase_cl, KatursacheDatabase_cl, FehlerDatabase_cl, KomponenteDatabase_cl, QsMitarbeiterDatabase_cl, SwEntwicklerDatabase_cl
 # Method-Dispatching!
 
 # Übersicht Anforderungen / Methoden
@@ -252,6 +252,11 @@ class Fehler_cl(object):
    def __init__(self):
    #-------------------------------------------------------
       self.db_o = FehlerDatabase_cl()
+      self.dbKomponente_o = KomponenteDatabase_cl()
+      self.dbQsMitarbeiter_o = QsMitarbeiterDatabase_cl()
+      self.dbSwEntwickler_o = SwEntwicklerDatabase_cl()
+      self.dbKatFehler_o = KatfehlerDatabase_cl()
+      self.dbKatUrsache_o = KatursacheDatabase_cl()
 
    #-------------------------------------------------------
    def GET(self, id = None):
@@ -268,6 +273,12 @@ class Fehler_cl(object):
          if data_o != None:
             retVal_o['data'] = adjustId_p(id, data_o)
 
+      retVal_o['komponente'] = self.dbKomponente_o.read_px()
+      retVal_o['qsmitarbeiter'] = self.dbQsMitarbeiter_o.read_px()
+      retVal_o['swentwickler'] = self.dbSwEntwickler_o.read_px()
+      retVal_o['katfehler'] = self.dbKatFehler_o.read_px()
+      retVal_o['katursache'] = self.dbKatUrsache_o.read_px()
+
       return retVal_o
 
    #-------------------------------------------------------
@@ -287,7 +298,13 @@ class Fehler_cl(object):
       id_s = data_opl["id_s"]
       data_o = {
          'name': data_opl["name_s"],
-         'id': data_opl["id_s"]
+         'id': data_opl["id_s"],
+         'komponente-id': data_opl["komponente-id_s"],
+         'katfehler-id': data_opl["katfehler-id_s"],
+         'katursache-id': data_opl["katursache-id_s"],
+         'qsmitarbeiter-id': data_opl["qsmitarbeiter-id_s"],
+         'swentwickler-id': data_opl["swentwickler-id_s"],
+         'status': data_opl["status_s"]
          }
       # Update-Operation
       retVal_o['id'] = id_s
@@ -310,7 +327,14 @@ class Fehler_cl(object):
       # hier müsste man prüfen, ob die Daten korrekt vorliegen!
 
       data_o = {
-         'name': data_opl["name_s"]
+         'name': data_opl["name_s"],
+         'id': data_opl["id_s"],
+         'komponente-id': data_opl["komponente-id_s"],
+         'katfehler-id': data_opl["katfehler-id_s"],
+         'katursache-id': data_opl["katursache-id_s"],
+         'qsmitarbeiter-id': data_opl["qsmitarbeiter-id_s"],
+         'swentwickler-id': data_opl["swentwickler-id_s"],
+         'status': data_opl["status_s"]
       }
       # Create-Operation
       id_s = self.db_o.create_px(data_o)
diff --git a/Praktikum3/bt/static/js/app.js b/Praktikum3/bt/static/js/app.js
index 45b2c2d..28835cb 100755
--- a/Praktikum3/bt/static/js/app.js
+++ b/Praktikum3/bt/static/js/app.js
@@ -39,6 +39,11 @@ APP.Application_cl = class {
       this.listKatUrsache_o     = new APP.ListView_cl('katursache', '/katursache/', 'katursachelist.tpl');
       this.detailKatUrsache_o   = new APP.DetailView_cl('katursache', '/katursache/', 'katursachedetail.tpl');
 
+      this.listFehler_o     = new APP.ListView_cl('fehler', '/fehler/', 'fehlerlist.tpl');
+      this.detailFehler_o   = new APP.DetailView_cl('fehler', '/fehler/', 'fehlerdetail.tpl');
+      this.detailFehlerQs_o   = new APP.DetailView_cl('fehler', '/fehler/', 'fehlerqsdetail.tpl');
+      this.detailFehlerSw_o   = new APP.DetailView_cl('fehler', '/fehler/', 'fehlerswdetail.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');
@@ -125,6 +130,25 @@ APP.Application_cl = class {
             // Detailformular im Content-Bereich anzeigen
             self_opl.setContent_p(self_opl.detailKatUrsache_o, data_apl[1]);
             break;
+         case 'fehler':
+            self_opl.setContent_p(self_opl.listFehler_o, data_apl[1]);
+            break;
+         case 'fehler.add':
+            // (leeres) Detailformular im Content-Bereich anzeigen
+            self_opl.setContent_p(self_opl.detailFehler_o, data_apl[1]);
+            break;
+         case 'fehler.edit':
+            // Detailformular im Content-Bereich anzeigen
+            self_opl.setContent_p(self_opl.detailFehler_o, data_apl[1]);
+            break;
+         case 'fehler.editqs':
+            // Detailformular im Content-Bereich anzeigen
+            self_opl.setContent_p(self_opl.detailFehlerQs_o, data_apl[1]);
+            break;
+         case 'fehler.editsw':
+            // Detailformular im Content-Bereich anzeigen
+            self_opl.setContent_p(self_opl.detailFehlerSw_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 cf404a5957ff5bcf3abb7675be3c281dc7cc01db..fc75f96cf7626cdf334ce7471cce8af4d64cdbae 100644
GIT binary patch
delta 421
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aKKDhQGX@);OX8HyNEfMf|n;$}e(
zF_z5=9KFno**Q2SHn8x5lnF4T0i`n-awaFRs*A4#>Z|w<20%Fm20n=FWCu14IYtg7
z2_cv^unmO_#gl)rDl2{lYR9drn4uh~N=bpi8qF4AhHQpJpc4@;QIlf?n#C{!$wonB
zML-9ssDaHvwoU}9q!j4sVxWo1K!2rztekv-l|=!~We_WolupiKQREdz_Q7TzmUO1g
xQ$z}wCpPd1GJ`{eL4q4dyMh867@*&oC-aMVPWI>F-~fg<C>|I#$Mei#1^}p>Zx#Rm

delta 132
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50D9Q<v2aDx1<T0cIaS21}#=_;y
ztRNYY$pu29n{9>sm^PM7VO-44!6C>D6b1qTZXn?bGH7Grcjn3bGM*q~8JHkefNW*h
J9M3a{830G46gB_=

diff --git a/Praktikum3/bt/templates/fehlerdetail.tpl b/Praktikum3/bt/templates/fehlerdetail.tpl
new file mode 100644
index 0000000..91057ff
--- /dev/null
+++ b/Praktikum3/bt/templates/fehlerdetail.tpl
@@ -0,0 +1,20 @@
+<!-- Template -->
+<form id="idForm" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      Pflege Fehlerkategorien
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+
+   <input type="hidden" value="#context.data.id#" id="id_s" name="id_s" />
+   <div class="clFormRow">
+      <label for="name_s">Name <span class="clRequired"></span></label>
+      <input type="text" value="#context.data.name#" id="name_s" name="name_s" autofocus required />
+   </div>
+
+   </div>
+   <div id="idButtonArea" class="clButtonArea">
+      <button data-action="back" class="clButton">Zurück</button>
+      <button data-action="save" class="clButton">Speichern</button>
+   </div>
+</form>
+<!-- EOF -->
\ No newline at end of file
diff --git a/Praktikum3/bt/templates/fehlerlist.tpl b/Praktikum3/bt/templates/fehlerlist.tpl
new file mode 100755
index 0000000..b7aee54
--- /dev/null
+++ b/Praktikum3/bt/templates/fehlerlist.tpl
@@ -0,0 +1,27 @@
+<!-- Template -->
+<div id="idListContent" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      Pflege SW-Mitarbeiter
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+      <table id="idList">
+         <tr class="listheader"><th>Name</th><th>ID</th><th>Komponente-ID</th><th>(KatFehler-ID)</th><th>(KatUrsache-ID)</th><th>(QS)</th><th>(SW)</th><th>Status</th></tr>
+      @var rows_o = context['data'];@
+      @for var key_s in rows_o@
+         <tr id='#key_s#'>
+         @var row_o = rows_o[key_s];@
+            <td>#row_o['name']#</td><td>#row_o['id']#</td><td>#row_o['komponente-id']#</td><td>#row_o['katfehler-id']#</td><td>#row_o['katursache-id']#</td><td>#row_o['qsmitarbeiter-id']#</td><td>#row_o['swentwickler-id']#</td><td>#row_o['status']#</td>
+         </tr>
+      @endfor@
+      </table>
+   </div>
+   <div id="idButtonArea" class="clButtonArea">
+      <button data-action="add" class="clButton">Hinzufügen</button>
+      <button data-action="edit" class="clButton">Bearbeiten</button>
+      <button data-action="editqs" class="clButton">Bearbeiten QS</button>
+      <button data-action="editsw" class="clButton">Bearbeiten SW</button>
+      <button data-action="delete" class="clButton">(Löschen)</button>
+   </div>
+</div>
+
+<!-- EOF -->
\ No newline at end of file
diff --git a/Praktikum3/bt/templates/fehlerqsdetail.tpl b/Praktikum3/bt/templates/fehlerqsdetail.tpl
new file mode 100644
index 0000000..91057ff
--- /dev/null
+++ b/Praktikum3/bt/templates/fehlerqsdetail.tpl
@@ -0,0 +1,20 @@
+<!-- Template -->
+<form id="idForm" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      Pflege Fehlerkategorien
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+
+   <input type="hidden" value="#context.data.id#" id="id_s" name="id_s" />
+   <div class="clFormRow">
+      <label for="name_s">Name <span class="clRequired"></span></label>
+      <input type="text" value="#context.data.name#" id="name_s" name="name_s" autofocus required />
+   </div>
+
+   </div>
+   <div id="idButtonArea" class="clButtonArea">
+      <button data-action="back" class="clButton">Zurück</button>
+      <button data-action="save" class="clButton">Speichern</button>
+   </div>
+</form>
+<!-- EOF -->
\ No newline at end of file
diff --git a/Praktikum3/bt/templates/fehlerswdetail.tpl b/Praktikum3/bt/templates/fehlerswdetail.tpl
new file mode 100644
index 0000000..91057ff
--- /dev/null
+++ b/Praktikum3/bt/templates/fehlerswdetail.tpl
@@ -0,0 +1,20 @@
+<!-- Template -->
+<form id="idForm" class="clContent">
+   <h2 id="idContentHeader" class="clContentHeader">
+      Pflege Fehlerkategorien
+   </h2>
+   <div id="idContentArea" class="clContentArea">
+
+   <input type="hidden" value="#context.data.id#" id="id_s" name="id_s" />
+   <div class="clFormRow">
+      <label for="name_s">Name <span class="clRequired"></span></label>
+      <input type="text" value="#context.data.name#" id="name_s" name="name_s" autofocus required />
+   </div>
+
+   </div>
+   <div id="idButtonArea" class="clButtonArea">
+      <button data-action="back" class="clButton">Zurück</button>
+      <button data-action="save" class="clButton">Speichern</button>
+   </div>
+</form>
+<!-- EOF -->
\ No newline at end of file