IT-Naturschutz
/
konova
7
1
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 21 Wiki Activity

#144 Report improved

Browse Source 
* fixes bug in egon_export.py where missing payment date would result in non writing of gml
* fixes bug in egon_export.py which occured due to extension of parcel data fetching
* updates unavailable.html report content, such that users will understand why a recorded entry might not be visible, yet
pull/145/head
mpeltriaux 3 years ago
parent 157655a085
commit e85a2294d9
4 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File

14
intervention/utils/egon_export.py
Unescape Escape View File

@ -80,7 +80,7 @@ class EgonGmlBuilder:
Returns: Returns:
str str
""" """
gmrkng_code = "000000" gmrkng_code = "{0:06d}".format(int(parcel.parcel_group.key) or 0)
flr_code = "{0:03d}".format(int(parcel.flr or 0)) flr_code = "{0:03d}".format(int(parcel.flr or 0))
flrstckzhlr_code = "{0:05d}".format(int(parcel.flrstck_zhlr or 0)) flrstckzhlr_code = "{0:05d}".format(int(parcel.flrstck_zhlr or 0))
flrstcknnr_code = "{0:06d}".format(int(parcel.flrstck_nnr or 0)) flrstcknnr_code = "{0:06d}".format(int(parcel.flrstck_nnr or 0))
@ -124,13 +124,13 @@ class EgonGmlBuilder:
"oneo:ortsangabe": { "oneo:ortsangabe": {
"oneo:Ortsangaben": { "oneo:Ortsangaben": {
"oneo:kreisSchluessel": { "oneo:kreisSchluessel": {
"xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/588/{parcel.district.krs}", "xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/588/{parcel.district.key}",
}, },
"oneo:gemeindeSchluessel": { "oneo:gemeindeSchluessel": {
"xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/910/{parcel.district.gmnd}", "xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/910/{parcel.municipal.key}",
}, },
"oneo:verbandsgemeindeSchluessel": { "oneo:verbandsgemeindeSchluessel": {
"xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/589/{parcel.gmrkng}", "xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/589/{None}",
}, },
"oneo:flurstuecksKennzeichen": self._gen_flurstuecksKennzeichen(parcel), "oneo:flurstuecksKennzeichen": self._gen_flurstuecksKennzeichen(parcel),
} }
@ -156,6 +156,10 @@ class EgonGmlBuilder:
def build_gml(self): def build_gml(self):
comp_type, comp_type_code = self._gen_kompensationsArt() comp_type, comp_type_code = self._gen_kompensationsArt()
payment_date = self.intervention.payments.first().due_on
if payment_date is not None:
payment_date = payment_date.strftime(DEFAULT_DATE_FORMAT)
xml_dict = { xml_dict = {
"wfs:FeatureCollection": { "wfs:FeatureCollection": {
"@xmlns:wfs": "http://www.opengis.net/wfs", "@xmlns:wfs": "http://www.opengis.net/wfs",
@ -207,7 +211,7 @@ class EgonGmlBuilder:
}, },
"oneo:zulassung": { "oneo:zulassung": {
"oneo:Zulassungstermin": { "oneo:Zulassungstermin": {
"oneo:bauBeginn": self.intervention.payments.first().due_on.strftime(DEFAULT_DATE_FORMAT), "oneo:bauBeginn": payment_date,
"oneo:erlass": self.intervention.legal.registration_date.strftime(DEFAULT_DATE_FORMAT), "oneo:erlass": self.intervention.legal.registration_date.strftime(DEFAULT_DATE_FORMAT),
"oneo:rechtsKraft": self.intervention.legal.binding_date.strftime(DEFAULT_DATE_FORMAT), "oneo:rechtsKraft": self.intervention.legal.binding_date.strftime(DEFAULT_DATE_FORMAT),
} }

BIN
locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

73
locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -15,9 +15,9 @@
#: konova/filters/mixins.py:107 konova/filters/mixins.py:108 #: konova/filters/mixins.py:107 konova/filters/mixins.py:108
#: konova/filters/mixins.py:120 konova/filters/mixins.py:121 #: konova/filters/mixins.py:120 konova/filters/mixins.py:121
#: konova/filters/mixins.py:134 konova/filters/mixins.py:135 #: konova/filters/mixins.py:134 konova/filters/mixins.py:135
#: konova/filters/mixins.py:270 konova/filters/mixins.py:316 #: konova/filters/mixins.py:277 konova/filters/mixins.py:323
#: konova/filters/mixins.py:354 konova/filters/mixins.py:355 #: konova/filters/mixins.py:361 konova/filters/mixins.py:362
#: konova/filters/mixins.py:386 konova/filters/mixins.py:387 #: konova/filters/mixins.py:393 konova/filters/mixins.py:394
#: konova/forms.py:143 konova/forms.py:244 konova/forms.py:315 #: konova/forms.py:143 konova/forms.py:244 konova/forms.py:315
#: konova/forms.py:359 konova/forms.py:369 konova/forms.py:382 #: konova/forms.py:359 konova/forms.py:369 konova/forms.py:382
#: konova/forms.py:394 konova/forms.py:412 user/forms.py:42 #: konova/forms.py:394 konova/forms.py:412 user/forms.py:42
@ -26,7 +26,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-04-11 09:07+0200\n" "POT-Creation-Date: 2022-04-12 10:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -52,7 +52,7 @@ msgstr "Bis"
#: intervention/forms/forms.py:102 #: intervention/forms/forms.py:102
#: intervention/templates/intervention/detail/view.html:56 #: intervention/templates/intervention/detail/view.html:56
#: intervention/templates/intervention/report/report.html:37 #: intervention/templates/intervention/report/report.html:37
#: intervention/utils/quality.py:49 konova/filters/mixins.py:396 #: intervention/utils/quality.py:49 konova/filters/mixins.py:403
msgid "Conservation office" msgid "Conservation office"
msgstr "Eintragungsstelle" msgstr "Eintragungsstelle"
@ -1016,10 +1016,10 @@ msgstr "Verzeichnet am"
msgid "Last modified" msgid "Last modified"
msgstr "Zuletzt bearbeitet" msgstr "Zuletzt bearbeitet"
#: compensation/templates/compensation/detail/compensation/view.html:100 #: compensation/templates/compensation/detail/compensation/view.html:106
#: compensation/templates/compensation/detail/eco_account/view.html:83 #: compensation/templates/compensation/detail/eco_account/view.html:89
#: ema/templates/ema/detail/view.html:76 #: ema/templates/ema/detail/view.html:75
#: intervention/templates/intervention/detail/view.html:116 #: intervention/templates/intervention/detail/view.html:122
msgid "Shared with" msgid "Shared with"
msgstr "Freigegeben für" msgstr "Freigegeben für"
@ -1286,7 +1286,7 @@ msgstr "Mehrfachauswahl möglich"
#: intervention/forms/forms.py:86 #: intervention/forms/forms.py:86
#: intervention/templates/intervention/detail/view.html:48 #: intervention/templates/intervention/detail/view.html:48
#: intervention/templates/intervention/report/report.html:29 #: intervention/templates/intervention/report/report.html:29
#: intervention/utils/quality.py:46 konova/filters/mixins.py:364 #: intervention/utils/quality.py:46 konova/filters/mixins.py:371
msgid "Registration office" msgid "Registration office"
msgstr "Zulassungsbehörde" msgstr "Zulassungsbehörde"
@ -1588,7 +1588,7 @@ msgid "Search for file number"
msgstr "Nach Aktenzeichen suchen" msgstr "Nach Aktenzeichen suchen"
#: konova/filters/mixins.py:85 #: konova/filters/mixins.py:85
#: konova/templates/konova/includes/parcel_table.html:11 #: konova/templates/konova/includes/parcel_table.html:13
msgid "District" msgid "District"
msgstr "Kreis" msgstr "Kreis"
@ -1627,19 +1627,19 @@ msgstr "Flurstücknenner"
msgid "Search for parcel number" msgid "Search for parcel number"
msgstr "Nach Flurstücknenner suchen" msgstr "Nach Flurstücknenner suchen"
#: konova/filters/mixins.py:269 #: konova/filters/mixins.py:276
msgid "Show unshared" msgid "Show unshared"
msgstr "Nicht freigegebene anzeigen" msgstr "Nicht freigegebene anzeigen"
#: konova/filters/mixins.py:315 #: konova/filters/mixins.py:322
msgid "Show recorded" msgid "Show recorded"
msgstr "Verzeichnete anzeigen" msgstr "Verzeichnete anzeigen"
#: konova/filters/mixins.py:365 #: konova/filters/mixins.py:372
msgid "Search for registration office" msgid "Search for registration office"
msgstr "Nach Zulassungsbehörde suchen" msgstr "Nach Zulassungsbehörde suchen"
#: konova/filters/mixins.py:397 #: konova/filters/mixins.py:404
msgid "Search for conservation office" msgid "Search for conservation office"
msgstr "Nch Eintragungsstelle suchen" msgstr "Nch Eintragungsstelle suchen"
@ -1746,11 +1746,11 @@ msgstr "Kontrolle am"
msgid "Other" msgid "Other"
msgstr "Sonstige" msgstr "Sonstige"
#: konova/sub_settings/django_settings.py:159 #: konova/sub_settings/django_settings.py:160
msgid "German" msgid "German"
msgstr "" msgstr ""
#: konova/sub_settings/django_settings.py:160 #: konova/sub_settings/django_settings.py:161
msgid "English" msgid "English"
msgstr "" msgstr ""
@ -1760,18 +1760,18 @@ msgstr ""
"Flurstücke können nicht berechnet werden, da keine Geometrie eingegeben " "Flurstücke können nicht berechnet werden, da keine Geometrie eingegeben "
"wurde." "wurde."
#: konova/templates/konova/includes/parcel_table.html:12 #: konova/templates/konova/includes/parcel_table.html:11
msgid "District key"
msgstr "Kreisschlüssel"
#: konova/templates/konova/includes/parcel_table.html:13
msgid "Municipal" msgid "Municipal"
msgstr "Gemeinde" msgstr "Gemeinde"
#: konova/templates/konova/includes/parcel_table.html:14 #: konova/templates/konova/includes/parcel_table.html:12
msgid "Municipal key" msgid "Municipal key"
msgstr "Gemeindeschlüssel" msgstr "Gemeindeschlüssel"
#: konova/templates/konova/includes/parcel_table.html:14
msgid "District key"
msgstr "Kreisschlüssel"
#: konova/templates/konova/includes/parcel_table.html:32 #: konova/templates/konova/includes/parcel_table.html:32
msgid "Parcel group" msgid "Parcel group"
msgstr "Gemarkung" msgstr "Gemarkung"
@ -2444,12 +2444,15 @@ msgstr "Daten nicht veröffentlicht"
msgid "" msgid ""
"\n" "\n"
" The data you want to see is not recorded and might still be work " " The data you want to see is not recorded and might still be work "
"in progress. Please come back another time.\n" "in progress or the legal binding date has\n"
" not been reached yet. We can not publish this report as long as "
"revocations could occur.\n"
" Please come back later.\n"
" " " "
msgstr "" msgstr ""
"\n" "\n"
" Diese Daten sind noch nicht veröffentlicht und können daher " " Diese Daten sind noch nicht veröffentlicht und/oder haben das Bestandskraftdatum noch nicht erreicht. "
"aktuell nicht eingesehen werden. Schauen Sie zu einem späteren Zeitpunkt " "Sie können daher aktuell nicht eingesehen werden. Schauen Sie zu einem späteren Zeitpunkt "
"wieder vorbei. \n" "wieder vorbei. \n"
" " " "
@ -2615,22 +2618,22 @@ msgid "Notification settings"
msgstr "Benachrichtigungen" msgstr "Benachrichtigungen"
#: user/templates/user/index.html:58 #: user/templates/user/index.html:58
msgid "See or edit your API token"
msgstr "API token einsehen oder neu generieren"
#: user/templates/user/index.html:61
msgid "API"
msgstr ""
#: user/templates/user/index.html:66
msgid "Manage teams" msgid "Manage teams"
msgstr "" msgstr ""
#: user/templates/user/index.html:69 user/templates/user/team/index.html:18 #: user/templates/user/index.html:61 user/templates/user/team/index.html:18
#: user/views.py:167 #: user/views.py:167
msgid "Teams" msgid "Teams"
msgstr "" msgstr ""
#: user/templates/user/index.html:66
msgid "See or edit your API token"
msgstr "API token einsehen oder neu generieren"
#: user/templates/user/index.html:69
msgid "API"
msgstr ""
#: user/templates/user/team/index.html:20 #: user/templates/user/team/index.html:20
msgid "Add new team" msgid "Add new team"
msgstr "Neues Team hinzufügen" msgstr "Neues Team hinzufügen"

4
templates/report/unavailable.html
Unescape Escape View File

@ -7,7 +7,9 @@
<hr> <hr>
<p class="lead"> <p class="lead">
{% blocktrans %} {% blocktrans %}
The data you want to see is not recorded and might still be work in progress. Please come back another time. The data you want to see is not recorded and might still be work in progress or the legal binding date has
not been reached yet. We can not publish this report as long as revocations could occur.
Please come back later.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
</div> </div>

Write Preview
Loading…
Cancel
Save