From 5bca8fc8f740198c91d7d152469a2ada128fdde3 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 11 Jan 2022 17:29:36 +0100 Subject: [PATCH] # 61 Filter frontend * adds filtering for file number * updates translations --- compensation/filters.py | 22 +++++- konova/filters.py | 27 ++++++- locale/de/LC_MESSAGES/django.mo | Bin 29698 -> 29827 bytes locale/de/LC_MESSAGES/django.po | 121 +++++++++++++++++--------------- 4 files changed, 110 insertions(+), 60 deletions(-) diff --git a/compensation/filters.py b/compensation/filters.py index b44b900a..b4dab866 100644 --- a/compensation/filters.py +++ b/compensation/filters.py @@ -8,11 +8,23 @@ Created on: 29.07.21 import django_filters from django.utils.translation import gettext_lazy as _ from django import forms -from django.db.models import QuerySet +from django.db.models import QuerySet, Q from konova.filters import QueryTableFilter, CheckboxTableFilter +class QueryCompensationTableFilter(QueryTableFilter): + """ Specialization of regular QueryTableFilter for compensation model + + """ + def filter_file_number(self, queryset, name, value) -> QuerySet: + queryset = queryset.filter( + Q(intervention__responsible__registration_file_number__icontains=value) | + Q(intervention__responsible__conservation_file_number__icontains=value) + ) + return queryset + + class CheckboxCompensationTableFilter(CheckboxTableFilter): """ Specialization of regular CheckboxTableFilter for compensation model @@ -71,7 +83,7 @@ class CompensationTableFilter: qs = kwargs.get("queryset", None) request_data = kwargs.get("data", None) - self.query_filter = QueryTableFilter( + self.query_filter = QueryCompensationTableFilter( user=user, data=request_data, queryset=qs, @@ -89,7 +101,11 @@ class CheckboxEcoAccountTableFilter(CheckboxTableFilter): method='filter_only_show_unrecorded', label=_("Show only unrecorded"), label_suffix=_(""), - widget=forms.CheckboxInput() + widget=forms.CheckboxInput( + attrs={ + "class": "form-check-input", + } + ) ) def filter_show_all(self, queryset, name, value) -> QuerySet: diff --git a/konova/filters.py b/konova/filters.py index 00445828..1364aeb1 100644 --- a/konova/filters.py +++ b/konova/filters.py @@ -57,6 +57,28 @@ class KeywordTableFilterMixin(django_filters.FilterSet): return queryset.filter(q) +class FileNumberTableFilterMixin(django_filters.FilterSet): + rf = django_filters.CharFilter( + method="filter_file_number", + label=_(""), + label_suffix=_(""), + widget=forms.TextInput( + attrs={ + "placeholder": _("File number"), + "title": _("Search for file number"), + "class": "form-control", + } + ), + ) + + def filter_file_number(self, queryset, name, value) -> QuerySet: + queryset = queryset.filter( + Q(responsible__registration_file_number__icontains=value) | + Q(responsible__conservation_file_number__icontains=value) + ) + return queryset + + class GeoReferencedTableFilterMixin(django_filters.FilterSet): """ A mixin for AbstractTableFilter @@ -329,7 +351,10 @@ class RecordableTableFilterMixin(django_filters.FilterSet): return queryset -class QueryTableFilter(AbstractTableFilter, KeywordTableFilterMixin, GeoReferencedTableFilterMixin): +class QueryTableFilter(AbstractTableFilter, + KeywordTableFilterMixin, + FileNumberTableFilterMixin, + GeoReferencedTableFilterMixin): """ TableFilter holding different filter options for query related filtering """ diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 65defeed94e56e2d8d0c68b2d053d54b629a1b04..1246234f1e0debae2285b00e000c54893295026c 100644 GIT binary patch delta 9226 zcmZA64Sdh#{>SkPyJc}J&)!~Tbq|)K2GslsVPIZ(V=k?zAn&X`7@&9;UH{b8~x~|Xl{r>oON-oq} z@{fAXnGlb1L)lr+m=-vup)rZ|jak)9y~fOHZA>6zMOa4r;b>!)W0N+`2 zV`JJ^FbKV3j0wh2R67O(u{SotG}QIk7{L5yHkGDylwcTcz}vB^_5x%6WIc`A!9`?q z=DO{V?qEy<+TAf0dm%eBd8i3zqBd57B-gA#&9@nSnBTlkMJwKqy74&bhEwQ^f3xk& z*56Ur`E)dXMGm#z@C;Mvys zs0=SgEno>cN=Z2tO|S)(!k1C~uc01LjoR4(JAMR}kz-hUwy2bzMNM!C^_(B=_%Emh z-9Wu7-lRv~-jnm!8OG3|6(yivx-{fVH1kjosz6Qn0%}3KQ18SWSd5>bKDPmUqq=?~ zYC}^|6BnV5cmZl7rKkn0?M42z@(Mb%(pKTvSO?V0i;8z%mQ3>t@iP(hpAk=kP zsEMYao?C2nP!p~~)@nAR?mMXgt@I-5?5?8Dv|*zAc1NLh&=qSlgj#4CHpMZh>kBaq z9lRYkpvHHj7W_vf`{o?RU}$f5UMHD~Ry+bVFcCFjDfYo9FbzMp{b6^wXB>rL^tVGD zO)}~z2ctGL&YFXI-fY`mh|Ou2B0o%ysi2|-yoY+3PN2T;)2Ijk9hJ)OQ4hXm+diyL z<4sZ5hokO~vF$k2ef?0G9g51}Bvi(VF@pKcaw^Zzu>n)} zf?u*$qjr7-HNlsti7%m^_bVy`rl0%V+pJ;etM9)96+N(r9Y{s~Rb?_z-}@re4%gWB zCe%Cd3hHg&gWCB%)Ju2>HSuB8foznLb2ae-`;abCo~BF(JtqHfu6a8(NEla64*&mr%bCKchawYf0q4_7^SL{T#wj z6UCw?9*BC-Xw=T8pjMuTdf)=o*_NP=YQ41rbzK$eC=Q{XcfyXJvHh2l9rwmx>ChQ^ zr?~&NYl=#3UsNiSQD-<9C*VlzfR(ryPhnded#CFnjHJEIdJv;&*I)zm9pG*tz@ehE z3`M0T3hQG#+wOq6p(|S2d+kCrVMqTQ$a;H zzJi)yA8NvbsD*umt?>l*#9y#Ec20HAe26s<Sg;Hb=~)<4F8HL^_YCHF@K?* zHiUn5F~4b_#$T~`95>;rq3-_+)qWWN7N9*3$6=S@#=MQoF$xEyb1&wiGPnkHrdv@H zzKHso_TW=^40T=p2scv?prZ>PqoN&b!e)2`!|^;Sbsi(#{%~sos{bz3b<VZnv)qTe{yhxDFEI!& zqIP->mGY3$?k`_B>dd>@b`R?i)XSYUn*6JhXFG~eXSfhG@p{yQ_oGt#XKaIKPz&+6 z%Y9c`U<=wYsEiIoZybYqekN+6xfqP|Q14i&Lq#iIhuYy*RO)u3Qui+E##5*XE})Lc zbBz1eN22bJMJ=eebu?`<{0)9hH)Of6$!dO%W zx?B687MzO8&`{ey1$BQR>WG$MBP_S$FCdRLyImdQo#DQnnWzW-j3MYh&i#xcP#Nfm zT2LR^5}u8enA{BKkW zL+*AT5RJOAH)^4&7>1b`igQupt5FkeK&5^g>N!WT8=ggNF!&zcJAMDrRCMDi)XTFT z8)F4(qP?gTeuDbkYEVBg4JNqv1)^TsW|)XQQ4`EUEo6!HG1Qr_M`dISI!f6aRJ8MI z48V_23ps`Q<*Py6cmee}{eZpjC)5O;GTkHUiMoFfY5^Iji3(8HIoK0RQO`S&N&dBf zkLb|%{xR}`n@^D+LDMeFy>K?B&|Zl8o!F1<@S<&pWV;jhL%kcrQSVF!DwBDrw|)^S zqvfatRc4carS?rabVi4*UtuKe@2!Co-LIr8YN5TXeNY=nMm=~CYUkP3BGlKl6gAIE z)Xuk{7P!-)qLl7It$d#yID~reXV$M!*L{sT`}4N{M^wtMqK?pel51ns=NE+?up4&4 zOw^ICL@mr&O+`B@N2O>ZK8aP>90yKzC!T_uC>NE|Ij9L%*#3>E48DMRnX6In& zq-}qL+Q1b|XMS^?N*Eo(rno7|#T44}upaJ3rEVW8WyeveK4-m(gJ}m&byGjyT8QEF zKZsiR)2Ic%ggSz1^wIbKJ{7I#DC#%=3yeW?FaPX<4%itdU@VrRzT>xWAbyK+7?PJk$e9Q5h&h?O;3VC@N7u zK<{Ep`~r2~Rn(4s^W5h(LoeD9sH16%j=s-$Dq3+GDic|#2Nc-$LR1PLv97}i+7;Lq z525bAWczR6QQ8st?#8}D9pNul-vT!SEepuM&N7=0O)v*F@lxwL)B>Nk?fvLY`#36N zpJN+5XUDy#xf=+>2K2W)zWXZF z4vyJ&jUBHy)4eVL^`Pdc4Rl36OhGL)9V0OtJEMcj?8~Uk?s9d^9xC(cIDm1Oc%S?4 zf$7+uw&yI@E*MFB9CpO{wtqY7!AH>-kE4$4G-^RLsCVIt?f)5d{SCZL-+%og_X0oE z$^ub0hGHU;hMW6|e+_lG7C18Cokx-Q?g???R|k>xyk6p|*+7-l5Vjq2fAxiDo zSNM(2f2Zwe$wfa?A3^97`px#&5lltjwhAXvTXc@MmYF;wf>6;$?j*VpQA8&Fr!kip zMtw2S(BY3B#3G`uY^I`g2HU=Q)PtzECWcZUPUwYFSxR39F`Cd1l1d@<-o!xaiMR!G zi2cNu#6O9t^s6|7sca|sM`>*tLH%AksE$F@^*hjsC{zbUKS19SONeDe4AGbC((pQQ zlsH3NBF+*EhN|hu=0*JXTKeK>PsHUIO{}NB z7+)jesUN_*@h*IexQ}`TE+y)UFMU-ss);K^U*tsJ|@g%2wJXG}aIo>pE{y zKdZC3W*(7F-47QMKT-dJc$Nqub`!but0dr)sDHkzIQr?GKy+iE2R@B!iS5)MA%;^w zgnW@^8u4dB|9kLbgvvq}{bR}OAiB^Wfxi$Z36)QXvBUz#h7bY7NZJq7O?hCh=FIoKWdXJYmPyV0&ACkA4s0b3&zr{-@mP%|9+Z09FJm$7 z2KxRR(ddjX+QCn)&FNFg$50}{ZJNo{y=-0oK}jVIdlDJc|42+E?xB4@(To^CTcwOh zrX5XuNZq+dz5iDRGFVsgsH76Dh>`Tag5Gv~Ir`H+LFgZ#rL^bZ7@|9&@+vWb{+9SS z?!~Lboz#ET_kU~gq4U<#f%X>SAf4lgKGchFE|EmtpNOQMiYoIl*{zztTen)p492?? zbw&UClL?_Ci=G-{F7-GfpZZ6{B%-c7V=K4W2mGsU!1|EwS92E;N&CDVdkMX0{{cNQ zi+EgP+J7q=8*nwzhfvYq*D7K9gYky&J+VS<%Im~hB8)K~ypK@XNqYb>iI`4IBN`Ed z+~J#lwx#cRT2A22uK!jpP+d=ql+)?3C?mhO3AIVjTTJ zw!atk2dF0!&*}RgPse0Ccq^l6lrwf1Tj1B&fe0Yl(N?LC>)fgdr|v<_vh5qz-|>j8 zKW5Fu=ZN^a_pg8(ml4zHdpHF(PrVb~LA0hGYsaS0K5pyhFp9Ry zU_zgJZ)}VW@WDhX{fKSqB>V`KG4w4VRuf6JJ^aN&U1g^J@GT3DZd5hAwRfP`%sDfr z$7TEb3w+P@9>?+DE;ej4HVm6xj199boBPJxV;CcIzigQqb62kU$6T^SA`-boNsj7- zTAeN;I&_jw(V-ftP$}u;($Vd_-v8fck4L|U&z|4!_jmbzzn|~-_y2DXrQiB2{l>?0 zKFoiE!|{xd<3wT45XVXPb)1q$YIU3r@s1P9xsJG=df%pwvjQt|DNbnSIC*#lr(u@_ z$H~FxaT)%Gjd4k$kDhA&3+2V=$h@`|%Ri!qLrLr=YG|fQ-diVeNad zF7?;2HhzG0@PgHU!cgkIEgUBt!%){JU@iK0GAPuiAsZWFJ~qIG-U}S(F>@Dc2K$jo zImfL1d-S9JE2iR~$jqG7mTrgbP!r2WlIsjZ^;d{B=-*jHK_gy)x^WZghV57r_gTHd zJc_#R-tP{krVCLsUx#}B4%Bn^v?BjnvkDsYz~iWW_c_Mk zZPez8V4AwIEoz{ht==1TUk<9{0#s(^*!hK6lX@xo;~Lb&)?*0nPA2~v$w3-4kaw^K zo(+Fj#G|PP@C#Ds^dTwUL7?=J+CQhBI&4s=b#3bXZ10t=NEdcFb$Qm zxu^%MMh)ai)Q!7Q9X*escnE{=6b9pG7=quRQhv+YL+)~4>qe+0YLDutKk7bD0R=s1 zIws;m^zI2H`%Z<`zs7;oe?g_PPiuDu1F$yrJk$V-%=xHPm!oF74KbhB|j^?5=S&o|V26HEd z>ivI_LIfucp*s8z>UH`8^+3OL_klIdP|T&hF1EpmsI}jM?Ql0nVUY&n2R;h z4AejdV1(ZPkre9UEY#YpM6Kag)S4c|Fg$`9&>0NJ&oK_KV_ghu>u$D0R0dMbHmJ;Y zL=7Mdm62TZsDn`yl)_>=F%|WIxu}^fvhyoZ11LvjY8`4OTTmVBK|SXMJHH>b`(H=x zk$23~s3pAAmi%i(H)zmi3m|{IX-+!oLHVc-3sD0qLG6W^I15*!_j`(WQ`bkLCKQ9} zI2l8+EovgYPy-o+8hCzt@~>1(vlH`B^;M`2*JDrIgb`SY>fk2UL%$C0bq!G+MWY^^ zVrHN^?1PNe8G*WQE$TVDJruNd2T^N!0+pId)C|5yZ-!6<3+U+XjoPT|6H%Y-8Q1`a zVtt&38t`%?xz1K>fghtf{v9=7Pf#cKL?o)iUYLmkFdNIP{S0c2E3qMdg<6{5Q3LkR za336Q#-W~3*Qz?I!-klIiKrWgpi)+3&PC09 zC8~pssE+rbp7$~;18<=Az)|xIYBOHOP`&>@*$JO6eA-bDL%r`EP&4dj^YE6t*+!>9i65@Grfv>&~4O= z0=u~*4@NyO8nvd0s3poYvr#h~j#`4rsOQbK^QG4QsMWWjmTq4+kNdma>oh2(U!qcY z8MSsl;3&L_Eit#d<2-Hz;Tx#Tyz8OhOW}QM zIE8-H&!7fy4wZ?E=4I4_uA(w<1C?6eo^IwsP^oQrX)^ zT9}>P6HYE_FHA7!pkAY8sI}XG>gZ`y1}m@{{sXmH-$qUB9BQVOR=;F^>uqQKf1sdE zbJI@v-t9gxz^s8vaWE<~5txb@sLV`3ZMK!D>(--EybZhiu*tBJ`j371?FUcxgL_U!fk=pFa}tV|){n2Dsnz-(qv>K{;*;+o0C8H>$&dsJCehZo)aJ zREG?7GZllnE)6w-uIOn*VFm@QZ8<7+&!O6nn3dN43+lQ$gWLh7qCOvTQ6DVDsLfZ3 zdQG3O_7|-EIO_WIn1r_m@&0QKo8-E?wJj!4?}S>*eAEp^7>XXOjgO#ax&xK+3e+At zf?D%Wtp2Ha4Yj#_2fGHF^#_xGtzj$;>Npei;CoT2U4YH76g80NPTp~SdChWy;uv6p&oD=HJ}UT zZB$30_qbo@aTra#A8JV_qXt-t0a%V2kY^nQ4PZN}qt{R=JdMi0S@R-l#NVMZblutm zhr0LIMlDfG498BW`*V;>onhua)aLZb^FGJpY^D%K!%L{w=qM@!AEE|y5%r+o%xc5j z6xTuxr~&GHG)7<|*265+QVd09Y#eGSCu22U%e5G+@BfX%-4X9XrLY3^fD@=2FJOKA z4wWgN5pGA3sPpNlj=EqA?1OsFENqR-P!oIwi|_>MzSbkzJ9_^!Db&SmR7c}bDZC%` zx|N|avj=tKLDZ%_gdOoSR0s7&xdUl#rlHn66E&fpsEmz7?WOVP{r!JB1$~4*fV$y9 z)E;;U+vCHi86HI~%?GFlTtIbv4b_3qX!p7ZY)3r~^}OMzj>n@vPDJ*rGi5aS=R?mq zWETdF;UklJIO+o;4-;{z)%T)0{sgt=mrw(`hRWcd*Z}K}bu*ca8hB4sMsrY0Q((>+ zOa5bNSV4n)7WH}@M~(E9c^Wl?bEqY{fSUO&v&K00z9>{j@u-=%M-4CwmC-?{f!|~8 zV>}e};A!R@)P)OBYrfdp%TP04i+XRjoBL3&-D}tqPhbk(KrLzfcz0k4s0k&bGL(kv z(9@4XB!%;+j_;s4`U92HkbJj;CaCr_R0_MHHscV~C*W8+Ut;xzs0pmX9Nd5n@oQ8@ z{y>)6Oi5eW*W+O8s@y?_T#UsgD|98&pPmpq5|=Y7dM; z4X66YB;Vv4EU^4!UsTeoGeSdSYH}z6X!}m}F{2eurT7`U-VjQZY0@U+L zFblV$*1XcZjE$)Oi2n5N)ST$1G!*rKI8+Bos2OCUmZB#{;0TPynW&{$i<P!CvU?T_P0>J_LNE}!Hs z;Tm%%Dg&>emhu+r`60#bz@v)EzXp&(gGSiZPUK-A^+{MAXJ9j&Z|Aq8X7CdF;hU&k zeHgWbpQ18WeX^T@#;Eg2s0s8$UmP}>{HvppG}OQX48Ri9z-FV?YB_32c3@+C2{qtT z7=@RxEBa1xJM4ivpNo1<5$gW=*d5DI89C{p(3-;6s5Pu#!WRi9pw_Msm4Vq9jEhh= zu0rjB9T<;?P#t`Qn)waXeKn@KGY-RG>djEEdm3tho*ZkKU>7`Su0}m*GinAeVh|oi z4fG_&VkIWyAE=bJn&xIS)ohRRXwSkld=)q0Rcx;Jf7x{Rx7z11mJ^>~65h7<_!;hl z`(sVo2cnj0Bx*ntPEbN3c&3&l7a|L6u+AJnc|4ssh3>=7h&C1dH z9-9^B8|GoujNi5Td#H|2p$2poHSjO&{1x+itVa7!sQYiDM>qUx4SuuT83v-(J`8nX zB6??v8d$oucR)Qb6V+jNYwwG?Zh+MXqf(xSdW{P(6(5>S{$nV-N<%F?YZqRz`p>BE zh6BV~#FvDQwJy$jPA(#zqP~@Qg$UOT95;w@l(kf`*0voVBgWJA5~2O)J@k%WCC^K+hjfbffS9kx4vB zUB^D6Dd9(38)5^YBMG-*B4!Z2#8K+M5c+zpI{rmrFz0ryKO7Uj{=*o5PgiP1Ri|+e z@f9(i_J^$fX)}tpew3fYTnxgM_&w2svW|E{f8IWTb1)HWTm$Xh|LHN$^n80vR; z&wPG-LFkxA;}Ey#Jc4o5dlNe9;X?c$afg^hJq&d;C%O<1(>BDeS9?364)x{M#%H@z zpYm$rUboHTJVfCQP7EU6AzHd8oPSWRI^wDd=HsTn+1(t0xpw~w%Ka$oOQ9!j!OnK> zDRZt5>tDi&6*O!kCQ=?l=u>9|^|Kg{ImC409QCT>pA@cGr4To9J_Fw*^fC53v7QK_ zy+0l&22s{gP81NEJv3xd=tNW<2d%IeM-fZ7ra8e_y~l_Ae4l7R{6suKl-q-+P@X_I z)K5bWv0ZhJu|$Dg7fbmu!c&tU(L@sQ9WjFo^05W>#zRCO${J{EqU!iBg)YT2Zct9}zlAHK&y{&ZV*gb&NGf<2dScarW9n<{ znpu>G5#dCMwJoPyb2a#W;+5 z6C&8!#6aqQU=yMbaha$(PF58#ok$@T5XIb6b=*(?PGcHA$2P>{l&9mp#KS}_>H|@~ z8&w@Qt&nXG8cjWuxX0Ru)1GhV`qJi4Il<0##B3`Mpk4iY|0_!_rJ*rCs-WBp8{#LZ zBY<+%@plRhsQ(8mtns?p%dYD{eIn)8a52unR>VBwRU%paM^WfX{7L*sEG2dmhl#fd z9lk^maglhDXh2jQV|ef`Vj&Sp<79l0c)>1+rd+@3V!WUFRN`)8q~8C#XiTA^xBp9dks9pijDv|MINyOtAhr, YEAR. # -#: compensation/filters.py:71 compensation/forms/modalForms.py:34 +#: compensation/filters.py:91 compensation/forms/modalForms.py:34 #: compensation/forms/modalForms.py:45 compensation/forms/modalForms.py:61 #: compensation/forms/modalForms.py:238 compensation/forms/modalForms.py:316 -#: intervention/filters.py:25 intervention/filters.py:31 #: intervention/forms/forms.py:52 intervention/forms/forms.py:154 #: intervention/forms/forms.py:166 intervention/forms/modalForms.py:125 #: intervention/forms/modalForms.py:138 intervention/forms/modalForms.py:151 -#: konova/filters.py:64 konova/filters.py:65 konova/filters.py:76 -#: konova/filters.py:77 konova/filters.py:88 konova/filters.py:89 -#: konova/filters.py:100 konova/filters.py:101 konova/filters.py:113 -#: konova/filters.py:114 konova/forms.py:140 konova/forms.py:241 -#: konova/forms.py:312 konova/forms.py:339 konova/forms.py:349 -#: konova/forms.py:362 konova/forms.py:374 konova/forms.py:392 user/forms.py:38 +#: konova/filters.py:63 konova/filters.py:64 konova/filters.py:91 +#: konova/filters.py:92 konova/filters.py:104 konova/filters.py:105 +#: konova/filters.py:117 konova/filters.py:118 konova/filters.py:130 +#: konova/filters.py:131 konova/filters.py:144 konova/filters.py:145 +#: konova/filters.py:280 konova/filters.py:324 konova/forms.py:140 +#: konova/forms.py:241 konova/forms.py:312 konova/forms.py:339 +#: konova/forms.py:349 konova/forms.py:362 konova/forms.py:374 +#: konova/forms.py:392 user/forms.py:38 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-11 09:31+0100\n" +"POT-Creation-Date: 2022-01-11 17:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,7 +148,7 @@ msgstr "Geprüft" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9 #: analysis/templates/analysis/reports/includes/intervention/laws.html:20 #: analysis/templates/analysis/reports/includes/old_data/amount.html:18 -#: compensation/tables.py:41 compensation/tables.py:181 +#: compensation/tables.py:41 compensation/tables.py:182 #: compensation/templates/compensation/detail/compensation/view.html:77 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 #: compensation/templates/compensation/detail/eco_account/view.html:44 @@ -233,7 +234,7 @@ msgstr "Kompensationsart" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15 #: analysis/templates/analysis/reports/includes/old_data/amount.html:29 -#: compensation/tables.py:84 +#: compensation/tables.py:85 #: compensation/templates/compensation/detail/compensation/view.html:19 #: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28 msgid "Compensation" @@ -278,14 +279,14 @@ msgstr "Typ" #: analysis/templates/analysis/reports/includes/old_data/amount.html:24 #: intervention/forms/modalForms.py:306 intervention/forms/modalForms.py:313 -#: intervention/tables.py:88 +#: intervention/tables.py:89 #: intervention/templates/intervention/detail/view.html:19 #: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 msgid "Intervention" msgstr "Eingriff" #: analysis/templates/analysis/reports/includes/old_data/amount.html:34 -#: compensation/tables.py:224 +#: compensation/tables.py:226 #: compensation/templates/compensation/detail/eco_account/view.html:19 #: intervention/forms/modalForms.py:279 intervention/forms/modalForms.py:286 #: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 @@ -300,12 +301,12 @@ msgstr "Altfälle" msgid "Before" msgstr "Vor" -#: compensation/filters.py:70 +#: compensation/filters.py:90 msgid "Show only unrecorded" msgstr "Nur unverzeichnete anzeigen" #: compensation/forms/forms.py:32 compensation/tables.py:25 -#: compensation/tables.py:166 ema/tables.py:28 intervention/forms/forms.py:26 +#: compensation/tables.py:167 ema/tables.py:28 intervention/forms/forms.py:26 #: intervention/tables.py:23 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" @@ -316,7 +317,7 @@ msgid "Generated automatically" msgstr "Automatisch generiert" #: compensation/forms/forms.py:44 compensation/tables.py:30 -#: compensation/tables.py:171 +#: compensation/tables.py:172 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28 #: compensation/templates/compensation/detail/compensation/view.html:31 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28 @@ -635,65 +636,65 @@ msgstr "" "Es wurde bereits mehr Fläche abgebucht, als Sie nun als abbuchbar einstellen " "wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!" -#: compensation/tables.py:47 compensation/tables.py:187 ema/tables.py:44 +#: compensation/tables.py:47 compensation/tables.py:188 ema/tables.py:44 #: intervention/tables.py:51 msgid "Editable" msgstr "Freigegeben" -#: compensation/tables.py:53 compensation/tables.py:193 ema/tables.py:50 +#: compensation/tables.py:53 compensation/tables.py:194 ema/tables.py:50 #: intervention/tables.py:57 msgid "Last edit" msgstr "Zuletzt bearbeitet" -#: compensation/tables.py:84 compensation/tables.py:224 ema/tables.py:82 -#: intervention/tables.py:88 +#: compensation/tables.py:85 compensation/tables.py:226 ema/tables.py:83 +#: intervention/tables.py:89 msgid "Open {}" msgstr "Öffne {}" -#: compensation/tables.py:105 intervention/tables.py:107 +#: compensation/tables.py:106 intervention/tables.py:108 msgid "Not checked yet" msgstr "Noch nicht geprüft" -#: compensation/tables.py:110 intervention/tables.py:112 +#: compensation/tables.py:111 intervention/tables.py:113 msgid "Checked on {} by {}" msgstr "Am {} von {} geprüft worden" -#: compensation/tables.py:129 +#: compensation/tables.py:130 #: compensation/templates/compensation/detail/compensation/view.html:80 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56 #: compensation/templates/compensation/detail/eco_account/view.html:47 -#: ema/tables.py:101 ema/templates/ema/detail/view.html:38 -#: intervention/tables.py:131 +#: ema/tables.py:102 ema/templates/ema/detail/view.html:38 +#: intervention/tables.py:132 #: intervention/templates/intervention/detail/view.html:85 msgid "Not recorded yet" msgstr "Noch nicht verzeichnet" -#: compensation/tables.py:134 compensation/tables.py:262 ema/tables.py:106 -#: intervention/tables.py:136 +#: compensation/tables.py:135 compensation/tables.py:264 ema/tables.py:107 +#: intervention/tables.py:137 msgid "Recorded on {} by {}" msgstr "Am {} von {} verzeichnet worden" -#: compensation/tables.py:158 compensation/tables.py:284 ema/tables.py:129 -#: intervention/tables.py:159 +#: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:130 +#: intervention/tables.py:160 msgid "Full access granted" msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden" -#: compensation/tables.py:158 compensation/tables.py:284 ema/tables.py:129 -#: intervention/tables.py:159 +#: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:130 +#: intervention/tables.py:160 msgid "Access not granted" msgstr "Nicht freigegeben - Datensatz nur lesbar" -#: compensation/tables.py:176 +#: compensation/tables.py:177 #: compensation/templates/compensation/detail/eco_account/view.html:35 #: konova/templates/konova/widgets/progressbar.html:3 msgid "Available" msgstr "Verfügbar" -#: compensation/tables.py:202 +#: compensation/tables.py:203 msgid "Eco Accounts" msgstr "Ökokonten" -#: compensation/tables.py:257 +#: compensation/tables.py:259 msgid "Not recorded yet. Can not be used for deductions, yet." msgstr "" "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden." @@ -1179,7 +1180,7 @@ msgstr "" "Maßnahmen aus Ersatzzahlungen, die nach 2015 rechtskräftig wurden, werden " "durch die Stiftung Natur und Umwelt verwaltet." -#: ema/tables.py:82 templates/navbars/navbar.html:43 +#: ema/tables.py:83 templates/navbars/navbar.html:43 msgid "EMA" msgstr "" @@ -1199,14 +1200,6 @@ msgstr "EMA {} bearbeitet" msgid "EMA removed" msgstr "EMA entfernt" -#: intervention/filters.py:24 -msgid "Show unshared" -msgstr "Nicht freigegebene anzeigen" - -#: intervention/filters.py:30 -msgid "Show recorded" -msgstr "Verzeichnete anzeigen" - #: intervention/forms/forms.py:44 msgid "Construction XY; Location ABC" msgstr "Bauvorhaben XY; Flur ABC" @@ -1376,11 +1369,11 @@ msgstr "" msgid "Revocation" msgstr "Widerspruch" -#: intervention/tables.py:176 +#: intervention/tables.py:177 msgid "No revocation" msgstr "Kein Widerspruch" -#: intervention/tables.py:182 +#: intervention/tables.py:183 msgid "Revocation from {}, added on {} by {}" msgstr "Widerspruch vom {}, am {} von {} hinzugefügt" @@ -1515,46 +1508,62 @@ msgstr "" "somit nichts eingeben, bearbeiten oder sonstige Aktionen ausführen. " "Kontaktieren Sie bitte einen Administrator. +++" +#: konova/filters.py:67 +msgid "File number" +msgstr "Aktenzeichen" + #: konova/filters.py:68 +msgid "Search for file number" +msgstr "Nach Aktenzeichen suchen" + +#: konova/filters.py:95 msgid "District" msgstr "Kreis" -#: konova/filters.py:69 +#: konova/filters.py:96 msgid "Search for district" msgstr "Nach Kreis suchen" -#: konova/filters.py:80 +#: konova/filters.py:108 msgid "Parcel gmrkng" msgstr "Gemarkung" -#: konova/filters.py:81 +#: konova/filters.py:109 msgid "Search for parcel gmrkng" msgstr "Nach Gemarkung suchen" -#: konova/filters.py:92 konova/templates/konova/includes/parcels.html:18 +#: konova/filters.py:121 konova/templates/konova/includes/parcels.html:18 msgid "Parcel" msgstr "Flur" -#: konova/filters.py:93 +#: konova/filters.py:122 msgid "Search for parcel" msgstr "Nach Flur suchen" -#: konova/filters.py:104 konova/templates/konova/includes/parcels.html:19 +#: konova/filters.py:134 konova/templates/konova/includes/parcels.html:19 msgid "Parcel counter" msgstr "Flurstückzähler" -#: konova/filters.py:105 +#: konova/filters.py:135 msgid "Search for parcel counter" msgstr "Nach Flurstückzähler suchen" -#: konova/filters.py:117 konova/templates/konova/includes/parcels.html:20 +#: konova/filters.py:148 konova/templates/konova/includes/parcels.html:20 msgid "Parcel number" msgstr "Flurstücknenner" -#: konova/filters.py:118 +#: konova/filters.py:149 msgid "Search for parcel number" msgstr "Nach Flurstücknenner suchen" +#: konova/filters.py:279 +msgid "Show unshared" +msgstr "Nicht freigegebene anzeigen" + +#: konova/filters.py:323 +msgid "Show recorded" +msgstr "Verzeichnete anzeigen" + #: konova/forms.py:37 templates/form/collapsable/form.html:62 msgid "Save" msgstr "Speichern" @@ -1921,11 +1930,11 @@ msgstr "Starte Suche" msgid "Results per page" msgstr "Treffer pro Seite" -#: templates/generic_index.html:82 templates/generic_index.html:88 +#: templates/generic_index.html:82 templates/generic_index.html:99 msgid "Filter" msgstr "" -#: templates/generic_index.html:90 +#: templates/generic_index.html:101 msgid "Apply filter" msgstr "Filter anwenden"