Skip to content

Commit

Permalink
continue work on levels page and python den general setup
Browse files Browse the repository at this point in the history
  • Loading branch information
evemartin committed Aug 15, 2024
1 parent 2035ead commit e54d9af
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 13 deletions.
6 changes: 3 additions & 3 deletions game/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -3646,9 +3646,9 @@ def get_episode_title(episode_id):
10: "Introduction to Python",
11: "Python",
12: "Counted Loops Using While",
13: "Indeterminate Loops - coming soon",
14: "Selection in a Loop - coming soon",
15: "For Loops - coming soon",
13: "Indeterminate Loops",
14: "Selection in a Loop",
15: "For Loops",
16: "Output, Operators, and Data",
17: "Variables, Input, and Casting",
18: "Selection",
Expand Down
54 changes: 54 additions & 0 deletions game/migrations/0099_reorder_python_levels.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
from django.apps.registry import Apps
from django.db import migrations, models

def rename_episode_12_levels(apps: Apps, *args):
Level = apps.get_model("game", "Level")
new_name = 1001

for i in range(110, 123):
level = Level.objects.get(name=i, default=True)
level.name = str(new_name)
level.save()
new_name += 1


def undo_rename_episode_12_levels(apps: Apps, *args):
Level = apps.get_model("game", "Level")
new_name = 110
for i in range(1001, 1014):
level = Level.objects.get(name=i, default=True)
level.name = str(new_name)
level.save()
new_name += 1


def delete_old_python_levels(apps: Apps, *args):



def add_back_old_python_levels(apps: Apps, *args):



def set_order_of_levels(apps: Apps, *args):
Level = apps.get_model("game", "Level")

level79 = Level.objects.get(name="79", default=True)
level79.next_level = None

level1013 = Level.objects.get(name="1013", default=True)
level1013.next_level = Level.objects.get(name="1014", default=True)


class Migration(migrations.Migration):

dependencies = [
('game', '0098_add_episode_resource_link_fields'),
]

operations = [
migrations.RunPython(
code=rename_episode_12_levels,
reverse_code=undo_rename_episode_12_levels
)
]
22 changes: 16 additions & 6 deletions game/templates/game/python_den_level_selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ <h4>Introduction to Python</h4>
<div class="panel-header bg--{{ episode.difficulty }}" id="episode-{{episode.id}}">
<p class="episode-title" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
{{episode.name}}
<span class="episode_range_text collapsed" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
Levels {{episode.first_level}}-{{episode.last_level}}
</span>
{% if episode.first_level != None and episode.last_level != None %}
<span class="episode_range_text collapsed" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
Levels {{episode.first_level}}-{{episode.last_level}}
</span>
{% endif %}
<img class="episode_image coin_image" value="{{episode.id}}">
</p>
</div>
Expand Down Expand Up @@ -157,9 +159,17 @@ <h4>Introduction to Python</h4>
id="episode-{{episode.id}}">
<p class="episode-title" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
{{episode.name}}
<span class="episode_range_text collapsed" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
Levels {{episode.first_level}}-{{episode.last_level}}
</span>
{% if episode.first_level != None and episode.last_level != None %}
{% if episode.first_level > 1000 %}
<span class="episode_range_text collapsed" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
Levels {{episode.first_level|stringformat:"i"|slice:"2:4"}}-{{episode.last_level|stringformat:"i"|slice:"2:4"}}
</span>
{% else %}
<span class="episode_range_text collapsed" data-toggle="collapse" data-target="#collapse-{{episode.id}}" aria-expanded="false" aria-controls="collapse-{{episode.id}}" data-parent="#episodes">
Levels {{episode.first_level}}-{{episode.last_level}}
</span>
{% endif %}
{% endif %}
<img class="episode_image coin_image" value="{{episode.id}}">
</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions game/views/level_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ def fetch_episode_data_from_database(early_access, start, end):
}

episode_data.append(e)
episode = episode.next_episode

current += 1
if current > end:
if episode.id == end:
break

episode = episode.next_episode

return episode_data


Expand Down Expand Up @@ -123,7 +123,7 @@ def get_blockly_episodes(request):


def get_python_episodes(request):
return fetch_episode_data(app_settings.EARLY_ACCESS_FUNCTION(request), 10, 12)
return fetch_episode_data(app_settings.EARLY_ACCESS_FUNCTION(request), 16, 22)


def levels(request, language):
Expand Down

0 comments on commit e54d9af

Please sign in to comment.