{{ file.slug }}
+ {{ file.licence.name }}
+{{ file.description }}
+{{ file.description }}
+Slug: {{ file.slug }}
Pīkau courses: {{ file.pikau_courses.count }}
+{% blocktrans trimmed %} - This page lists files used within Kia Takatū ā-Matihiko. + This page lists files used within Kia Takatū ā-Matihiko. + For retrieving licence information for images from Wikipedia and Wikimedia Commons use the Attribution Generator. {% endblocktrans %}
{% if unknown_licences %}
+{% elif record.media_type == "Video" %}
+ 
+{% endif %}
+{{ record.media_type }}
diff --git a/templates/files/previews/vimeo.html b/templates/files/previews/vimeo.html
new file mode 100644
index 0000000..e2b49e5
--- /dev/null
+++ b/templates/files/previews/vimeo.html
@@ -0,0 +1 @@
+
diff --git a/templates/files/previews/youtube.html b/templates/files/previews/youtube.html
new file mode 100644
index 0000000..dc0a4ec
--- /dev/null
+++ b/templates/files/previews/youtube.html
@@ -0,0 +1,3 @@
+
diff --git a/templates/pikau/glossaryterm_detail.html b/templates/pikau/glossaryterm_detail.html
index 3bebb24..395ccd3 100644
--- a/templates/pikau/glossaryterm_detail.html
+++ b/templates/pikau/glossaryterm_detail.html
@@ -25,7 +25,7 @@
Pikau Courses: {{ glossaryterm.pikau_courses.count }}
TODO RENDERING
diff --git a/tests/files/FileTestDataGenerator.py b/tests/files/FileTestDataGenerator.py index 586a649..b687543 100644 --- a/tests/files/FileTestDataGenerator.py +++ b/tests/files/FileTestDataGenerator.py @@ -27,9 +27,10 @@ def create_file(self, number, licence=None): """ file_object = File( slug="file-{}".format(number), - filename="File {}".format(number), + name="File {}".format(number), + filename="file-{}.ext".format(number), description="Description for file {}".format(number), - location="https://www.example.com", + location="https://www.example.com/{}".format(number), ) file_object.save() if licence: @@ -46,6 +47,7 @@ def create_licence(self, number): File object. """ licence = Licence( + slug="licence-{}".format(number), name="Licence {}".format(number), url="https://www.example.com/licence-{}".format(number), ) diff --git a/tests/files/models/test_file.py b/tests/files/models/test_file.py index 48981b6..7b6c58c 100644 --- a/tests/files/models/test_file.py +++ b/tests/files/models/test_file.py @@ -1,6 +1,9 @@ from tests.BaseTestWithDB import BaseTestWithDB from tests.files.FileTestDataGenerator import FileTestDataGenerator +from files.models import File +from django.db import IntegrityError + class FileModelTest(BaseTestWithDB): @@ -14,3 +17,34 @@ def test_file_str(self): obj.__str__(), "File 1" ) + + def test_file_repr(self): + obj = self.test_data.create_file(1) + self.assertEqual( + obj.__repr__(), + "File: {}".format(obj.slug) + ) + + def test_file_model_one_file(self): + file = self.test_data.create_file(1) + query_result = File.objects.get(slug="file-1") + self.assertEqual(query_result, file) + + def test_file_model_two_files(self): + self.test_data.create_file(1) + self.test_data.create_file(2) + self.assertQuerysetEqual( + File.objects.all(), + [ + "File: file-1", + "File: file-2" + ], + ordered=False + ) + + def test_file_model_uniqueness(self): + self.test_data.create_file(1) + self.assertRaises( + IntegrityError, + lambda: self.test_data.create_file(1) + ) diff --git a/tests/files/models/test_licence_model.py b/tests/files/models/test_licence_model.py new file mode 100644 index 0000000..95bc60e --- /dev/null +++ b/tests/files/models/test_licence_model.py @@ -0,0 +1,56 @@ +from tests.BaseTestWithDB import BaseTestWithDB +from tests.files.FileTestDataGenerator import FileTestDataGenerator + +from files.models import Licence +from django.db import IntegrityError + + +class LicenceModelTest(BaseTestWithDB): + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.test_data = FileTestDataGenerator() + + def test_licence_str(self): + obj = self.test_data.create_licence(1) + self.assertEqual( + obj.__str__(), + "Licence 1" + ) + + def test_licence_model_one_licence(self): + licence = self.test_data.create_licence(1) + query_result = Licence.objects.get(name="Licence 1") + self.assertEqual(query_result, licence) + + def test_licence_model_two_licences(self): + self.test_data.create_licence(1) + self.test_data.create_licence(2) + self.assertQuerysetEqual( + Licence.objects.all(), + [ + "Description for glossary term {}.
".format(number), + ) + glossary_term.save() + return glossary_term + + def create_goal(self, number): + """Create Goal object. + + Args: + number: Identifier of the goal (int). + + Returns: + Goal object. + """ + goal = Goal( + slug="goal-{}".format(number), + description="Description for goal {}.
".format(number), + ) + goal.save() + return goal + + def create_tag(self, number): + """Create Tag object. + + Args: + number: Identifier of the tag (int). + + Returns: + Tag object. + """ + tag = Tag( + slug="tag-{}".format(number), + name="tag-{}-name".format(number), + description="Description for tag {}.
".format(number), + ) + tag.save() + return tag + + def create_topic(self, number): + """Create Topic object. + + Args: + number: Identifier of the topic (int). + + Returns: + Topic object. + """ + topic = Topic( + slug="topic-{}".format(number), + name="topic-{}-name".format(number), + ) + topic.save() + return topic + + def create_level(self, number): + """Create Level object. + + Args: + number: Identifier of the level (int). + + Returns: + Level object. + """ + level = Level( + slug="level-{}".format(number), + name="level-{}-name".format(number), + ) + level.save() + return level + + def create_progress_outcome(self, number): + """Create Progress Outcome object. + + Args: + number: Identifier of the progress outcome (int). + + Returns: + Progress Outcome object. + """ + progress_outcome = ProgressOutcome( + slug="progress-outcome-{}".format(number), + name="progress-outcome-{}-name".format(number), + abbreviation="pr-out-{}".format(number), + description="Description for progress outcome {}.".format(number), + exemplars="progress-outcome-{}".format(number), + ) + progress_outcome.save() + return progress_outcome + + def create_milestone(self, number, date): + """Create Milestone object. + + Args: + number: Identifier of the milestone (int). + + Returns: + Milestone object. + """ + milestone = Milestone( + name="milestone-{}".format(number), + date=date, + ) + milestone.save() + return milestone + + def create_pikau_unit(self, pikau_course, number, module_name=False): + """Create PikauUnit object. + + Args: + number: Identifier of the pikau unit (int). + + Returns: + PikauUnit object. + """ + pikau_unit = PikauUnit( + slug="pikau-unit-{}".format(number), + number=number, + pikau_course=pikau_course, + name="pikau-unit-{}-name".format(number), + content="Content for piaku unit {}.
".format(number), + ) + if module_name: + pikau_unit.module_name = "pikau-unit-{}-module-name".format(number) + + pikau_unit.save() + return pikau_unit diff --git a/tests/pikau/models/test_glossary_model.py b/tests/pikau/models/test_glossary_model.py new file mode 100644 index 0000000..023377d --- /dev/null +++ b/tests/pikau/models/test_glossary_model.py @@ -0,0 +1,43 @@ +from tests.BaseTestWithDB import BaseTestWithDB +from tests.pikau.PikauTestDataGenerator import PikauTestDataGenerator + +from pikau.models import GlossaryTerm +from django.db import IntegrityError + + +class GlossaryModelTest(BaseTestWithDB): + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.test_data = PikauTestDataGenerator() + + def test_glossary_model_one_glossary_term(self): + glossary_term = self.test_data.create_glossary_term(1) + query_result = GlossaryTerm.objects.get(slug="glossary-term-1") + self.assertEqual(query_result, glossary_term) + + def test_glossary_model_two_glossary_terms(self): + self.test_data.create_glossary_term(1) + self.test_data.create_glossary_term(2) + self.assertQuerysetEqual( + GlossaryTerm.objects.all(), + [ + "Description for goal 1.
" + ) diff --git a/tests/pikau/models/test_level_model.py b/tests/pikau/models/test_level_model.py new file mode 100644 index 0000000..5bd6abd --- /dev/null +++ b/tests/pikau/models/test_level_model.py @@ -0,0 +1,43 @@ +from tests.BaseTestWithDB import BaseTestWithDB +from tests.pikau.PikauTestDataGenerator import PikauTestDataGenerator + +from pikau.models import Level +from django.db import IntegrityError + + +class LevelModelTest(BaseTestWithDB): + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.test_data = PikauTestDataGenerator() + + def test_level_model_one_level(self): + level = self.test_data.create_level(1) + query_result = Level.objects.get(slug="level-1") + self.assertEqual(query_result, level) + + def test_level_model_two_levels(self): + self.test_data.create_level(1) + self.test_data.create_level(2) + self.assertQuerysetEqual( + Level.objects.all(), + [ + "Description for tag 1.
", + ) + tag_1.save() + + tag_2 = Tag( + slug="srt-tag-2", + name="srt-tag-2-name", + description="Description for tag 2.
", + ) + tag_2.save() + + response = self.client.get(reverse("pikau:docs")) + self.assertEqual(HTTPStatus.OK, response.status_code) + self.assertQuerysetEqual( + response.context["srt_tags"], + [ + "