rapid-router 5.4.1__py2.py3-none-any.whl → 7.6.8__py2.py3-none-any.whl

game/level_management.py

@@ -1,19 +1,14 @@
 from __future__ import absolute_import
+
 from builtins import str
 from itertools import chain
 
-from . import permissions
-from .models import Block, LevelBlock, LevelDecor
+from common.mail import campaign_ids, send_dotdigital_email
 
+from game.character import get_character_by_pk
 from game.decor import get_decor_element
 from game.theme import get_theme_by_pk
-from game.character import get_character_by_pk
-from game.messages import (
-    level_creation_email_subject,
-    level_creation_email_text_content,
-)
-
-from common.helpers.emails import NOTIFICATION_EMAIL, send_email
+from .models import Block, LevelBlock, LevelDecor
 
 
 ##########
@@ -40,8 +35,12 @@ def levels_shared_with(user):
         return []
 
     shared_levels = user.shared
+    shared_levels = add_related_fields(shared_levels)
+
+    if hasattr(user.userprofile, "student"):
+        shared_levels = shared_levels.filter(needs_approval=False)
 
-    return add_related_fields(shared_levels)
+    return shared_levels
 
 
 def levels_owned_by(user):
@@ -57,16 +56,17 @@ def get_decor(level):
     """Helper method parsing decor into a dictionary format 'sendable' to javascript."""
     decorData = []
     for ld in LevelDecor.objects.filter(level=level):
-        decor = get_decor_element(name=ld.decorName, theme=level.theme)
+        decor = get_decor_element(name=ld.decor_name, theme=level.theme)
         decorData.append(
             {
                 "x": int(ld.x),
                 "y": int(ld.y),
                 "z": int(decor.z_index),
-                "decorName": str(ld.decorName),
+                "decorName": str(ld.decor_name),
                 "width": int(decor.width),
                 "height": int(decor.height),
                 "url": str(decor.url),
+                "xmas_url": str(decor.xmas_url),
             }
         )
 
@@ -85,7 +85,10 @@ def set_decor_inner(level, decor, LevelDecor):
     for data in decor:
         level_decors.append(
             LevelDecor(
-                level_id=level.id, x=data["x"], y=data["y"], decorName=data["decorName"]
+                level_id=level.id,
+                x=data["x"],
+                y=data["y"],
+                decor_name=data["decorName"],
             )
         )
     LevelDecor.objects.bulk_create(level_decors)
@@ -164,11 +167,19 @@ def save_level(level, data):
     level.max_fuel = data["max_fuel"]
     level.traffic_lights = data["traffic_lights"]
     level.cows = data["cows"]
-    level.blocklyEnabled = data.get("blocklyEnabled", True)
-    level.pythonEnabled = data.get("pythonEnabled", False)
-    level.pythonViewEnabled = data.get("pythonViewEnabled", False)
+    level.blockly_enabled = data.get("blockly_enabled", True)
+    level.python_enabled = data.get("python_enabled", False)
+    level.python_view_enabled = data.get("python_view_enabled", False)
     level.theme = get_theme_by_pk(pk=data["theme"])
     level.character = get_character_by_pk(pk=data["character"])
+    level.disable_algorithm_score = data.get("disable_algorithm_score", False)
+    if data.get("subtitle") != None:
+        level.subtitle = data.get("subtitle")
+    if data.get("lesson") != None:
+        level.lesson = data.get("lesson")
+    if data.get("hint") != None:
+        level.hint = data.get("hint")
+
     level.save()
 
     set_decor(level, data["decor"])
@@ -188,19 +199,17 @@ def unshare_level(level, *users):
 
 
 def email_new_custom_level(
-    teacher_email, moderate_url, level_url, home_url, student_name, class_name
+    teacher_email, moderate_url, level_url, student_name, class_name
 ):
-    # email teacher when a new custom level is created by a pupil, so it can be moderated ASAP
-    send_email(
-        NOTIFICATION_EMAIL,
+    # email teacher when a new custom level is created by a pupil, so it can be moderated
+
+    send_dotdigital_email(
+        campaign_ids["level_creation"],
         [teacher_email],
-        level_creation_email_subject(),
-        level_creation_email_text_content().format(
-            moderate_url=moderate_url,
-            level_url=level_url,
-            student_name=student_name,
-            class_name=class_name,
-            home_url=home_url,
-        ),
-        level_creation_email_subject(),
+        personalization_values={
+            "STUDENT_NAME": student_name,
+            "CLASS_NAME": class_name,
+            "LEVEL_URL": level_url,
+            "MODERATE_URL": moderate_url,
+        },
     )