From a3450f2675694cbd6abdd231f1a75f8235ee80f4 Mon Sep 17 00:00:00 2001 From: darthsandmann Date: Mon, 17 Oct 2016 18:04:28 +0200 Subject: [PATCH] Praktikum1_Kai --- .../__pycache__/application.cpython-35.pyc | Bin 2350 -> 0 bytes .../app/__pycache__/database.cpython-35.pyc | Bin 2259 -> 0 bytes .../app/__pycache__/view.cpython-35.pyc | Bin 1838 -> 0 bytes Praktikum1/webteams/content/webteams.css | 0 Praktikum1/webteams/data/webteams.json | 1 - Praktikum1/webteams/template/form1.tpl | 14 ---- Praktikum1/webteams/template/form2.tpl | 6 -- Praktikum1/webteams/template/list1.tpl | 5 -- Praktikum1/webteams/template/listaufz1.tpl | 7 -- {Praktikum1 => Praktikum1_Kai}/Aufgabe A.pdf | Bin .../test/app/__init__.py | 0 .../test/app/__init__.pyc | Bin .../app/__pycache__/__init__.cpython-35.pyc | Bin .../__pycache__/application.cpython-35.pyc | Bin .../test/app/application.py | 0 .../test/app/application.pyc | Bin .../test/content/index.html | 0 .../test/testserver.py | 0 .../webteams/app/__init__.py | 0 .../app/__pycache__/__init__.cpython-35.pyc | Bin .../__pycache__/application.cpython-35.pyc | Bin 0 -> 2834 bytes .../app/__pycache__/database.cpython-35.pyc | Bin 0 -> 2363 bytes .../app/__pycache__/view.cpython-35.pyc | Bin 0 -> 2543 bytes .../webteams/app/application.py | 27 ++++++- .../webteams/app/database.py | 12 ++- .../webteams/app/view.py | 47 ++++++++++-- Praktikum1_Kai/webteams/content/webteams.css | 72 ++++++++++++++++++ .../webteams/content/webteams.js | 9 +++ Praktikum1_Kai/webteams/data/webteams.json | 1 + .../webteams/server.py | 0 .../webteams/template/form0.tpl | 0 Praktikum1_Kai/webteams/template/form1.tpl | 37 +++++++++ Praktikum1_Kai/webteams/template/form2.tpl | 12 +++ .../webteams/template/list0.tpl | 6 +- Praktikum1_Kai/webteams/template/list1.tpl | 5 ++ .../webteams/template/list2.tpl | 1 + .../webteams/template/listaufz0.tpl | 0 .../webteams/template/listaufz1.tpl | 7 ++ .../webteams/template/listaufz2.tpl | 1 + 39 files changed, 219 insertions(+), 51 deletions(-) delete mode 100644 Praktikum1/webteams/app/__pycache__/application.cpython-35.pyc delete mode 100644 Praktikum1/webteams/app/__pycache__/database.cpython-35.pyc delete mode 100644 Praktikum1/webteams/app/__pycache__/view.cpython-35.pyc delete mode 100644 Praktikum1/webteams/content/webteams.css delete mode 100644 Praktikum1/webteams/data/webteams.json delete mode 100644 Praktikum1/webteams/template/form1.tpl delete mode 100644 Praktikum1/webteams/template/form2.tpl delete mode 100644 Praktikum1/webteams/template/list1.tpl delete mode 100644 Praktikum1/webteams/template/listaufz1.tpl rename {Praktikum1 => Praktikum1_Kai}/Aufgabe A.pdf (100%) rename {Praktikum1 => Praktikum1_Kai}/test/app/__init__.py (100%) rename {Praktikum1 => Praktikum1_Kai}/test/app/__init__.pyc (100%) rename {Praktikum1 => Praktikum1_Kai}/test/app/__pycache__/__init__.cpython-35.pyc (100%) rename {Praktikum1 => Praktikum1_Kai}/test/app/__pycache__/application.cpython-35.pyc (100%) rename {Praktikum1 => Praktikum1_Kai}/test/app/application.py (100%) rename {Praktikum1 => Praktikum1_Kai}/test/app/application.pyc (100%) rename {Praktikum1 => Praktikum1_Kai}/test/content/index.html (100%) rename {Praktikum1 => Praktikum1_Kai}/test/testserver.py (100%) rename {Praktikum1 => Praktikum1_Kai}/webteams/app/__init__.py (100%) rename {Praktikum1 => Praktikum1_Kai}/webteams/app/__pycache__/__init__.cpython-35.pyc (100%) create mode 100644 Praktikum1_Kai/webteams/app/__pycache__/application.cpython-35.pyc create mode 100644 Praktikum1_Kai/webteams/app/__pycache__/database.cpython-35.pyc create mode 100644 Praktikum1_Kai/webteams/app/__pycache__/view.cpython-35.pyc rename {Praktikum1 => Praktikum1_Kai}/webteams/app/application.py (82%) rename {Praktikum1 => Praktikum1_Kai}/webteams/app/database.py (89%) rename {Praktikum1 => Praktikum1_Kai}/webteams/app/view.py (61%) create mode 100644 Praktikum1_Kai/webteams/content/webteams.css rename {Praktikum1 => Praktikum1_Kai}/webteams/content/webteams.js (69%) create mode 100644 Praktikum1_Kai/webteams/data/webteams.json rename {Praktikum1 => Praktikum1_Kai}/webteams/server.py (100%) rename {Praktikum1 => Praktikum1_Kai}/webteams/template/form0.tpl (100%) create mode 100644 Praktikum1_Kai/webteams/template/form1.tpl create mode 100644 Praktikum1_Kai/webteams/template/form2.tpl rename {Praktikum1 => Praktikum1_Kai}/webteams/template/list0.tpl (56%) create mode 100644 Praktikum1_Kai/webteams/template/list1.tpl rename {Praktikum1 => Praktikum1_Kai}/webteams/template/list2.tpl (68%) rename {Praktikum1 => Praktikum1_Kai}/webteams/template/listaufz0.tpl (100%) create mode 100644 Praktikum1_Kai/webteams/template/listaufz1.tpl rename {Praktikum1 => Praktikum1_Kai}/webteams/template/listaufz2.tpl (67%) diff --git a/Praktikum1/webteams/app/__pycache__/application.cpython-35.pyc b/Praktikum1/webteams/app/__pycache__/application.cpython-35.pyc deleted file mode 100644 index 42b38b08d20f04ddf88d0dba3105d9f069976d48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 zcmb6b%Wm67aF(PuEy3Sj? z3;J&v!Y(VCkHb71gqaA2F)p2-B5{G}keJHPMC1XE>`w#&6=0+c%Eb#&GD`7H5Eh)F zP?Hov$~7a23u37Z5uK9g0I!#v^^)iUZ?^==^Q&@Zuq|zePJ}2*`=tnCP@yQ<`T_pc=(EBkHGV6`PsFw{RF-UvQqWmx% z^j(T63@D zx?vWXrp#&}f(D%_%ajqU@P<-^xj2lnJeYKutRs)oTLU^$)S`ro*(RbHxd`m}RzROL z&&8MIr)>n#Y%pi}Ynh(0ZMKbh)!B6B!_oZ&@6gdDH>m(KTB{0Gp*9!#a}f)rzoeR3 zgkEkSURBZ7tdDR@mzJ|(%sZ9%Yn~e!Kn>srI`kC+3_rFEt*oAUMbXvU`pb-=z|c6LvjnIbK^55-?=;t{VmT%2B~fM3vcS$PI!Hk@bQh_q z)RLd#jehG?-Vi*~tAj{#M8 z5EP9d7^i$16Yd4UFVisAJFa-9Hma=AsILtqa<;b<499lmFeJ240FZ( VAwfm`8*SLP6i1b+9@}6W=6{%A-TnXo diff --git a/Praktikum1/webteams/app/__pycache__/database.cpython-35.pyc b/Praktikum1/webteams/app/__pycache__/database.cpython-35.pyc deleted file mode 100644 index 96730b434ddc103753013a0716b2000189ad882d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2259 zcmah~OK;mo5T0F9)H{B~N|h!lawr-eVj%@u6h&$njbj5vAtZGRxdsA)5@|;=Ez-MG z;|TW2x#utR+P}nWPXP+_UZ6m~SxSne1Sq8)4R?pbZ@zh`QLk72Uj4W8SB>aTn!9Z1 zJ6QS$hyY(f5z*017jwF#BRRFP=*Xh|0QVNXfwe`UP1o2hu!{rNeg}Wl?y;O+7L*+< ztsz3ZMX)#a2}QCS_=KmxHo8p#oH-N}=?!2&FHul7N7$@TP&Imyf*J*Nqr>0^1uI4` zQ?N?Gn$clg0I2n>y6dNY*Vm!fi+Tbu_~KuQ^#n`bf&i*ZBG1Typlg_5>%bLlS7uHC z7harIROkon&P!a8**c7l{~+by@qcz&zvxiu)~Vlb>0UqV#;yH+`lH`%b)J6TdZzr- zw0}A}d(?UrcGJ*5(=9(qTI`phZ6&X>lIQh@{nYbrGA0{>WLb=F&cWZBn)DbuUu?$9 z!~uRejw?wQhm=A$9A8V?eX&nh76*vXQc0HaJ;AjVS;n5JQjx|NFuYh96*t)1n?i?y&BC& zRB!;jCRapVjyL9^Pb_rb%s*APe%Coa!Nj_*r`#7RM|iab4&dX>i30$!`V z_p>W=bal9K^AxCc=;{VUR??}Tj}l75p3q9%J$wOt2sO_{|`U~VH6rrJhL=+97%w37As+9wb18mZ3t~Z;htFho;V;( zwp9hE=Dh&L^}39qeiEj;;jur8QjpVug*II%$IbbaE?CWQa8kKh436KSynetPnztj` zYkI|Qg5aMEwQVc^g8%;ld#iU|NE`1RTSB67rkvT?_oAxc4_C4RG z&acD!bcnKfdy7O`ra^^k2xfT7bEt#vc>dENX}jA*>(4vpQ_xJP4;juP}e`UNXI51sZ-LhJfNhB9a^UTJQZhQoW&08@x%YzzCcqx0OpSe z&ggdQLV0b1b zT10a-jLLHO3R~`%Kbb}trg^HvaEJHelaYJgTRODAnvCrP=IUsDH0#+PAUN`+OBeVN z&Cqq}%ArqrsOo#%zw}5uG{a!k_38D`q-}r@nk$zc|B%yVjV>J0K3!nQp}ot%n)PXB zqj!OD`Lu`dF>8P|Eo*^oSk?yXShfk)wX6rWbz}63>g?OgBRaWpxxaSVMU=NkhR&N= zs`SVEy38tiz*KTduDbwJ&!f3G2$gBQD&&%1^R#KsBQ0}@xoeJDwekUaoUrwB9^kyL zmUF+xeLqb?RqgqJ_Z$SKB}J4xNiz|aCQw?Y`3uu{Cgx=pX<=$I%3lcMVZwA(G!>y* zOq5RbLW@CN+D#fsq@%DXGt-zy@^n$carnvXIcPmgbMY)JOpp~t8Kx$%>!TZuN$XoD zh9_D)MQFnE^_y^4y#pXGaJHSU)Ae?pp0n$;*6%%U+dbb|Y3a__F^7Yn0Ii2+1@#*U z3(8}m+!fTizf#arP$*V>0O?>sjb>I;NG)WwhmvDf2Wwc?1Z!Eg0oJyx1GZ^d7p%t; zv?96f!d4{^J9Iqgk0e*Yd2?FG`BEcHD~;eTA}bWxVz$B1X6P_%GO&UqpIL4(a5>3s zhI@d@Y?XUoa#6}%hBp}Q0|r5r)PR)&QF0#STMTbAa7O+oaZlhR688yKD7Lgt+?}Mg z-2WzR`Q`c+U{&!!ZPFftRJVXe$)kc@PQwhh9_k&@v{x%i7nka<+soXdq_2oCj+2Dw zn{U5Io{k5#DzK)ZSK@Z$d2OMmAAN>02;w3Uu`+&9irlybSQ+UbjXx{W-1uB11K);b z+@7LZMyOB@(6|{FxfZ#G(*0=}7XONljqz7FgK7ZC4V(`gM4-Qt?M?NK26etJx!l9h zw8C&+Bny;fXxd@;auH?KjATj6cNyMeusQUY-2m5< -
- - -
-
- - -
-
- - -
- \ No newline at end of file diff --git a/Praktikum1/webteams/template/form2.tpl b/Praktikum1/webteams/template/form2.tpl deleted file mode 100644 index 8c836cd..0000000 --- a/Praktikum1/webteams/template/form2.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
- -
- - - \ No newline at end of file diff --git a/Praktikum1/webteams/template/list1.tpl b/Praktikum1/webteams/template/list1.tpl deleted file mode 100644 index 2ad319a..0000000 --- a/Praktikum1/webteams/template/list1.tpl +++ /dev/null @@ -1,5 +0,0 @@ - - $name1_s$vorname1_s$matrnr1_s - $name2_s$vorname2_s$matrnr2_s - bearbeiten löschen - \ No newline at end of file diff --git a/Praktikum1/webteams/template/listaufz1.tpl b/Praktikum1/webteams/template/listaufz1.tpl deleted file mode 100644 index 4b00513..0000000 --- a/Praktikum1/webteams/template/listaufz1.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -
  • Gruppe $nr: bearbeiten löschen -
      -
    • $name1_s, $vorname1_s, $matrnr1_s
      • -
    • $name2_s, $vorname2_s, $matrnr2_s
      • -
    -
    • \ No newline at end of file diff --git a/Praktikum1/Aufgabe A.pdf b/Praktikum1_Kai/Aufgabe A.pdf similarity index 100% rename from Praktikum1/Aufgabe A.pdf rename to Praktikum1_Kai/Aufgabe A.pdf diff --git a/Praktikum1/test/app/__init__.py b/Praktikum1_Kai/test/app/__init__.py similarity index 100% rename from Praktikum1/test/app/__init__.py rename to Praktikum1_Kai/test/app/__init__.py diff --git a/Praktikum1/test/app/__init__.pyc b/Praktikum1_Kai/test/app/__init__.pyc similarity index 100% rename from Praktikum1/test/app/__init__.pyc rename to Praktikum1_Kai/test/app/__init__.pyc diff --git a/Praktikum1/test/app/__pycache__/__init__.cpython-35.pyc b/Praktikum1_Kai/test/app/__pycache__/__init__.cpython-35.pyc similarity index 100% rename from Praktikum1/test/app/__pycache__/__init__.cpython-35.pyc rename to Praktikum1_Kai/test/app/__pycache__/__init__.cpython-35.pyc diff --git a/Praktikum1/test/app/__pycache__/application.cpython-35.pyc b/Praktikum1_Kai/test/app/__pycache__/application.cpython-35.pyc similarity index 100% rename from Praktikum1/test/app/__pycache__/application.cpython-35.pyc rename to Praktikum1_Kai/test/app/__pycache__/application.cpython-35.pyc diff --git a/Praktikum1/test/app/application.py b/Praktikum1_Kai/test/app/application.py similarity index 100% rename from Praktikum1/test/app/application.py rename to Praktikum1_Kai/test/app/application.py diff --git a/Praktikum1/test/app/application.pyc b/Praktikum1_Kai/test/app/application.pyc similarity index 100% rename from Praktikum1/test/app/application.pyc rename to Praktikum1_Kai/test/app/application.pyc diff --git a/Praktikum1/test/content/index.html b/Praktikum1_Kai/test/content/index.html similarity index 100% rename from Praktikum1/test/content/index.html rename to Praktikum1_Kai/test/content/index.html diff --git a/Praktikum1/test/testserver.py b/Praktikum1_Kai/test/testserver.py similarity index 100% rename from Praktikum1/test/testserver.py rename to Praktikum1_Kai/test/testserver.py diff --git a/Praktikum1/webteams/app/__init__.py b/Praktikum1_Kai/webteams/app/__init__.py similarity index 100% rename from Praktikum1/webteams/app/__init__.py rename to Praktikum1_Kai/webteams/app/__init__.py diff --git a/Praktikum1/webteams/app/__pycache__/__init__.cpython-35.pyc b/Praktikum1_Kai/webteams/app/__pycache__/__init__.cpython-35.pyc similarity index 100% rename from Praktikum1/webteams/app/__pycache__/__init__.cpython-35.pyc rename to Praktikum1_Kai/webteams/app/__pycache__/__init__.cpython-35.pyc diff --git a/Praktikum1_Kai/webteams/app/__pycache__/application.cpython-35.pyc b/Praktikum1_Kai/webteams/app/__pycache__/application.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cc5e8369e1b97e31689bdb6c765aaec3b791b5ff GIT binary patch literal 2834 zcmb_eOK;mo5S}F|Qlh9>wj;?-(bVbVARvjFqNk!Lns?C}Y5+TJ!3#lY*A6X;RF+ii z2+5_+rT6}c{+QkiqPL#%7kcW1d?;~1CDPmwrAc1)YfYvsnDC=uuYBWKVq9*CCFif@9j;0TSH z|;8zuon>)a}z2a8}xGO`Zd69;tTRM?HpGN1op^*+ z(FvxUsG2uJ&ab0xrebCCY(WZW02EcwPX%w-};yq<}v zzy^_FvIw8WBvLA0oKqowsX}Z;1w~lbX(IZTq#p1a^BKo-3uY&NL)RIyI`WoEvR}vd zVUW&Z*&_v8EyH(`k%ceBO^WR`B+zu3bK$RLdPdjWFc#G$k>2H1K?mtFq=2fzV6;~A zMU{xT#K1)?6b8A5I?Ixg9ptNS+Is8v_$s4{0H4uheVw(~qWcb5y=?{e!l3J;Hljnsh)zXcp~IQ>T8(zB;v;Jr3L5Z>YqwU{ z4$ZKg)$&%qR@7!PN^+I8!ofMmsn{H};kV8Yxs$T%b+M%tY_g3S;}tH$Wozc*g9@(m z=lxIEuAgC1*l0dqz$ZUOrxZH*32_S9`k5zspqJ?6r?iJ=k|s2ERRK?t(J9l=K6)=S zec*7_KUAi4-=`CZ&`bk0oNiQm3CB>fRti;5tp<}$DV4OLXL0Qel;1iO`2$^B)$HkC zhm*dkCx=Z#4d=#XIBB*Ylb2N0V0f%!yf=x%-pNFx2 zBb#`f{18cDi<4Q39}e_;D6bOf64@p~vqj!OQaE}SS4E}5ucqI*yr>MR^5+6us~1!(VcfCap_KTc#_jVHyuC7zRqGLz8A;I-Wvc5;8DCwv=E;v6S~@ zntGB|y6>KUz>0svLR(f{vtz}%PqyPYok6i~uJo>+&N=r(t!A_S*FW~|?@gk=Y3{J$ zKf$TLfr;=Flo0LBd@<)s+LO~5i}ozqig0bwYeZWV+jNe*4sWsT+i$TSb$V>4hXv;e zPOV{LyhZSCyeAyV+h9-Z6xqhNDZ*whMHPAt81SnU)yxuZ)+uTjze15mQPcPcxJJ>E z@oN+(Qp2*IswUvzv~ zxDmDp(xR^7Fyifk%ol~N<7EF2QZ63l>uD0TU&h@$4v%y@%(6D`&G6Q*6*ZKNXYM zQ%R5bDa1pR7soBy!7Ze_qgchaOE3lbcHyXScn~X#uPvRcqOQZ=;)z_ga`=9g*#>Er z6m~xfbm1mxngxBMVQDHHR_j6OJPxvx_i?G0VaRnwOWYNnXo|XUiD6{y^Ocus5 zOYvh|l(K*q9Oiq^5Hwm1?@ak($tCsqWC_7*tOfH$B?v>#w@NN9GsqHiZ;?QSD+TZ$ z;=S5~A;$%DPcDh39IwtppG5W;FCUyr_MhU^pTZzToVYR{CB9D>5+?=qD$4XsYF3(9 z3wW*0v+sRbqQeM4h74@A0$*K&DXKaT^N|j^i|A{k40&StzeHS#-*N@8Lwa{X`dREu z`AZDG#tzJ2R#7E`P3o7uw!naymQ{MOAWh|&B*@M)$j|Z=&4W1Ki1))$k^`u^LXlf& zuNF-r^c9X#oWzDBk3r3X5OZ{zWr;1YoJC(6AyqtN@^l9dx7xdY2UTQ4c2pfP1_kPf zn_&SF`j6-*oZ2+D9Iwq+$tAKg3@ilqpTY1aoL3LH>B|mB#||)1rvm_89+`Q4CTM5) z3kf006a)^PJf|E3*34crE56`_VG6(V2SQwX4&@cDLyQqKAgU%!$6K`XX6jZzE8&FM^BALw*g2sL&_`ToPt%#2YrP&4}Z zjl%7vQQXsooo4Z{kSV+@%zrKHLE0ad<=)_M?mANySm7=0Bn_i!@7nuWkSd-li&@~} z?c&s2KO`;jKvt`6kR+Bf)r>ffmC>))=3*Ozm_u^bOYqjd{e>jg{1&sa4 z&Rj0|ZQSw}AjY4?QpUP-Zn3UCvpcNou$>rVhy9Ev9L8OC0&9uBw%2k`;e&O0gtN;A zxs6-y0ysQdtYv9e^0Y4;SPlGrv;Do~Lbea1q%C_1KgilUiQ0`0+WX&r z)4ngFLzNtkhuiHJ{6O(&DBDqV_?Ytr)fn)-Y@h zY<;oN39Hb4pY5>y#W9-mW7vrNMn|(rB~7IId`snNLAQwtO4Df_pv$9Z$hSkOtIsnr z<)<{QE5k^Mk-*$3#Zj+FKIBqy5sfC%)0FI#&ceeDj40)EH)JTCaYJM8HEzgG>CtWy zhqBn?4ccSN(^bKv_+FCoFxQ?`A{jl={zE>@(@1e$!bYBO?O;OJWz^@P93M!PsIlU$ zvM{^x<48qemZ#buM&fXs$93X=iz@}n1WJ1sZni4NkF+3 z*9hJscpEUSCGid!-X(aCfC@l-K=2{KT-l0>Sy|-!Ya9?&^97#zw^g%wxoW0fdbAE* z^e)i>@8FiN03>M+N!58tn~!H2HkCBA4txRPg$GJ(U{no40%6-k10Yrg^9`$jRSjDL z3k<7)T`{ZQb20sUWX-w+?4d{eXo7;~W`|iPG=70fagT z!)N0tEoKCjzxasYV}ef!%v-!jjbS9;g4!2pgCq?J+`tR22G@cOV{dulGg!OjOm5Lx k#dVB~7HBU!81SAlkDWQt+^_a;7Q4GeiX>@EfrXFr58fXEssI20 literal 0 HcmV?d00001 diff --git a/Praktikum1/webteams/app/application.py b/Praktikum1_Kai/webteams/app/application.py similarity index 82% rename from Praktikum1/webteams/app/application.py rename to Praktikum1_Kai/webteams/app/application.py index 1b2991a..c303add 100644 --- a/Praktikum1/webteams/app/application.py +++ b/Praktikum1_Kai/webteams/app/application.py @@ -14,13 +14,19 @@ class Application_cl(object): # spezielle Initialisierung können hier eingetragen werden self.db_o = Database_cl() self.view_o = View_cl() + self.liste = 0 @cherrypy.expose #------------------------------------------------------- - def index(self): + def index(self, form="NULL"): #------------------------------------------------------- - return self.createList_p() + if(form == "0"): + return self.createListAufz_p() + elif(form == "1"): + return self.createList_p() + elif(form == "NULL"): + return self.createList_p() @cherrypy.expose @@ -50,9 +56,11 @@ class Application_cl(object): data_a = [ data_opl["name1_s"] , data_opl["vorname1_s"] , data_opl["matrnr1_s"] + , data_opl["semesteranzahl1_s"] , data_opl["name2_s"] , data_opl["vorname2_s"] , data_opl["matrnr2_s"] + , data_opl["semesteranzahl2_s"] ] if id_s != "None": @@ -72,7 +80,7 @@ class Application_cl(object): # Eintrag löschen, dann Liste neu anzeigen self.db_o.delete_px(id) - return self.createList_p() + return self.createListAufz_p() @cherrypy.expose @@ -90,11 +98,22 @@ class Application_cl(object): #------------------------------------------------------- def createList_p(self): #------------------------------------------------------- + print("---------- List ----------") data_o = self.db_o.read_px() # mit diesen Daten Markup erzeugen return self.view_o.createList_px(data_o) - + + + #------------------------------------------------------- + def createListAufz_p(self): + #------------------------------------------------------- + print("---------- ListAufz ----------") + data_o = self.db_o.read_px() + # mit diesen Daten Markup erzeugen + + return self.view_o.createListAufz_px(data_o) + #------------------------------------------------------- def createForm_p(self, id_spl = None): diff --git a/Praktikum1/webteams/app/database.py b/Praktikum1_Kai/webteams/app/database.py similarity index 89% rename from Praktikum1/webteams/app/database.py rename to Praktikum1_Kai/webteams/app/database.py index de58a0a..20cfc8d 100644 --- a/Praktikum1/webteams/app/database.py +++ b/Praktikum1_Kai/webteams/app/database.py @@ -73,12 +73,17 @@ class Database_cl(object): #------------------------------------------------------- def delete_px(self, id_spl): #------------------------------------------------------- + #print("\n---------------------- DELETE ---------------------") status_b = False if id_spl in self.data_o: pass # hier müssen Sie den Code ergänzen # Löschen als Zurücksetzen auf die Default-Werte implementieren - # Ihre Ergänzung + # Ihre Ergänzung + self.data_o[id_spl] = {} + default_s = self.getDefault_px() + self.data_o[id_spl] = default_s + self.saveData_p() return status_b @@ -86,7 +91,7 @@ class Database_cl(object): #------------------------------------------------------- def getDefault_px(self): #------------------------------------------------------- - return ['', '', '', '', '', ''] # HIER müssen Sie eine Ergänzung vornehmen + return ['', '', '', '', '', '', '', ''] # HIER müssen Sie eine Ergänzung vornehmen #------------------------------------------------------- @@ -96,8 +101,9 @@ class Database_cl(object): fp_o = codecs.open(os.path.join('data', 'webteams.json'), 'r', 'utf-8') except: # Datei neu anlegen self.data_o = {} + self.data_o = {} for loop_i in range(0,15): - self.data_o[str(loop_i)] = ['', '', '', '', '', ''] # HIER müssen Sie eine Ergänzung vornehmen + self.data_o[str(loop_i)] = ['', '', '', '', '', '', '', ''] self.saveData_p() else: with fp_o: diff --git a/Praktikum1/webteams/app/view.py b/Praktikum1_Kai/webteams/app/view.py similarity index 61% rename from Praktikum1/webteams/app/view.py rename to Praktikum1_Kai/webteams/app/view.py index b166006..13e58db 100644 --- a/Praktikum1/webteams/app/view.py +++ b/Praktikum1_Kai/webteams/app/view.py @@ -35,12 +35,14 @@ class View_cl(object): # mehrfach nutzen, um die einzelnen Zeilen der Tabelle zu erzeugen for loop_i in range(0,15): data_a = data_opl[str(loop_i)] - markup_s += lineT_o.safe_substitute (name1_s=data_a[0] # HIER müssen Sie eine Ergänzung vornehmen + markup_s += lineT_o.safe_substitute (name1_s=data_a[0] , vorname1_s=data_a[1] , matrnr1_s=data_a[2] - , name2_s=data_a[3] - , vorname2_s=data_a[4] - , matrnr2_s=data_a[5] + , semesteranzahl1_s=data_a[3] + , name2_s=data_a[4] + , vorname2_s=data_a[5] + , matrnr2_s=data_a[6] + , semesteranzahl2_s=data_a[7] , id_s=str(loop_i) ) @@ -48,6 +50,33 @@ class View_cl(object): return markup_s + #------------------------------------------------------- + def createListAufz_px(self, data_opl): + #------------------------------------------------------- + # hier müsste noch eine Fehlerbehandlung ergänzt werden ! + markup_s = '' + markup_s += self.readFile_p('listaufz0.tpl') + markupV_s = self.readFile_p('listaufz1.tpl') + lineT_o = string.Template(markupV_s) + + # mehrfach nutzen, um die einzelnen Zeilen der Tabelle zu erzeugen + for loop_i in range(0,15): + data_a = data_opl[str(loop_i)] + markup_s += lineT_o.safe_substitute (name1_s=data_a[0] + , vorname1_s=data_a[1] + , matrnr1_s=data_a[2] + , semesteranzahl1_s=data_a[3] + , name2_s=data_a[4] + , vorname2_s=data_a[5] + , matrnr2_s=data_a[6] + , semesteranzahl2_s=data_a[7] + , id_s=str(loop_i) + ) + + markup_s += self.readFile_p('listaufz2.tpl') + + return markup_s + #------------------------------------------------------- def createForm_px(self, id_spl, data_opl): @@ -57,12 +86,14 @@ class View_cl(object): markup_s += self.readFile_p('form0.tpl') markupV_s = self.readFile_p('form1.tpl') lineT_o = string.Template(markupV_s) - markup_s += lineT_o.safe_substitute (name1_s=data_opl[0] # HIER müssen Sie eine Ergänzung vornehmen + markup_s += lineT_o.safe_substitute (name1_s=data_opl[0] , vorname1_s=data_opl[1] , matrnr1_s=data_opl[2] - , name2_s=data_opl[3] - , vorname2_s=data_opl[4] - , matrnr2_s=data_opl[5] + , semesteranzahl1_s=data_opl[3] + , name2_s=data_opl[4] + , vorname2_s=data_opl[5] + , matrnr2_s=data_opl[6] + , semesteranzahl2_s=data_opl[7] , id_s=id_spl ) markup_s += self.readFile_p('form2.tpl') diff --git a/Praktikum1_Kai/webteams/content/webteams.css b/Praktikum1_Kai/webteams/content/webteams.css new file mode 100644 index 0000000..577a9e3 --- /dev/null +++ b/Praktikum1_Kai/webteams/content/webteams.css @@ -0,0 +1,72 @@ +body { + font-family: "Open Sans", sans-serif; + font-size: 12pt; + padding: 0; + margin: 0; +} + +td { + border: 1px solid black; +} + +th { + height: 50px; + border: 1px solid black; +} + +li { +} + +ul { + padding-left: 30px; + list-style-type: square; + margin-bottom: 50px; +} + +label { + padding-left: 15px; +} + +input { + width: 200px; + border: none; + border-bottom: 2px solid black; + font-size: 12pt; +} + +input.button { + background-color: #eeeeee; + color: black; + padding: 5px 10px; + text-align: center; + text-decoration: none; + display: inline-block; + border: none; +} + +input.button:hover, input.button:active { + background-color: #e7e7e7; +} + +idWTForm { +} + + + +a:link, a:visited { + background-color: #eeeeee; + color: black; + padding: 5px 10px; + text-align: center; + text-decoration: none; + display: inline-block; +} + + +a:hover, a:active { + background-color: #e7e7e7; +} + +a.clDelete { +} + diff --git a/Praktikum1/webteams/content/webteams.js b/Praktikum1_Kai/webteams/content/webteams.js similarity index 69% rename from Praktikum1/webteams/content/webteams.js rename to Praktikum1_Kai/webteams/content/webteams.js index e0a29d8..2ae20fe 100644 --- a/Praktikum1/webteams/content/webteams.js +++ b/Praktikum1_Kai/webteams/content/webteams.js @@ -2,6 +2,15 @@ function confirmDelete_p (event_opl) { if ((event_opl.target.tagName.toLowerCase() == 'a') && (event_opl.target.className == "clDelete")) { // Klick auf Link zum Löschen // Ihre Ergänzung + var result = confirm("Sind Sie sicher, dass der Eintrag gelöscht werden soll?"); + if(result) + { + return true; + } + else + { + return false; + } } } diff --git a/Praktikum1_Kai/webteams/data/webteams.json b/Praktikum1_Kai/webteams/data/webteams.json new file mode 100644 index 0000000..1c9b79e --- /dev/null +++ b/Praktikum1_Kai/webteams/data/webteams.json @@ -0,0 +1 @@ +{"13": ["", "", "", "", "", "", "", ""], "12": ["", "", "", "", "", "", "", ""], "2": ["", "", "", "", "", "", "", ""], "7": ["", "", "", "", "", "", "", ""], "6": ["", "", "", "", "", "", "", ""], "0": ["", "", "", "", "", "", "", ""], "3": ["", "", "", "", "", "", "", ""], "5": ["", "", "", "", "", "", "", ""], "8": ["", "", "", "", "", "", "", ""], "11": ["", "", "", "", "", "", "", ""], "9": ["", "", "", "", "", "", "", ""], "10": ["", "", "", "", "", "", "", ""], "4": ["", "", "", "", "", "", "", ""], "1": ["", "", "", "", "", "", "", ""], "14": ["", "", "", "", "", "", "", ""]} \ No newline at end of file diff --git a/Praktikum1/webteams/server.py b/Praktikum1_Kai/webteams/server.py similarity index 100% rename from Praktikum1/webteams/server.py rename to Praktikum1_Kai/webteams/server.py diff --git a/Praktikum1/webteams/template/form0.tpl b/Praktikum1_Kai/webteams/template/form0.tpl similarity index 100% rename from Praktikum1/webteams/template/form0.tpl rename to Praktikum1_Kai/webteams/template/form0.tpl diff --git a/Praktikum1_Kai/webteams/template/form1.tpl b/Praktikum1_Kai/webteams/template/form1.tpl new file mode 100644 index 0000000..f010a75 --- /dev/null +++ b/Praktikum1_Kai/webteams/template/form1.tpl @@ -0,0 +1,37 @@ + + + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    \ No newline at end of file diff --git a/Praktikum1_Kai/webteams/template/form2.tpl b/Praktikum1_Kai/webteams/template/form2.tpl new file mode 100644 index 0000000..00ef544 --- /dev/null +++ b/Praktikum1_Kai/webteams/template/form2.tpl @@ -0,0 +1,12 @@ +
    + +
    + + +
    +
    + +
    +
    + + \ No newline at end of file diff --git a/Praktikum1/webteams/template/list0.tpl b/Praktikum1_Kai/webteams/template/list0.tpl similarity index 56% rename from Praktikum1/webteams/template/list0.tpl rename to Praktikum1_Kai/webteams/template/list0.tpl index 33cdf10..245a9df 100644 --- a/Praktikum1/webteams/template/list0.tpl +++ b/Praktikum1_Kai/webteams/template/list0.tpl @@ -9,9 +9,9 @@ - +
    - - + + \ No newline at end of file diff --git a/Praktikum1_Kai/webteams/template/list1.tpl b/Praktikum1_Kai/webteams/template/list1.tpl new file mode 100644 index 0000000..ac66bc5 --- /dev/null +++ b/Praktikum1_Kai/webteams/template/list1.tpl @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Praktikum1/webteams/template/list2.tpl b/Praktikum1_Kai/webteams/template/list2.tpl similarity index 68% rename from Praktikum1/webteams/template/list2.tpl rename to Praktikum1_Kai/webteams/template/list2.tpl index 5d3af45..78217cc 100644 --- a/Praktikum1/webteams/template/list2.tpl +++ b/Praktikum1_Kai/webteams/template/list2.tpl @@ -1,6 +1,7 @@
    Name (1)Vorname (1)Matr.-Nr. (1)Name (2)Vorname (2)Matr.-Nr. (2)Name (1)Vorname (1)Matr.-Nr. (1)Anzahl Semester (1)Name (2)Vorname (2)Matr.-Nr. (2)Anzahl Semester (2) Aktion
    $name1_s$vorname1_s$matrnr1_s$semesteranzahl1_s$name2_s$vorname2_s$matrnr2_s$semesteranzahl2_sbearbeiten löschen
    \ No newline at end of file diff --git a/Praktikum1/webteams/template/listaufz0.tpl b/Praktikum1_Kai/webteams/template/listaufz0.tpl similarity index 100% rename from Praktikum1/webteams/template/listaufz0.tpl rename to Praktikum1_Kai/webteams/template/listaufz0.tpl diff --git a/Praktikum1_Kai/webteams/template/listaufz1.tpl b/Praktikum1_Kai/webteams/template/listaufz1.tpl new file mode 100644 index 0000000..4241c7f --- /dev/null +++ b/Praktikum1_Kai/webteams/template/listaufz1.tpl @@ -0,0 +1,7 @@ + +
  • Gruppe $id_s: bearbeiten  löschen +
      +
    • $name1_s, $vorname1_s, $matrnr1_s, $semesteranzahl1_s
      • +
    • $name2_s, $vorname2_s, $matrnr2_s, $semesteranzahl2_s
      • +
    +
    • \ No newline at end of file diff --git a/Praktikum1/webteams/template/listaufz2.tpl b/Praktikum1_Kai/webteams/template/listaufz2.tpl similarity index 67% rename from Praktikum1/webteams/template/listaufz2.tpl rename to Praktikum1_Kai/webteams/template/listaufz2.tpl index dfff501..ea495d4 100644 --- a/Praktikum1/webteams/template/listaufz2.tpl +++ b/Praktikum1_Kai/webteams/template/listaufz2.tpl @@ -1,6 +1,7 @@ \ No newline at end of file