Compare commits

..

No commits in common. "75bae95db724c330aa432764802280021636cab9" and "157655a08582c4d4dfc5cd83b1a41657ff09abfc" have entirely different histories.

4 changed files with 42 additions and 51 deletions

View File

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

Binary file not shown.

View File

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

View File

@ -7,9 +7,7 @@
<hr>
<p class="lead">
{% blocktrans %}
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.
The data you want to see is not recorded and might still be work in progress. Please come back another time.
{% endblocktrans %}
</p>
</div>