+
+ {% points_progress module %}
+ {% endwith %}
+
{{ module.introduction|safe }}
{% if student %}
{% adddeviationsbutton instance module submitters=student %}
@@ -282,3 +284,16 @@
startListen("{{course|safe}}");
}, false);
+
+
\ No newline at end of file
diff --git a/exercise/templates/exercise/points_goal_modal.html b/exercise/templates/exercise/points_goal_modal.html
new file mode 100644
index 000000000..8b87ab9be
--- /dev/null
+++ b/exercise/templates/exercise/points_goal_modal.html
@@ -0,0 +1,28 @@
+
+
\ No newline at end of file
diff --git a/exercise/templatetags/exercise.py b/exercise/templatetags/exercise.py
index 7158e0587..1def0e3fc 100644
--- a/exercise/templatetags/exercise.py
+++ b/exercise/templatetags/exercise.py
@@ -53,11 +53,15 @@ def _prepare_context(context: Context, student: Optional[User] = None) -> Cached
def _get_toc(context, student=None):
points = _prepare_context(context, student)
- # Add personalized_points_goal to the context
+
+ # Add personalized_points_goal to the context
if 'personalized_points_goal' not in context:
- context["personalized_points_goal"] = StudentModuleGoal.objects.all
- print(StudentModuleGoal.objects.all())
-
+ course_module = context.get('course_module')
+ if course_module:
+ context["personalized_points_goal"] = StudentModuleGoal.objects.filter(module=course_module)
+ else:
+ context["personalized_points_goal"] = StudentModuleGoal.objects.none()
+
context = context.flatten()
context.update({
'modules': points.modules_flatted(),
@@ -69,6 +73,14 @@ def _get_toc(context, student=None):
return context
+@register.simple_tag
+def get_goal(module, student):
+ try:
+ goal = StudentModuleGoal.objects.get(module_id=module, student_id=student)
+ return goal
+ except StudentModuleGoal.DoesNotExist:
+ return None
+
def _is_accessible(context, entry, t):
if t and t > _prepare_now(context):
return False
@@ -115,7 +127,7 @@ def user_results(context: Context, student: Optional[User] = None) -> Dict[str,
.order_by()
)
values['exercise_submitter_counts'] = {row['submissions__exercise_id']: row['count'] for row in counts}
- print("StudentModuleGoalObjects", StudentModuleGoal.objects.all())
+ #print("StudentModuleGoalObjects", StudentModuleGoal.objects.all())
return values
@@ -221,6 +233,7 @@ def _points_data(
'unofficial_submission_type': getattr(obj, 'unofficial_submission_type', None),
'confirmable_points': getattr(obj, 'confirmable_points', False),
'feedback_revealed': getattr(obj, 'feedback_revealed', True),
+ 'personalized_points_module_goal': getattr(obj, 'personalized_points_module_goal', None),
}
reveal_time = getattr(obj, 'feedback_reveal_time', None)
@@ -259,10 +272,8 @@ def _points_data(
@register.inclusion_tag("exercise/_points_progress.html")
def points_progress(
obj: Union[CachedPointsData, ModulePoints, CategoryPoints],
- personalized_points_goal: int = 100,
) -> Dict[str, Any]:
data = _points_data(obj, None)
- data['personalized_points_goal'] = personalized_points_goal
return data
diff --git a/exercise/urls.py b/exercise/urls.py
index 8cd74f05b..75b7e7471 100644
--- a/exercise/urls.py
+++ b/exercise/urls.py
@@ -85,6 +85,9 @@
re_path(MODULE_URL_PREFIX + r'student_module_goal/$',
views.StudentModuleGoalView.as_view(),
name="student_module_goal"),
+ re_path(r'save_points_goal/$',
+ views.StudentModuleGoalView.save_points_goal,
+ name="save_points_goal"),
re_path(EDIT_URL_PREFIX + r'analytics/$',
staff_views.AnalyticsView.as_view(),
name="analytics"),
diff --git a/exercise/views.py b/exercise/views.py
index afb97a319..b88e5dfd5 100644
--- a/exercise/views.py
+++ b/exercise/views.py
@@ -21,7 +21,7 @@
from lib.remote_page import RemotePageNotFound, request_for_response
from lib.viewbase import BaseFormView, BaseRedirectMixin, BaseView
from userprofile.models import UserProfile
-from .cache.points import ExercisePoints
+from .cache.points import CachedPoints, ExercisePoints, ModulePoints
from .models import BaseExercise, LearningObject, LearningObjectDisplay
from .protocol.exercise_page import ExercisePage
from .submission_models import SubmittedFile, Submission, SubmissionTagging
@@ -614,6 +614,38 @@ class StudentModuleGoalView(CourseModuleBaseView, BaseFormView):
template_name = "exercise/student_module_goal.html"
form_class = StudentModuleGoalForm
+ @csrf_exempt
+ def save_points_goal(request):
+ if request.method == 'POST':
+ points_goal = request.POST.get('points_goal')
+ user_id = request.POST.get('student')
+ module_id = request.POST.get('module-id')
+
+ student = UserProfile.objects.get(id=user_id)
+ module = CourseModule.objects.get(id=module_id)
+
+ cached_points = CachedPoints(module.course_instance, student, True)
+ cached_module, _, _, _ = cached_points.find(module)
+ print(cached_module.max_points)
+ # Points goal can either be an integer or percentage. If the the points goal is given as a percentage, give it to the points goal directly as an int
+ # Otherwise calculate the points goal by taking the integer and calculating how much that is of the module's max points
+ if '%' in points_goal:
+ points_goal = int(points_goal.replace('%', ''))
+ elif cached_module.max_points > 0:
+ points_goal = float(float(points_goal) / float(cached_module.max_points)) * 100
+ elif cached_module.max_points == 0:
+ points_goal = 0
+
+ if points_goal > 100:
+ points_goal = 100
+ elif points_goal < 0:
+ points_goal = 0
+ StudentModuleGoal.objects.update_or_create(student=student, module=module, defaults={'personalized_points_goal': points_goal})
+ print(StudentModuleGoal.objects.get(student=user_id, module=module_id).personalized_points_goal)
+ cached_points.invalidate(module.course_instance, student)
+ return redirect(request.META.get('HTTP_REFERER', '/'))
+ return HttpResponse('Invalid request', status=400)
+
def get_common_objects(self):
super().get_common_objects()