diff --git a/django/cantusdb_project/main_app/templates/source_list.html b/django/cantusdb_project/main_app/templates/source_list.html
index c3cff7bfd..330f48e82 100644
--- a/django/cantusdb_project/main_app/templates/source_list.html
+++ b/django/cantusdb_project/main_app/templates/source_list.html
@@ -103,9 +103,16 @@
Browse Sources
{{ source.holding_institution.country }}
-
- {{ source.holding_institution.city }}, {{ source.holding_institution.name }}
-
+ {% if source.holding_institution %}
+
+
+ {% if source.holding_institution.city %}
+ {{ source.holding_institution.city }},
+ {% endif %}
+ {{ source.holding_institution.name }}
+
+
+ {% endif %}
|
@@ -113,6 +120,9 @@ Browse Sources
|
+ {% if source.name %}
+ "{{ source.name }}"
+ {% endif %}
{{ source.summary|default:""|truncatechars_html:120 }}
|
diff --git a/django/cantusdb_project/main_app/tests/make_fakes.py b/django/cantusdb_project/main_app/tests/make_fakes.py
index a2febbdbd..5991df946 100644
--- a/django/cantusdb_project/main_app/tests/make_fakes.py
+++ b/django/cantusdb_project/main_app/tests/make_fakes.py
@@ -362,15 +362,33 @@ def make_fake_institution(
city: Optional[str] = None,
region: Optional[str] = None,
country: Optional[str] = None,
+ is_private_collector: Optional[bool] = None,
) -> Institution:
+ """
+ Note that the siglum and is_private_collector fields
+ are mutually exclusive. If both are specified, an exception
+ will be raised. If neither are specified, the function will
+ randomly determine whether the institution is a private collector or
+ will be given a fake siglum.
+ """
name = name if name else faker.sentence()
- siglum = siglum if siglum else faker.sentence(nb_words=1)
city = city if city else faker.city()
region = region if region else faker.country()
country = country if country else faker.country()
+ if siglum and is_private_collector:
+ raise ValueError("Siglum and Private Collector cannot both be specified.")
+ is_private_collector = False if siglum else faker.boolean(chance_of_getting_true=20)
+ if not is_private_collector and not siglum:
+ siglum = faker.sentence(nb_words=1)
+
inst = Institution.objects.create(
- name=name, siglum=siglum, city=city, region=region, country=country
+ name=name,
+ siglum=siglum,
+ city=city,
+ region=region,
+ country=country,
+ is_private_collector=is_private_collector,
)
inst.save()
@@ -468,4 +486,4 @@ def get_random_search_term(target):
slice_start = random.randint(0, len(target) - 2)
slice_end = random.randint(slice_start + 2, len(target))
search_term = target[slice_start:slice_end]
- return search_term
\ No newline at end of file
+ return search_term
diff --git a/django/cantusdb_project/main_app/tests/test_populate_source_completeness.py b/django/cantusdb_project/main_app/tests/test_populate_source_completeness.py
new file mode 100644
index 000000000..065bbb2ea
--- /dev/null
+++ b/django/cantusdb_project/main_app/tests/test_populate_source_completeness.py
@@ -0,0 +1,29 @@
+from django.test import TestCase
+from django.core.management import call_command
+
+from main_app.models import Source
+from main_app.tests.make_fakes import make_fake_source
+
+
+class TestPopulateSourceCompleteness(TestCase):
+ def test_populate_source_completeness(self):
+ # make a few "Full Source" sources
+ for _ in range(5):
+ make_fake_source(full_source=True)
+ # make a few "Fragment" sources
+ for _ in range(3):
+ make_fake_source(full_source=False)
+ # run the command
+ call_command("populate_source_completeness")
+ sources = Source.objects.all()
+ for source in sources:
+ if source.full_source:
+ self.assertEqual(
+ source.source_completeness,
+ source.SourceCompletenessChoices.FULL_SOURCE,
+ )
+ else:
+ self.assertEqual(
+ source.source_completeness,
+ source.SourceCompletenessChoices.FRAGMENT,
+ )
diff --git a/django/cantusdb_project/main_app/tests/test_views/test_source.py b/django/cantusdb_project/main_app/tests/test_views/test_source.py
index e7102d4ec..8c9e529a5 100644
--- a/django/cantusdb_project/main_app/tests/test_views/test_source.py
+++ b/django/cantusdb_project/main_app/tests/test_views/test_source.py
@@ -54,15 +54,14 @@ def test_url_and_templates(self):
self.assertTemplateUsed(response, "source_create.html")
def test_create_source(self):
- hinst = make_fake_institution(siglum="FA-Ke")
response = self.client.post(
reverse("source-create"),
{
"shelfmark": "test-shelfmark", # shelfmark is a required field
- "holding_institution": hinst.id, # holding institution is a required field
+ "source_completeness": "1", # required field
+ "production_method": "1", # required field
},
)
-
self.assertEqual(response.status_code, 302)
created_source = Source.objects.get(shelfmark="test-shelfmark")
self.assertRedirects(
@@ -106,13 +105,13 @@ def test_url_and_templates(self):
def test_edit_source(self):
source = make_fake_source()
- hinst = make_fake_institution(siglum="FA-Ke")
response = self.client.post(
reverse("source-edit", args=[source.id]),
{
"shelfmark": "test-shelfmark", # shelfmark is a required field,
- "holding_institution": hinst.id, # holding institution is a required field
+ "source_completeness": "1", # required field
+ "production_method": "1", # required field
},
)
@@ -981,10 +980,14 @@ def test_ordering(self) -> None:
Order is currently available by country, city + institution name (parameter:
"city_institution"), and siglum + shelfmark. Siglum + shelfmark is the default.
"""
- # Create a bunch of sources
sources = []
+ # Add a source from a private collector
+ private_collector = make_fake_institution(is_private_collector=True)
+ sources.append(make_fake_source(holding_institution=private_collector))
+ # Create a bunch of other sources
for _ in range(10):
- sources.append(make_fake_source())
+ inst = make_fake_institution(siglum=faker.word())
+ sources.append(make_fake_source(holding_institution=inst))
# Default ordering is by siglum and shelfmark, ascending
with self.subTest("Default ordering"):
response = self.client.get(reverse("source-list"))
@@ -992,7 +995,13 @@ def test_ordering(self) -> None:
expected_source_order = sorted(
sources,
key=lambda source: (
- source.holding_institution.siglum,
+ 0 if source.holding_institution else 1,
+ 1 if source.holding_institution.is_private_collector else 0,
+ (
+ source.holding_institution.siglum
+ if source.holding_institution.siglum
+ else ""
+ ),
source.shelfmark,
),
)
|