From 782896691c6886263f6bce1492eb02aefdf88eb8 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Tue, 24 Mar 2020 23:12:26 +0100 Subject: [PATCH] 0.8.2. Zwischencommit Standards fertig --- dasettings/__pycache__/views.cpython-38.pyc | Bin 13225 -> 13198 bytes dasettings/views.py | 2 - standards/__pycache__/forms.cpython-38.pyc | Bin 3980 -> 3953 bytes standards/__pycache__/models.cpython-38.pyc | Bin 2031 -> 2103 bytes standards/__pycache__/views.cpython-38.pyc | Bin 9874 -> 10993 bytes standards/forms.py | 38 ++- standards/models.py | 3 + .../templates/standards/standards_add.html | 225 +++++++++++++-- .../templates/standards/standards_single.html | 117 +++++--- .../templates/standards/standards_update.html | 256 +++++++++++++++++- standards/views.py | 86 +++++- 11 files changed, 626 insertions(+), 101 deletions(-) diff --git a/dasettings/__pycache__/views.cpython-38.pyc b/dasettings/__pycache__/views.cpython-38.pyc index 4c316c7f0dc7bad7775cf407825f6688765b0b9f..d8f0f4bcac3d0dd52df6d3182c2fe04e2957d3f2 100644 GIT binary patch delta 688 zcmX|7OGs2v7@q&$;WjhQn8Uoh^Ss@e&}l};BBciuWTsLQL1I{_6L%Q7GNT=@R(2;J z6TJ=V50z*kR7Mbl+@dzRXwj-ggo~I(n>LZwqJ>0@=$sKeaK8WXecyjL|BLLstfSN6 zu$kx?QO0^MFF9IW(1x9^Sy;q%*9bJ=dG}dZ#T9o4Tt~a-I2^z;o)&&v{x>doMnFfe zw;lFipLY%(;U8}YoWNtgx9|}E`QE@+d|my7Im8ZF$3-y*SJCZ13H7M>8+k6jfsg&u zk$&BzniOt;o3W73GzWzjP0GQ|T9a|bBVsx*h+hJYR$Uj>N_rC*4%WE5Tk0cJZ6)5a zx*CUqqKj;C&1H^kPV$M&O|?A==wfdoFDMok@ncYQHf?#1Qjd)^;YM)(?j&`@R9g|W zq%Id>fTv7Qu@s`3q*_#~E>jn;n$-%$In5PfS{?R~vmfpebu~s;3bj3oz%V0OI>=Za*l2JwDM$I9BdHhiO z16~wDM a4DMs7;S!jQ*#-+=agGD~J`QXF4*mmuxW>`| delta 772 zcmX|-?@Lor7{~YA>#lcm6K!sK-Inue+H(E~5{ke?Q~QC`8$nj+CU>m1b~n!MHN&gs z7W7jQpW1rSi>L_t@y2eyi1KgnMGy=ksOW`6Z}UY(=S=Xxea`tl-|y$ShqD}i5_gU{ zopuXd)^`^t9;`V>TriGft^&NqpDrExajNbNe8=^=Q7E9peG*RKxO<2fRSxgFb-0Bd z&v6*Qh^GioamzCbXK}dx4Lrhs^{?O;zHE5N2x%1l;A1HT%UIWV3i?oK?B#h?zp0YX)>e=ipX|+?~`hWcbKD;v6Er^ z;XAaylM<~7dmgk-L(W5zr%p%_=UTKtLQL2UnNobBB2lH(E^%|MS{I)74?;KI_Md~W z`PaV+f$S-~h~FF)#!MehxejF49O4NO|K31HwW! zm7b0%L5{?!ELA8`EgI~>7tJ4Q=GnmAtSqpyhz0qGtz^xR^QuO!;wQNYZsKowabcR; zVOu6fQj=;l6(g6Ju8hXxB&}ykq83YKm`P^Y7C_-yYcteJ)2F@PL?+4q*V?sjOfX*xq*PAHbM*wyt7bllbb0n)h9E!PxS ddzBTQl@;WAWcSGAw7c+V&r6u ziD+V9J?N36@t_y~1P_vU*^^hjc_r~t)eEz@0d~?~YPzaxs=I!@FB*Q;hi_VzA;52H zb>sGh%J<>VB73CIi7_^>Mp=*Kw(N$-sFPW8T++Ch@f~+J61-1j@1|Top|Y=1V}E3c zI?hrC;%q~6?1UtHC>)bZ@JlHFhD^;X)Q1Gi)V#Fk>U;Vb`oj|Ou z5*`sg(i1t-b0Y9e7pE%=T*aR9BRv&^0udI3M3ilX;unLH*%otJiaIIV&JccRV>AXE zr!{~d5+Enj)dyZqU_V1sbxD2Qv+p}JmGzS$Fr9}Y%RvrAxcnQfUK zR>EN`ry+g}h9?0uiB7}EVr)(9W%GKwp~B=adI#Azv90cnl2nOK3{px&5Q?>|BsCI- zzC<=^*(A8m6_hj&7MU#tj-dE2Zms zT)w@tY+hjC0rMDq4~g9av+m@p=hMInltH;pm`=gFS_Chj%}g^$8+=)A>k9*$0p_xT z=XlvGtZcArEHmpBp=>&{-gFVN-W)WFbg&hr2_=fsj1uQj<)YS!(@uU}86ye)Mv3c0 z{-Ifr;$M^&GRY0~X~}EIsky+sOi4`2X*oS-P<@fiOF5GoG0CmbM-NNq#;)B1hy+q1}1I)4QEcGiQ7V2l9 zIGN2e+jgc{Av0&&GnXOeSLRoZ%F+;j7Z{P#QGQrELOS>@ZP@HW7u(K1X(t=}`fbCd zJwnoAxb6Iq-W+Hn;?FaBYF~?3gjSR!N(u#o%OTs&<|uzcROq0$O;hf%iimwJQJ z3_+eSqx`G>q?EwrYE<>rm~uc2w@!#bR9TkP6;+ibc|}$H7mhBe@UL_HE8D0@(udh( z%q9aqXT;zgW|6-kWBh~JSAqtylGfMah48K^;@Xf3e81vGVbfck7IAJ|$RD>NGLiXv zB}h{IzSSak6aLhCi+Xjl3H4e3XKt;J3URkBmg6f5Rkz z@jt5Vl2no^_w2!_zbQ&Lmg_SDK95n`^_&8AfZ7vtup2|iP>=@DQ1+tiL)njV0OcS` z2TCuBj)Lca!zkD(=$Awz0TF;BD1#`-Xj+3IoF7Ly!54z@*h!rFgjE5;15EPeV23Uz zNP=8X@{eZI-H_RH3WKYVRKUbFJoktgt}4Wk!!a0JLikw{0j(4g{dF7pvD&V{u1GMl<0tfiAUyy8 diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index df8199757c9856ecfb7e7dc6298202ed49079bec..4a1625b805fd375405e051f927d6ac82d592bbac 100644 GIT binary patch delta 428 zcmaFQzg>Vgl$V!_0SJ1$tKu$h`RN?^V+P`yYmQ?A-Br-XdS$1+ivkjxfj9N0{y17UgNJO!NMN=!F(ut)d znv7uS%rA_S*D~8NicfyS?9XU6*@mS;TMDF26hw%_2?-$UmOy%HNqk~baehu|Noss) zQI6H*`z-2=T9esXa~VY@m$Dw19Ld(=A_>wZ1J{abND((sf)|L3b$|p1lK>+Wf>=x< VP|Pz~mHmbQLMNCdF`1V`3jl7ZSjzwa diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index f9b4a9d0769d0c6ab6f225ffb641b9863b6bc9a7..5c9e239300caec16558265c2b2b3540b759a752e 100644 GIT binary patch delta 4508 zcmai1U2Gf25x%`6kN?MiiqsGFYuU7A%eJhj+`MZFq01~w|h)2I#KTXI|^z9&Ji*r(|H(gHoqA3Eo{H~faNFElZ2 zOw61v81#6KzLcAqwhH_Cf@|--H1tjo5bM7%C?2?;fvfOaMUt3gN;;X5S7rJ~{u@`y z^N5kMeNBS)BmQ64&r8G%>CS}2luVqV?h<-}DP?U}GBO_ArkC%d{21I{@q# zEB4f}@?xvN2J2Wa^9rnw`D)m+fb9kBPJ#95-coJ5;n6j%Kdwzav8s=?M{imtqf$O@5gbvMS4fdq zHlg#R*IDw5c>2&_s-{DagF}D?Aoi0*pS8CdtGUnY$F&xNENJduRp?RXFCSn&eA@X| z>mZX@P>j&OtUzyUqjyzVj4{Gwy$LqF-P|+}o|`ibro;+ierrHXy5ZQYx2(vJd#wq{ z>=zr~*w?lq>&e^BV#qoK`_s-s%gU&f>fnF&9ylGGq=qq>GiLS7#C+Z|@>a#aVX|`8 ztdVvt6*89%n$25}NFO~3sgt&Y$+(hMt37E=B%q;ZM3NTx8Q;&^Ql#Qvp!1WtStFCl zP8s=$t7AWr=^=pAQ#_zWiIewgeVT6x^0qKPS#{wrYJ-8niaKXl)AKqFqW5`zOS?C5 z5!Fr<85A#rsMre&vpK8c$QAV56ezCj62NHAx>`}Px=!ur*^lBmbaxt8jEN;{o>nw! zEKs8W%gtIjSlbBtB=|f2k@1&M9Yk>o1(FX%9-&`HA%jST=>gQIQRG0Ry?Nu6Ou@?L z^(@uXYIUZWhO5EB^c`Y#HK2AANyW`!RMc9TAC1b29j zLTb1LQyt|ugD;j8(=RyAo{2!3`H{$(Jrl)~TaF>e(cfE5=tGoJ$~C)j9B~N$tPHZe-e%ioQHEq z$59}4&|VZ>D0ZL_X4b_AJa7)>$m=5Dnlj=em_Yhz$DrsSo|De8H2^HgcX1MW1Ni5@HFR zFq!CU{8n^N_Wu&bb@X`wMG=J{qpPUBih`j?px7Xms34Y#oYUzF_EZ^$Yq6%NSkD`1 zd>zG`DBk5qVr`}GfSUH>N^+NgYpdjwj&3nzCUg1hY(-wUT-^)d3tJGZ`x#fNK51{= z1Y@N`jjgH&ZKN>R4mu1WRJ3&tJH4Q1E#sG9D`3=;93x&?gLl0M(FBtLtF8b2UJ{p` zL5f2_WZ&qhilz z=Zpe<8oNYLxT*99Acpv-iR=A11KkHArBufggNP@w1%pn{@J#a)QKWl%9L3jAh~s^N z-)-&~!g0lD^jXw4c0r6Krp5`M#656>;uL#olf4dli>ocm4$S2fum!6v*N$Uxt(Io7 z=-y(1Gza@7Q&Rg2gz{98QJww|K;9bv#W7NnlZmcUwVsiDE z+Ww`gbdCS6{bLyN)s7)m9Lh5PyyFEJ*WEeL^`+yE!5J;`OlLd!h?hFs0$<3RzGf=? zr=6*wOz%S-vy~mXO}r%E=U;RV1m(pFSe-h&OzX}WnSRQ5clCr;8_g~-|A}Ah>WOSJ zd*Dln&<_6I)()@eILm*%wL=pft2erPN}ERV3;VC&9V1ZoT0v7b6%iABSzyGb-Bh9M zh|kMSxRAj8N8sFFj?3fPtE&tHsst~e01G{Cx_r3~ivUcfra(PzGP90~3RD?T;l{a2 z`ZjCJ!z+0$#+ZOr1nhB>+4QEOY(?}qlXC<=UQ&q>`W~F?F)FC(5~vk5J7MMK^J#Y> z124l<{9Jdol=c)d)R?Ol2|5ODkUkpQ4@fMN~BM=0*1IJQ{~^TWM^JCZVS Wcfqv?mkE~|3WD^&)mppzW%56lV=n3d delta 3405 zcmaJ@&2JmW72jDdm*2||Nfb#*ltfapXi0WtSwY;Wg%hc+tH^dz$t~*ImKn`f=1QWZ z;mThfT8iZ;fl{T02dR_R1}LA>patBzK+&S@A^$)wKCzb`3beg6a1RA)MfN`ia&U=KFUeixuZavihp^2zvd_#I|@9z!-|#ToLCX+jw|@|;7Qaxp1P;4=7BoM z7>xHpP1>n{hmQgq+J*t0(JR zm&q>fswHniavG9@GTF5!c~d3_>$z_3mbo78spWnSxf#gqk-45dxu45iXIv?HA?8#o zRH6&2-y9@+-DDs%PAV}RvOz@fx_{)Vhze_?(Iu#tF-N|t7O=R z;Gx^OvEi6fvK?YQFf?i~bD5b%vtZ}!{3WyEHm{hotM(GBcyg=u#U+-vubwd^J54$x z8C-lq2H3ZOenK}MbWQ(4Wrv}`P9h*vcOBheXIBK4~K>;`l1OVQWnO@v*Kd# z;n)nC7|1RlyoHcMcpISNEG{qP?TRa3r1`nL%}$}yk)xEwG3Fq`gt#6$d3*}Z5d^sm z)Eh(Tus0A?fNYQrp`Ayt0M7Ue=H;29oh#5BqihoWXGC9ks`u+?J|j@yR4wo|N~fW} zcth-j4|yDJHA3L;6#ot%IpkCc{v&WDN%Mbo58HsyS)6|NXMhoaOUjq2VkVL%6JjIM z<2w(;^GZpb7Y`$EtvRjcatrV`NO#5Qw4yc7t~i}mYs~`^m2yRz$55*5D?46JzP`<|#!Eh?INetK2+aB?PTSiINNxz=eBORCG#EGLZs z+d8L-Sw6N_5f5Y&I3|MiIYHhNj)ipSI)xjvU3Qi5!Q>4 zLg+z|guj4Ro#u>U(-ePhxt{tVnA7YcI`$#VArOG9x5iwt8XYp$(LIl_2p}FsNBRdD z(yFEjv<@K*Bgl0X&}u?BD-O55oM|lNY0)u`F-TKZ5;t4>PyAnL{Rm@DAY4O`l5EJ$ zkaDZ2dCE4iyQ(`8inX?^WBVP1HG~@o?}^b^$J%u?pC>4P;1bga&zun6g{2&wv2(@wq8E0osLSQ~NjqWNLL?T* zySLl!>o+me6rZ;B!gyb_#m;>Qj*3pr1=BXG6sgu8+*ucU6~pn|s%SYjS7f8u#(GxV zaB43v6^drXS;#G#MRpXs5Rcnm zZW+gpZz3E+kktB?813j9#c}0m>^NGDA{@o0oEj$#V+rs(#Vw1eseTvxP<-66;X+j$ zgA$~Y*TyF>ryIdQcppK^q=Z%x!2tjZmuI(BnPgLA+A;ChWV|hf(}f^Z0W#=v!*zmN z&OQ>&oqtMV*^fyfO;=@!>dLCD4{mHzeA)T^tX#`8qB(-y_|~cN{7tkb#Y)%LvT_wK zWa?DDFt=bH5Rbb0$(`HX?~t3~M)!X5f%sMTcVX|fRA%&f`Tkv|zsAhm8;!?GlBimx zr}mYuvrhy~eF{Sc(xbYhTi|t5__U(#d6hj7f6Qc}g-3O#2b_O{cUGY6 z7cccBBZYFk%LiYmgeAoOo=mJ@)!lySeiPqwkWc5aEE^<+{7jRs4q9ikzw z=E(+uFPQL2_G8$QX(mNQMc+Pq?HEJqWW%h0d-dWYQJ!=-LUoI;qJ^heMQ7&X(j}A0 z6AnN0t0x@tE356HB2INCczKD72UYSv`!ef` diff --git a/standards/forms.py b/standards/forms.py index 3723e2f..081e45e 100644 --- a/standards/forms.py +++ b/standards/forms.py @@ -22,11 +22,10 @@ class StandardAddStandard(forms.ModelForm): "task" : "Tätigkeitsbereich", "content": "Inhalt", "public" : "Direkt veröffentlichen?", - "representative" : "Vertreter", - "executor" : "Ausführender", - "authority" : "Verantwortlicher", + "freefield_title" : "Freifeld Titel", + "freefield_content" : "Freifeld Inhalt", } - fields = ['name', 'area', 'task', 'content', 'public', "authority", "executor", "representative"] + fields = ['name', 'area', 'task', 'content', 'public',"freefield_title", "freefield_content"] ''' @@ -51,14 +50,22 @@ class StandardAddStandard(forms.ModelForm): elif self.instance.pk: self.fields['task'].queryset = Tasks.objects.none() - self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) - self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) - self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) + self.fields['freefield_title'].required = False + self.fields['freefield_content'].required = False + self.fields['freefield_content'].widget.attrs['rows'] = 2 + + #self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) + #self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) + #self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk) self.fields['checked_groups'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) self.fields['added_files'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) self.fields['added_standards'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['us_verant'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['us_ex'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['us_ver'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + class StandardAddStandardEditor(forms.ModelForm): @@ -84,11 +91,10 @@ class StandardUpdateStandard(forms.ModelForm): "area" : "Übergeordneter Bereich", "task" : "Tätigkeitsbereich", "content": "Inhalt", - "representative" : "Vertreter", - "executor" : "Ausführender", - "authority" : "Verantwortlicher", + "freefield_title" : "Freifeld Titel", + "freefield_content" : "Freifeld Inhalt", } - fields = ['name', 'area', 'task', 'content', "authority", "executor", "representative"] + fields = ['name', 'area', 'task', 'content',"freefield_title", "freefield_content"] ''' Hier werden die Elemente für die DropDowns erstellt, damit @@ -115,9 +121,13 @@ class StandardUpdateStandard(forms.ModelForm): elif loggeduser.pk: self.fields['task'].queryset = Tasks.objects.filter(area__pk=standard.area.pk) - self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) - self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) - self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) + + self.fields['freefield_title'].required = False + self.fields['freefield_content'].required = False + self.fields['freefield_content'].widget.attrs['rows'] = 2 + #self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) + #self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) + #self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk) class StandardUpdateStandardEditor(forms.ModelForm): diff --git a/standards/models.py b/standards/models.py index c44af06..11b975d 100644 --- a/standards/models.py +++ b/standards/models.py @@ -29,6 +29,9 @@ class Standards(models.Model): public = models.BooleanField(default=False) + freefield_title = models.CharField(max_length=200, blank=False, default="") + freefield_content = models.TextField(max_length=500, blank=False, default="") + # USER # VERTRETER diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 1f3a6b3..dd4ec34 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -9,17 +9,26 @@ {% csrf_token %}
{% for field in normalForm %} + {% if field.is_hidden == False %} {% if forloop.counter|divisibleby:6 %}
{{field|as_crispy_field }} {% else %} {{field|as_crispy_field }} {% endif %} + {% endif %} {% endfor %} + + {% for field in normalForm %} + {% if field.is_hidden %} + {{field}} + {% endif %} + {% endfor %} + - + -
+
@@ -105,23 +114,6 @@
-
@@ -172,10 +164,202 @@ + + + +