From c8d672cbc8a17b6346b5729de581d2c97b63a4b3 Mon Sep 17 00:00:00 2001 From: Stefan Kairinos Date: Wed, 27 Nov 2024 16:23:03 +0000 Subject: [PATCH] feat: new python den episodes and fix links (#1750) --- game/messages.py | 2 + ...eet_link_episode_student_worksheet_link.py | 18 ++++ .../0108_episode_indy_worksheet_link.py | 18 ++++ .../0109_create_episodes_23_and_24.py | 99 +++++++++++++++++++ game/models.py | 5 +- .../game/python_den_level_selection.html | 10 +- game/views/level_selection.py | 3 +- 7 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 game/migrations/0107_rename_worksheet_link_episode_student_worksheet_link.py create mode 100644 game/migrations/0108_episode_indy_worksheet_link.py create mode 100644 game/migrations/0109_create_episodes_23_and_24.py diff --git a/game/messages.py b/game/messages.py index 074ce69bd..759bcda8e 100644 --- a/game/messages.py +++ b/game/messages.py @@ -3339,6 +3339,8 @@ def get_episode_title(episode_id): 20: "String Manipulation", 21: "Lists", 22: "Procedures", + 23: "2D Lists", + 24: "Procedures and Functions" } return episode_titles[episode_id] diff --git a/game/migrations/0107_rename_worksheet_link_episode_student_worksheet_link.py b/game/migrations/0107_rename_worksheet_link_episode_student_worksheet_link.py new file mode 100644 index 000000000..e3b716236 --- /dev/null +++ b/game/migrations/0107_rename_worksheet_link_episode_student_worksheet_link.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-27 15:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("game", "0106_fields_to_snake_case"), + ] + + operations = [ + migrations.RenameField( + model_name="episode", + old_name="worksheet_link", + new_name="student_worksheet_link", + ), + ] diff --git a/game/migrations/0108_episode_indy_worksheet_link.py b/game/migrations/0108_episode_indy_worksheet_link.py new file mode 100644 index 000000000..6048d2bb7 --- /dev/null +++ b/game/migrations/0108_episode_indy_worksheet_link.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-27 15:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("game", "0107_rename_worksheet_link_episode_student_worksheet_link"), + ] + + operations = [ + migrations.AddField( + model_name="episode", + name="indy_worksheet_link", + field=models.CharField(blank=True, default=None, max_length=500, null=True), + ), + ] diff --git a/game/migrations/0109_create_episodes_23_and_24.py b/game/migrations/0109_create_episodes_23_and_24.py new file mode 100644 index 000000000..044be5152 --- /dev/null +++ b/game/migrations/0109_create_episodes_23_and_24.py @@ -0,0 +1,99 @@ +from django.apps.registry import Apps +from django.db import migrations + + +def create_episodes_23_and_24(apps: Apps, *args): + Episode = apps.get_model("game", "Episode") + + episode_23 = Episode.objects.create( + pk=23, + name="2D Lists", + student_worksheet_link="https://code-for-life.gitbook.io/student-resources/python-den-student-resources/worksheet-12-2d-lists", + indy_worksheet_link="https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-12-2d-lists", + video_link="https://www.youtube.com/watch?v=MBU49ivZk6w", + lesson_plan_link="https://code-for-life.gitbook.io/python-lessons-with-raspberry-pi-ide/EMEzsyyl4uRclyA9LDGN/python-12-2d-lists", + slides_link="https://4077022412-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FwAuC4Q5WQz4ea2O2b2JP%2Fuploads%2F3Q4X7ZDk1TNej5c2e7LW%2FPython%2012%202D%20Lists.pptx?alt=media&token=847d9d69-4610-4c67-a649-0c6e0f88d372", + ) + + episode_24 = Episode.objects.create( + pk=24, + name="Procedures and Functions", + student_worksheet_link="https://code-for-life.gitbook.io/student-resources/python-den-student-resources/worksheet-13-procedures-and-functions", + indy_worksheet_link="https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-13-procedures-and-functions", + video_link="https://www.youtube.com/watch?v=LJMfI7P3Dzk", + lesson_plan_link="https://code-for-life.gitbook.io/python-lessons-with-raspberry-pi-ide/EMEzsyyl4uRclyA9LDGN/python-13-procedures-and-functions", + slides_link="https://4077022412-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FwAuC4Q5WQz4ea2O2b2JP%2Fuploads%2Fmr6FvFzY3LVuaGT1zd6d%2FPython%2013%20Procedures%20and%20Functions.pptx?alt=media&token=c5835e00-8d42-4567-8cf4-868b0f23dc0a", + ) + + episode_23.next_episode = episode_24 + episode_23.save() + + episode_16 = Episode.objects.get(pk=16) + episode_16.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-1-output-operators-and-data" + episode_16.save() + + episode_17 = Episode.objects.get(pk=17) + episode_17.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-2-variables-input-and-casting" + episode_17.save() + + episode_18 = Episode.objects.get(pk=18) + episode_18.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-3-selection" + episode_18.save() + + episode_19 = Episode.objects.get(pk=19) + episode_19.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-4-complex-selection" + episode_19.save() + + episode_12 = Episode.objects.get(pk=12) + episode_12.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-5-iteration-part-1" + episode_12.save() + + episode_13 = Episode.objects.get(pk=13) + episode_13.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-7-selection-in-a-loop" + episode_13.save() + + episode_14 = Episode.objects.get(pk=14) + episode_14.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-8-indeterminate-loops" + episode_14.save() + + episode_20 = Episode.objects.get(pk=20) + episode_20.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-9-string-manipulation" + episode_20.save() + + episode_21 = Episode.objects.get(pk=21) + episode_21.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-10-1d-lists" + episode_21.save() + + episode_15 = Episode.objects.get(pk=15) + episode_15.next_episode = episode_23 + episode_15.indy_worksheet_link = "https://code-for-life.gitbook.io/independent-student-resources/python-den-resources-beta/session-11-using-for-loops" + episode_15.save() + + +def delete_episodes_23_and_24(apps: Apps, *args): + Episode = apps.get_model("game", "Episode") + + episode_15 = Episode.objects.get(pk=15) + episode_15.next_episode = None + episode_15.indy_worksheet_link = None + episode_15.save() + + Episode.objects.filter(pk__in=[ + 16, 17, 18, 19, 12, 13, 14, 20, 21 + ]).update(indy_worksheet_link=None) + + Episode.objects.filter(pk__in=[23, 24]).delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ("game", "0108_episode_indy_worksheet_link"), + ] + + operations = [ + migrations.RunPython( + code=create_episodes_23_and_24, + reverse_code=delete_episodes_23_and_24, + ) + ] diff --git a/game/models.py b/game/models.py index 04aa7eaf1..78efb6e11 100644 --- a/game/models.py +++ b/game/models.py @@ -66,7 +66,10 @@ class Episode(models.Model): slides_link = models.CharField( max_length=500, null=True, blank=True, default=None ) - worksheet_link = models.CharField( + student_worksheet_link = models.CharField( + max_length=500, null=True, blank=True, default=None + ) + indy_worksheet_link = models.CharField( max_length=500, null=True, blank=True, default=None ) video_link = models.CharField( diff --git a/game/templates/game/python_den_level_selection.html b/game/templates/game/python_den_level_selection.html index 34177d667..019da611d 100644 --- a/game/templates/game/python_den_level_selection.html +++ b/game/templates/game/python_den_level_selection.html @@ -85,7 +85,7 @@

Introduction to Python

{% elif user|is_independent_student %}
- + Worksheet
@@ -95,7 +95,7 @@

Introduction to Python

{% else %}
- + Worksheet
{% endif %} @@ -161,7 +161,7 @@

Introduction to Python

{% elif user|is_independent_student %}
- + Worksheet
@@ -171,7 +171,7 @@

Introduction to Python

{% else %}
- + Worksheet
{% endif %} @@ -230,7 +230,7 @@

Introduction to Python

{% elif user|is_independent_student %}
- + Worksheet
diff --git a/game/views/level_selection.py b/game/views/level_selection.py index 83d5ab424..21c8cb2ac 100644 --- a/game/views/level_selection.py +++ b/game/views/level_selection.py @@ -60,7 +60,8 @@ def fetch_episode_data_from_database(early_access, start, end): "difficulty": episode.difficulty, "lesson_plan_link": episode.lesson_plan_link, "slides_link": episode.slides_link, - "worksheet_link": episode.worksheet_link, + "student_worksheet_link": episode.student_worksheet_link, + "indy_worksheet_link": episode.indy_worksheet_link, "video_link": episode.video_link, }