diff --git a/archiv/api_views.py b/archiv/api_views.py
index ef56491..1efff8d 100644
--- a/archiv/api_views.py
+++ b/archiv/api_views.py
@@ -64,7 +64,7 @@ class SlideViewSet(viewsets.ModelViewSet):
class UseCaseViewSet(viewsets.ModelViewSet):
- queryset = UseCase.objects.all().distinct()
+ queryset = UseCase.objects.filter(published=True).distinct()
serializer_class = UseCaseSerializer
filter_backends = [
django_filters.rest_framework.DjangoFilterBackend,
diff --git a/archiv/filters.py b/archiv/filters.py
index 373fcb9..04706b4 100644
--- a/archiv/filters.py
+++ b/archiv/filters.py
@@ -100,6 +100,7 @@ class Meta:
"id",
"show_labels",
"layer",
+ "published",
]
diff --git a/archiv/fixtures/dump.json b/archiv/fixtures/dump.json
index a09bf84..d234a31 100644
--- a/archiv/fixtures/dump.json
+++ b/archiv/fixtures/dump.json
@@ -481,6 +481,7 @@
"layer": [],
"pi_norm_id": "",
"principal_investigator": "Katharina Winckler",
+ "published": false,
"show_labels": false,
"story_map": "The Avaria in the view of the Carolingians
\r\n\r\nPaulus Diaconus
\r\n\r\nPannonia
\r\n\r\nBavaria
\r\n\r\nThe Avaria of the early 9th century
\r\n\r\n\r\n\r\n![\"Paulus](\"https://upload.wikimedia.org/wikipedia/commons/f/f0/Paulus_Diaconus_Plutei_65.35_croppedmid.jpg\")
This writer was born around 720/730 in Cividale del Friuli. He was probably educated at the royal court of King Liutprant (d. 744). After the deposition of king Ratchis, or the conquest of the Lombard realm by Charlemagne in 774, he became monk in Montecassino, where he taught grammar. In 782 he went to the Carolingian court to request the release of his brother, who was held captive since 776. He remained for at least three years at the court of Charlemagne and returned around 786/87 to Montecassino, where he died in 799.
\r\n\r\nIn 790-799 he wrote the Historia Langobardorum in which he narrates many storys originationg from the Lombard duchy Friuli at the frontier to the Avarian Realm.
\r\n\r\n
\r\n\r\n
\r\n\r\n
\r\n\r\n
\r\n\r\n\r\n\r\nPaulus Diaconus has an unique view on the Avars.
\r\n\r\n\r\n\r\n
\r\n\r\n\r\n\r\nWhen we turn north of the Alps, the view differs significantely. Our sources of the 8th century come also from Bavaria, taht under duke Tassilo III acted quite independently from the Francs. In 788 the duke was deposed by his cousin, Charlemagne.
\r\n\r\n\r\n\r\nHere lived the bishop Arbeo of Freising, about the same time as Paulus Diaconus. He wrote the ViIta Haimhrammi, a text, that has a different view of the Avars: they are the enemy on the east, beyond the river Enns. this river is called a "limes certus". The relations of the Avars with Tassilo seem to have been very bad, expecially in the 760ties and 770ties as the border area was described to have been vastated. Curiously, in 788, when Charlemagne deposed duke Tassilo one of the allegiations was that the duke had turned to the Avars for help.
\r\n\r\n\r\n\r\n
\r\n\r\n
\r\n\r\n\r\n\r\nFor the writers of the 8th century, the Avaria was synonymous with the late Antique roman province of Pannonia.
\r\n\r\n\r\n\r\nIn 796 the Frankish army under Pippin conquered the Avarian realm.
\r\n\r\n
\r\n\r\n\r\n\r\nBut its was more than a decade later, when we first hear of actuall property in the former Avarian realm - and this property was positioned very near to the border between Bavarians and Avars at the Enns and far way form the Avar centres in Pannonia. The places that are mentioned in charters ranging from 808 to 836 are all described as being in the "provintia Auarorum" or the "terra Auarorum".
\r\n\r\n\r\n\r\nBut only a few decades later this spatial designation dissapears from the sources. Places are not called as being in the "Avaria" anymore. The name has lost prestige and power and was, replaced by the more generic "plaga orientalis" or, from 996 on "Ostarrichi".
",
"title": "The Carolingian Avaria: Katharina Winckler"
@@ -495,6 +496,7 @@
"layer": [],
"pi_norm_id": "",
"principal_investigator": "",
+ "published": false,
"show_labels": true,
"story_map": "",
"title": "Steppe Peoples 3: View from the \"West\" (5th-10th c.)"
@@ -1309,6 +1311,7 @@
"layer": [],
"pi_norm_id": "",
"principal_investigator": "Laura Gazzoli",
+ "published": false,
"show_labels": false,
"story_map": "In the ninth century, Latin authors in western Europe became more aware of Scandinavia and its peoples, due to viking raiding and Christian missionary activity. Frankish chroniclers refer to the Scandinavians broadly as Nordmanni, Nort(h)manni or Normanni ('Northmen'), who are divided further into Danes (Dani) and Swedes (Sueones), whom Einhard situates around the Baltic, opposite the Slavs and Aisti:
\r\n\r\n
\r\n\r\n\r\n\r\n\r\n\r\n
\r\n\r\n(Ideally: all on one map, with Einhard's passage opposite them)
\r\n\r\n
\r\n\r\nThe territorial extent of the Danish and Swedish kingdoms in this period are not known. Frankish annals hint that powerful Danish kings such as Godofrid in the time of Charlemagne had dominion from the river Eider northwards to Vestfold west of Oslo in modern Norway (whose 'princes and people' are recorded as not wishing to submit to his sons in 813)...
\r\n\r\n\r\n\r\nand eastwards to Skåne across Øresund, in modern Sweden (an Osfrid of Skåne is listed as a Danish signatory to a peace-treaty in 811).
\r\n\r\n\r\n\r\nDue to the political chaos in Denmark and the limited view provided by the sources, it is difficult to be certain that the power of many ninth-century Danish kings extended beyond southern Jutland (and probably Fyn). The Danish Kings Horic I and Horic II granted the Christian missionary Ansgar permission to build churches in the ports of Hedeby/Schleswig and Ribe, confirming that their power encompassed at least southern Jutland.
\r\n\r\n
\r\n\r\n\r\n\r\n
\r\n\r\n
\r\n\r\n(Map: broader Denmark with ARF 811, 813? Plus south Jutland-Fyn: Hedeby and Ribe marked plus Rimbert passages)
\r\n\r\n
\r\n\r\nThe Swedes are also located on the Baltic littoral by Einhard, who makes no mention of the Götar (the Geats of Beowulf fame), who live to their south. Ansgar also visted the port of Birka in Sweden and had dealings with their kings. Again, we can not be certain how much these kings ruled besides Birka, although one passage refers to an assembly that was held in another part of the kingdom - often assumed, though there is no proof of this, to be Old Uppsala.
\r\n\r\n\r\n\r\n
\r\n\r\n
\r\n\r\n(Map: Swedes on the Coast with Einhard; Upper Sweden, Birka and Gamla Uppsala marked with VA, passage on the assembly)
\r\n\r\n
\r\n\r\nIn the tenth century, we lose sight of Scandinavia farther afield than Denmark: however, we seem to be able to see consolidation of the Danish kingdom following fragmentation and collapse at the end of the ninth century. In 931 or 934 King Henry I of the Eastern Franks is recorded to have defeated the Danish King Chnuba, who is known from a rune-stone to have held power in the south of Jutland, particularly in Hedeby. Chnuba was forcibly baptised, and Thietmar of Merseburg, writing in the 11th century, claims that Henry forced the cessation of the prolific blood-sacrifices held at the old centre of Lejre on Zealand. Although this is dubious, if it were so it would indicate that Chnuba held power over a wider area of Denmark; but we can not be sure he ruled more than southern Jutland. The description of the sacrifices (similar to those which Adam of Bremen later describes at Old Uppsala in Sweden) shows the view of the north as a seat of barbarous, threatening paganism:
\r\n\r\n\r\n\r\n
\r\n\r\n(Map: southern Jutland versus wider Denmark with Lejre and Schleswig/Hedeby highlighted, picture of runestone?)
\r\n\r\n
\r\n\r\nIn the mid-tenth century, a dynasty based at Jelling expanded its power: by 948 it seems to have ruled all Jutland, if we can equate the foundation of bishoprics in the Jutish towns of Hedeby, Ribe and Aarhus in this year to its political influence. By 965, another charter includes a see of Odense as well, which would suggest power over Fyn. The network of distinctive circular fortifications from the 970s suggests that the reigning Danish king, Harald Bluetooth, had expanded his power to Zealand and probably Skåne as well. Widukind records how Harald, in response to the missionary work of Poppo (probably identical with Folkmar, later Archbishop of Cologne) made Christianity the official and exclusive religion of Denmark, whereas Danes had previously worshipped Christ and pagan gods as well.
\r\n\r\n\r\n\r\n(Map: wider DK, passage: Poppo. Add charters to DB. Points on map for fortresses and Jelling (and bishoprics? Can we differentiate different types of pin?.)
\r\n\r\n
\r\n\r\nIn the eleventh century and beyond we have several developments. In Denmark, boundaries became more established as those recognisable from the high middle ages, thanks to the efforts of kings like Svend Forkbeard and Cnut the Great.
\r\n\r\n\r\n\r\n
\r\n\r\nMeanwhile, to the north, a conception of Norway and a Norwegian ethnic identity began to be articulated in the sources. Terms like 'Normannus', which was previously (and also contemporaneously) a generic term for Scandinavian or someone who seemed to the observer to have some Scandinavian-derived identity, came to be used specifically about Norway, whose separateness from Denmark had been established over the century by Kings like Olav Tryggvason, St Olav Haraldsson and his half-brother Harald Sigurdsson. 'Normanni' was also used of the Normans settled in France since 911. To distinguish from these other uses of the word 'Normanni', authors used new terms for Norwegians - such as Norwagenses, Norvei and Norici - the latter a re-use of a classical term for the people of the Roman province of Noricum (in modern-day Austria).
\r\n\r\n
\r\n\r\n\r\n\r\n\r\n\r\n(Is there a better way to list different terms for Norwegians?)
\r\n\r\n
\r\n\r\nIn the twelfth century, the dawn of Latin writing in Scandinavia itself brought a western European, Christian gaze to the peoples further afield from Denmark and Norway. Ailnoth, an Englishman from Canterbury writing in exile in Odense, saw the Danes as far from unproblematic, but still more faithful Christians than the Norwegians or Icelanders, the poverty of whose soil made them unable to observe proper strictures on feasting and fasting, whereas the Swedes and Götar persecuted Christian clergy in times of poor harvest or other crises.
\r\n\r\n
\r\n\r\n(Map with terms, network graph/word cloud focused on Ailnoth)
\r\n\r\n\r\n\r\n
\r\n\r\n
\r\n\r\nThis contrasted from the view of Adam of Bremen, who saw many of the peoples of the north as admirable in spite of their rudeness in the faith or even their paganism: in the case of the Icelanders, he saw their poverty as a positive, which made them, even before their conversion, live according to a sort of natural Christianity. The pagan Prussians, meanwhile, he found admirable for their hospitality towards strangers and their scorn of the precious furs from their territory that were loved by vain, luxurious western Christians. A look at the different associations for the Icelanders between Ailnoth and Adam is visible in the list of passages and the word-cloud here:
\r\n\r\n
\r\n\r\n\r\n\r\n
\r\n\r\nSimilar to the use of the classicising term 'Norici' in Norway, some authors, beginning with Dudo of St Quentin, began to associate the danes with the 'Daci' and 'Dacia' of Roman antiquity. In Latin, 'Dacia' became the dominant term for Denmark, with 'Dania' limited to earlier authors writing in Denmark in the twelfth century and Saxo Grammaticus.
\r\n\r\n\r\n\r\n
",
"title": "Mapping morals: Peoples, faith and virtue in Europe\u2019s North, c. 830\u2013c. 1200: Laura Gazzoli"
@@ -241267,5 +241270,20 @@
},
"model": "layers.geojsonlayer",
"pk": 7
+ },
+ {
+ "fields": {
+ "description": "Between 800 and 1200, the area between the Baltic and the Elbe was a place of interaction for many peoples, including Danes, Saxons, Frisians and Slavs such as the Abodrites, Wagrians, Liutizi and others. This case study focuses on exploring the shifting dynamics of power, religion and identity in this region in the period between the Christianisation of the Saxons and the beginning of the Baltic Crusades.",
+ "knightlab_stoy_map": [],
+ "layer": [],
+ "pi_norm_id": "",
+ "principal_investigator": "Laura Gazzoli",
+ "published": true,
+ "show_labels": false,
+ "story_map": "",
+ "title": "Between the Baltic and the Elbe: the Danish-Saxon-Slavic frontier: Laura Gazzoli"
+ },
+ "model": "archiv.usecase",
+ "pk": 14
}
]
diff --git a/archiv/forms.py b/archiv/forms.py
index 5665cf7..c9d1996 100644
--- a/archiv/forms.py
+++ b/archiv/forms.py
@@ -69,6 +69,7 @@ def __init__(self, *args, **kwargs):
"title",
"principal_investigator",
"show_labels",
+ "published",
css_id="basic_search_fields",
),
Accordion(
diff --git a/archiv/migrations/0047_usecase_published.py b/archiv/migrations/0047_usecase_published.py
new file mode 100644
index 0000000..ad751d8
--- /dev/null
+++ b/archiv/migrations/0047_usecase_published.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.7 on 2023-01-16 12:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archiv', '0046_remove_stelle_ort'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='usecase',
+ name='published',
+ field=models.BooleanField(default=False, help_text='True if the use case should be presented in the frontend, false if not', verbose_name='Published'),
+ ),
+ ]
diff --git a/archiv/models.py b/archiv/models.py
index a0ef235..c0fd144 100644
--- a/archiv/models.py
+++ b/archiv/models.py
@@ -102,6 +102,11 @@ class UseCase(models.Model):
verbose_name="Show Labels",
help_text="True if labels of the Spatial Coverage should be visible in the front end"
)
+ published = models.BooleanField(
+ default=False,
+ verbose_name="Published",
+ help_text="True if the use case should be presented in the frontend, false if not"
+ )
class Meta:
diff --git a/create_fixtures.sh b/create_fixtures.sh
index fe73973..3f59ec8 100755
--- a/create_fixtures.sh
+++ b/create_fixtures.sh
@@ -16,13 +16,17 @@ python manage.py dump_object archiv.keyword 28 > fixtures_keyword.json
echo "create fixtures_layer"
python manage.py dump_object layers.geojsonlayer 7 3 > fixtures_layer.json
+echo "create fixtures_usecase"
+python manage.py dump_object archiv.usecase 14 > fixtures_usecase.json
+
echo "merging fixtures"
-python manage.py merge_fixtures fixtures_stelle.json fixtures_spatialcoverage.json fixtures_keyword.json fixtures_layer.json > archiv/fixtures/dump.json
+python manage.py merge_fixtures fixtures_stelle.json fixtures_spatialcoverage.json fixtures_keyword.json fixtures_layer.json fixtures_usecase.json > archiv/fixtures/dump.json
echo "delete fixtures"
rm fixtures_keyword.json
rm fixtures_spatialcoverage.json
rm fixtures_stelle.json
rm fixtures_layer.json
+rm fixtures_usecase.json
echo "done"
\ No newline at end of file
diff --git a/djangobaseproject/settings.py b/djangobaseproject/settings.py
index 63bffb5..0e7f29d 100644
--- a/djangobaseproject/settings.py
+++ b/djangobaseproject/settings.py
@@ -91,7 +91,7 @@
]
if DEBUG:
INSTALLED_APPS.insert(10, "django_extensions")
- # INSTALLED_APPS.insert(11, 'fixture_magic')
+ INSTALLED_APPS.insert(11, 'fixture_magic')
CRISPY_TEMPLATE_PACK = "bootstrap4"
SPAGHETTI_SAUCE = {