IT-Naturschutz/konova
7
0
Fork 0
Code Issues 5 Pull Requests Actions Projects Releases 47 Wiki Activity

#132 Log migration

Browse Source 
* adds basic log migration for all data types
  * empty users will be auto-created on log creation
* drops CODELIST_INTERVENTION_HANDLER in favor of CODELIST_COMPENSATION_HANDLER
* fixes bug in rendering of parent-child Konova Code label
This commit is contained in:
mpeltriaux
2022-03-24 13:42:05 +01:00
parent f621aab6e1
commit a77cfa7fe3
8 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
codelist/management/commands/update_codelist.py
View File

@@ -6,15 +6,14 @@ Created on: 23.08.21
"""
import requests
from django.core.management import BaseCommand
from xml.etree import ElementTree as etree
from codelist.models import KonovaCode, KonovaCodeList
from codelist.settings import CODELIST_INTERVENTION_HANDLER_ID, CODELIST_CONSERVATION_OFFICE_ID, \
from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, \
CODELIST_REGISTRATION_OFFICE_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, CODELIST_HANDLER_ID, \
CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_CLASS_ID, CODELIST_COMPENSATION_ADDITIONAL_TYPE_ID, \
CODELIST_BASE_URL, CODELIST_PROCESS_TYPE_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, \
CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_288_ID
CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_288_ID, CODELIST_COMPENSATION_HANDLER_ID
from konova.management.commands.setup import BaseKonovaCommand
from konova.settings import PROXIES
@@ -29,8 +28,7 @@ class Command(BaseKonovaCommand):
def handle(self, *args, **options):
try:
codelist_ids = [
CODELIST_INTERVENTION_HANDLER_ID,
codelist_ids = {
CODELIST_CONSERVATION_OFFICE_ID,
CODELIST_REGISTRATION_OFFICE_ID,
CODELIST_288_ID,
@@ -38,12 +36,13 @@ class Command(BaseKonovaCommand):
CODELIST_BIOTOPES_EXTRA_CODES_ID,
CODELIST_LAW_ID,
CODELIST_HANDLER_ID,
CODELIST_COMPENSATION_HANDLER_ID,
CODELIST_COMPENSATION_ACTION_ID,
CODELIST_COMPENSATION_ACTION_CLASS_ID,
CODELIST_COMPENSATION_ACTION_DETAIL_ID,
CODELIST_COMPENSATION_ADDITIONAL_TYPE_ID,
CODELIST_PROCESS_TYPE_ID,
]
}
self._write_warning("Fetching codes...")
for list_id in codelist_ids:

4
codelist/models.py
View File

@@ -51,8 +51,8 @@ class KonovaCode(models.Model):
def __str__(self, with_parent: bool = True):
ret_val = ""
if self.parent and with_parent:
ret_val += self.parent.long_name or self.parent.short_name + " > "
ret_val += self.long_name
ret_val += (self.parent.long_name or self.parent.short_name) + " > "
ret_val += self.long_name or ""
if self.short_name and self.short_name != self.long_name:
# Only add short name, if we won't have stupid repition like 'thing a (thing a)' due to misused long-short names
ret_val += f" ({self.short_name})"

1
codelist/settings.py
View File

@@ -10,7 +10,6 @@ Created on: 23.08.21
CODELIST_BASE_URL = "https://codelisten.naturschutz.rlp.de/repository/referenzliste"
# Identifier
CODELIST_INTERVENTION_HANDLER_ID = 903 # CLMassnahmeträger
CODELIST_CONSERVATION_OFFICE_ID = 907 # CLNaturschutzbehörden
CODELIST_REGISTRATION_OFFICE_ID = 1053 # CLZulassungsbehörden
CODELIST_288_ID = 288 # CL_288 (holds GISPAD related detail-biotope codes, similar to 975, but historical and only important for migration)