From fe6c129eb62e53d6aa181730b1e5db714658e667 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 19 Sep 2024 11:41:27 +0200 Subject: [PATCH 1/3] linting, upgrading gh-actions, upgrading django-packages, removed leaflet --- .dockerignore | 4 +- .flake8 | 5 +- .github/workflows/build.yml | 10 +- .github/workflows/lint.yml | 8 +- .github/workflows/test.yml | 18 +- .gitignore | 3 +- archiv/dal_views.py | 35 +-- archiv/data_views.py | 10 +- archiv/import_utils.py | 8 +- .../management/commands/bruckner_entities.py | 44 +-- archiv/management/commands/event_wab.py | 12 +- archiv/management/commands/fix_encoding.py | 4 +- archiv/management/commands/fix_stichworte.py | 8 +- .../commands/helper_scripts/link_keywords.py | 14 +- .../commands/helper_scripts/scraper.py | 21 +- .../management/commands/import_abcd_data.py | 34 +-- archiv/management/commands/import_keywords.py | 46 ++- archiv/management/commands/import_ners.py | 16 +- archiv/management/commands/import_wab.py | 14 +- archiv/management/commands/link_persons.py | 6 +- archiv/management/commands/link_wabs.py | 4 +- archiv/management/commands/link_works.py | 12 +- archiv/management/commands/save_all.py | 2 +- archiv/management/commands/update_ts_index.py | 2 +- archiv/migrations/0001_initial.py | 272 +++++++++++++++--- .../migrations/0002_alter_work_full_quote.py | 14 +- archiv/migrations/0003_person.py | 45 ++- archiv/migrations/0004_event_person.py | 10 +- archiv/migrations/0005_auto_20220205_0740.py | 48 +++- archiv/migrations/0006_auto_20220216_1157.py | 22 +- archiv/migrations/0007_auto_20220226_0854.py | 19 +- archiv/migrations/0008_auto_20220318_0842.py | 55 ++-- .../0009_remove_event_orig_data_csv.py | 6 +- archiv/migrations/0010_auto_20220318_1736.py | 40 +-- archiv/migrations/0011_wab.py | 56 +++- archiv/migrations/0012_event_wab.py | 13 +- archiv/migrations/0013_auto_20220419_1159.py | 36 ++- archiv/migrations/0014_auto_20220429_1058.py | 18 +- archiv/migrations/0015_auto_20220501_0833.py | 36 ++- archiv/migrations/0016_auto_20220501_0841.py | 25 +- archiv/migrations/0017_auto_20220504_0635.py | 17 +- archiv/migrations/0018_auto_20220525_0931.py | 62 ++-- archiv/migrations/0019_auto_20220525_0935.py | 102 +++++-- archiv/migrations/0020_person_remarks.py | 13 +- .../migrations/0021_alter_event_key_word.py | 13 +- archiv/migrations/0022_auto_20220615_0924.py | 58 ++-- archiv/migrations/0023_auto_20220623_0720.py | 46 ++- archiv/migrations/0024_auto_20220623_0726.py | 24 +- archiv/migrations/0025_alter_place_remarks.py | 13 +- archiv/migrations/0026_auto_20220623_0738.py | 24 +- archiv/migrations/0027_person_work.py | 14 +- archiv/migrations/0028_place_work.py | 14 +- archiv/migrations/0029_auto_20220627_0820.py | 68 +++-- archiv/migrations/0030_auto_20220726_0839.py | 23 +- archiv/migrations/0031_auto_20220726_0902.py | 10 +- .../migrations/0032_alter_person_options.py | 6 +- archiv/migrations/0033_alter_wab_note.py | 13 +- archiv/migrations/0033_auto_20220801_0828.py | 27 +- ..._alter_wab_note_0033_auto_20220801_0828.py | 7 +- archiv/migrations/0035_auto_20221128_0936.py | 12 +- archiv/migrations/0037_auto_20221128_1305.py | 14 +- archiv/search_result_views.py | 12 +- .../archiv/partials/entity_sidebar.html | 30 -- archiv/templates/archiv/place_detail.html | 15 +- archiv/tests.py | 17 +- archiv/urls.py | 4 +- archiv/utils.py | 4 +- djangobaseproject/asgi.py | 2 +- djangobaseproject/settings.py | 2 +- djangobaseproject/urls.py | 33 ++- djangobaseproject/wsgi.py | 2 +- infos/apps.py | 2 +- infos/filters.py | 2 +- infos/forms.py | 93 +++--- infos/migrations/0001_initial.py | 182 +++++++++--- infos/models.py | 141 ++++----- infos/special_views.py | 8 +- infos/tables.py | 14 +- infos/templatetags/infos_extras.py | 1 - infos/templatetags/stats_extras.py | 24 +- infos/tests.py | 11 +- infos/views.py | 51 ++-- manage.py | 4 +- requirements.txt | 11 +- requirements_dev.txt | 5 +- vocabs/admin.py | 21 +- vocabs/apps.py | 4 +- vocabs/dal_urls.py | 16 +- vocabs/dal_views.py | 9 +- vocabs/filters.py | 31 +- vocabs/import_utils.py | 30 +- .../commands/import_remote_concepts.py | 18 +- vocabs/migrations/0001_initial.py | 159 ++++++++-- vocabs/migrations/0002_auto_20220504_1140.py | 26 +- .../migrations/0003_skoscollection_remarks.py | 13 +- vocabs/migrations/0004_auto_20220704_0714.py | 17 +- vocabs/tables.py | 3 +- vocabs/tests.py | 20 +- webpage/forms.py | 6 +- .../management/commands/delete_migrations.py | 7 +- webpage/metadata.py | 35 +-- webpage/templates/webpage/base.html | 3 - webpage/templatetags/webpage_extras.py | 8 +- webpage/urls.py | 2 +- webpage/utils.py | 2 +- webpage/views.py | 44 +-- webpage/webpage_content_processors.py | 14 +- 107 files changed, 1729 insertions(+), 1064 deletions(-) diff --git a/.dockerignore b/.dockerignore index a92e2c7..57d0787 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,4 +3,6 @@ env db.sqlite3 .env env.default -*.sql \ No newline at end of file +*.sql +.git +/venv diff --git a/.flake8 b/.flake8 index a20be78..38a522e 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,5 @@ [flake8] -ignore = D203 W504 +ignore = D203 W504 W503 max-line-length = 120 exclude = */migrations, @@ -11,4 +11,5 @@ exclude = dist env appcreator - webpage \ No newline at end of file + webpage + venv \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b37085..a81d91c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,13 +17,13 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -31,12 +31,12 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 803e5e1..b1bc656 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,10 +8,10 @@ jobs: name: Lint steps: - name: Check out source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python environment - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.12" - name: flake8 Lint - uses: py-actions/flake8@v1 \ No newline at end of file + uses: py-actions/flake8@v2 \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d84031..9adceb9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: POSTGRES_DB: github_actions services: postgres: - image: postgres:13 + image: postgres:16 env: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres @@ -19,17 +19,15 @@ jobs: # needed because the postgres container does not provide a healthcheck options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - name: Set up Python 12 + uses: actions/setup-python@v5 with: - python-version: 3.8 - - uses: actions/cache@v2 + python-version: "3.12" + - uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ env.pythonLocation }}-${{ hashFiles('requirements_dev.txt') }} - - name: GDAL - run: sudo apt-get install postgresql-common libpq-dev python3-gdal - name: Install dependencies run: | pip install --upgrade --upgrade-strategy eager -r requirements_dev.txt @@ -40,8 +38,8 @@ jobs: - name: Create Coverage Report run: coverage xml - name: "Upload coverage to Codecov" - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{secrets.CODECOV_TOKEN}} file: ./coverage.xml - fail_ci_if_error: true \ No newline at end of file + fail_ci_if_error: false \ No newline at end of file diff --git a/.gitignore b/.gitignore index 09fc0b1..d6152c3 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ key.pub bin/ pg_hba.conf lib64 -*sql \ No newline at end of file +*sql +/venv \ No newline at end of file diff --git a/archiv/dal_views.py b/archiv/dal_views.py index 03b2d44..2e963f9 100644 --- a/archiv/dal_views.py +++ b/archiv/dal_views.py @@ -1,14 +1,7 @@ # generated by appcreator from django.db.models import Q from dal import autocomplete -from . models import ( - Event, - Work, - Person, - Place, - Institution, - Wab -) +from .models import Event, Work, Person, Place, Institution, Wab class PersonAC(autocomplete.Select2QuerySetView): @@ -17,9 +10,9 @@ def get_queryset(self): if self.q: qs = qs.filter( - Q(title__icontains=self.q) | - Q(gnd_gnd_id=self.q) | - Q(gnd_pref_name=self.q) + Q(title__icontains=self.q) + | Q(gnd_gnd_id=self.q) + | Q(gnd_pref_name=self.q) ) return qs @@ -29,9 +22,7 @@ def get_queryset(self): qs = Place.objects.all() if self.q: - qs = qs.filter( - Q(title__icontains=self.q) - ) + qs = qs.filter(Q(title__icontains=self.q)) return qs @@ -40,9 +31,7 @@ def get_queryset(self): qs = Wab.objects.all() if self.q: - qs = qs.filter( - Q(title__icontains=self.q) - ) + qs = qs.filter(Q(title__icontains=self.q)) return qs @@ -51,9 +40,7 @@ def get_queryset(self): qs = Institution.objects.all() if self.q: - qs = qs.filter( - Q(title__icontains=self.q) - ) + qs = qs.filter(Q(title__icontains=self.q)) return qs @@ -62,10 +49,7 @@ def get_queryset(self): qs = Event.objects.all() if self.q: - qs = qs.filter( - Q(id__icontains=self.q) | - Q(full_text__icontains=self.q) - ) + qs = qs.filter(Q(id__icontains=self.q) | Q(full_text__icontains=self.q)) return qs @@ -75,7 +59,6 @@ def get_queryset(self): if self.q: qs = qs.filter( - Q(order_code__icontains=self.q) | - Q(full_quote__icontains=self.q) + Q(order_code__icontains=self.q) | Q(full_quote__icontains=self.q) ) return qs diff --git a/archiv/data_views.py b/archiv/data_views.py index fd88c44..e7bcb88 100644 --- a/archiv/data_views.py +++ b/archiv/data_views.py @@ -9,10 +9,10 @@ def event_calendar_data(request): data = [] for x in Event.objects.exclude(not_before__isnull=True): item = { - 'id': x.date_written, - 'name': f"{x}", - 'startDate': f"{x.not_before}", - 'linkId': x.get_absolute_url() + "id": x.date_written, + "name": f"{x}", + "startDate": f"{x.not_before}", + "linkId": x.get_absolute_url(), } data.append(item) var_data = f"var calendarData = {json.dumps(data, ensure_ascii=False)}" @@ -20,4 +20,4 @@ def event_calendar_data(request): class EventCalendarView(TemplateView): - template_name = 'archiv/event_calendar.html' + template_name = "archiv/event_calendar.html" diff --git a/archiv/import_utils.py b/archiv/import_utils.py index bd0e568..aebb3e6 100644 --- a/archiv/import_utils.py +++ b/archiv/import_utils.py @@ -4,14 +4,14 @@ def field_mapping(some_class): - """ returns a dictionary mapping model field names to lookukp values - :param some_class: Any django model class with extra field properties - :return: A dict mapping model field names to lookukp values + """returns a dictionary mapping model field names to lookukp values + :param some_class: Any django model class with extra field properties + :return: A dict mapping model field names to lookukp values """ field_mapping_dict = {} for x in some_class._meta.get_fields(): try: - field_mapping_dict[(x.extra['data_lookup']).strip()] = x.name + field_mapping_dict[(x.extra["data_lookup"]).strip()] = x.name except: # noqa: E722 pass return field_mapping_dict diff --git a/archiv/management/commands/bruckner_entities.py b/archiv/management/commands/bruckner_entities.py index 2d1cd72..be39a00 100644 --- a/archiv/management/commands/bruckner_entities.py +++ b/archiv/management/commands/bruckner_entities.py @@ -12,43 +12,47 @@ NS_LIST = { "tei": "http://www.tei-c.org/ns/1.0", "mei": "http://www.music-encoding.org/ns/mei", - "xml": "http://www.w3.org/XML/1998/namespace" + "xml": "http://www.w3.org/XML/1998/namespace", } class Command(BaseCommand): - help = 'Enriches Persons with bruckner_entities_xml data' + help = "Enriches Persons with bruckner_entities_xml data" def handle(self, *args, **kwargs): - headers = { - "PRIVATE-TOKEN": settings.GITLAB_TOKEN - } + headers = {"PRIVATE-TOKEN": settings.GITLAB_TOKEN} r = requests.get(settings.BRUCKNER_PERSON_URL, headers=headers) - content = r.content.decode('utf-8') - content = content.replace('http://www.music-encoding.org/ns/mei', 'http://www.tei-c.org/ns/1.0') + content = r.content.decode("utf-8") + content = content.replace( + "http://www.music-encoding.org/ns/mei", "http://www.tei-c.org/ns/1.0" + ) doc = TeiReader(content) - person_entries = doc.any_xpath('.//tei:persName[@xml:id]') + person_entries = doc.any_xpath(".//tei:persName[@xml:id]") for x in tqdm(person_entries, total=len(person_entries)): item = {} - item['xml_id'] = x.attrib['{http://www.w3.org/XML/1998/namespace}id'] + item["xml_id"] = x.attrib["{http://www.w3.org/XML/1998/namespace}id"] try: - item['last_name'] = x.xpath('.//tei:famName/text()', namespaces=NS_LIST)[0] + item["last_name"] = x.xpath( + ".//tei:famName/text()", namespaces=NS_LIST + )[0] except IndexError: - item['last_name'] = '' + item["last_name"] = "" try: - item['first_name'] = x.xpath('.//tei:foreName/text()', namespaces=NS_LIST)[0] + item["first_name"] = x.xpath( + ".//tei:foreName/text()", namespaces=NS_LIST + )[0] except IndexError: - item['first_name'] = '' - item['label'] = f"{item['first_name'].strip()} {item['last_name'].strip()}" - item['xml_node'] = ET.tostring(x) + item["first_name"] = "" + item["label"] = f"{item['first_name'].strip()} {item['last_name'].strip()}" + item["xml_node"] = ET.tostring(x) try: - pers = Person.objects.get(title=item['label']) + pers = Person.objects.get(title=item["label"]) except ObjectDoesNotExist: pers, _ = Person.objects.get_or_create( - bruckner_entity_id=item['xml_id'] + bruckner_entity_id=item["xml_id"] ) - pers.title = item['label'] + pers.title = item["label"] pers.bruckner_entity = True - pers.bruckner_entity_id = item['xml_id'] - pers.bruckner_entity_xml = item['xml_node'].decode('utf-8') + pers.bruckner_entity_id = item["xml_id"] + pers.bruckner_entity_xml = item["xml_node"].decode("utf-8") pers.save() diff --git a/archiv/management/commands/event_wab.py b/archiv/management/commands/event_wab.py index 336b0d0..3cbc932 100644 --- a/archiv/management/commands/event_wab.py +++ b/archiv/management/commands/event_wab.py @@ -9,7 +9,7 @@ class Command(BaseCommand): - help = 'Links WAB to Events based on Wab-Titles' + help = "Links WAB to Events based on Wab-Titles" def handle(self, *args, **kwargs): sheet_id = settings.WAB_SEARCH @@ -20,10 +20,10 @@ def handle(self, *args, **kwargs): try: wab = Wab.objects.get(wab_id=wab_id) except ObjectDoesNotExist: - data.append([wab_id, row['match_str'], 0]) + data.append([wab_id, row["match_str"], 0]) continue - matches = Event.objects.filter(main_text__contains=row['match_str']) + matches = Event.objects.filter(main_text__contains=row["match_str"]) wab.rvn_wab_mentioned_in.add(*matches) - data.append([wab_id, row['match_str'], matches.count()]) - out_df = pd.DataFrame(data, columns=['wab', 'search_str', 'matches']) - out_df.to_csv('./media/wab_matching.csv', index=False) + data.append([wab_id, row["match_str"], matches.count()]) + out_df = pd.DataFrame(data, columns=["wab", "search_str", "matches"]) + out_df.to_csv("./media/wab_matching.csv", index=False) diff --git a/archiv/management/commands/fix_encoding.py b/archiv/management/commands/fix_encoding.py index 7ca67d6..e2394f1 100644 --- a/archiv/management/commands/fix_encoding.py +++ b/archiv/management/commands/fix_encoding.py @@ -6,7 +6,7 @@ class Command(BaseCommand): - help = 'Fix wrong encoding of latin chars' + help = "Fix wrong encoding of latin chars" def handle(self, *args, **kwargs): fields = Event.search_field_names() @@ -17,7 +17,7 @@ def handle(self, *args, **kwargs): old = getattr(x, f) if old is not None: for i, row in df.iterrows(): - old = old.replace(row['from'], row['to']) + old = old.replace(row["from"], row["to"]) setattr(x, f, old) x.save() print("done") diff --git a/archiv/management/commands/fix_stichworte.py b/archiv/management/commands/fix_stichworte.py index 4c48683..fc92142 100644 --- a/archiv/management/commands/fix_stichworte.py +++ b/archiv/management/commands/fix_stichworte.py @@ -8,19 +8,19 @@ class Command(BaseCommand): - help = 'Imports text_Stichworte Data' + help = "Imports text_Stichworte Data" def handle(self, *args, **kwargs): sheet_id = settings.LEGACY_DB_SHEET_ID self.stdout.write(f"fetching data from {sheet_id}") df = gsheet_to_df(sheet_id) - df = df.dropna(subset=['text_Stichworte', 'input_Sortiercode']) + df = df.dropna(subset=["text_Stichworte", "input_Sortiercode"]) for i, row in tqdm(df.iterrows(), total=len(df)): try: - event = Event.objects.get(id=row['input_Sortiercode']) + event = Event.objects.get(id=row["input_Sortiercode"]) except ObjectDoesNotExist: continue - stichwort = row['text_Stichworte'] + stichwort = row["text_Stichworte"] event.key_word = stichwort event.save() self.stdout.write("done") diff --git a/archiv/management/commands/helper_scripts/link_keywords.py b/archiv/management/commands/helper_scripts/link_keywords.py index a75b1ff..1d1a131 100644 --- a/archiv/management/commands/helper_scripts/link_keywords.py +++ b/archiv/management/commands/helper_scripts/link_keywords.py @@ -1,9 +1,17 @@ from archiv.models import Event, Wab # Title of WAB for which the keywords are to be linked -titles = ["1. Symphonie", "2. Symphonie", - "3. Symph", "4. Symph", "5. Symph", "6. Symphonie", "7. Symphon", - "8. Symphonie", "9. Symphon"] +titles = [ + "1. Symphonie", + "2. Symphonie", + "3. Symph", + "4. Symph", + "5. Symph", + "6. Symphonie", + "7. Symphon", + "8. Symphonie", + "9. Symphon", +] for title in titles: WAB = Wab.objects.filter(title__contains=title)[0] diff --git a/archiv/management/commands/helper_scripts/scraper.py b/archiv/management/commands/helper_scripts/scraper.py index b18884f..92e02eb 100644 --- a/archiv/management/commands/helper_scripts/scraper.py +++ b/archiv/management/commands/helper_scripts/scraper.py @@ -10,7 +10,10 @@ try: page += 1 # Search result url - URL = "https://abcd.acdh-dev.oeaw.ac.at/results?full_text=Erinnerung&Filter=Suchen&page=" + str(page) + URL = ( + "https://abcd.acdh-dev.oeaw.ac.at/results?full_text=Erinnerung&Filter=Suchen&page=" + + str(page) + ) r = requests.get(URL) html = r.text @@ -24,11 +27,11 @@ WabSoup = BeautifulSoup(WabHtml, features="html.parser") soup = BeautifulSoup(html, features="html.parser") - table = soup.find('table', {"class": "table"}) - rows = table.find_all('tr') + table = soup.find("table", {"class": "table"}) + rows = table.find_all("tr") data = [] for row in rows[1:]: - cols = row.find_all('td') + cols = row.find_all("td") cols = [ele.text.strip() for ele in cols] data.append([ele for ele in cols if ele]) @@ -36,18 +39,18 @@ for column in result["Datum"]: if column is not None: - matches = WabHtml.find('>' + str(column) + '<') + matches = WabHtml.find(">" + str(column) + "<") else: - print('HERE NON FOUND: ', column, page) + print("HERE NON FOUND: ", column, page) matches = 0 if matches == -1: - index = result.index[result['Datum'] == column].tolist()[0] + index = result.index[result["Datum"] == column].tolist()[0] print(result["ID"][index]) count = count + 1 except Exception as ex: print(ex) print(traceback.format_exc()) - print('Probably last page', page) - print('Missing links founds:', count) + print("Probably last page", page) + print("Missing links founds:", count) break # exit while loop diff --git a/archiv/management/commands/import_abcd_data.py b/archiv/management/commands/import_abcd_data.py index 50a89d6..1f0a999 100644 --- a/archiv/management/commands/import_abcd_data.py +++ b/archiv/management/commands/import_abcd_data.py @@ -11,7 +11,7 @@ class Command(BaseCommand): - help = 'Imports Legacy Data' + help = "Imports Legacy Data" def handle(self, *args, **kwargs): sheet_id = settings.LEGACY_DB_SHEET_ID @@ -58,38 +58,24 @@ def handle(self, *args, **kwargs): fm = field_mapping(Work) for i, row in tqdm(df.iterrows(), total=len(df)): try: - item, _ = Work.objects.get_or_create( - order_code=row['input_Nummer'] - ) + item, _ = Work.objects.get_or_create(order_code=row["input_Nummer"]) except Exception as e: - work_error.append([row['input_Nummer'], e]) + work_error.append([row["input_Nummer"], e]) continue for x in fm.keys(): - setattr( - item, - fm[x], - row[x] - ) + setattr(item, fm[x], row[x]) row_data = f"{json.dumps(row.to_dict(), cls=DjangoJSONEncoder)}" item.orig_data_csv = row_data try: item.save() except Exception as e: - work_error.append([row['input_Nummer'], e]) - self.stdout.write( - self.style.SUCCESS( - "DONE with Works" - ) - ) + work_error.append([row["input_Nummer"], e]) + self.stdout.write(self.style.SUCCESS("DONE with Works")) df = pd.DataFrame(event_error) - df.to_csv('./media/event_error.csv') + df.to_csv("./media/event_error.csv") df = pd.DataFrame(work_error) - df.to_csv('./media/work_error.csv') + df.to_csv("./media/work_error.csv") for x in event_error: - self.stdout.write( - self.style.ERROR(x) - ) + self.stdout.write(self.style.ERROR(x)) for x in work_error: - self.stdout.write( - self.style.ERROR(x) - ) + self.stdout.write(self.style.ERROR(x)) diff --git a/archiv/management/commands/import_keywords.py b/archiv/management/commands/import_keywords.py index eaf2bdb..24f8b8a 100644 --- a/archiv/management/commands/import_keywords.py +++ b/archiv/management/commands/import_keywords.py @@ -9,55 +9,43 @@ class Command(BaseCommand): - help = 'Imports Keywords' + help = "Imports Keywords" def handle(self, *args, **kwargs): tech_col, _ = SkosTechnicalCollection.objects.get_or_create( - pref_label='event__key_word' - ) - klaeren, _ = SkosCollection.objects.get_or_create( - pref_label="klären" - ) - wab, _ = SkosCollection.objects.get_or_create( - pref_label="WAB" - ) - mus_hs, _ = SkosCollection.objects.get_or_create( - pref_label="Mus.Hs." - ) - detail, _ = SkosCollection.objects.get_or_create( - pref_label="detaillieren" - ) - jahreszahl, _ = SkosCollection.objects.get_or_create( - pref_label=". Datum" - ) - schlagwort, _ = SkosCollection.objects.get_or_create( - pref_label="Schlagwort" + pref_label="event__key_word" ) + klaeren, _ = SkosCollection.objects.get_or_create(pref_label="klären") + wab, _ = SkosCollection.objects.get_or_create(pref_label="WAB") + mus_hs, _ = SkosCollection.objects.get_or_create(pref_label="Mus.Hs.") + detail, _ = SkosCollection.objects.get_or_create(pref_label="detaillieren") + jahreszahl, _ = SkosCollection.objects.get_or_create(pref_label=". Datum") + schlagwort, _ = SkosCollection.objects.get_or_create(pref_label="Schlagwort") sheet_id = settings.LEGACY_DB_SHEET_ID self.stdout.write(f"fetching data from {sheet_id}") df = gsheet_to_df(sheet_id) - filtered_df = df[df['text_Stichworte'].notnull()] + filtered_df = df[df["text_Stichworte"].notnull()] for i, row in tqdm(filtered_df.iterrows(), total=len(filtered_df)): try: - event = Event.objects.get(id=row['input_Sortiercode']) + event = Event.objects.get(id=row["input_Sortiercode"]) except Exception: continue - words = row['text_Stichworte'] - for x in words.split(', '): + words = row["text_Stichworte"] + for x in words.split(", "): if len(x) > 3: concept, _ = SkosConcept.objects.get_or_create( pref_label=x[:249], ) concept.tech_collection.add(tech_col) - if 'WAB' in x: + if "WAB" in x: concept.collection = wab - elif 'klären' in x: + elif "klären" in x: concept.collection = klaeren - elif 'Mus.Hs.' in x: + elif "Mus.Hs." in x: concept.collection = mus_hs - elif 'detaillieren' in x: + elif "detaillieren" in x: concept.collection = detail - elif x[0] == '.': + elif x[0] == ".": concept.collection = jahreszahl else: concept.collection = schlagwort diff --git a/archiv/management/commands/import_ners.py b/archiv/management/commands/import_ners.py index f6f7132..1c4eeda 100644 --- a/archiv/management/commands/import_ners.py +++ b/archiv/management/commands/import_ners.py @@ -6,13 +6,13 @@ from archiv.models import Place, Institution, Person, Event PERS_TO_EXLUDE = [ - 'Anton Bruckner', - 'Anton Bruckners', + "Anton Bruckner", + "Anton Bruckners", ] class Command(BaseCommand): - help = 'NER things' + help = "NER things" def handle(self, *args, **kwargs): @@ -23,15 +23,19 @@ def handle(self, *args, **kwargs): for x in tqdm(Event.objects.all(), total=Event.objects.all().count()): orig_text = x.main_text - text = strip_tags(orig_text).replace('\n', ' ') + text = strip_tags(orig_text).replace("\n", " ") doc = nlp(text) for ent in doc.ents: if not ent.text[0].isalpha(): continue if ent.text[0].islower(): continue - if ent.label_ == 'PER': - if ' ' in ent.text and ent.text not in PERS_TO_EXLUDE and len(ent.text) > 7: + if ent.label_ == "PER": + if ( + " " in ent.text + and ent.text not in PERS_TO_EXLUDE + and len(ent.text) > 7 + ): try: pers, _ = Person.objects.get_or_create(title=ent.text) except Exception as e: diff --git a/archiv/management/commands/import_wab.py b/archiv/management/commands/import_wab.py index c8e0cf3..632d6c4 100644 --- a/archiv/management/commands/import_wab.py +++ b/archiv/management/commands/import_wab.py @@ -21,19 +21,23 @@ def is_date(string, fuzzy=False): files = sorted( - [x for x in glob.glob('../xml/bruckner-wab-data/data/wab-*.xml') if 'exclude' not in x] + [ + x + for x in glob.glob("../xml/bruckner-wab-data/data/wab-*.xml") + if "exclude" not in x + ] ) class Command(BaseCommand): - help = 'imports WAB-XMLs' + help = "imports WAB-XMLs" def handle(self, *args, **kwargs): for x in tqdm(files, total=len(files)): with open(x) as fp: - soup = BeautifulSoup(fp, 'xml') - wab_id = soup.find("identifier", {'label': 'WAB'}).text - proper_wab_id = x.split('/')[-1].replace('wab-', '').replace('.xml', '') + soup = BeautifulSoup(fp, "xml") + wab_id = soup.find("identifier", {"label": "WAB"}).text + proper_wab_id = x.split("/")[-1].replace("wab-", "").replace(".xml", "") proper_wab_id title = soup.find("title") if title: diff --git a/archiv/management/commands/link_persons.py b/archiv/management/commands/link_persons.py index 865f08a..e44fc67 100644 --- a/archiv/management/commands/link_persons.py +++ b/archiv/management/commands/link_persons.py @@ -5,15 +5,15 @@ class Command(BaseCommand): - help = 'Links Persons to Events' + help = "Links Persons to Events" def handle(self, *args, **kwargs): sheet_id = "1o0eUACXdLRu0jz_NGDsj3A3iIHeaQeEPGvXn3THktoE" today = date.today() df = gsheet_to_df(sheet_id) - for g, ndf in df.groupby('entity_id'): + for g, ndf in df.groupby("entity_id"): entity = Person.objects.get(id=g) - event_ids = ndf['event_id'].values + event_ids = ndf["event_id"].values events = Event.objects.filter(id__in=event_ids).distinct() before = entity.rvn_person_mentioned_in.all().count() entity.rvn_person_mentioned_in.add(*events) diff --git a/archiv/management/commands/link_wabs.py b/archiv/management/commands/link_wabs.py index 0c2b872..2015824 100644 --- a/archiv/management/commands/link_wabs.py +++ b/archiv/management/commands/link_wabs.py @@ -6,7 +6,7 @@ class Command(BaseCommand): - help = 'Links WAB to Events' + help = "Links WAB to Events" def handle(self, *args, **kwargs): regex = r"WAB\s?\d\d*" @@ -16,7 +16,7 @@ def handle(self, *args, **kwargs): wab_ids = set() text = x.full_text for m in re.findall(regex, text, re.MULTILINE): - wab_nr = m.replace('WAB', '').strip() + wab_nr = m.replace("WAB", "").strip() wab_id = wab_nr.zfill(3) wab_ids.add(wab_id) for w in wab_ids: diff --git a/archiv/management/commands/link_works.py b/archiv/management/commands/link_works.py index d5f696c..a132fbc 100644 --- a/archiv/management/commands/link_works.py +++ b/archiv/management/commands/link_works.py @@ -7,22 +7,22 @@ class Command(BaseCommand): - help = 'Links works to Events' + help = "Links works to Events" def handle(self, *args, **kwargs): miss_matches = [] all_events = Event.objects.all() for event in tqdm(all_events, total=len(all_events)): try: - number = re.findall('([0-9]+[a-z]?)/', event.notes_lit) + number = re.findall("([0-9]+[a-z]?)/", event.notes_lit) except TypeError: continue works = [] for literature in set(number): - pieces = re.split(r'(\d+)', literature) + pieces = re.split(r"(\d+)", literature) number_int = int(pieces[1]) - lit_string = 'Lit.' + ('%04d' % number_int) - if (pieces[2] != ''): + lit_string = "Lit." + ("%04d" % number_int) + if pieces[2] != "": lit_string = lit_string + pieces[2] try: related_work = Work.objects.get(order_code=lit_string) @@ -33,4 +33,4 @@ def handle(self, *args, **kwargs): works.append(related_work) event.work.set(works) df = pd.DataFrame(miss_matches) - df.to_csv('./media/miss_matches.csv') + df.to_csv("./media/miss_matches.csv") diff --git a/archiv/management/commands/save_all.py b/archiv/management/commands/save_all.py index 09833b9..a91bbb3 100644 --- a/archiv/management/commands/save_all.py +++ b/archiv/management/commands/save_all.py @@ -5,7 +5,7 @@ class Command(BaseCommand): - help = 'Saves all Work, Persons and Events' + help = "Saves all Work, Persons and Events" def handle(self, *args, **kwargs): for item in [Work, Person, Event]: diff --git a/archiv/management/commands/update_ts_index.py b/archiv/management/commands/update_ts_index.py index 4f711cf..9e58617 100644 --- a/archiv/management/commands/update_ts_index.py +++ b/archiv/management/commands/update_ts_index.py @@ -5,7 +5,7 @@ class Command(BaseCommand): - help = 'Updates Typesense Index' + help = "Updates Typesense Index" def handle(self, *args, **kwargs): Event.ts_recreate_schema() diff --git a/archiv/migrations/0001_initial.py b/archiv/migrations/0001_initial.py index 8f14508..f60d8f1 100644 --- a/archiv/migrations/0001_initial.py +++ b/archiv/migrations/0001_initial.py @@ -10,61 +10,261 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('vocabs', '0001_initial'), + ("vocabs", "0001_initial"), ] operations = [ migrations.CreateModel( - name='Work', + name="Work", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('legacy_id', models.CharField(blank=True, max_length=300, verbose_name='Legacy ID')), - ('order_code', models.CharField(blank=True, help_text='Lit.0001', max_length=250, null=True, verbose_name='Ordnungsnummer')), - ('author_name', models.CharField(blank=True, help_text='whatever', max_length=250, null=True, verbose_name='Autorenname')), - ('full_quote', models.CharField(blank=True, help_text='whatever', max_length=250, null=True, verbose_name='Langzitat')), - ('orig_data_csv', ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='The original data')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "legacy_id", + models.CharField( + blank=True, max_length=300, verbose_name="Legacy ID" + ), + ), + ( + "order_code", + models.CharField( + blank=True, + help_text="Lit.0001", + max_length=250, + null=True, + verbose_name="Ordnungsnummer", + ), + ), + ( + "author_name", + models.CharField( + blank=True, + help_text="whatever", + max_length=250, + null=True, + verbose_name="Autorenname", + ), + ), + ( + "full_quote", + models.CharField( + blank=True, + help_text="whatever", + max_length=250, + null=True, + verbose_name="Langzitat", + ), + ), + ( + "orig_data_csv", + ckeditor.fields.RichTextField( + blank=True, null=True, verbose_name="The original data" + ), + ), ], options={ - 'verbose_name': 'Literatur', - 'ordering': ['order_code'], + "verbose_name": "Literatur", + "ordering": ["order_code"], }, ), migrations.CreateModel( - name='Reference', + name="Reference", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('legacy_id', models.CharField(blank=True, max_length=300, verbose_name='Legacy ID')), - ('location', models.CharField(blank=True, help_text='whatever', max_length=250, null=True, verbose_name='Seitenzahl')), - ('orig_data_csv', ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='The original data')), - ('work', models.ForeignKey(blank=True, help_text='whatever', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rvn_reference_work_work', to='archiv.work', verbose_name='Werk')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "legacy_id", + models.CharField( + blank=True, max_length=300, verbose_name="Legacy ID" + ), + ), + ( + "location", + models.CharField( + blank=True, + help_text="whatever", + max_length=250, + null=True, + verbose_name="Seitenzahl", + ), + ), + ( + "orig_data_csv", + ckeditor.fields.RichTextField( + blank=True, null=True, verbose_name="The original data" + ), + ), + ( + "work", + models.ForeignKey( + blank=True, + help_text="whatever", + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="rvn_reference_work_work", + to="archiv.work", + verbose_name="Werk", + ), + ), ], options={ - 'verbose_name': 'Referenz', - 'ordering': ['id'], + "verbose_name": "Referenz", + "ordering": ["id"], }, ), migrations.CreateModel( - name='Event', + name="Event", fields=[ - ('legacy_id', models.CharField(blank=True, max_length=300, verbose_name='Legacy ID')), - ('id', models.IntegerField(help_text='YYYYMMDD+curnr', primary_key=True, serialize=False, verbose_name='Ordnungsnummer')), - ('date_written', models.CharField(blank=True, help_text='helptext for date_written', max_length=250, null=True, verbose_name='Datum')), - ('not_before', models.DateField(blank=True, help_text='whatever', null=True, verbose_name='nicht bevor')), - ('not_after', models.DateField(blank=True, help_text='whatever', null=True, verbose_name='nicht danach')), - ('main_text', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Haupttext')), - ('notes_lit', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Literatur')), - ('notes_img', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Abbildungen')), - ('notes_facs', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Faksimiles')), - ('notes_archive', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Archiv')), - ('notes_text', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Text')), - ('note', ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Allgemeine Anmkerungen')), - ('orig_data_csv', ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='The original data')), - ('key_word', models.ManyToManyField(blank=True, help_text='whatever', related_name='rvn_event_key_word_skosconcept', to='vocabs.SkosConcept', verbose_name='Stichwort')), - ('reference', models.ManyToManyField(blank=True, help_text='whatever', related_name='rvn_event_reference_reference', to='archiv.Reference', verbose_name='Literatur')), + ( + "legacy_id", + models.CharField( + blank=True, max_length=300, verbose_name="Legacy ID" + ), + ), + ( + "id", + models.IntegerField( + help_text="YYYYMMDD+curnr", + primary_key=True, + serialize=False, + verbose_name="Ordnungsnummer", + ), + ), + ( + "date_written", + models.CharField( + blank=True, + help_text="helptext for date_written", + max_length=250, + null=True, + verbose_name="Datum", + ), + ), + ( + "not_before", + models.DateField( + blank=True, + help_text="whatever", + null=True, + verbose_name="nicht bevor", + ), + ), + ( + "not_after", + models.DateField( + blank=True, + help_text="whatever", + null=True, + verbose_name="nicht danach", + ), + ), + ( + "main_text", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Haupttext", + ), + ), + ( + "notes_lit", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Literatur", + ), + ), + ( + "notes_img", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Abbildungen", + ), + ), + ( + "notes_facs", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Faksimiles", + ), + ), + ( + "notes_archive", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Archiv", + ), + ), + ( + "notes_text", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Text", + ), + ), + ( + "note", + ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Allgemeine Anmkerungen", + ), + ), + ( + "orig_data_csv", + ckeditor.fields.RichTextField( + blank=True, null=True, verbose_name="The original data" + ), + ), + ( + "key_word", + models.ManyToManyField( + blank=True, + help_text="whatever", + related_name="rvn_event_key_word_skosconcept", + to="vocabs.SkosConcept", + verbose_name="Stichwort", + ), + ), + ( + "reference", + models.ManyToManyField( + blank=True, + help_text="whatever", + related_name="rvn_event_reference_reference", + to="archiv.Reference", + verbose_name="Literatur", + ), + ), ], options={ - 'verbose_name': 'Ereignis', - 'ordering': ['id'], + "verbose_name": "Ereignis", + "ordering": ["id"], }, ), ] diff --git a/archiv/migrations/0002_alter_work_full_quote.py b/archiv/migrations/0002_alter_work_full_quote.py index 4d6d1ca..4485916 100644 --- a/archiv/migrations/0002_alter_work_full_quote.py +++ b/archiv/migrations/0002_alter_work_full_quote.py @@ -6,13 +6,19 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0001_initial'), + ("archiv", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='work', - name='full_quote', - field=models.CharField(blank=True, help_text='whatever', max_length=500, null=True, verbose_name='Langzitat'), + model_name="work", + name="full_quote", + field=models.CharField( + blank=True, + help_text="whatever", + max_length=500, + null=True, + verbose_name="Langzitat", + ), ), ] diff --git a/archiv/migrations/0003_person.py b/archiv/migrations/0003_person.py index a685e45..fd24a66 100644 --- a/archiv/migrations/0003_person.py +++ b/archiv/migrations/0003_person.py @@ -7,27 +7,44 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0002_alter_work_full_quote'), + ("archiv", "0002_alter_work_full_quote"), ] operations = [ migrations.CreateModel( - name='Person', + name="Person", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('gnd_gnd_id', gnd.fields.GndField(blank=True, null=True, unique=True)), - ('gnd_pref_name', models.CharField(blank=True, max_length=250, null=True)), - ('gnd_payload', models.JSONField(blank=True, null=True)), - ('gnd_created', models.DateTimeField(blank=True, null=True)), - ('gnd_gender', models.CharField(blank=True, max_length=250, null=True)), - ('gnd_birth_date_written', models.CharField(blank=True, max_length=250, null=True)), - ('gnd_death_date_written', models.CharField(blank=True, max_length=250, null=True)), - ('gnd_birth_date', models.DateField(blank=True, null=True)), - ('gnd_death_date', models.DateField(blank=True, null=True)), - ('title', models.CharField(blank=True, max_length=250, null=True)), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("gnd_gnd_id", gnd.fields.GndField(blank=True, null=True, unique=True)), + ( + "gnd_pref_name", + models.CharField(blank=True, max_length=250, null=True), + ), + ("gnd_payload", models.JSONField(blank=True, null=True)), + ("gnd_created", models.DateTimeField(blank=True, null=True)), + ("gnd_gender", models.CharField(blank=True, max_length=250, null=True)), + ( + "gnd_birth_date_written", + models.CharField(blank=True, max_length=250, null=True), + ), + ( + "gnd_death_date_written", + models.CharField(blank=True, max_length=250, null=True), + ), + ("gnd_birth_date", models.DateField(blank=True, null=True)), + ("gnd_death_date", models.DateField(blank=True, null=True)), + ("title", models.CharField(blank=True, max_length=250, null=True)), ], options={ - 'abstract': False, + "abstract": False, }, ), ] diff --git a/archiv/migrations/0004_event_person.py b/archiv/migrations/0004_event_person.py index 4cef886..7036def 100644 --- a/archiv/migrations/0004_event_person.py +++ b/archiv/migrations/0004_event_person.py @@ -6,13 +6,15 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0003_person'), + ("archiv", "0003_person"), ] operations = [ migrations.AddField( - model_name='event', - name='person', - field=models.ManyToManyField(blank=True, related_name='person_mentioned_in', to='archiv.Person'), + model_name="event", + name="person", + field=models.ManyToManyField( + blank=True, related_name="person_mentioned_in", to="archiv.Person" + ), ), ] diff --git a/archiv/migrations/0005_auto_20220205_0740.py b/archiv/migrations/0005_auto_20220205_0740.py index bcd0708..d17fc7e 100644 --- a/archiv/migrations/0005_auto_20220205_0740.py +++ b/archiv/migrations/0005_auto_20220205_0740.py @@ -6,32 +6,54 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0004_event_person'), + ("archiv", "0004_event_person"), ] operations = [ migrations.CreateModel( - name='Institution', + name="Institution", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(blank=True, max_length=250, null=True)), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(blank=True, max_length=250, null=True)), ], ), migrations.CreateModel( - name='Place', + name="Place", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(blank=True, max_length=250, null=True)), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(blank=True, max_length=250, null=True)), ], ), migrations.AddField( - model_name='event', - name='institution', - field=models.ManyToManyField(blank=True, related_name='institution_mentioned_in', to='archiv.Institution'), + model_name="event", + name="institution", + field=models.ManyToManyField( + blank=True, + related_name="institution_mentioned_in", + to="archiv.Institution", + ), ), migrations.AddField( - model_name='event', - name='place', - field=models.ManyToManyField(blank=True, related_name='place_mentioned_in', to='archiv.Place'), + model_name="event", + name="place", + field=models.ManyToManyField( + blank=True, related_name="place_mentioned_in", to="archiv.Place" + ), ), ] diff --git a/archiv/migrations/0006_auto_20220216_1157.py b/archiv/migrations/0006_auto_20220216_1157.py index 7837932..589378f 100644 --- a/archiv/migrations/0006_auto_20220216_1157.py +++ b/archiv/migrations/0006_auto_20220216_1157.py @@ -6,22 +6,26 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0005_auto_20220205_0740'), + ("archiv", "0005_auto_20220205_0740"), ] operations = [ migrations.AlterModelOptions( - name='person', - options={'ordering': ['id']}, + name="person", + options={"ordering": ["id"]}, ), migrations.AddField( - model_name='event', - name='work', - field=models.ManyToManyField(blank=True, related_name='work_referenced_in', to='archiv.Work'), + model_name="event", + name="work", + field=models.ManyToManyField( + blank=True, related_name="work_referenced_in", to="archiv.Work" + ), ), migrations.AlterField( - model_name='event', - name='person', - field=models.ManyToManyField(blank=True, related_name='rvn_person_mentioned_in', to='archiv.Person'), + model_name="event", + name="person", + field=models.ManyToManyField( + blank=True, related_name="rvn_person_mentioned_in", to="archiv.Person" + ), ), ] diff --git a/archiv/migrations/0007_auto_20220226_0854.py b/archiv/migrations/0007_auto_20220226_0854.py index fc896b1..1b42622 100644 --- a/archiv/migrations/0007_auto_20220226_0854.py +++ b/archiv/migrations/0007_auto_20220226_0854.py @@ -6,20 +6,25 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0006_auto_20220216_1157'), + ("archiv", "0006_auto_20220216_1157"), ] operations = [ migrations.RemoveField( - model_name='event', - name='reference', + model_name="event", + name="reference", ), migrations.AddField( - model_name='event', - name='full_text', - field=models.TextField(blank=True, help_text='Volltext Feld (technisch notwendig)', null=True, verbose_name='Volltext Feld'), + model_name="event", + name="full_text", + field=models.TextField( + blank=True, + help_text="Volltext Feld (technisch notwendig)", + null=True, + verbose_name="Volltext Feld", + ), ), migrations.DeleteModel( - name='Reference', + name="Reference", ), ] diff --git a/archiv/migrations/0008_auto_20220318_0842.py b/archiv/migrations/0008_auto_20220318_0842.py index 6710eae..aa444ba 100644 --- a/archiv/migrations/0008_auto_20220318_0842.py +++ b/archiv/migrations/0008_auto_20220318_0842.py @@ -6,33 +6,56 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0007_auto_20220226_0854'), + ("archiv", "0007_auto_20220226_0854"), ] operations = [ migrations.AlterField( - model_name='event', - name='id', - field=models.IntegerField(db_index=True, help_text='YYYYMMDD+curnr', primary_key=True, serialize=False, verbose_name='Ordnungsnummer'), + model_name="event", + name="id", + field=models.IntegerField( + db_index=True, + help_text="YYYYMMDD+curnr", + primary_key=True, + serialize=False, + verbose_name="Ordnungsnummer", + ), ), migrations.AlterField( - model_name='event', - name='institution', - field=models.ManyToManyField(blank=True, related_name='institution_mentioned_in', to='archiv.Institution', verbose_name='erwähnte Institutionen'), + model_name="event", + name="institution", + field=models.ManyToManyField( + blank=True, + related_name="institution_mentioned_in", + to="archiv.Institution", + verbose_name="erwähnte Institutionen", + ), ), migrations.AlterField( - model_name='event', - name='legacy_id', - field=models.CharField(blank=True, db_index=True, max_length=300, verbose_name='Legacy ID'), + model_name="event", + name="legacy_id", + field=models.CharField( + blank=True, db_index=True, max_length=300, verbose_name="Legacy ID" + ), ), migrations.AlterField( - model_name='event', - name='person', - field=models.ManyToManyField(blank=True, related_name='rvn_person_mentioned_in', to='archiv.Person', verbose_name='erwähnte Personen'), + model_name="event", + name="person", + field=models.ManyToManyField( + blank=True, + related_name="rvn_person_mentioned_in", + to="archiv.Person", + verbose_name="erwähnte Personen", + ), ), migrations.AlterField( - model_name='event', - name='place', - field=models.ManyToManyField(blank=True, related_name='place_mentioned_in', to='archiv.Place', verbose_name='erwähnte Orte'), + model_name="event", + name="place", + field=models.ManyToManyField( + blank=True, + related_name="place_mentioned_in", + to="archiv.Place", + verbose_name="erwähnte Orte", + ), ), ] diff --git a/archiv/migrations/0009_remove_event_orig_data_csv.py b/archiv/migrations/0009_remove_event_orig_data_csv.py index 53840f3..8876f82 100644 --- a/archiv/migrations/0009_remove_event_orig_data_csv.py +++ b/archiv/migrations/0009_remove_event_orig_data_csv.py @@ -6,12 +6,12 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0008_auto_20220318_0842'), + ("archiv", "0008_auto_20220318_0842"), ] operations = [ migrations.RemoveField( - model_name='event', - name='orig_data_csv', + model_name="event", + name="orig_data_csv", ), ] diff --git a/archiv/migrations/0010_auto_20220318_1736.py b/archiv/migrations/0010_auto_20220318_1736.py index 31884c2..94fd371 100644 --- a/archiv/migrations/0010_auto_20220318_1736.py +++ b/archiv/migrations/0010_auto_20220318_1736.py @@ -6,33 +6,41 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0009_remove_event_orig_data_csv'), + ("archiv", "0009_remove_event_orig_data_csv"), ] operations = [ migrations.AddField( - model_name='person', - name='ablo_uri', - field=models.URLField(blank=True, null=True, verbose_name='Link zu ABLO Eintrag'), + model_name="person", + name="ablo_uri", + field=models.URLField( + blank=True, null=True, verbose_name="Link zu ABLO Eintrag" + ), ), migrations.AddField( - model_name='person', - name='bruckner_entity', - field=models.BooleanField(default=False, verbose_name='Link zu Bruckner XML'), + model_name="person", + name="bruckner_entity", + field=models.BooleanField( + default=False, verbose_name="Link zu Bruckner XML" + ), ), migrations.AddField( - model_name='person', - name='bruckner_entity_id', - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Bruckner-Entity-ID'), + model_name="person", + name="bruckner_entity_id", + field=models.CharField( + blank=True, max_length=50, null=True, verbose_name="Bruckner-Entity-ID" + ), ), migrations.AddField( - model_name='person', - name='bruckner_entity_xml', - field=models.TextField(blank=True, null=True, verbose_name='MEI:XML'), + model_name="person", + name="bruckner_entity_xml", + field=models.TextField(blank=True, null=True, verbose_name="MEI:XML"), ), migrations.AddField( - model_name='person', - name='oeml_uri', - field=models.URLField(blank=True, null=True, verbose_name='Link zu ÖML Eintrag'), + model_name="person", + name="oeml_uri", + field=models.URLField( + blank=True, null=True, verbose_name="Link zu ÖML Eintrag" + ), ), ] diff --git a/archiv/migrations/0011_wab.py b/archiv/migrations/0011_wab.py index 537ef2c..9b5c2d0 100644 --- a/archiv/migrations/0011_wab.py +++ b/archiv/migrations/0011_wab.py @@ -6,22 +6,60 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0010_auto_20220318_1736'), + ("archiv", "0010_auto_20220318_1736"), ] operations = [ migrations.CreateModel( - name='Wab', + name="Wab", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(blank=True, max_length=250, null=True)), - ('wab_id', models.CharField(help_text='z.B. 003, 021, 123', max_length=3, unique=True, verbose_name='WAB Nummer')), - ('date', models.DateField(blank=True, help_text='z.B. 1874-12-24', null=True, verbose_name='Maschinenlesbare Datierung')), - ('date_written', models.CharField(blank=True, help_text='z.B. Nicht vor September 1772', max_length=250, null=True, verbose_name='Datierung des Werkes')), - ('wab_xml', models.TextField(blank=True, null=True, verbose_name='XML/MEI des Werkes')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(blank=True, max_length=250, null=True)), + ( + "wab_id", + models.CharField( + help_text="z.B. 003, 021, 123", + max_length=3, + unique=True, + verbose_name="WAB Nummer", + ), + ), + ( + "date", + models.DateField( + blank=True, + help_text="z.B. 1874-12-24", + null=True, + verbose_name="Maschinenlesbare Datierung", + ), + ), + ( + "date_written", + models.CharField( + blank=True, + help_text="z.B. Nicht vor September 1772", + max_length=250, + null=True, + verbose_name="Datierung des Werkes", + ), + ), + ( + "wab_xml", + models.TextField( + blank=True, null=True, verbose_name="XML/MEI des Werkes" + ), + ), ], options={ - 'ordering': ['wab_id'], + "ordering": ["wab_id"], }, ), ] diff --git a/archiv/migrations/0012_event_wab.py b/archiv/migrations/0012_event_wab.py index dfb2bba..4174d0b 100644 --- a/archiv/migrations/0012_event_wab.py +++ b/archiv/migrations/0012_event_wab.py @@ -6,13 +6,18 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0011_wab'), + ("archiv", "0011_wab"), ] operations = [ migrations.AddField( - model_name='event', - name='wab', - field=models.ManyToManyField(blank=True, related_name='rvn_wab_mentioned_in', to='archiv.Wab', verbose_name='erwähnte Bruckner Werke (WAB)'), + model_name="event", + name="wab", + field=models.ManyToManyField( + blank=True, + related_name="rvn_wab_mentioned_in", + to="archiv.Wab", + verbose_name="erwähnte Bruckner Werke (WAB)", + ), ), ] diff --git a/archiv/migrations/0013_auto_20220419_1159.py b/archiv/migrations/0013_auto_20220419_1159.py index 45e0d0e..57de02a 100644 --- a/archiv/migrations/0013_auto_20220419_1159.py +++ b/archiv/migrations/0013_auto_20220419_1159.py @@ -7,23 +7,39 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0012_event_wab'), + ("archiv", "0012_event_wab"), ] operations = [ migrations.AlterField( - model_name='event', - name='main_text', - field=ckeditor.fields.RichTextField(blank=True, help_text='Beschreibung des Ereignis', null=True, verbose_name='Haupttext'), + model_name="event", + name="main_text", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Beschreibung des Ereignis", + null=True, + verbose_name="Haupttext", + ), ), migrations.AlterField( - model_name='event', - name='note', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Allgemeine Anmerkungen'), + model_name="event", + name="note", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Allgemeine Anmerkungen", + ), ), migrations.AlterField( - model_name='event', - name='work', - field=models.ManyToManyField(blank=True, help_text='Literaturangaben zu diesem Event', related_name='work_referenced_in', to='archiv.Work', verbose_name='Literatur'), + model_name="event", + name="work", + field=models.ManyToManyField( + blank=True, + help_text="Literaturangaben zu diesem Event", + related_name="work_referenced_in", + to="archiv.Work", + verbose_name="Literatur", + ), ), ] diff --git a/archiv/migrations/0014_auto_20220429_1058.py b/archiv/migrations/0014_auto_20220429_1058.py index f8b0bb5..204c285 100644 --- a/archiv/migrations/0014_auto_20220429_1058.py +++ b/archiv/migrations/0014_auto_20220429_1058.py @@ -7,21 +7,23 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0013_auto_20220419_1159'), + ("archiv", "0013_auto_20220419_1159"), ] operations = [ migrations.AlterModelOptions( - name='institution', - options={'ordering': ['title']}, + name="institution", + options={"ordering": ["title"]}, ), migrations.AlterModelOptions( - name='place', - options={'ordering': ['title']}, + name="place", + options={"ordering": ["title"]}, ), migrations.AlterField( - model_name='work', - name='full_quote', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Langzitat'), + model_name="work", + name="full_quote", + field=ckeditor.fields.RichTextField( + blank=True, help_text="whatever", null=True, verbose_name="Langzitat" + ), ), ] diff --git a/archiv/migrations/0015_auto_20220501_0833.py b/archiv/migrations/0015_auto_20220501_0833.py index 3eb4ab7..d74bfbc 100644 --- a/archiv/migrations/0015_auto_20220501_0833.py +++ b/archiv/migrations/0015_auto_20220501_0833.py @@ -6,23 +6,39 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0014_auto_20220429_1058'), + ("archiv", "0014_auto_20220429_1058"), ] operations = [ migrations.AddField( - model_name='wab', - name='status', - field=models.TextField(blank=True, help_text='Internes Feld zur Dokumentation der Verknüpfungen von WAB zu Ereignis', null=True, verbose_name='Berabeitungsstand'), + model_name="wab", + name="status", + field=models.TextField( + blank=True, + help_text="Internes Feld zur Dokumentation der Verknüpfungen von WAB zu Ereignis", + null=True, + verbose_name="Berabeitungsstand", + ), ), migrations.AddField( - model_name='work', - name='short_quote', - field=models.CharField(blank=True, help_text='Kurzzitat: Autor, Titel, Ornungsnummer', max_length=500, null=True, verbose_name='Kurzzitat'), + model_name="work", + name="short_quote", + field=models.CharField( + blank=True, + help_text="Kurzzitat: Autor, Titel, Ornungsnummer", + max_length=500, + null=True, + verbose_name="Kurzzitat", + ), ), migrations.AddField( - model_name='work', - name='year', - field=models.IntegerField(blank=True, help_text='Erscheingungsjahr', null=True, verbose_name='Erscheinungsjahr'), + model_name="work", + name="year", + field=models.IntegerField( + blank=True, + help_text="Erscheingungsjahr", + null=True, + verbose_name="Erscheinungsjahr", + ), ), ] diff --git a/archiv/migrations/0016_auto_20220501_0841.py b/archiv/migrations/0016_auto_20220501_0841.py index f3e1fe5..07d105b 100644 --- a/archiv/migrations/0016_auto_20220501_0841.py +++ b/archiv/migrations/0016_auto_20220501_0841.py @@ -6,18 +6,29 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0015_auto_20220501_0833'), + ("archiv", "0015_auto_20220501_0833"), ] operations = [ migrations.AddField( - model_name='wab', - name='note', - field=models.TextField(blank=True, help_text='Anmerkungen und Erläuterungen', null=True, verbose_name='Anmerkungen'), + model_name="wab", + name="note", + field=models.TextField( + blank=True, + help_text="Anmerkungen und Erläuterungen", + null=True, + verbose_name="Anmerkungen", + ), ), migrations.AlterField( - model_name='work', - name='short_quote', - field=models.CharField(blank=True, help_text='Kurzzitat: Autor, Titel, Ornungsnummer (leere Felder werden automatisiert befüllt)', max_length=500, null=True, verbose_name='Kurzzitat'), + model_name="work", + name="short_quote", + field=models.CharField( + blank=True, + help_text="Kurzzitat: Autor, Titel, Ornungsnummer (leere Felder werden automatisiert befüllt)", + max_length=500, + null=True, + verbose_name="Kurzzitat", + ), ), ] diff --git a/archiv/migrations/0017_auto_20220504_0635.py b/archiv/migrations/0017_auto_20220504_0635.py index 92fe819..c65649c 100644 --- a/archiv/migrations/0017_auto_20220504_0635.py +++ b/archiv/migrations/0017_auto_20220504_0635.py @@ -6,17 +6,22 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0016_auto_20220501_0841'), + ("archiv", "0016_auto_20220501_0841"), ] operations = [ migrations.RemoveField( - model_name='event', - name='key_word', + model_name="event", + name="key_word", ), migrations.AddField( - model_name='event', - name='key_word', - field=models.TextField(blank=True, help_text='Feld für interne Notizen und Stihworte', null=True, verbose_name='Stichwort'), + model_name="event", + name="key_word", + field=models.TextField( + blank=True, + help_text="Feld für interne Notizen und Stihworte", + null=True, + verbose_name="Stichwort", + ), ), ] diff --git a/archiv/migrations/0018_auto_20220525_0931.py b/archiv/migrations/0018_auto_20220525_0931.py index 008a712..d9ddd22 100644 --- a/archiv/migrations/0018_auto_20220525_0931.py +++ b/archiv/migrations/0018_auto_20220525_0931.py @@ -7,63 +7,73 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0017_auto_20220504_0635'), + ("archiv", "0017_auto_20220504_0635"), ] operations = [ migrations.AddField( - model_name='event', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + model_name="event", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, default=django.utils.timezone.now + ), preserve_default=False, ), migrations.AddField( - model_name='event', - name='updated_at', + model_name="event", + name="updated_at", field=models.DateTimeField(auto_now=True), ), migrations.AddField( - model_name='institution', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + model_name="institution", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, default=django.utils.timezone.now + ), preserve_default=False, ), migrations.AddField( - model_name='institution', - name='updated_at', + model_name="institution", + name="updated_at", field=models.DateTimeField(auto_now=True), ), migrations.AddField( - model_name='place', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + model_name="place", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, default=django.utils.timezone.now + ), preserve_default=False, ), migrations.AddField( - model_name='place', - name='updated_at', + model_name="place", + name="updated_at", field=models.DateTimeField(auto_now=True), ), migrations.AddField( - model_name='wab', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + model_name="wab", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, default=django.utils.timezone.now + ), preserve_default=False, ), migrations.AddField( - model_name='wab', - name='updated_at', + model_name="wab", + name="updated_at", field=models.DateTimeField(auto_now=True), ), migrations.AddField( - model_name='work', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + model_name="work", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, default=django.utils.timezone.now + ), preserve_default=False, ), migrations.AddField( - model_name='work', - name='updated_at', + model_name="work", + name="updated_at", field=models.DateTimeField(auto_now=True), ), ] diff --git a/archiv/migrations/0019_auto_20220525_0935.py b/archiv/migrations/0019_auto_20220525_0935.py index 769b3ea..807f156 100644 --- a/archiv/migrations/0019_auto_20220525_0935.py +++ b/archiv/migrations/0019_auto_20220525_0935.py @@ -6,58 +6,98 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0018_auto_20220525_0931'), + ("archiv", "0018_auto_20220525_0931"), ] operations = [ migrations.AlterField( - model_name='event', - name='created_at', - field=models.DateTimeField(auto_now_add=True, help_text='Zeit der Erstellung des Objektes (ab 2022-05-25)', verbose_name='Erstellt am'), + model_name="event", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + help_text="Zeit der Erstellung des Objektes (ab 2022-05-25)", + verbose_name="Erstellt am", + ), ), migrations.AlterField( - model_name='event', - name='updated_at', - field=models.DateTimeField(auto_now=True, help_text='Zeit der letzten Änderung', verbose_name='Letzte Änderung'), + model_name="event", + name="updated_at", + field=models.DateTimeField( + auto_now=True, + help_text="Zeit der letzten Änderung", + verbose_name="Letzte Änderung", + ), ), migrations.AlterField( - model_name='institution', - name='created_at', - field=models.DateTimeField(auto_now_add=True, help_text='Zeit der Erstellung des Objektes (ab 2022-05-25)', verbose_name='Erstellt am'), + model_name="institution", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + help_text="Zeit der Erstellung des Objektes (ab 2022-05-25)", + verbose_name="Erstellt am", + ), ), migrations.AlterField( - model_name='institution', - name='updated_at', - field=models.DateTimeField(auto_now=True, help_text='Zeit der letzten Änderung', verbose_name='Letzte Änderung'), + model_name="institution", + name="updated_at", + field=models.DateTimeField( + auto_now=True, + help_text="Zeit der letzten Änderung", + verbose_name="Letzte Änderung", + ), ), migrations.AlterField( - model_name='place', - name='created_at', - field=models.DateTimeField(auto_now_add=True, help_text='Zeit der Erstellung des Objektes (ab 2022-05-25)', verbose_name='Erstellt am'), + model_name="place", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + help_text="Zeit der Erstellung des Objektes (ab 2022-05-25)", + verbose_name="Erstellt am", + ), ), migrations.AlterField( - model_name='place', - name='updated_at', - field=models.DateTimeField(auto_now=True, help_text='Zeit der letzten Änderung', verbose_name='Letzte Änderung'), + model_name="place", + name="updated_at", + field=models.DateTimeField( + auto_now=True, + help_text="Zeit der letzten Änderung", + verbose_name="Letzte Änderung", + ), ), migrations.AlterField( - model_name='wab', - name='created_at', - field=models.DateTimeField(auto_now_add=True, help_text='Zeit der Erstellung des Objektes (ab 2022-05-25)', verbose_name='Erstellt am'), + model_name="wab", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + help_text="Zeit der Erstellung des Objektes (ab 2022-05-25)", + verbose_name="Erstellt am", + ), ), migrations.AlterField( - model_name='wab', - name='updated_at', - field=models.DateTimeField(auto_now=True, help_text='Zeit der letzten Änderung', verbose_name='Letzte Änderung'), + model_name="wab", + name="updated_at", + field=models.DateTimeField( + auto_now=True, + help_text="Zeit der letzten Änderung", + verbose_name="Letzte Änderung", + ), ), migrations.AlterField( - model_name='work', - name='created_at', - field=models.DateTimeField(auto_now_add=True, help_text='Zeit der Erstellung des Objektes (ab 2022-05-25)', verbose_name='Erstellt am'), + model_name="work", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + help_text="Zeit der Erstellung des Objektes (ab 2022-05-25)", + verbose_name="Erstellt am", + ), ), migrations.AlterField( - model_name='work', - name='updated_at', - field=models.DateTimeField(auto_now=True, help_text='Zeit der letzten Änderung', verbose_name='Letzte Änderung'), + model_name="work", + name="updated_at", + field=models.DateTimeField( + auto_now=True, + help_text="Zeit der letzten Änderung", + verbose_name="Letzte Änderung", + ), ), ] diff --git a/archiv/migrations/0020_person_remarks.py b/archiv/migrations/0020_person_remarks.py index 2fca14a..4023430 100644 --- a/archiv/migrations/0020_person_remarks.py +++ b/archiv/migrations/0020_person_remarks.py @@ -6,13 +6,18 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0019_auto_20220525_0935'), + ("archiv", "0019_auto_20220525_0935"), ] operations = [ migrations.AddField( - model_name='person', - name='remarks', - field=models.TextField(blank=True, help_text='Anmerkungen zur Person', null=True, verbose_name='Anmerkungen'), + model_name="person", + name="remarks", + field=models.TextField( + blank=True, + help_text="Anmerkungen zur Person", + null=True, + verbose_name="Anmerkungen", + ), ), ] diff --git a/archiv/migrations/0021_alter_event_key_word.py b/archiv/migrations/0021_alter_event_key_word.py index 04aea55..5a75e6d 100644 --- a/archiv/migrations/0021_alter_event_key_word.py +++ b/archiv/migrations/0021_alter_event_key_word.py @@ -6,13 +6,18 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0020_person_remarks'), + ("archiv", "0020_person_remarks"), ] operations = [ migrations.AlterField( - model_name='event', - name='key_word', - field=models.TextField(blank=True, help_text='Feld für interne Notizen und Stichworte', null=True, verbose_name='Stichwort'), + model_name="event", + name="key_word", + field=models.TextField( + blank=True, + help_text="Feld für interne Notizen und Stichworte", + null=True, + verbose_name="Stichwort", + ), ), ] diff --git a/archiv/migrations/0022_auto_20220615_0924.py b/archiv/migrations/0022_auto_20220615_0924.py index 4c47d87..7582786 100644 --- a/archiv/migrations/0022_auto_20220615_0924.py +++ b/archiv/migrations/0022_auto_20220615_0924.py @@ -6,33 +6,59 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0021_alter_event_key_word'), + ("archiv", "0021_alter_event_key_word"), ] operations = [ migrations.AddField( - model_name='place', - name='geonames_id', - field=models.URLField(blank=True, help_text="z.B. 'https://www.geonames.org/2782480/ansfelden.html'", null=True, verbose_name='GeoNames ID'), + model_name="place", + name="geonames_id", + field=models.URLField( + blank=True, + help_text="z.B. 'https://www.geonames.org/2782480/ansfelden.html'", + null=True, + verbose_name="GeoNames ID", + ), ), migrations.AddField( - model_name='place', - name='lat', - field=models.FloatField(blank=True, help_text="Längengrad, z.B. '48.20969'", null=True, verbose_name='Längengrad'), + model_name="place", + name="lat", + field=models.FloatField( + blank=True, + help_text="Längengrad, z.B. '48.20969'", + null=True, + verbose_name="Längengrad", + ), ), migrations.AddField( - model_name='place', - name='long', - field=models.FloatField(blank=True, help_text="Breitengrad, z.B. '14.29004'", null=True, verbose_name='Breitengrad'), + model_name="place", + name="long", + field=models.FloatField( + blank=True, + help_text="Breitengrad, z.B. '14.29004'", + null=True, + verbose_name="Breitengrad", + ), ), migrations.AddField( - model_name='place', - name='remarks', - field=models.TextField(blank=True, help_text='Anmerkungen zur Person', null=True, verbose_name='Anmerkungen'), + model_name="place", + name="remarks", + field=models.TextField( + blank=True, + help_text="Anmerkungen zur Person", + null=True, + verbose_name="Anmerkungen", + ), ), migrations.AlterField( - model_name='place', - name='title', - field=models.CharField(blank=True, help_text='z.B. Ansfelden', max_length=250, null=True, verbose_name='Ortsname'), + model_name="place", + name="title", + field=models.CharField( + blank=True, + help_text="z.B. Ansfelden", + max_length=250, + null=True, + verbose_name="Ortsname", + ), ), ] diff --git a/archiv/migrations/0023_auto_20220623_0720.py b/archiv/migrations/0023_auto_20220623_0720.py index 0d74e8c..3ba5980 100644 --- a/archiv/migrations/0023_auto_20220623_0720.py +++ b/archiv/migrations/0023_auto_20220623_0720.py @@ -7,28 +7,48 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0022_auto_20220615_0924'), + ("archiv", "0022_auto_20220615_0924"), ] operations = [ migrations.AddField( - model_name='person', - name='notes_lit', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Literatur'), + model_name="person", + name="notes_lit", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Literatur", + ), ), migrations.AddField( - model_name='place', - name='notes_lit', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Literatur'), + model_name="place", + name="notes_lit", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Literatur", + ), ), migrations.AlterField( - model_name='person', - name='remarks', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen zur Person', null=True, verbose_name='Anmerkungen generell'), + model_name="person", + name="remarks", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen zur Person", + null=True, + verbose_name="Anmerkungen generell", + ), ), migrations.AlterField( - model_name='place', - name='remarks', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen zur Person', null=True, verbose_name='Anmerkungen generell'), + model_name="place", + name="remarks", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen zur Person", + null=True, + verbose_name="Anmerkungen generell", + ), ), ] diff --git a/archiv/migrations/0024_auto_20220623_0726.py b/archiv/migrations/0024_auto_20220623_0726.py index 4fb8325..aa35bd3 100644 --- a/archiv/migrations/0024_auto_20220623_0726.py +++ b/archiv/migrations/0024_auto_20220623_0726.py @@ -7,18 +7,28 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0023_auto_20220623_0720'), + ("archiv", "0023_auto_20220623_0720"), ] operations = [ migrations.AlterField( - model_name='person', - name='notes_lit', - field=ckeditor.fields.RichTextField(blank=True, help_text='Literatur zur Person', null=True, verbose_name='Anmerkungen Literatur'), + model_name="person", + name="notes_lit", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Literatur zur Person", + null=True, + verbose_name="Anmerkungen Literatur", + ), ), migrations.AlterField( - model_name='place', - name='notes_lit', - field=ckeditor.fields.RichTextField(blank=True, help_text='Literatur zum Ort', null=True, verbose_name='Anmerkungen Literatur'), + model_name="place", + name="notes_lit", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Literatur zum Ort", + null=True, + verbose_name="Anmerkungen Literatur", + ), ), ] diff --git a/archiv/migrations/0025_alter_place_remarks.py b/archiv/migrations/0025_alter_place_remarks.py index 3456d68..5ca03f5 100644 --- a/archiv/migrations/0025_alter_place_remarks.py +++ b/archiv/migrations/0025_alter_place_remarks.py @@ -7,13 +7,18 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0024_auto_20220623_0726'), + ("archiv", "0024_auto_20220623_0726"), ] operations = [ migrations.AlterField( - model_name='place', - name='remarks', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen zum Ort', null=True, verbose_name='Anmerkungen generell'), + model_name="place", + name="remarks", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen zum Ort", + null=True, + verbose_name="Anmerkungen generell", + ), ), ] diff --git a/archiv/migrations/0026_auto_20220623_0738.py b/archiv/migrations/0026_auto_20220623_0738.py index 5574156..6ec6b8b 100644 --- a/archiv/migrations/0026_auto_20220623_0738.py +++ b/archiv/migrations/0026_auto_20220623_0738.py @@ -6,18 +6,28 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0025_alter_place_remarks'), + ("archiv", "0025_alter_place_remarks"), ] operations = [ migrations.AddField( - model_name='person', - name='status', - field=models.TextField(blank=True, help_text='Internes Feld zur Dokumentation der Verknüpfungen von Person zu Ereignis', null=True, verbose_name='Berabeitungsstand'), + model_name="person", + name="status", + field=models.TextField( + blank=True, + help_text="Internes Feld zur Dokumentation der Verknüpfungen von Person zu Ereignis", + null=True, + verbose_name="Berabeitungsstand", + ), ), migrations.AddField( - model_name='place', - name='status', - field=models.TextField(blank=True, help_text='Internes Feld zur Dokumentation der Verknüpfungen von Ort zu Ereignis', null=True, verbose_name='Berabeitungsstand'), + model_name="place", + name="status", + field=models.TextField( + blank=True, + help_text="Internes Feld zur Dokumentation der Verknüpfungen von Ort zu Ereignis", + null=True, + verbose_name="Berabeitungsstand", + ), ), ] diff --git a/archiv/migrations/0027_person_work.py b/archiv/migrations/0027_person_work.py index 520f068..08c0ec1 100644 --- a/archiv/migrations/0027_person_work.py +++ b/archiv/migrations/0027_person_work.py @@ -6,13 +6,19 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0026_auto_20220623_0738'), + ("archiv", "0026_auto_20220623_0738"), ] operations = [ migrations.AddField( - model_name='person', - name='work', - field=models.ManyToManyField(blank=True, help_text='Literaturangaben zu dieser Person', related_name='work_referenced_in_person', to='archiv.Work', verbose_name='Literatur'), + model_name="person", + name="work", + field=models.ManyToManyField( + blank=True, + help_text="Literaturangaben zu dieser Person", + related_name="work_referenced_in_person", + to="archiv.Work", + verbose_name="Literatur", + ), ), ] diff --git a/archiv/migrations/0028_place_work.py b/archiv/migrations/0028_place_work.py index 0fe9186..abe818f 100644 --- a/archiv/migrations/0028_place_work.py +++ b/archiv/migrations/0028_place_work.py @@ -6,13 +6,19 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0027_person_work'), + ("archiv", "0027_person_work"), ] operations = [ migrations.AddField( - model_name='place', - name='work', - field=models.ManyToManyField(blank=True, help_text='Literaturangaben zu diesem Ort', related_name='work_referenced_in_place', to='archiv.Work', verbose_name='Literatur'), + model_name="place", + name="work", + field=models.ManyToManyField( + blank=True, + help_text="Literaturangaben zu diesem Ort", + related_name="work_referenced_in_place", + to="archiv.Work", + verbose_name="Literatur", + ), ), ] diff --git a/archiv/migrations/0029_auto_20220627_0820.py b/archiv/migrations/0029_auto_20220627_0820.py index 8042530..6daa69d 100644 --- a/archiv/migrations/0029_auto_20220627_0820.py +++ b/archiv/migrations/0029_auto_20220627_0820.py @@ -7,38 +7,68 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0028_place_work'), + ("archiv", "0028_place_work"), ] operations = [ migrations.AddField( - model_name='person', - name='notes_archive', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Archiv'), + model_name="person", + name="notes_archive", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Archiv", + ), ), migrations.AddField( - model_name='person', - name='notes_facs', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Faksimiles'), + model_name="person", + name="notes_facs", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Faksimiles", + ), ), migrations.AddField( - model_name='person', - name='notes_img', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Abbildungen'), + model_name="person", + name="notes_img", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Abbildungen", + ), ), migrations.AddField( - model_name='place', - name='notes_archive', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Archiv'), + model_name="place", + name="notes_archive", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Archiv", + ), ), migrations.AddField( - model_name='place', - name='notes_facs', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Faksimiles'), + model_name="place", + name="notes_facs", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Faksimiles", + ), ), migrations.AddField( - model_name='place', - name='notes_img', - field=ckeditor.fields.RichTextField(blank=True, help_text='whatever', null=True, verbose_name='Anmerkungen Abbildungen'), + model_name="place", + name="notes_img", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="whatever", + null=True, + verbose_name="Anmerkungen Abbildungen", + ), ), ] diff --git a/archiv/migrations/0030_auto_20220726_0839.py b/archiv/migrations/0030_auto_20220726_0839.py index e53d3ac..86be4f1 100644 --- a/archiv/migrations/0030_auto_20220726_0839.py +++ b/archiv/migrations/0030_auto_20220726_0839.py @@ -7,19 +7,28 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0029_auto_20220627_0820'), + ("archiv", "0029_auto_20220627_0820"), ] operations = [ migrations.AddField( - model_name='person', - name='created_at', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, help_text='Zeit der Erstellung des Objektes (ab 2022-05-25)', verbose_name='Erstellt am'), + model_name="person", + name="created_at", + field=models.DateTimeField( + auto_now_add=True, + default=django.utils.timezone.now, + help_text="Zeit der Erstellung des Objektes (ab 2022-05-25)", + verbose_name="Erstellt am", + ), preserve_default=False, ), migrations.AddField( - model_name='person', - name='updated_at', - field=models.DateTimeField(auto_now=True, help_text='Zeit der letzten Änderung', verbose_name='Letzte Änderung'), + model_name="person", + name="updated_at", + field=models.DateTimeField( + auto_now=True, + help_text="Zeit der letzten Änderung", + verbose_name="Letzte Änderung", + ), ), ] diff --git a/archiv/migrations/0031_auto_20220726_0902.py b/archiv/migrations/0031_auto_20220726_0902.py index d93f914..59ce189 100644 --- a/archiv/migrations/0031_auto_20220726_0902.py +++ b/archiv/migrations/0031_auto_20220726_0902.py @@ -6,17 +6,17 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0030_auto_20220726_0839'), + ("archiv", "0030_auto_20220726_0839"), ] operations = [ migrations.AlterModelOptions( - name='person', - options={'ordering': ['title']}, + name="person", + options={"ordering": ["title"]}, ), migrations.AddField( - model_name='person', - name='surname', + model_name="person", + name="surname", field=models.CharField(blank=True, max_length=250, null=True), ), ] diff --git a/archiv/migrations/0032_alter_person_options.py b/archiv/migrations/0032_alter_person_options.py index 209d2a1..109a7ce 100644 --- a/archiv/migrations/0032_alter_person_options.py +++ b/archiv/migrations/0032_alter_person_options.py @@ -6,12 +6,12 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0031_auto_20220726_0902'), + ("archiv", "0031_auto_20220726_0902"), ] operations = [ migrations.AlterModelOptions( - name='person', - options={'ordering': ['surname']}, + name="person", + options={"ordering": ["surname"]}, ), ] diff --git a/archiv/migrations/0033_alter_wab_note.py b/archiv/migrations/0033_alter_wab_note.py index 0a7c74a..b709d26 100644 --- a/archiv/migrations/0033_alter_wab_note.py +++ b/archiv/migrations/0033_alter_wab_note.py @@ -7,13 +7,18 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0032_alter_person_options'), + ("archiv", "0032_alter_person_options"), ] operations = [ migrations.AlterField( - model_name='wab', - name='note', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen und Erläuterungen', null=True, verbose_name='Anmerkungen'), + model_name="wab", + name="note", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen und Erläuterungen", + null=True, + verbose_name="Anmerkungen", + ), ), ] diff --git a/archiv/migrations/0033_auto_20220801_0828.py b/archiv/migrations/0033_auto_20220801_0828.py index 5695d4a..529e62e 100644 --- a/archiv/migrations/0033_auto_20220801_0828.py +++ b/archiv/migrations/0033_auto_20220801_0828.py @@ -7,19 +7,30 @@ class Migration(migrations.Migration): dependencies = [ - ('vocabs', '0004_auto_20220704_0714'), - ('archiv', '0032_alter_person_options'), + ("vocabs", "0004_auto_20220704_0714"), + ("archiv", "0032_alter_person_options"), ] operations = [ migrations.AddField( - model_name='event', - name='concept', - field=models.ManyToManyField(blank=True, help_text='Diese Schlagworte werden in einer eigenen Liste geführt', related_name='concept_for_event', to='vocabs.SkosConcept', verbose_name='Systematisches Schlagwort'), + model_name="event", + name="concept", + field=models.ManyToManyField( + blank=True, + help_text="Diese Schlagworte werden in einer eigenen Liste geführt", + related_name="concept_for_event", + to="vocabs.SkosConcept", + verbose_name="Systematisches Schlagwort", + ), ), migrations.AlterField( - model_name='wab', - name='note', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen und Erläuterungen', null=True, verbose_name='Anmerkungen'), + model_name="wab", + name="note", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen und Erläuterungen", + null=True, + verbose_name="Anmerkungen", + ), ), ] diff --git a/archiv/migrations/0034_merge_0033_alter_wab_note_0033_auto_20220801_0828.py b/archiv/migrations/0034_merge_0033_alter_wab_note_0033_auto_20220801_0828.py index 8b65f02..64cd9ba 100644 --- a/archiv/migrations/0034_merge_0033_alter_wab_note_0033_auto_20220801_0828.py +++ b/archiv/migrations/0034_merge_0033_alter_wab_note_0033_auto_20220801_0828.py @@ -6,9 +6,8 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0033_alter_wab_note'), - ('archiv', '0033_auto_20220801_0828'), + ("archiv", "0033_alter_wab_note"), + ("archiv", "0033_auto_20220801_0828"), ] - operations = [ - ] + operations = [] diff --git a/archiv/migrations/0035_auto_20221128_0936.py b/archiv/migrations/0035_auto_20221128_0936.py index 433f002..4b404ea 100644 --- a/archiv/migrations/0035_auto_20221128_0936.py +++ b/archiv/migrations/0035_auto_20221128_0936.py @@ -8,17 +8,19 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0034_merge_0033_alter_wab_note_0033_auto_20220801_0828'), + ("archiv", "0034_merge_0033_alter_wab_note_0033_auto_20220801_0828"), ] operations = [ migrations.AddField( - model_name='event', - name='vector_column', + model_name="event", + name="vector_column", field=django.contrib.postgres.search.SearchVectorField(null=True), ), migrations.AddIndex( - model_name='event', - index=django.contrib.postgres.indexes.GinIndex(fields=['vector_column'], name='archiv_even_vector__799b44_gin'), + model_name="event", + index=django.contrib.postgres.indexes.GinIndex( + fields=["vector_column"], name="archiv_even_vector__799b44_gin" + ), ), ] diff --git a/archiv/migrations/0037_auto_20221128_1305.py b/archiv/migrations/0037_auto_20221128_1305.py index cc79866..473168f 100644 --- a/archiv/migrations/0037_auto_20221128_1305.py +++ b/archiv/migrations/0037_auto_20221128_1305.py @@ -6,20 +6,20 @@ class Migration(migrations.Migration): dependencies = [ - ('archiv', '0036_create_trigger'), + ("archiv", "0036_create_trigger"), ] operations = [ migrations.RemoveField( - model_name='event', - name='legacy_id', + model_name="event", + name="legacy_id", ), migrations.RemoveField( - model_name='work', - name='legacy_id', + model_name="work", + name="legacy_id", ), migrations.RemoveField( - model_name='work', - name='orig_data_csv', + model_name="work", + name="orig_data_csv", ), ] diff --git a/archiv/search_result_views.py b/archiv/search_result_views.py index e645669..2c5d941 100644 --- a/archiv/search_result_views.py +++ b/archiv/search_result_views.py @@ -2,18 +2,18 @@ from django_tables2.export.views import ExportMixin -from . models import Event -from . tables import ResultsTable -from . filters import EventSimpleFilter +from .models import Event +from .tables import ResultsTable +from .filters import EventSimpleFilter class EventResultView(ExportMixin, django_tables2.SingleTableView): filter_class = EventSimpleFilter model = Event - context_filter_name = 'filter' + context_filter_name = "filter" paginate_by = 50 - template_name = 'archiv/event_result.html' + template_name = "archiv/event_result.html" table_class = ResultsTable def get_queryset(self, **kwargs): @@ -23,5 +23,5 @@ def get_queryset(self, **kwargs): def get_context_data(self, **kwargs): context = super(EventResultView, self).get_context_data() - context['query_string'] = self.request.GET.get('ft_search', None) + context["query_string"] = self.request.GET.get("ft_search", None) return context diff --git a/archiv/templates/archiv/partials/entity_sidebar.html b/archiv/templates/archiv/partials/entity_sidebar.html index d99892f..ca07e97 100644 --- a/archiv/templates/archiv/partials/entity_sidebar.html +++ b/archiv/templates/archiv/partials/entity_sidebar.html @@ -1,4 +1,3 @@ -{% load leaflet_tags %}
{% if object.wab.all %} @@ -32,34 +31,5 @@
  • {{ x }}
    • {% endfor %} - -
    - - {% leaflet_map "yourmap" callback="window.map_init_basic" %} - -
    {% endif %}
    \ No newline at end of file diff --git a/archiv/templates/archiv/place_detail.html b/archiv/templates/archiv/place_detail.html index ea709a8..c88adee 100644 --- a/archiv/templates/archiv/place_detail.html +++ b/archiv/templates/archiv/place_detail.html @@ -1,20 +1,10 @@ {% extends "webpage/base.html" %} {% load static %} {% load webpage_extras %} -{% load leaflet_tags %} {% block title %}{{ object }}{% endblock %} {% block content %} - - +
    @@ -78,9 +68,6 @@

    {{ object.remarks|safe }}

    {% endif %} - {% if object.lat %} - {% leaflet_map "yourmap" callback="window.map_init_basic" %} - {% endif %}
    {% if object.notes_lit %} diff --git a/archiv/tests.py b/archiv/tests.py index a00b43d..69ba639 100644 --- a/archiv/tests.py +++ b/archiv/tests.py @@ -9,17 +9,14 @@ from archiv.dal_urls import urlpatterns -MODELS = list(apps.all_models['archiv'].values()) +MODELS = list(apps.all_models["archiv"].values()) client = Client() -USER = { - "username": "testuser", - "password": "somepassword" -} +USER = {"username": "testuser", "password": "somepassword"} class ArchivTestCase(TestCase): - fixtures = ['dump.json'] + fixtures = ["dump.json"] def setUp(self): # Create two users @@ -43,7 +40,7 @@ def test_003_detailviews(self): except AttributeError: url = False if url: - response = client.get(url, {'pk': item.id}) + response = client.get(url, {"pk": item.id}) self.assertEqual(response.status_code, 200) def test_004_editviews(self): @@ -55,7 +52,7 @@ def test_004_editviews(self): except AttributeError: url = False if url: - response = client.get(url, {'pk': item.id}) + response = client.get(url, {"pk": item.id}) self.assertEqual(response.status_code, 200) def test_005_createviews_not_logged_in(self): @@ -66,7 +63,7 @@ def test_005_createviews_not_logged_in(self): except AttributeError: url = False if url: - response = client.get(url, {'pk': item.id}) + response = client.get(url, {"pk": item.id}) self.assertEqual(response.status_code, 302) def test_006_createviews_logged_in(self): @@ -78,7 +75,7 @@ def test_006_createviews_logged_in(self): except AttributeError: url = False if url: - response = client.get(url, {'pk': item.id}) + response = client.get(url, {"pk": item.id}) self.assertEqual(response.status_code, 200) def test_016_ac_views(self): diff --git a/archiv/urls.py b/archiv/urls.py index 98b2c17..bba340f 100644 --- a/archiv/urls.py +++ b/archiv/urls.py @@ -52,7 +52,9 @@ path("place/create/", views.PlaceCreate.as_view(), name="place_create"), path("place/edit//", views.PlaceUpdate.as_view(), name="place_edit"), path("place/delete//", views.PlaceDelete.as_view(), name="place_delete"), - path("institution/", views.InstitutionListView.as_view(), name="institution_browse"), + path( + "institution/", views.InstitutionListView.as_view(), name="institution_browse" + ), path( "institution/detail//", views.InstitutionDetailView.as_view(), diff --git a/archiv/utils.py b/archiv/utils.py index ec2f392..775d791 100644 --- a/archiv/utils.py +++ b/archiv/utils.py @@ -11,8 +11,8 @@ def fix_hrefs(item): data = getattr(item, x) if data: soup = BeautifulSoup(data, "html.parser") - for link in soup.find_all('a'): - href = link.get('href') + for link in soup.find_all("a"): + href = link.get("href") if href is not None: if "abcd.acdh" in href: pass diff --git a/djangobaseproject/asgi.py b/djangobaseproject/asgi.py index b7c8532..5ab0c04 100644 --- a/djangobaseproject/asgi.py +++ b/djangobaseproject/asgi.py @@ -11,6 +11,6 @@ from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangobaseproject.settings') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangobaseproject.settings") application = get_asgi_application() diff --git a/djangobaseproject/settings.py b/djangobaseproject/settings.py index 75c7982..e8c3488 100644 --- a/djangobaseproject/settings.py +++ b/djangobaseproject/settings.py @@ -61,7 +61,7 @@ "django.contrib.messages", "django.contrib.staticfiles", "django_extensions", - "leaflet", + # "leaflet", "rest_framework", "crispy_forms", "crispy_bootstrap4", diff --git a/djangobaseproject/urls.py b/djangobaseproject/urls.py index 9a65ea3..5c88f56 100644 --- a/djangobaseproject/urls.py +++ b/djangobaseproject/urls.py @@ -7,25 +7,24 @@ from archiv import api_views as archiv_api_views router = routers.DefaultRouter() -router.register(r'events', archiv_api_views.EventViewSet) -router.register(r'works', archiv_api_views.WorkViewSet) -router.register(r'persons', archiv_api_views.PersonViewSet) -router.register(r'places', archiv_api_views.PlaceViewSet) -router.register(r'institutions', archiv_api_views.InstitutionViewSet) -router.register(r'wabs', archiv_api_views.WabViewSet) +router.register(r"events", archiv_api_views.EventViewSet) +router.register(r"works", archiv_api_views.WorkViewSet) +router.register(r"persons", archiv_api_views.PersonViewSet) +router.register(r"places", archiv_api_views.PlaceViewSet) +router.register(r"institutions", archiv_api_views.InstitutionViewSet) +router.register(r"wabs", archiv_api_views.WabViewSet) urlpatterns = [ - path('api/', include(router.urls), name="api-root"), - path('admin/', admin.site.urls), - path('archiv/', include('archiv.urls', namespace='archiv')), - path('browsing/', include('browsing.urls', namespace='browsing')), - path('archiv-ac/', include('archiv.dal_urls', namespace='archiv-ac')), - path('vocabs/', include('vocabs.urls', namespace='vocabs')), - path('vocabs-ac/', include('vocabs.dal_urls', namespace='vocabs-ac')), - path('', include('webpage.urls', namespace='webpage')), - path('infos/', include('infos.urls', namespace='infos')), - + path("api/", include(router.urls), name="api-root"), + path("admin/", admin.site.urls), + path("archiv/", include("archiv.urls", namespace="archiv")), + path("browsing/", include("browsing.urls", namespace="browsing")), + path("archiv-ac/", include("archiv.dal_urls", namespace="archiv-ac")), + path("vocabs/", include("vocabs.urls", namespace="vocabs")), + path("vocabs-ac/", include("vocabs.dal_urls", namespace="vocabs-ac")), + path("", include("webpage.urls", namespace="webpage")), + path("infos/", include("infos.urls", namespace="infos")), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) -handler404 = 'webpage.views.handler404' +handler404 = "webpage.views.handler404" diff --git a/djangobaseproject/wsgi.py b/djangobaseproject/wsgi.py index 5df6ca7..be74f9b 100644 --- a/djangobaseproject/wsgi.py +++ b/djangobaseproject/wsgi.py @@ -11,6 +11,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangobaseproject.settings') +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangobaseproject.settings") application = get_wsgi_application() diff --git a/infos/apps.py b/infos/apps.py index 458a7d4..40918ec 100644 --- a/infos/apps.py +++ b/infos/apps.py @@ -2,4 +2,4 @@ class InfosConfig(AppConfig): - name = 'infos' + name = "infos" diff --git a/infos/filters.py b/infos/filters.py index 602855a..dde41ab 100644 --- a/infos/filters.py +++ b/infos/filters.py @@ -1,6 +1,6 @@ # generated by appcreator import django_filters -from . models import AboutTheProject, TeamMember, ProjectInst +from .models import AboutTheProject, TeamMember, ProjectInst class TeamMemberListFilter(django_filters.FilterSet): diff --git a/infos/forms.py b/infos/forms.py index 271b064..f7df54b 100644 --- a/infos/forms.py +++ b/infos/forms.py @@ -3,31 +3,24 @@ from crispy_forms.helper import FormHelper from crispy_forms.layout import Submit, Layout, Fieldset from crispy_forms.bootstrap import Accordion, AccordionGroup -from . models import AboutTheProject, TeamMember, ProjectInst +from .models import AboutTheProject, TeamMember, ProjectInst class ProjectInstFilterFormHelper(FormHelper): def __init__(self, *args, **kwargs): super(ProjectInstFilterFormHelper, self).__init__(*args, **kwargs) self.helper = FormHelper() - self.form_class = 'genericFilterForm' - self.form_method = 'GET' + self.form_class = "genericFilterForm" + self.form_method = "GET" self.helper.form_tag = False - self.add_input(Submit('Filter', 'Search')) + self.add_input(Submit("Filter", "Search")) self.layout = Layout( Fieldset( - 'Basic search options', - 'id', - 'name', - css_id="basic_search_fields" + "Basic search options", "id", "name", css_id="basic_search_fields" ), Accordion( - AccordionGroup( - 'More', - 'website', - css_id="more" - ), - ) + AccordionGroup("More", "website", css_id="more"), + ), ) @@ -40,35 +33,29 @@ def __init__(self, *args, **kwargs): super(ProjectInstForm, self).__init__(*args, **kwargs) self.helper = FormHelper() self.helper.form_tag = True - self.helper.form_class = 'form-horizontal' - self.helper.label_class = 'col-md-3' - self.helper.field_class = 'col-md-9' - self.helper.add_input(Submit('submit', 'save'),) + self.helper.form_class = "form-horizontal" + self.helper.label_class = "col-md-3" + self.helper.field_class = "col-md-9" + self.helper.add_input( + Submit("submit", "save"), + ) class TeamMemberFilterFormHelper(FormHelper): def __init__(self, *args, **kwargs): super(TeamMemberFilterFormHelper, self).__init__(*args, **kwargs) self.helper = FormHelper() - self.form_class = 'genericFilterForm' - self.form_method = 'GET' + self.form_class = "genericFilterForm" + self.form_method = "GET" self.helper.form_tag = False - self.add_input(Submit('Filter', 'Search')) + self.add_input(Submit("Filter", "Search")) self.layout = Layout( Fieldset( - 'Basic search options', - 'id', - 'name', - css_id="basic_search_fields" + "Basic search options", "id", "name", css_id="basic_search_fields" ), Accordion( - AccordionGroup( - 'More', - 'website', - 'role', - css_id="more" - ), - ) + AccordionGroup("More", "website", "role", css_id="more"), + ), ) @@ -81,34 +68,32 @@ def __init__(self, *args, **kwargs): super(TeamMemberForm, self).__init__(*args, **kwargs) self.helper = FormHelper() self.helper.form_tag = True - self.helper.form_class = 'form-horizontal' - self.helper.label_class = 'col-md-3' - self.helper.field_class = 'col-md-9' - self.helper.add_input(Submit('submit', 'save'),) + self.helper.form_class = "form-horizontal" + self.helper.label_class = "col-md-3" + self.helper.field_class = "col-md-9" + self.helper.add_input( + Submit("submit", "save"), + ) class AboutTheProjectFilterFormHelper(FormHelper): def __init__(self, *args, **kwargs): super(AboutTheProjectFilterFormHelper, self).__init__(*args, **kwargs) self.helper = FormHelper() - self.form_class = 'genericFilterForm' - self.form_method = 'GET' + self.form_class = "genericFilterForm" + self.form_method = "GET" self.helper.form_tag = False - self.add_input(Submit('Filter', 'Search')) + self.add_input(Submit("Filter", "Search")) self.layout = Layout( Fieldset( - 'Basic search options', - 'id', - 'description', - css_id="basic_search_fields" + "Basic search options", + "id", + "description", + css_id="basic_search_fields", ), Accordion( - AccordionGroup( - 'Authors', - 'author', - css_id="more" - ), - ) + AccordionGroup("Authors", "author", css_id="more"), + ), ) @@ -121,7 +106,9 @@ def __init__(self, *args, **kwargs): super(AboutTheProjectForm, self).__init__(*args, **kwargs) self.helper = FormHelper() self.helper.form_tag = True - self.helper.form_class = 'form-horizontal' - self.helper.label_class = 'col-md-3' - self.helper.field_class = 'col-md-9' - self.helper.add_input(Submit('submit', 'save'),) + self.helper.form_class = "form-horizontal" + self.helper.label_class = "col-md-3" + self.helper.field_class = "col-md-9" + self.helper.add_input( + Submit("submit", "save"), + ) diff --git a/infos/migrations/0001_initial.py b/infos/migrations/0001_initial.py index cbf7587..0f23bc5 100644 --- a/infos/migrations/0001_initial.py +++ b/infos/migrations/0001_initial.py @@ -7,56 +7,174 @@ class Migration(migrations.Migration): initial = True - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='AboutTheProject', + name="AboutTheProject", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(blank=True, max_length=300, verbose_name="Project's Title")), - ('subtitle', models.CharField(blank=True, max_length=300, verbose_name="Project's Sub Title")), - ('description', models.TextField(blank=True, verbose_name='Project Description')), - ('author', models.CharField(blank=True, help_text='The names of the Agents responsible for this description', max_length=250, verbose_name='Authors')), - ('github', models.CharField(blank=True, help_text="Link to the application's source code", max_length=250, verbose_name='Code Repo')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('updated_at', models.DateTimeField(auto_now=True)), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "title", + models.CharField( + blank=True, max_length=300, verbose_name="Project's Title" + ), + ), + ( + "subtitle", + models.CharField( + blank=True, max_length=300, verbose_name="Project's Sub Title" + ), + ), + ( + "description", + models.TextField(blank=True, verbose_name="Project Description"), + ), + ( + "author", + models.CharField( + blank=True, + help_text="The names of the Agents responsible for this description", + max_length=250, + verbose_name="Authors", + ), + ), + ( + "github", + models.CharField( + blank=True, + help_text="Link to the application's source code", + max_length=250, + verbose_name="Code Repo", + ), + ), + ("created_at", models.DateTimeField(auto_now_add=True)), + ("updated_at", models.DateTimeField(auto_now=True)), ], options={ - 'verbose_name': 'About the Project', - 'ordering': ['id'], + "verbose_name": "About the Project", + "ordering": ["id"], }, ), migrations.CreateModel( - name='ProjectInst', + name="ProjectInst", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, max_length=300, verbose_name='Name')), - ('abbr', models.CharField(blank=True, max_length=300, verbose_name='Abbreviation')), - ('description', models.TextField(blank=True, verbose_name='Short description of the Institution')), - ('website', models.URLField(blank=True, max_length=300, verbose_name="Link to the Institution's website")), - ('logo_url', models.URLField(blank=True, max_length=300, verbose_name="Link to the Insitution's Logo")), - ('norm_url', models.URLField(blank=True, help_text='URL to any normdata record of the institution', max_length=300, verbose_name='Norm Data URL (OCRID, GND, VIAF, ...)')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "name", + models.CharField(blank=True, max_length=300, verbose_name="Name"), + ), + ( + "abbr", + models.CharField( + blank=True, max_length=300, verbose_name="Abbreviation" + ), + ), + ( + "description", + models.TextField( + blank=True, verbose_name="Short description of the Institution" + ), + ), + ( + "website", + models.URLField( + blank=True, + max_length=300, + verbose_name="Link to the Institution's website", + ), + ), + ( + "logo_url", + models.URLField( + blank=True, + max_length=300, + verbose_name="Link to the Insitution's Logo", + ), + ), + ( + "norm_url", + models.URLField( + blank=True, + help_text="URL to any normdata record of the institution", + max_length=300, + verbose_name="Norm Data URL (OCRID, GND, VIAF, ...)", + ), + ), ], options={ - 'verbose_name': 'Institution involved in the Project', - 'ordering': ['name'], + "verbose_name": "Institution involved in the Project", + "ordering": ["name"], }, ), migrations.CreateModel( - name='TeamMember', + name="TeamMember", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, max_length=300, verbose_name='Name')), - ('description', models.TextField(blank=True, verbose_name='Short description of the Person')), - ('website', models.URLField(blank=True, max_length=300, verbose_name="Link to the person's website")), - ('role', models.CharField(blank=True, help_text='will be used to group the team member', max_length=300, verbose_name="The person's role in the project")), - ('norm_url', models.URLField(blank=True, help_text='URL to any normdata record of the person', max_length=300, verbose_name='Norm Data URL (OCRID, GND, VIAF, ...)')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "name", + models.CharField(blank=True, max_length=300, verbose_name="Name"), + ), + ( + "description", + models.TextField( + blank=True, verbose_name="Short description of the Person" + ), + ), + ( + "website", + models.URLField( + blank=True, + max_length=300, + verbose_name="Link to the person's website", + ), + ), + ( + "role", + models.CharField( + blank=True, + help_text="will be used to group the team member", + max_length=300, + verbose_name="The person's role in the project", + ), + ), + ( + "norm_url", + models.URLField( + blank=True, + help_text="URL to any normdata record of the person", + max_length=300, + verbose_name="Norm Data URL (OCRID, GND, VIAF, ...)", + ), + ), ], options={ - 'verbose_name': 'Team Member', - 'ordering': ['role', 'name'], + "verbose_name": "Team Member", + "ordering": ["role", "name"], }, ), ] diff --git a/infos/models.py b/infos/models.py index 8a31fa5..7ff88a4 100644 --- a/infos/models.py +++ b/infos/models.py @@ -4,37 +4,32 @@ class ProjectInst(models.Model): - """ A class describing Institutions involved in the Project""" - name = models.CharField( - max_length=300, blank=True, - verbose_name="Name" - ) - abbr = models.CharField( - max_length=300, blank=True, - verbose_name="Abbreviation" - ) + """A class describing Institutions involved in the Project""" + + name = models.CharField(max_length=300, blank=True, verbose_name="Name") + abbr = models.CharField(max_length=300, blank=True, verbose_name="Abbreviation") description = models.TextField( - blank=True, - verbose_name="Short description of the Institution" + blank=True, verbose_name="Short description of the Institution" ) website = models.URLField( - max_length=300, blank=True, - verbose_name="Link to the Institution's website" + max_length=300, blank=True, verbose_name="Link to the Institution's website" ) logo_url = models.URLField( - max_length=300, blank=True, + max_length=300, + blank=True, verbose_name="Link to the Insitution's Logo", ) norm_url = models.URLField( - max_length=300, blank=True, + max_length=300, + blank=True, verbose_name="Norm Data URL (OCRID, GND, VIAF, ...)", - help_text="URL to any normdata record of the institution" + help_text="URL to any normdata record of the institution", ) class Meta: ordering = [ - 'name', + "name", ] verbose_name = "Institution involved in the Project" @@ -46,70 +41,62 @@ def field_dict(self): @classmethod def get_listview_url(self): - return reverse('info:projectinst_browse') + return reverse("info:projectinst_browse") @classmethod def get_createview_url(self): - return reverse('info:projectinst_create') + return reverse("info:projectinst_create") def get_absolute_url(self): - return reverse('info:projectinst_detail', kwargs={'pk': self.id}) + return reverse("info:projectinst_detail", kwargs={"pk": self.id}) def get_delete_url(self): - return reverse('info:projectinst_delete', kwargs={'pk': self.id}) + return reverse("info:projectinst_delete", kwargs={"pk": self.id}) def get_edit_url(self): - return reverse('info:projectinst_edit', kwargs={'pk': self.id}) + return reverse("info:projectinst_edit", kwargs={"pk": self.id}) def get_next(self): next = self.__class__.objects.filter(id__gt=self.id) if next: - return reverse( - 'info:projectinst_detail', - kwargs={'pk': next.first().id} - ) + return reverse("info:projectinst_detail", kwargs={"pk": next.first().id}) return False def get_prev(self): - prev = self.__class__.objects.filter(id__lt=self.id).order_by('-id') + prev = self.__class__.objects.filter(id__lt=self.id).order_by("-id") if prev: - return reverse( - 'info:projectinst_detail', - kwargs={'pk': prev.first().id} - ) + return reverse("info:projectinst_detail", kwargs={"pk": prev.first().id}) return False class TeamMember(models.Model): - """ A class describing project's team member""" - name = models.CharField( - max_length=300, blank=True, - verbose_name="Name" - ) + """A class describing project's team member""" + + name = models.CharField(max_length=300, blank=True, verbose_name="Name") description = models.TextField( - blank=True, - verbose_name="Short description of the Person" + blank=True, verbose_name="Short description of the Person" ) website = models.URLField( - max_length=300, blank=True, - verbose_name="Link to the person's website" + max_length=300, blank=True, verbose_name="Link to the person's website" ) role = models.CharField( - max_length=300, blank=True, + max_length=300, + blank=True, verbose_name="The person's role in the project", - help_text="will be used to group the team member" + help_text="will be used to group the team member", ) norm_url = models.URLField( - max_length=300, blank=True, + max_length=300, + blank=True, verbose_name="Norm Data URL (OCRID, GND, VIAF, ...)", - help_text="URL to any normdata record of the person" + help_text="URL to any normdata record of the person", ) class Meta: ordering = [ - 'role', - 'name', + "role", + "name", ] verbose_name = "Team Member" @@ -121,54 +108,42 @@ def field_dict(self): @classmethod def get_listview_url(self): - return reverse('info:teammember_browse') + return reverse("info:teammember_browse") @classmethod def get_createview_url(self): - return reverse('info:teammember_create') + return reverse("info:teammember_create") def get_absolute_url(self): - return reverse('info:teammember_detail', kwargs={'pk': self.id}) + return reverse("info:teammember_detail", kwargs={"pk": self.id}) def get_delete_url(self): - return reverse('info:teammember_delete', kwargs={'pk': self.id}) + return reverse("info:teammember_delete", kwargs={"pk": self.id}) def get_edit_url(self): - return reverse('info:teammember_edit', kwargs={'pk': self.id}) + return reverse("info:teammember_edit", kwargs={"pk": self.id}) def get_next(self): next = self.__class__.objects.filter(id__gt=self.id) if next: - return reverse( - 'info:teammember_detail', - kwargs={'pk': next.first().id} - ) + return reverse("info:teammember_detail", kwargs={"pk": next.first().id}) return False def get_prev(self): - prev = self.__class__.objects.filter(id__lt=self.id).order_by('-id') + prev = self.__class__.objects.filter(id__lt=self.id).order_by("-id") if prev: - return reverse( - 'info:teammember_detail', - kwargs={'pk': prev.first().id} - ) + return reverse("info:teammember_detail", kwargs={"pk": prev.first().id}) return False class AboutTheProject(models.Model): - """ A class containing a lengthy project description """ - title = models.CharField( - max_length=300, blank=True, - verbose_name="Project's Title" - ) + """A class containing a lengthy project description""" + + title = models.CharField(max_length=300, blank=True, verbose_name="Project's Title") subtitle = models.CharField( - max_length=300, blank=True, - verbose_name="Project's Sub Title" - ) - description = models.TextField( - blank=True, - verbose_name="Project Description" + max_length=300, blank=True, verbose_name="Project's Sub Title" ) + description = models.TextField(blank=True, verbose_name="Project Description") author = models.CharField( max_length=250, blank=True, @@ -187,7 +162,7 @@ class AboutTheProject(models.Model): class Meta: ordering = [ - 'id', + "id", ] verbose_name = "About the Project" @@ -199,35 +174,29 @@ def field_dict(self): @classmethod def get_listview_url(self): - return reverse('info:about_browse') + return reverse("info:about_browse") @classmethod def get_createview_url(self): - return reverse('info:about_create') + return reverse("info:about_create") def get_absolute_url(self): - return reverse('info:about_detail', kwargs={'pk': self.id}) + return reverse("info:about_detail", kwargs={"pk": self.id}) def get_delete_url(self): - return reverse('info:about_delete', kwargs={'pk': self.id}) + return reverse("info:about_delete", kwargs={"pk": self.id}) def get_edit_url(self): - return reverse('info:about_edit', kwargs={'pk': self.id}) + return reverse("info:about_edit", kwargs={"pk": self.id}) def get_next(self): next = self.__class__.objects.filter(id__gt=self.id) if next: - return reverse( - 'info:about_detail', - kwargs={'pk': next.first().id} - ) + return reverse("info:about_detail", kwargs={"pk": next.first().id}) return False def get_prev(self): - prev = self.__class__.objects.filter(id__lt=self.id).order_by('-id') + prev = self.__class__.objects.filter(id__lt=self.id).order_by("-id") if prev: - return reverse( - 'info:about_detail', - kwargs={'pk': prev.first().id} - ) + return reverse("info:about_detail", kwargs={"pk": prev.first().id}) return False diff --git a/infos/special_views.py b/infos/special_views.py index cf31b6d..41f04a2 100644 --- a/infos/special_views.py +++ b/infos/special_views.py @@ -1,7 +1,7 @@ from django.views.generic import TemplateView from webpage.utils import PROJECT_METADATA as PM -from . models import AboutTheProject, TeamMember +from .models import AboutTheProject, TeamMember class TeamView(TemplateView): @@ -10,12 +10,12 @@ class TeamView(TemplateView): def get_context_data(self, **kwargs): objects = TeamMember.objects.all() context = super().get_context_data(**kwargs) - context['objects'] = objects + context["objects"] = objects return context class SpecialAboutView(TemplateView): - template_name = 'infos/about.html' + template_name = "infos/about.html" def get_context_data(self, **kwargs): try: @@ -23,5 +23,5 @@ def get_context_data(self, **kwargs): except IndexError: object = PM context = super().get_context_data(**kwargs) - context['object'] = object + context["object"] = object return context diff --git a/infos/tables.py b/infos/tables.py index 4d928e1..f4c1174 100644 --- a/infos/tables.py +++ b/infos/tables.py @@ -1,32 +1,32 @@ import django_tables2 as tables -from . models import AboutTheProject, TeamMember, ProjectInst +from .models import AboutTheProject, TeamMember, ProjectInst class AboutTheProjectTable(tables.Table): - id = tables.LinkColumn(verbose_name='ID') + id = tables.LinkColumn(verbose_name="ID") class Meta: model = AboutTheProject - sequence = ('id',) + sequence = ("id",) attrs = {"class": "table table-responsive table-hover"} class TeamMemberTable(tables.Table): - id = tables.LinkColumn(verbose_name='ID') + id = tables.LinkColumn(verbose_name="ID") class Meta: model = TeamMember - sequence = ('id',) + sequence = ("id",) attrs = {"class": "table table-responsive table-hover"} class ProjectInstTable(tables.Table): - id = tables.LinkColumn(verbose_name='ID') + id = tables.LinkColumn(verbose_name="ID") class Meta: model = ProjectInst - sequence = ('id',) + sequence = ("id",) attrs = {"class": "table table-responsive table-hover"} diff --git a/infos/templatetags/infos_extras.py b/infos/templatetags/infos_extras.py index 1f0d69e..51709e0 100644 --- a/infos/templatetags/infos_extras.py +++ b/infos/templatetags/infos_extras.py @@ -6,7 +6,6 @@ @register.simple_tag def project_insts(): - """returns all Project Institution objects""" project_insts = ProjectInst.objects.all() return project_insts diff --git a/infos/templatetags/stats_extras.py b/infos/templatetags/stats_extras.py index d56a140..07e7dc0 100644 --- a/infos/templatetags/stats_extras.py +++ b/infos/templatetags/stats_extras.py @@ -6,7 +6,6 @@ @register.simple_tag def create_object_count(app=None): - """fetches all models of the passed in app and returns a dict containg the name of each class and the number of instances""" @@ -17,28 +16,21 @@ def create_object_count(app=None): modelname = x.model try: fetched_model = ContentType.objects.get( - app_label=app, model=modelname).model_class() + app_label=app, model=modelname + ).model_class() item = { - 'name': modelname.title(), - 'count': fetched_model.objects.count() + "name": modelname.title(), + "count": fetched_model.objects.count(), } except Exception as e: - item = { - 'name': x, - 'count': e - } + item = {"name": x, "count": e} try: - item['link'] = fetched_model.get_listview_url() + item["link"] = fetched_model.get_listview_url() except AttributeError: - item['link'] = None + item["link"] = None result.append(item) return result else: - result = [ - { - 'name': 'no parameter passed in', - 'count': '1' - } - ] + result = [{"name": "no parameter passed in", "count": "1"}] return result diff --git a/infos/tests.py b/infos/tests.py index d2a9860..94c528d 100644 --- a/infos/tests.py +++ b/infos/tests.py @@ -3,17 +3,14 @@ from django.test import Client, TestCase -MODELS = list(apps.all_models['archiv'].values()) +MODELS = list(apps.all_models["archiv"].values()) client = Client() -USER = { - "username": "temporary1", - "password": "temporary1" -} +USER = {"username": "temporary1", "password": "temporary1"} class InfosTest(TestCase): - fixtures = ['dump.json'] + fixtures = ["dump.json"] def setUp(self): self.client = Client() @@ -37,5 +34,5 @@ def test_003_detailviews(self): except AttributeError: url = False if url: - response = client.get(url, {'pk': item.id}) + response = client.get(url, {"pk": item.id}) self.assertEqual(response.status_code, 200) diff --git a/infos/views.py b/infos/views.py index 2fb63d7..58259be 100644 --- a/infos/views.py +++ b/infos/views.py @@ -4,34 +4,22 @@ from django.urls import reverse_lazy from django.views.generic.detail import DetailView from django.views.generic.edit import DeleteView -from . filters import ( +from .filters import ( AboutTheProjectListFilter, ProjectInstListFilter, TeamMemberListFilter, ) -from . forms import ( +from .forms import ( AboutTheProjectForm, AboutTheProjectFilterFormHelper, ProjectInstForm, ProjectInstFilterFormHelper, TeamMemberForm, - TeamMemberFilterFormHelper -) -from . tables import ( - AboutTheProjectTable, - ProjectInstTable, - TeamMemberTable -) -from . models import ( - AboutTheProject, - ProjectInst, - TeamMember -) -from browsing.browsing_utils import ( - GenericListView, - BaseCreateView, - BaseUpdateView + TeamMemberFilterFormHelper, ) +from .tables import AboutTheProjectTable, ProjectInstTable, TeamMemberTable +from .models import AboutTheProject, ProjectInst, TeamMember +from browsing.browsing_utils import GenericListView, BaseCreateView, BaseUpdateView class TeamMemberListView(GenericListView): @@ -41,14 +29,15 @@ class TeamMemberListView(GenericListView): formhelper_class = TeamMemberFilterFormHelper table_class = TeamMemberTable init_columns = [ - 'id', 'description', + "id", + "description", ] class TeamMemberDetailView(DetailView): model = TeamMember - template_name = 'browsing/generic_detail.html' + template_name = "browsing/generic_detail.html" class TeamMemberCreate(BaseCreateView): @@ -73,8 +62,8 @@ def dispatch(self, *args, **kwargs): class TeamMemberDelete(DeleteView): model = TeamMember - template_name = 'webpage/confirm_delete.html' - success_url = reverse_lazy('info:teammember_browse') + template_name = "webpage/confirm_delete.html" + success_url = reverse_lazy("info:teammember_browse") @method_decorator(login_required) def dispatch(self, *args, **kwargs): @@ -88,14 +77,15 @@ class AboutTheProjectListView(GenericListView): formhelper_class = AboutTheProjectFilterFormHelper table_class = AboutTheProjectTable init_columns = [ - 'id', 'description', + "id", + "description", ] class AboutTheProjectDetailView(DetailView): model = AboutTheProject - template_name = 'browsing/generic_detail.html' + template_name = "browsing/generic_detail.html" class AboutTheProjectCreate(BaseCreateView): @@ -120,8 +110,8 @@ def dispatch(self, *args, **kwargs): class AboutTheProjectDelete(DeleteView): model = AboutTheProject - template_name = 'webpage/confirm_delete.html' - success_url = reverse_lazy('info:about_browse') + template_name = "webpage/confirm_delete.html" + success_url = reverse_lazy("info:about_browse") @method_decorator(login_required) def dispatch(self, *args, **kwargs): @@ -135,14 +125,15 @@ class ProjectInstListView(GenericListView): formhelper_class = ProjectInstFilterFormHelper table_class = ProjectInstTable init_columns = [ - 'id', 'description', + "id", + "description", ] class ProjectInstDetailView(DetailView): model = ProjectInst - template_name = 'browsing/generic_detail.html' + template_name = "browsing/generic_detail.html" class ProjectInstCreate(BaseCreateView): @@ -167,8 +158,8 @@ def dispatch(self, *args, **kwargs): class ProjectInstDelete(DeleteView): model = ProjectInst - template_name = 'webpage/confirm_delete.html' - success_url = reverse_lazy('info:projectinst_browse') + template_name = "webpage/confirm_delete.html" + success_url = reverse_lazy("info:projectinst_browse") @method_decorator(login_required) def dispatch(self, *args, **kwargs): diff --git a/manage.py b/manage.py index 660f2ee..7c14955 100755 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangobaseproject.settings') + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangobaseproject.settings") try: from django.core.management import execute_from_command_line except ImportError as exc: @@ -18,5 +18,5 @@ def main(): execute_from_command_line(sys.argv) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/requirements.txt b/requirements.txt index 63400e0..23b8bc5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ acdh-cfts-pyutils==0.2 -acdh-django-browsing==1.3 +acdh-django-browsing==2.0 beautifulsoup4>=4.11.2,<5 ciso8601==2.2.0 -crispy-bootstrap4 -Django>=3.2,<4.3 +crispy-bootstrap4>=2024.1,<2025 +Django>=5.0.6,<6 django-ckeditor==6.2.0 django-extensions>=3.1.5,<4 django-fixture-magic==0.1.5 @@ -13,7 +13,8 @@ django-next-prev==1.1.0 django-spaghetti-and-meatballs==0.4.2 djangorestframework>=3.13.1,<4 django-leaflet==0.28.3 -rdflib>=6.1.1>7 +rdflib>=7.0.0,<8 tqdm>=4.62.3,<5 requests>=2.25 -psycopg2-binary==2.9.3 \ No newline at end of file +psycopg2-binary==2.9.3 +pandas \ No newline at end of file diff --git a/requirements_dev.txt b/requirements_dev.txt index 0e451a0..f10f371 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,3 +1,4 @@ -r requirements.txt -flake8>=4.0.0 -coverage>=5.5 \ No newline at end of file +flake8 +coverage +black \ No newline at end of file diff --git a/vocabs/admin.py b/vocabs/admin.py index 8293c89..ea521b6 100644 --- a/vocabs/admin.py +++ b/vocabs/admin.py @@ -4,7 +4,7 @@ from vocabs.models import SkosCollection, SkosConcept, SkosTechnicalCollection -VOCABS_LISTVIEW_PAGESIZE = getattr(settings, 'VOCABS_LISTVIEW_PAGESIZE', 50) +VOCABS_LISTVIEW_PAGESIZE = getattr(settings, "VOCABS_LISTVIEW_PAGESIZE", 50) @admin.register(SkosConcept) @@ -12,25 +12,20 @@ class SkosConceptAdmin(DraggableMPTTAdmin): model = SkosConcept list_filter = ( - ('tech_collection', admin.RelatedOnlyFieldListFilter), - ('collection'), - ('broader_concept', admin.RelatedOnlyFieldListFilter), + ("tech_collection", admin.RelatedOnlyFieldListFilter), + ("collection"), + ("broader_concept", admin.RelatedOnlyFieldListFilter), ) list_per_page = VOCABS_LISTVIEW_PAGESIZE - search_fields = ['pref_label'] - autocomplete_fields = ['broader_concept'] + search_fields = ["pref_label"] + autocomplete_fields = ["broader_concept"] @admin.register(SkosCollection) class SkosCollectionAdmin(admin.ModelAdmin): model = SkosCollection - list_display = ( - 'pref_label', - 'source_uri' - ) - list_filter = ( - 'pref_label', - ) + list_display = ("pref_label", "source_uri") + list_filter = ("pref_label",) @admin.register(SkosTechnicalCollection) diff --git a/vocabs/apps.py b/vocabs/apps.py index 597974e..e3070ac 100644 --- a/vocabs/apps.py +++ b/vocabs/apps.py @@ -2,5 +2,5 @@ class VocabsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'vocabs' + default_auto_field = "django.db.models.BigAutoField" + name = "vocabs" diff --git a/vocabs/dal_urls.py b/vocabs/dal_urls.py index 7cdf8dd..efcade8 100644 --- a/vocabs/dal_urls.py +++ b/vocabs/dal_urls.py @@ -4,19 +4,13 @@ from vocabs import dal_views from vocabs.models import SkosConcept -app_name = 'vocabs' +app_name = "vocabs" urlpatterns = [ + path("concept", dal_views.SkosConceptAC.as_view(), name="concept-ac"), path( - 'concept', - dal_views.SkosConceptAC.as_view(), - name='concept-ac' + r"concept/", + dal_views.SpecificConcepts.as_view(model=SkosConcept), + name="specific-concept-ac", ), - path( - r'concept/', - dal_views.SpecificConcepts.as_view( - model=SkosConcept - ), - name='specific-concept-ac', - ) ] diff --git a/vocabs/dal_views.py b/vocabs/dal_views.py index 983442c..6d4d6a9 100644 --- a/vocabs/dal_views.py +++ b/vocabs/dal_views.py @@ -9,8 +9,7 @@ def get_queryset(self): qs = SkosConcept.objects.all() if self.q: qs = qs.filter( - Q(pref_label__icontains=self.q) | - Q(source_uri__icontains=self.q) + Q(pref_label__icontains=self.q) | Q(source_uri__icontains=self.q) ) return qs @@ -18,9 +17,11 @@ def get_queryset(self): class SpecificConcepts(autocomplete.Select2QuerySetView): def get_queryset(self): - tech_collection = self.kwargs['tech_col'] + tech_collection = self.kwargs["tech_col"] try: - selected_collection = SkosTechnicalCollection.objects.get(pref_label=tech_collection) + selected_collection = SkosTechnicalCollection.objects.get( + pref_label=tech_collection + ) qs = SkosConcept.objects.filter(tech_collection=selected_collection) except ObjectDoesNotExist: qs = SkosConcept.objects.all() diff --git a/vocabs/filters.py b/vocabs/filters.py index b552bb8..f6b281e 100644 --- a/vocabs/filters.py +++ b/vocabs/filters.py @@ -1,6 +1,6 @@ import django_filters -from . models import ( +from .models import ( SkosTechnicalCollection, SkosConcept, SkosCollection, @@ -8,41 +8,28 @@ class SkosTechnicalCollectionListFilter(django_filters.FilterSet): - pref_label = django_filters.CharFilter( - lookup_expr='icontains' - ) + pref_label = django_filters.CharFilter(lookup_expr="icontains") class Meta: model = SkosTechnicalCollection - fields = [ - 'pref_label', - 'id' - ] + fields = ["pref_label", "id"] class SkosCollectionListFilter(django_filters.FilterSet): - pref_label = django_filters.CharFilter( - lookup_expr='icontains' - ) + pref_label = django_filters.CharFilter(lookup_expr="icontains") class Meta: model = SkosCollection - fields = [ - 'pref_label', - 'id' - ] + fields = ["pref_label", "id"] class SkosConceptListFilter(django_filters.FilterSet): - pref_label = django_filters.CharFilter( - lookup_expr='icontains', - label='Titel' - ) + pref_label = django_filters.CharFilter(lookup_expr="icontains", label="Titel") class Meta: model = SkosConcept fields = [ - 'id', - 'pref_label', - 'collection', + "id", + "pref_label", + "collection", ] diff --git a/vocabs/import_utils.py b/vocabs/import_utils.py index 98d2422..626b486 100644 --- a/vocabs/import_utils.py +++ b/vocabs/import_utils.py @@ -5,7 +5,7 @@ from vocabs.models import SkosConcept, SkosCollection -DEFAULT_LANG = getattr(settings, 'VOCABS_DEFAULT_LANG', 'eng') +DEFAULT_LANG = getattr(settings, "VOCABS_DEFAULT_LANG", "eng") get_concepts_query = f""" @@ -21,40 +21,30 @@ }} """ -colums = [ - "concept", "label", "definition", "broader" -] +colums = ["concept", "label", "definition", "broader"] def concept_sparql_to_df(graph): qres = graph.query(get_concepts_query) - df = pd.DataFrame( - [x for x in qres], columns=colums - ) + df = pd.DataFrame([x for x in qres], columns=colums) return df def import_concept_from_df( df, collection_uri="https://some-default-collection", - collection_pref_label="default-collection" + collection_pref_label="default-collection", ): - collection, _ = SkosCollection.objects.get_or_create( - source_uri=collection_uri - ) + collection, _ = SkosCollection.objects.get_or_create(source_uri=collection_uri) collection.pref_label = collection_pref_label collection.save() concepts = [] for i, row in tqdm(df.iterrows(), total=(len(df))): - concept, _ = SkosConcept.objects.get_or_create( - source_uri=row['concept'] - ) - concept.pref_label = row['label'] - concept.definition = row['definition'] - if row['broader']: - broader, _ = SkosConcept.objects.get_or_create( - source_uri=row['broader'] - ) + concept, _ = SkosConcept.objects.get_or_create(source_uri=row["concept"]) + concept.pref_label = row["label"] + concept.definition = row["definition"] + if row["broader"]: + broader, _ = SkosConcept.objects.get_or_create(source_uri=row["broader"]) concept.broader_concept = broader concept.collection = collection concept.save() diff --git a/vocabs/management/commands/import_remote_concepts.py b/vocabs/management/commands/import_remote_concepts.py index d034db5..6d7dffe 100644 --- a/vocabs/management/commands/import_remote_concepts.py +++ b/vocabs/management/commands/import_remote_concepts.py @@ -17,35 +17,35 @@ def add_arguments(self, parser): "-i", "--import-url", type=str, - help=f"The URL of the Concepts to import, defaults to {DEFAULT_IMPORT_URL}" + help=f"The URL of the Concepts to import, defaults to {DEFAULT_IMPORT_URL}", ) parser.add_argument( "-u", "--collection-uri", type=str, help=f"An URI for a SkosCollection to group the imported SkosConcetps\ - defaults to {DEFAULT_IMPORT_URL}" + defaults to {DEFAULT_IMPORT_URL}", ) parser.add_argument( "-l", "--label", type=str, help=f"A label for a SkosCollection to group the imported SkosConcetps\ - defaults to {DEFAULT_IMPORT_URL}" + defaults to {DEFAULT_IMPORT_URL}", ) def handle(self, *args, **kwargs): - if kwargs['import_url']: - import_url = kwargs['import_url'] + if kwargs["import_url"]: + import_url = kwargs["import_url"] else: import_url = DEFAULT_IMPORT_URL - if kwargs['collection_uri']: + if kwargs["collection_uri"]: collection_uri = import_url else: collection_uri = import_url - if kwargs['label']: - label = kwargs['label'] + if kwargs["label"]: + label = kwargs["label"] else: label = import_url g = Graph() @@ -53,6 +53,6 @@ def handle(self, *args, **kwargs): imported = import_concept_from_df( concept_sparql_to_df(g), collection_uri=collection_uri, - collection_pref_label=label + collection_pref_label=label, ) print(f"imported {len(imported)} SkosConcepts") diff --git a/vocabs/migrations/0001_initial.py b/vocabs/migrations/0001_initial.py index 4beff6a..a656083 100644 --- a/vocabs/migrations/0001_initial.py +++ b/vocabs/migrations/0001_initial.py @@ -9,43 +9,156 @@ class Migration(migrations.Migration): initial = True - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='SkosCollection', + name="SkosCollection", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pref_label', models.CharField(blank=True, help_text='Collection label or name', max_length=300, null=True, verbose_name='skos:prefLabel')), - ('definition', models.TextField(blank=True, help_text='definition', null=True, verbose_name='elaborate definition of the collection')), - ('source_uri', models.CharField(blank=True, help_text='URI of the Resource', max_length=300, null=True, verbose_name='source URI')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "pref_label", + models.CharField( + blank=True, + help_text="Collection label or name", + max_length=300, + null=True, + verbose_name="skos:prefLabel", + ), + ), + ( + "definition", + models.TextField( + blank=True, + help_text="definition", + null=True, + verbose_name="elaborate definition of the collection", + ), + ), + ( + "source_uri", + models.CharField( + blank=True, + help_text="URI of the Resource", + max_length=300, + null=True, + verbose_name="source URI", + ), + ), ], ), migrations.CreateModel( - name='SkosTechnicalCollection', + name="SkosTechnicalCollection", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pref_label', models.CharField(blank=True, help_text="e.g. 'Artifact__artefact_type", max_length=300, null=True, verbose_name='Model and property name')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "pref_label", + models.CharField( + blank=True, + help_text="e.g. 'Artifact__artefact_type", + max_length=300, + null=True, + verbose_name="Model and property name", + ), + ), ], ), migrations.CreateModel( - name='SkosConcept', + name="SkosConcept", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pref_label', models.CharField(help_text='Preferred label for concept', max_length=300, verbose_name='skos:prefLabel')), - ('definition', models.TextField(blank=True, help_text='skos:definition', null=True, verbose_name='elaborate definition of the concept')), - ('source_uri', models.CharField(blank=True, help_text='URI of the Resource', max_length=300, null=True, verbose_name='source URI')), - ('lft', models.PositiveIntegerField(editable=False)), - ('rght', models.PositiveIntegerField(editable=False)), - ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), - ('level', models.PositiveIntegerField(editable=False)), - ('broader_concept', mptt.fields.TreeForeignKey(blank=True, help_text='Concept with a broader meaning that this concept inherits from', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='narrower_concepts', to='vocabs.skosconcept', verbose_name='skos:broader')), - ('collection', models.ForeignKey(blank=True, help_text='Collection that this concept is a member of', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='has_members', to='vocabs.skoscollection', verbose_name='member of skos:Collection')), - ('tech_collection', models.ManyToManyField(blank=True, help_text='Collection that this concept is a member of', related_name='has_members', to='vocabs.SkosTechnicalCollection', verbose_name='member of skos:Collection')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "pref_label", + models.CharField( + help_text="Preferred label for concept", + max_length=300, + verbose_name="skos:prefLabel", + ), + ), + ( + "definition", + models.TextField( + blank=True, + help_text="skos:definition", + null=True, + verbose_name="elaborate definition of the concept", + ), + ), + ( + "source_uri", + models.CharField( + blank=True, + help_text="URI of the Resource", + max_length=300, + null=True, + verbose_name="source URI", + ), + ), + ("lft", models.PositiveIntegerField(editable=False)), + ("rght", models.PositiveIntegerField(editable=False)), + ("tree_id", models.PositiveIntegerField(db_index=True, editable=False)), + ("level", models.PositiveIntegerField(editable=False)), + ( + "broader_concept", + mptt.fields.TreeForeignKey( + blank=True, + help_text="Concept with a broader meaning that this concept inherits from", + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="narrower_concepts", + to="vocabs.skosconcept", + verbose_name="skos:broader", + ), + ), + ( + "collection", + models.ForeignKey( + blank=True, + help_text="Collection that this concept is a member of", + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="has_members", + to="vocabs.skoscollection", + verbose_name="member of skos:Collection", + ), + ), + ( + "tech_collection", + models.ManyToManyField( + blank=True, + help_text="Collection that this concept is a member of", + related_name="has_members", + to="vocabs.SkosTechnicalCollection", + verbose_name="member of skos:Collection", + ), + ), ], options={ - 'abstract': False, + "abstract": False, }, ), ] diff --git a/vocabs/migrations/0002_auto_20220504_1140.py b/vocabs/migrations/0002_auto_20220504_1140.py index b748d00..e55af4a 100644 --- a/vocabs/migrations/0002_auto_20220504_1140.py +++ b/vocabs/migrations/0002_auto_20220504_1140.py @@ -7,18 +7,30 @@ class Migration(migrations.Migration): dependencies = [ - ('vocabs', '0001_initial'), + ("vocabs", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='skosconcept', - name='collection', - field=models.ForeignKey(blank=True, help_text='Collection that this concept is a member of', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='has_members', to='vocabs.skoscollection', verbose_name='Teil der Skos-Kollektion'), + model_name="skosconcept", + name="collection", + field=models.ForeignKey( + blank=True, + help_text="Collection that this concept is a member of", + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="has_members", + to="vocabs.skoscollection", + verbose_name="Teil der Skos-Kollektion", + ), ), migrations.AlterField( - model_name='skosconcept', - name='pref_label', - field=models.CharField(help_text='Preferred label for concept', max_length=300, verbose_name='Label'), + model_name="skosconcept", + name="pref_label", + field=models.CharField( + help_text="Preferred label for concept", + max_length=300, + verbose_name="Label", + ), ), ] diff --git a/vocabs/migrations/0003_skoscollection_remarks.py b/vocabs/migrations/0003_skoscollection_remarks.py index 8c9565c..26c294e 100644 --- a/vocabs/migrations/0003_skoscollection_remarks.py +++ b/vocabs/migrations/0003_skoscollection_remarks.py @@ -7,13 +7,18 @@ class Migration(migrations.Migration): dependencies = [ - ('vocabs', '0002_auto_20220504_1140'), + ("vocabs", "0002_auto_20220504_1140"), ] operations = [ migrations.AddField( - model_name='skoscollection', - name='remarks', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen', null=True, verbose_name='Anmerkungen generell'), + model_name="skoscollection", + name="remarks", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen", + null=True, + verbose_name="Anmerkungen generell", + ), ), ] diff --git a/vocabs/migrations/0004_auto_20220704_0714.py b/vocabs/migrations/0004_auto_20220704_0714.py index 9357820..bc8d73f 100644 --- a/vocabs/migrations/0004_auto_20220704_0714.py +++ b/vocabs/migrations/0004_auto_20220704_0714.py @@ -7,17 +7,22 @@ class Migration(migrations.Migration): dependencies = [ - ('vocabs', '0003_skoscollection_remarks'), + ("vocabs", "0003_skoscollection_remarks"), ] operations = [ migrations.RemoveField( - model_name='skoscollection', - name='remarks', + model_name="skoscollection", + name="remarks", ), migrations.AddField( - model_name='skosconcept', - name='remarks', - field=ckeditor.fields.RichTextField(blank=True, help_text='Anmerkungen', null=True, verbose_name='Anmerkungen generell'), + model_name="skosconcept", + name="remarks", + field=ckeditor.fields.RichTextField( + blank=True, + help_text="Anmerkungen", + null=True, + verbose_name="Anmerkungen generell", + ), ), ] diff --git a/vocabs/tables.py b/vocabs/tables.py index 9b48299..10e2102 100644 --- a/vocabs/tables.py +++ b/vocabs/tables.py @@ -31,8 +31,7 @@ class SkosConceptTable(tables.Table): id = tables.LinkColumn(verbose_name="ID") remarks = tables.columns.TemplateColumn( - template_code="{{ record.remarks|safe }}", - verbose_name="Anmerkungen generell" + template_code="{{ record.remarks|safe }}", verbose_name="Anmerkungen generell" ) class Meta: diff --git a/vocabs/tests.py b/vocabs/tests.py index 3599452..e4a1757 100644 --- a/vocabs/tests.py +++ b/vocabs/tests.py @@ -6,17 +6,14 @@ from vocabs.models import SkosCollection IMPORT_URL = "https://vocabs.dariah.eu/rest/v1/arche_access_restrictions/data?format=application/rdf%2Bxml" -MODELS = list(apps.all_models['vocabs'].values()) +MODELS = list(apps.all_models["vocabs"].values()) client = Client() -USER = { - "username": "temporary1", - "password": "temporary1" -} +USER = {"username": "temporary1", "password": "temporary1"} class InfosTest(TestCase): - fixtures = ['dump.json'] + fixtures = ["dump.json"] def setUp(self): self.client = Client() @@ -24,11 +21,6 @@ def setUp(self): def test_import_cmd(self): - call_command('import_remote_concepts', import_url=IMPORT_URL) - new_collection = SkosCollection.objects.get( - source_uri=IMPORT_URL - ) - self.assertEqual( - IMPORT_URL, - new_collection.source_uri - ) + call_command("import_remote_concepts", import_url=IMPORT_URL) + new_collection = SkosCollection.objects.get(source_uri=IMPORT_URL) + self.assertEqual(IMPORT_URL, new_collection.source_uri) diff --git a/webpage/forms.py b/webpage/forms.py index cdbf19a..85b49a5 100644 --- a/webpage/forms.py +++ b/webpage/forms.py @@ -5,10 +5,10 @@ class form_user_login(forms.Form): - username = forms.CharField(label='Username', widget=forms.TextInput) - password = forms.CharField(label='Password', widget=forms.PasswordInput) + username = forms.CharField(label="Username", widget=forms.TextInput) + password = forms.CharField(label="Password", widget=forms.PasswordInput) def __init__(self, *args, **kwargs): super(form_user_login, self).__init__(*args, **kwargs) self.helper = FormHelper() - self.helper.add_input(Submit('submit', 'login')) + self.helper.add_input(Submit("submit", "login")) diff --git a/webpage/management/commands/delete_migrations.py b/webpage/management/commands/delete_migrations.py index d7c550f..c8122f4 100644 --- a/webpage/management/commands/delete_migrations.py +++ b/webpage/management/commands/delete_migrations.py @@ -15,9 +15,10 @@ def handle(self, *args, **options): counter = 0 for root, dirs, files in os.walk(cwd): for file in files: - if 'migrations' in os.path.join(root, file)\ - and '00' in os.path.join(root, file): - if 'myenv' in os.path.join(root, file): + if "migrations" in os.path.join(root, file) and "00" in os.path.join( + root, file + ): + if "myenv" in os.path.join(root, file): pass else: deleted_files.append((os.path.join(root, file))) diff --git a/webpage/metadata.py b/webpage/metadata.py index 1ffe220..f9cdda2 100644 --- a/webpage/metadata.py +++ b/webpage/metadata.py @@ -2,21 +2,24 @@ # (by default) in the base.html and index.html PROJECT_METADATA = { - 'title': 'Anton Bruckner Chronologie Datenbank', - 'author': 'Peter Andorfer', - 'subtitle': 'A django project to bootstrap further web-app developments', - 'description': 'A django project to bootstrap further web-app developments', - 'github': 'https://github.com/acdh-oeaw/djangobaseproject', - 'purpose_de': 'der Schaffung einer einheitlichen\ - und generischen Grundlage für Web Applikationen.', - 'purpose_en': 'to bootstrap web development.', - 'version': '0.0.1', - 'matomo_id': '211', - 'matomo_url': '//matomo.acdh.oeaw.ac.at/', - 'imprint': '/imprint', - 'social_media': [ - ('fab fa-twitter fa-2x', 'https://twitter.com/ACDH_OeAW'), - ('fab fa-youtube fa-2x', 'https://www.youtube.com/channel/UCgaEMaMbPkULYRI5u6gvG-w'), + "title": "Anton Bruckner Chronologie Datenbank", + "author": "Peter Andorfer", + "subtitle": "A django project to bootstrap further web-app developments", + "description": "A django project to bootstrap further web-app developments", + "github": "https://github.com/acdh-oeaw/djangobaseproject", + "purpose_de": "der Schaffung einer einheitlichen\ + und generischen Grundlage für Web Applikationen.", + "purpose_en": "to bootstrap web development.", + "version": "0.0.1", + "matomo_id": "211", + "matomo_url": "//matomo.acdh.oeaw.ac.at/", + "imprint": "/imprint", + "social_media": [ + ("fab fa-twitter fa-2x", "https://twitter.com/ACDH_OeAW"), + ( + "fab fa-youtube fa-2x", + "https://www.youtube.com/channel/UCgaEMaMbPkULYRI5u6gvG-w", + ), ], - 'app_type': 'database', # database|website|service|tool|digital-edition + "app_type": "database", # database|website|service|tool|digital-edition } diff --git a/webpage/templates/webpage/base.html b/webpage/templates/webpage/base.html index dc5f4e0..0a6d7e2 100644 --- a/webpage/templates/webpage/base.html +++ b/webpage/templates/webpage/base.html @@ -1,6 +1,5 @@ {% load static %} -{% load leaflet_tags %} {% load webpage_extras %} {% load browsing_extras %} {% load infos_extras %} @@ -48,8 +47,6 @@ rel="stylesheet"/> - {% leaflet_js %} - {% leaflet_css %} diff --git a/webpage/templatetags/webpage_extras.py b/webpage/templatetags/webpage_extras.py index 3e54147..322888b 100644 --- a/webpage/templatetags/webpage_extras.py +++ b/webpage/templatetags/webpage_extras.py @@ -43,10 +43,10 @@ def get_help_text(instance, field_name): return "No helptext for '{}' provided".format(field_name) -@register.inclusion_tag('webpage/tags/social_media.html', takes_context=True) +@register.inclusion_tag("webpage/tags/social_media.html", takes_context=True) def social_media(context): - """ looks for a 'social_media' key in webpage.py and renders html-tags for each entry """ + """looks for a 'social_media' key in webpage.py and renders html-tags for each entry""" values = {} - values['sm_items'] = PM['social_media'] - values['sm_len'] = len(PM['social_media']) + values["sm_items"] = PM["social_media"] + values["sm_len"] = len(PM["social_media"]) return values diff --git a/webpage/urls.py b/webpage/urls.py index dbe5408..c7c3257 100644 --- a/webpage/urls.py +++ b/webpage/urls.py @@ -3,7 +3,7 @@ from . import views from archiv import search_result_views from django_spaghetti.views import Plate -from archiv.views import EventDetailView +from archiv.views import EventDetailView app_name = "webpage" diff --git a/webpage/utils.py b/webpage/utils.py index 8748cbd..f6418b5 100644 --- a/webpage/utils.py +++ b/webpage/utils.py @@ -1,5 +1,5 @@ from django.conf import settings -from . metadata import PROJECT_METADATA as PM +from .metadata import PROJECT_METADATA as PM SHARED_URL = settings.SHARED_URL PROJECT_METADATA = PM diff --git a/webpage/views.py b/webpage/views.py index 4ccbca6..4eb305e 100644 --- a/webpage/views.py +++ b/webpage/views.py @@ -10,8 +10,8 @@ from django.views.generic import TemplateView from django.contrib.auth import authenticate, login, logout -from . forms import form_user_login -from . metadata import PROJECT_METADATA as PM +from .forms import form_user_login +from .metadata import PROJECT_METADATA as PM def get_imprint_url(): @@ -27,7 +27,7 @@ def get_imprint_url(): class ImprintView(TemplateView): - template_name = 'webpage/imprint.html' + template_name = "webpage/imprint.html" def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -35,9 +35,11 @@ def get_context_data(self, **kwargs): r = requests.get(imprint_url) if r.status_code == 200: - context['imprint_body'] = "{}".format(r.text) + context["imprint_body"] = "{}".format(r.text) else: - context['imprint_body'] = """ + context[ + "imprint_body" + ] = """ On of our services is currently not available.\ Please try it later or write an email to\ acdh@oeaw.ac.at; if you are service provide,\ @@ -47,21 +49,19 @@ def get_context_data(self, **kwargs): class GenericWebpageView(TemplateView): - template_name = 'webpage/index.html' + template_name = "webpage/index.html" def get_context_data(self, **kwargs): context = super(GenericWebpageView, self).get_context_data(**kwargs) - context['apps'] = settings.INSTALLED_APPS + context["apps"] = settings.INSTALLED_APPS return context def get_template_names(self): - template_name = "webpage/{}.html".format( - self.kwargs.get("template", 'index') - ) + template_name = "webpage/{}.html".format(self.kwargs.get("template", "index")) try: loader.select_template([template_name]) template_name = "webpage/{}.html".format( - self.kwargs.get("template", 'index') + self.kwargs.get("template", "index") ) except TemplateDoesNotExist: template_name = "webpage/index.html" @@ -72,19 +72,20 @@ def get_template_names(self): # views for login/logout # ################################################################# + def user_login(request): - if request.method == 'POST': + if request.method == "POST": form = form_user_login(request.POST) if form.is_valid(): cd = form.cleaned_data - user = authenticate(username=cd['username'], password=cd['password']) + user = authenticate(username=cd["username"], password=cd["password"]) if user and user.is_active: login(request, user) - return HttpResponseRedirect(request.GET.get('next', '/')) - return HttpResponse('user does not exist') + return HttpResponseRedirect(request.GET.get("next", "/")) + return HttpResponse("user does not exist") else: form = form_user_login() - return render(request, 'webpage/user_login.html', {'form': form}) + return render(request, "webpage/user_login.html", {"form": form}) def user_logout(request): @@ -93,11 +94,10 @@ def user_logout(request): def handler404(request, exception): - return render(request, 'webpage/404-error.html', locals()) + return render(request, "webpage/404-error.html", locals()) def project_info(request): - """ returns a dict providing metadata about the current project """ @@ -107,8 +107,8 @@ def project_info(request): if request.user.is_authenticated: pass else: - del info_dict['matomo_id'] - del info_dict['matomo_url'] - info_dict['base_tech'] = 'django' - info_dict['framework'] = 'djangobaseproject' + del info_dict["matomo_id"] + del info_dict["matomo_url"] + info_dict["base_tech"] = "django" + info_dict["framework"] = "djangobaseproject" return JsonResponse(info_dict) diff --git a/webpage/webpage_content_processors.py b/webpage/webpage_content_processors.py index 251fca1..556f595 100644 --- a/webpage/webpage_content_processors.py +++ b/webpage/webpage_content_processors.py @@ -1,29 +1,29 @@ from django.conf import settings -from . utils import SHARED_URL +from .utils import SHARED_URL def my_app_name(request): - return {'PROJECT_NAME': settings.PROJECT_NAME} + return {"PROJECT_NAME": settings.PROJECT_NAME} def shared_url(request): - return {'SHARED_URL': SHARED_URL} + return {"SHARED_URL": SHARED_URL} def installed_apps(request): - return {'APPS': settings.INSTALLED_APPS} + return {"APPS": settings.INSTALLED_APPS} def is_dev_version(request): try: - return {'DEV_VERSION': settings.DEV_VERSION} + return {"DEV_VERSION": settings.DEV_VERSION} except AttributeError: return {} def get_db_name(request): try: - db_name = settings.DATABASES['default']['NAME'] - return {'DB_NAME': db_name} + db_name = settings.DATABASES["default"]["NAME"] + return {"DB_NAME": db_name} except (AttributeError, KeyError): return {} From e582303db82e290514cdaece6ce274d8e3b90f33 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 19 Sep 2024 11:41:39 +0200 Subject: [PATCH 2/3] removed leafleat [skip ci] --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 23b8bc5..c51eb78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ django-mptt>=0.11.0,<1 django-next-prev==1.1.0 django-spaghetti-and-meatballs==0.4.2 djangorestframework>=3.13.1,<4 -django-leaflet==0.28.3 rdflib>=7.0.0,<8 tqdm>=4.62.3,<5 requests>=2.25 From 1bcd7a4ff8f5634a7ced6e4cf50d2c283a53938b Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 19 Sep 2024 11:54:19 +0200 Subject: [PATCH 3/3] Person -> Personen und Orte --- .../archiv/partials/entity_sidebar.html | 2 +- archiv/templates/archiv/person_list.html | 125 ++++++++++++++++++ archiv/views.py | 2 +- webpage/templates/webpage/base.html | 2 +- 4 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 archiv/templates/archiv/person_list.html diff --git a/archiv/templates/archiv/partials/entity_sidebar.html b/archiv/templates/archiv/partials/entity_sidebar.html index ca07e97..364b748 100644 --- a/archiv/templates/archiv/partials/entity_sidebar.html +++ b/archiv/templates/archiv/partials/entity_sidebar.html @@ -9,7 +9,7 @@ {% endif %} {% if object.person.all %} - Personen + Personen und Institutionen
      {% for x in object.person.all %}
    • {{ x }}
      • diff --git a/archiv/templates/archiv/person_list.html b/archiv/templates/archiv/person_list.html new file mode 100644 index 0000000..ed9f92e --- /dev/null +++ b/archiv/templates/archiv/person_list.html @@ -0,0 +1,125 @@ +{% extends "webpage/base.html" %} +{% load static %} +{% load django_tables2 %} +{% load browsing_extras %} +{% load crispy_forms_field %} +{% load crispy_forms_tags %} +{% block title %} + Personen und Institutionen +{% endblock title %} +{% block scriptHeader %}{% endblock scriptHeader %} +{% block content %} + +
      +
      +
      +
      +
      +

      + Personen und Institutionen +

      + {% if user.is_authenticated %} + {% if create_view_link %} + + {% if class_name == "Skos Concept" %} + Neues Schlagwort erstellen + {% else %} + Neue {{ class_name }} erstellen + {% endif %} + + {% endif %} + {% endif %} + {% block customView %} + {% endblock customView %} + {% block create_button %} + {% endblock create_button %} + + {% load django_tables2 crispy_forms_tags %} +
      + {% crispy filter.form filter.form.helper %} + {% if togglable_colums %} + + {% if togglable_colums %} + + + {% else %} + {% endif %} + + {% endif %} + Suche zurücksetzen + +
      + + {% include "browsing/partials/chart_form.html" %} +
      +
      +
      +
      +
      +
      + {% with table.paginator.count as total %} + + Alle Treffer: {{ total }} + + {% endwith %} + + {% block table %} + {% include "browsing/partials/table.html" %} + {% endblock table %} + {% block pagination.allpages %} + {% include "browsing/partials/pagination.html" %} + {% endblock pagination.allpages %} +
      + {% include "browsing/partials/download_menu.html" %} +
      + +
      +
      +
      +
      +
      +{% endblock content %} +{% block scripts2 %} + + + + + +{% endblock scripts2 %} diff --git a/archiv/views.py b/archiv/views.py index 660232f..9075abf 100644 --- a/archiv/views.py +++ b/archiv/views.py @@ -108,7 +108,7 @@ class PersonListView(GenericListView): "title", ] enable_merge = True - template_name = "archiv/custom_list.html" + template_name = "archiv/person_list.html" class PersonDetailView(BaseDetailView): diff --git a/webpage/templates/webpage/base.html b/webpage/templates/webpage/base.html index 0a6d7e2..e6cd5ae 100644 --- a/webpage/templates/webpage/base.html +++ b/webpage/templates/webpage/base.html @@ -149,7 +149,7 @@ Ereignisse Bruckner Werke Literatur - Personen + Personen und Institutionen Orte Schlagworte