From 3535aba30f9588faa59ff77da1fd3f4a727aa8b9 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 11 May 2022 15:52:29 +0200 Subject: [PATCH] #160 Parcel number to parcel table * adds number of all underlying parcels into parcel table * reworks minor code parts of parcel related logic * fixes bug where under certain circumstances a parcel would have been added twice to a geometry * removes unused parcel fetching on intervention detail view --- intervention/views.py | 3 - konova/models/geometry.py | 13 +- konova/models/object.py | 17 +- .../includes/parcels/parcel_table_frame.html | 5 + konova/views.py | 2 + locale/de/LC_MESSAGES/django.mo | Bin 42175 -> 42171 bytes locale/de/LC_MESSAGES/django.po | 156 +++++++++--------- 7 files changed, 113 insertions(+), 83 deletions(-) diff --git a/intervention/views.py b/intervention/views.py index f882f21..15388db 100644 --- a/intervention/views.py +++ b/intervention/views.py @@ -266,14 +266,11 @@ def detail_view(request: HttpRequest, id: str): instance=intervention, ) - parcels = intervention.get_underlying_parcels() - context = { "obj": intervention, "compensations": compensations, "has_access": is_data_shared, "geom_form": geom_form, - "parcels": parcels, "is_default_member": in_group(_user, DEFAULT_GROUP), "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), diff --git a/konova/models/geometry.py b/konova/models/geometry.py index 283f850..ac1e91c 100644 --- a/konova/models/geometry.py +++ b/konova/models/geometry.py @@ -152,6 +152,7 @@ class Geometry(BaseResource): underlying_parcels.append(parcel_obj) # Update the linked parcels + self.parcels.clear() self.parcels.set(underlying_parcels) # Set the calculated_on intermediate field, so this related data will be found on lookups @@ -172,7 +173,6 @@ class Geometry(BaseResource): Returns: parcels (QuerySet): The related parcels as queryset """ - parcels = self.parcels.filter( parcelintersection__calculated_on__isnull=False, ).prefetch_related( @@ -184,6 +184,17 @@ class Geometry(BaseResource): return parcels + def count_underlying_parcels(self): + """ Getter for number of underlying parcels + + Returns: + + """ + num_parcels = self.parcels.filter( + parcelintersection__calculated_on__isnull=False, + ).count() + return num_parcels + class GeometryConflict(UuidModel): """ diff --git a/konova/models/object.py b/konova/models/object.py index a1cff71..780a0c2 100644 --- a/konova/models/object.py +++ b/konova/models/object.py @@ -652,10 +652,21 @@ class GeoReferencedMixin(models.Model): Returns: parcels (Iterable): An empty list or a Queryset """ + result = [] if self.geometry is not None: - return self.geometry.get_underlying_parcels() - else: - return [] + result = self.geometry.get_underlying_parcels() + return result + + def count_underlying_parcels(self): + """ Getter for number of underlying parcels + + Returns: + + """ + result = 0 + if self.geometry is not None: + result = self.geometry.count_underlying_parcels() + return result def set_geometry_conflict_message(self, request: HttpRequest): if self.geometry is None: diff --git a/konova/templates/konova/includes/parcels/parcel_table_frame.html b/konova/templates/konova/includes/parcels/parcel_table_frame.html index e329200..21b75b7 100644 --- a/konova/templates/konova/includes/parcels/parcel_table_frame.html +++ b/konova/templates/konova/includes/parcels/parcel_table_frame.html @@ -5,6 +5,11 @@ {% trans 'Parcels can not be calculated, since no geometry is given.' %} {% else %} +
+

+ {{num_parcels}} + {% trans 'Parcels found' %}

+
diff --git a/konova/views.py b/konova/views.py index 97cb7d8..001ed57 100644 --- a/konova/views.py +++ b/konova/views.py @@ -135,12 +135,14 @@ def get_geom_parcels(request: HttpRequest, id: str): municipals = Municipal.objects.filter(id__in=municipals) rpp = 100 + num_all_parcels = parcels.count() parcels = parcels[:rpp] next_page = 1 if len(parcels) < rpp: next_page = None context = { + "num_parcels": num_all_parcels, "parcels": parcels, "municipals": municipals, "geom_id": str(id), diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 4557506492ae0c22aef1fdb700430c20118e8ffa..3ad3ba93f9b9757af8f547efa515d891c9a213c0 100644 GIT binary patch delta 6990 zcmYk=d01D)9>?+XQ&1LBKo${|Rgg{Gm&%P)R1~+A6p_d+6);gsarxzfX^N@G!WDPZ z#OemutEKgLtx&sWR$5_ZK3Z0$X<2D@m-mM=e_WpDJg=EK=gfTPJ2MCL-Bb16K2`6H zzCLb0%d%!=T2@0`gsQK=##oNwxEEXCKd}j3MlbvseeoVPK#!r86@|Vy3{!9xF2u+1 z7aWP{+-!uKhgt5r0r#1PL#U2UpgKN{8t8(lUq-!n1B37$2B6G&sVB59*7%hO{0GbkuU!%>+Shru`lL$K7;w_sE1ZyGSHAuNsx=BdDc1iP}T8sP}K8`g?%Nut$#5?vDznRSx-AgmE+|qD1V9ov=IR zV+`)aE_fRCylcF(+dWaIBnFkqeyF7?!DQTnv+)yDVCke)jx`pzDQH(ehnm59b7QY* zKVm#%+OME8ao6bag!91(LS>>gYJg6trAbFE)gWw!!%!2Lipqeyz%&#a=b9S}P@Aw6 z)!{nSi+fNV@5dypG=71au}2=CUu=)c;3RB|+feU)gb8>K2k87ippZ#J-zS|2ZEQ}x z($s5=-(VQ+_c0usPH^@{D#lQM2vc!9>i%lfn!k$LLx)g%;y9+cEbA;@()kaZWLd9p z<2L?;8zx)U$5=YW32gLJyi9!$X5qN0mURrPF$#;OSypdck6Oa>*aokomezl|(;kan z)VrVp=_MK88bToivvC6!p}tVQ`Ob@xs3qutda)mBrXx|AT7oUH0=33RP5XJ{ZPV^s z;5-+L3Oo(n8h9dwP@ISQ?Pa4n-i^BdE-Ii4s3o|8I)#T0#x9; zQOETk7>7quoAPQQ`LCw%0}TqGVurK351|7202RRJsF~eDA8h!vliEP6PdyGbaH47N zW*m&(v_FAbnrWs!-?;2)@~_RZh6Y7ei5l=z)LQ+Bt?^e>fMGM8Q_&toH>aS;qELafMGZUvmD&jyh*MCRDM4jst#K1J zp}q?>qbk&MN6h_?QT=|23iMZV-fsLY)~1^zXvzx&2|&p1osi<)RK#$q&j>inlu&)_MMS)Kd7&acqI=uPy5Rz8IqOKa@f=PDagO1uA8`QGvXJ zdf@^pfGei`25OD#&*gKADX7fkBHu2n2=!hq2I04;&HAUQdzFxX-DpW61UsMx9Eh56 zp0OD9fmwkX;1$&KZ<+czR0gl1GH@5QG_HA00Dh=V+YGy7Cmf4~^T@wCJVk?M_LcEF z)Gob^O4&Ws=4w3O86XIC8lq4$YKQf(C+fXEsLeYNyW$Yk9w|k=_cChSJ@d)G1~^QE z0{95K;1{Tlnk;aRNhoTdR;ZLFqXO!R`m*)FhcFFC;sVUTbEtk=E_D7bXpO6=55qLP zX|B<+KY)3E{dRj3);#toGX%#Asy561JT8Er&uy4~jfo2GsobxhBqcK3DE%p;z60!~5= z& zua(X~1F;?Tk=P5Dq8GkrJcG@tUqBDMvy%KP<-gP5jb1FQ3`C`{1!}H7PJf5K;9hI`+wa%Vs zW$b|33;j_Y=U@Ql8yBL!q-#ulFY39&s7%$M51vK!UyCjD`~ND1)->oW1wb5XM%}PJ z_C+1P0jL1-P${2-%1D{HzZnCmSEG(`4Qk-is3rXbmGZBUfvu|;p!09p&H#a^&5?xu z*dMjKvrscDM!mQawYK|EsjR`?cnfvhQrA0y4Me?{g_>9as$Vzi_^rXZ-~XRdXivkB z*aTa=`gr%HPeHr)V+<3@I6#U&Y=SO9%HcK%T7HB^&uLB3VgC@Ut-*eZbfvQ zLJ)p}8sItx;%(GG^~;@({4tn%GAhtC(>?-Is28H1-(uX4>h}<;zYkHF_!_mux68@D zI{J%-NNlvh=_m!YhS{h!9B-VAIzEM{_hzBib_r^;mEj!Rf*mk;qw_c90MseFf(7Wi z$@wSR+)b>18ya@f5Q!gR68?lC*le>CX)5ZuhcO)|;$W=AzIY$=vF8>i@B^sb{u(O4 zBd8glKyB)?*a<&%Q_#8e+Uh*m1~u~zsHNzPdZ8z3hH0pb3`cc52G#KdRBC6K`XUUc zUWVEm`%%09Bx=deqL#}24F#>uP1GjS|C=iE#;6CvP%p%x2JVUquoo)8H0+ES*bNt< zHuGEf5dMUEK7N~%;Y8FX%|J5hwq{Uxn1&6gbYN09X>z>VC`@^ z^gs>hgL*Fjbw3XEd?MS%~F~{B--O)ABJ{KMCxq$i@`%ZMI-#ki>ab4!A z0y{V+#`8&P6YU-`;okbg-Y%QR=Z!k+cnO9KR(8DKKD1-H{+9BFWF&j zBD~j9Pv^?A`?NXWT4LX96Y9#eJrlb6ZK1VZ>Z=Ou-DkDzpqYqh{Cfy{c>p=OWO&2+4f70 zaLu$+l2ctv?VRMKfbq2Ir>TQA+TNHP<9fzEmK^RXw!ch{h$=Eq=z$IYS3W>Jmus>e zmJ$>EB6oJ0yLXJ+?cpg&o+GI}ZZAp+^?R05FRtBO8>{xDd>rXpG+|QytjNhTiVG)J y6=l|VRrSvr+}XE(esR&P*(Z)pm_Dg$?W!W5hMC1hk;R42*zL=MtJ;;n==VPsaPVdT delta 6979 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, YEAR. # -#: compensation/filters.py:123 compensation/forms/modalForms.py:36 -#: compensation/forms/modalForms.py:47 compensation/forms/modalForms.py:63 -#: compensation/forms/modalForms.py:358 compensation/forms/modalForms.py:466 +#: compensation/filters.py:123 compensation/forms/modalForms.py:37 +#: compensation/forms/modalForms.py:48 compensation/forms/modalForms.py:64 +#: compensation/forms/modalForms.py:362 compensation/forms/modalForms.py:470 #: intervention/forms/forms.py:54 intervention/forms/forms.py:174 #: intervention/forms/forms.py:186 intervention/forms/modalForms.py:150 #: intervention/forms/modalForms.py:163 intervention/forms/modalForms.py:176 @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-21 14:16+0200\n" +"POT-Creation-Date: 2022-05-11 13:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -97,7 +97,7 @@ msgstr "" #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 #: analysis/templates/analysis/reports/includes/old_data/amount.html:3 -#: compensation/forms/modalForms.py:450 +#: compensation/forms/modalForms.py:454 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" @@ -215,7 +215,7 @@ msgstr "Abbuchungen" #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 -#: compensation/forms/modalForms.py:195 +#: compensation/forms/modalForms.py:187 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 @@ -248,7 +248,7 @@ msgid "Compensation" msgstr "Kompensation" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:21 -#: compensation/forms/modalForms.py:76 +#: compensation/forms/modalForms.py:77 msgid "Payment" msgstr "Zahlung" @@ -354,8 +354,8 @@ msgstr "Aussagekräftiger Titel" msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" -#: compensation/forms/forms.py:57 compensation/forms/modalForms.py:62 -#: compensation/forms/modalForms.py:357 compensation/forms/modalForms.py:465 +#: compensation/forms/forms.py:57 compensation/forms/modalForms.py:63 +#: compensation/forms/modalForms.py:361 compensation/forms/modalForms.py:469 #: compensation/templates/compensation/detail/compensation/includes/actions.html:35 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 #: compensation/templates/compensation/detail/compensation/includes/documents.html:34 @@ -373,7 +373,7 @@ msgstr "Kompensation XY; Flur ABC" msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:467 +#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:471 #: intervention/forms/forms.py:200 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" @@ -479,70 +479,70 @@ msgstr "Ökokonto XY; Flur ABC" msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" -#: compensation/forms/modalForms.py:37 +#: compensation/forms/modalForms.py:38 msgid "in Euro" msgstr "in Euro" -#: compensation/forms/modalForms.py:46 +#: compensation/forms/modalForms.py:47 #: intervention/templates/intervention/detail/includes/payments.html:31 msgid "Due on" msgstr "Fällig am" -#: compensation/forms/modalForms.py:49 +#: compensation/forms/modalForms.py:50 msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:359 +#: compensation/forms/modalForms.py:65 compensation/forms/modalForms.py:363 #: intervention/forms/modalForms.py:177 konova/forms.py:429 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" -#: compensation/forms/modalForms.py:77 +#: compensation/forms/modalForms.py:78 msgid "Add a payment for intervention '{}'" msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen" -#: compensation/forms/modalForms.py:97 +#: compensation/forms/modalForms.py:98 msgid "If there is no date you can enter, please explain why." msgstr "Falls Sie kein Datum angeben können, erklären Sie bitte weshalb." -#: compensation/forms/modalForms.py:116 +#: compensation/forms/modalForms.py:117 #: intervention/templates/intervention/detail/includes/payments.html:59 msgid "Edit payment" msgstr "Zahlung bearbeiten" -#: compensation/forms/modalForms.py:159 compensation/forms/modalForms.py:171 +#: compensation/forms/modalForms.py:161 msgid "Biotope Type" msgstr "Biotoptyp" -#: compensation/forms/modalForms.py:162 +#: compensation/forms/modalForms.py:164 msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:176 compensation/forms/modalForms.py:188 +#: compensation/forms/modalForms.py:168 compensation/forms/modalForms.py:180 msgid "Biotope additional type" msgstr "Zusatzbezeichnung" -#: compensation/forms/modalForms.py:179 +#: compensation/forms/modalForms.py:171 msgid "Select an additional biotope type" msgstr "Zusatzbezeichnung wählen" -#: compensation/forms/modalForms.py:198 intervention/forms/modalForms.py:366 +#: compensation/forms/modalForms.py:190 intervention/forms/modalForms.py:366 msgid "in m²" msgstr "" -#: compensation/forms/modalForms.py:209 +#: compensation/forms/modalForms.py:201 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms/modalForms.py:210 +#: compensation/forms/modalForms.py:202 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms/modalForms.py:217 konova/forms.py:227 +#: compensation/forms/modalForms.py:219 konova/forms.py:227 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modalForms.py:272 +#: compensation/forms/modalForms.py:274 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:62 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:62 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:62 @@ -552,15 +552,15 @@ msgstr "Objekt entfernt" msgid "Edit state" msgstr "Zustand bearbeiten" -#: compensation/forms/modalForms.py:329 +#: compensation/forms/modalForms.py:333 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms/modalForms.py:332 +#: compensation/forms/modalForms.py:336 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms/modalForms.py:341 +#: compensation/forms/modalForms.py:345 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31 #: ema/templates/ema/detail/includes/deadlines.html:31 @@ -568,30 +568,30 @@ msgstr "Fristart wählen" msgid "Date" msgstr "Datum" -#: compensation/forms/modalForms.py:344 +#: compensation/forms/modalForms.py:348 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms/modalForms.py:371 +#: compensation/forms/modalForms.py:375 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms/modalForms.py:372 +#: compensation/forms/modalForms.py:376 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms/modalForms.py:385 +#: compensation/forms/modalForms.py:389 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:59 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:57 #: ema/templates/ema/detail/includes/deadlines.html:57 msgid "Edit deadline" msgstr "Frist/Termin bearbeiten" -#: compensation/forms/modalForms.py:413 +#: compensation/forms/modalForms.py:417 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms/modalForms.py:416 +#: compensation/forms/modalForms.py:420 msgid "" "An action can consist of multiple different action types. All the selected " "action types are expected to be performed according to the amount and unit " @@ -601,35 +601,35 @@ msgstr "" "hier gewählten Einträge sollen mit der weiter unten angegebenen Einheit und " "Menge umgesetzt werden. " -#: compensation/forms/modalForms.py:421 compensation/forms/modalForms.py:433 +#: compensation/forms/modalForms.py:425 compensation/forms/modalForms.py:437 msgid "Action Type detail" msgstr "Zusatzmerkmal" -#: compensation/forms/modalForms.py:424 +#: compensation/forms/modalForms.py:428 msgid "Select the action type detail" msgstr "Zusatzmerkmal wählen" -#: compensation/forms/modalForms.py:438 +#: compensation/forms/modalForms.py:442 msgid "Unit" msgstr "Einheit" -#: compensation/forms/modalForms.py:441 +#: compensation/forms/modalForms.py:445 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:453 +#: compensation/forms/modalForms.py:457 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms/modalForms.py:478 +#: compensation/forms/modalForms.py:482 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms/modalForms.py:479 +#: compensation/forms/modalForms.py:483 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" -#: compensation/forms/modalForms.py:503 +#: compensation/forms/modalForms.py:507 #: compensation/templates/compensation/detail/compensation/includes/actions.html:68 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:67 #: ema/templates/ema/detail/includes/actions.html:65 @@ -1150,17 +1150,17 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation.py:182 compensation/views/eco_account.py:173 -#: ema/views.py:240 intervention/views.py:335 +#: ema/views.py:240 intervention/views.py:334 msgid "Edit {}" msgstr "Bearbeite {}" #: compensation/views/compensation.py:261 compensation/views/eco_account.py:359 -#: ema/views.py:194 intervention/views.py:539 +#: ema/views.py:194 intervention/views.py:538 msgid "Log" msgstr "Log" #: compensation/views/compensation.py:605 compensation/views/eco_account.py:727 -#: ema/views.py:558 intervention/views.py:685 +#: ema/views.py:558 intervention/views.py:684 msgid "Report {}" msgstr "Bericht {}" @@ -1181,32 +1181,32 @@ msgid "Eco-account removed" msgstr "Ökokonto entfernt" #: compensation/views/eco_account.py:380 ema/views.py:282 -#: intervention/views.py:638 +#: intervention/views.py:637 msgid "{} unrecorded" msgstr "{} entzeichnet" #: compensation/views/eco_account.py:380 ema/views.py:282 -#: intervention/views.py:638 +#: intervention/views.py:637 msgid "{} recorded" msgstr "{} verzeichnet" #: compensation/views/eco_account.py:804 ema/views.py:628 -#: intervention/views.py:436 +#: intervention/views.py:435 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" #: compensation/views/eco_account.py:809 ema/views.py:633 -#: intervention/views.py:441 +#: intervention/views.py:440 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" #: compensation/views/eco_account.py:816 ema/views.py:640 -#: intervention/views.py:448 +#: intervention/views.py:447 msgid "Share link invalid" msgstr "Freigabelink ungültig" #: compensation/views/eco_account.py:839 ema/views.py:663 -#: intervention/views.py:471 +#: intervention/views.py:470 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" @@ -1312,7 +1312,7 @@ msgstr "Datum Zulassung bzw. Satzungsbeschluss" msgid "Binding on" msgstr "Datum Bestandskraft" -#: intervention/forms/forms.py:211 intervention/views.py:95 +#: intervention/forms/forms.py:211 intervention/views.py:97 msgid "New intervention" msgstr "Neuer Eingriff" @@ -1532,27 +1532,27 @@ msgstr "" "Kein Ausgleich jeglicher Art gefunden (Kompensation, Ersatzzahlung, " "Abbuchung)" -#: intervention/views.py:52 +#: intervention/views.py:54 msgid "Interventions - Overview" msgstr "Eingriffe - Übersicht" -#: intervention/views.py:85 +#: intervention/views.py:87 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views.py:323 +#: intervention/views.py:322 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:359 +#: intervention/views.py:358 msgid "{} removed" msgstr "{} entfernt" -#: intervention/views.py:492 +#: intervention/views.py:491 msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views.py:643 +#: intervention/views.py:642 msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" @@ -1582,7 +1582,7 @@ msgid "Search for file number" msgstr "Nach Aktenzeichen suchen" #: konova/filters/mixins.py:85 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:13 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:18 msgid "District" msgstr "Kreis" @@ -1595,7 +1595,7 @@ msgid "Search for parcel gmrkng" msgstr "Nach Gemarkung suchen" #: konova/filters/mixins.py:111 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:34 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:39 msgid "Parcel" msgstr "Flur" @@ -1604,7 +1604,7 @@ msgid "Search for parcel" msgstr "Nach Flur suchen" #: konova/filters/mixins.py:124 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:35 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:40 msgid "Parcel counter" msgstr "Flurstückzähler" @@ -1613,7 +1613,7 @@ msgid "Search for parcel counter" msgstr "Nach Flurstückzähler suchen" #: konova/filters/mixins.py:138 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:36 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:41 msgid "Parcel number" msgstr "Flurstücknenner" @@ -1748,10 +1748,6 @@ msgstr "" msgid "English" msgstr "" -#: konova/templates/konova/includes/parcels/parcel_table_content.html:18 -msgid "Show more..." -msgstr "Mehr anzeigen..." - #: konova/templates/konova/includes/parcels/parcel_table_frame.html:5 msgid "Parcels can not be calculated, since no geometry is given." msgstr "" @@ -1759,22 +1755,26 @@ msgstr "" "wurde." #: konova/templates/konova/includes/parcels/parcel_table_frame.html:11 +msgid "Parcels found" +msgstr "Flurstücke" + +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:16 msgid "Municipal" msgstr "Gemeinde" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:12 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:17 msgid "Municipal key" msgstr "Gemeindeschlüssel" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:14 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:19 msgid "District key" msgstr "Kreisschlüssel" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:32 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:37 msgid "Parcel group" msgstr "Gemarkung" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:33 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:38 msgid "Parcel group key" msgstr "Gemarkungsschlüssel" @@ -1808,11 +1808,6 @@ msgstr "Im Browser öffnen" msgid "View in LANIS" msgstr "In LANIS öffnen" -#: konova/templates/konova/widgets/checkbox-tree-select.html:4 -#: templates/generic_index.html:56 -msgid "Search" -msgstr "Suchen" - #: konova/templates/konova/widgets/generate-content-input.html:6 msgid "Generate new" msgstr "Neu generieren" @@ -1825,6 +1820,12 @@ msgstr "In Zwischenablage kopieren" msgid "Copied to clipboard" msgstr "In Zwischenablage kopiert" +#: konova/templates/konova/widgets/tree/checkbox/checkbox-tree-select.html:4 +#: konova/templates/konova/widgets/tree/radio/radio-tree-select.html:4 +#: templates/generic_index.html:56 +msgid "Search" +msgstr "Suchen" + #: konova/utils/mailer.py:68 konova/utils/mailer.py:137 msgid "{} - Shared access removed" msgstr "{} - Zugriff entzogen" @@ -4245,6 +4246,9 @@ msgstr "" msgid "Unable to connect to qpid with SASL mechanism %s" msgstr "" +#~ msgid "Show more..." +#~ msgstr "Mehr anzeigen..." + #~ msgid "Kreis" #~ msgstr "Kreis"