Improve pseudonymization

- Added studentID to be pseudonymizized
- Fixed hashing issues

course/staff_views.py

@@ -28,7 +28,7 @@
 def format_group(group: StudentGroup, pseudonymized: bool):
     if pseudonymized:
         for member in group.members.all():
-            format_user(member.user, True)
+            format_user(member.user, True, member)
     return group
 
 
@@ -71,7 +71,7 @@ def _get_students_with_tags(self) -> List[Dict[str, Any]]:
         participants = ci.all_students.prefetch_tags(ci)
         data = []
         for participant in participants:
-            format_user(participant.user, self.pseudonymize)
+            format_user(participant.user, self.pseudonymize, participant)
             user_id = participant.user.id
             user_tags = CachedStudent(ci, participant.user).data
             user_tags_html = ' '.join(tags[slug].html_label for slug in user_tags['tag_slugs'] if slug in tags)
@@ -124,7 +124,7 @@ def get_resource_objects(self):
             )
         else:
             group = StudentGroup(course_instance=self.instance)
-        self.group = format_group(group, self.pseudonymize)
+        self.group = group
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()

course/templates/course/_course_menu.html

@@ -202,6 +202,19 @@ <h4>{% translate "COURSE_STAFF" %}</h4>
 		{% translate "SUBMISSION_DEVIATIONS" %}
 	</a>
 </li>
+
+<li class="menu-pseudonymize">
+	<a href="{% url 'toggle-pseudonymization' %}">
+		{% if pseudonymize %}
+			<span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+			{% translate "UNPSEUDONYMIZE" %}
+		{% else %}
+			<span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
+			{% translate "PSEUDONYMIZE" %}
+		{% endif %}
+	</a>
+</li>
+
 {% endif %}
 
 {% for group in course_menu.staff_link_groups %}

deviations/viewbase.py

@@ -284,7 +284,7 @@ def get_deviation_groups(
         lambda obj: (obj.submitter, obj.exercise.course_module),
     )
     for (submitter, module), deviations_iter in deviation_groups:
-        format_user(submitter.user, pseudonymize)
+        format_user(submitter.user, pseudonymize, submitter)
         deviations = list(deviations_iter)
         can_group = True
         show_granter = True

exercise/staff_views.py

@@ -52,7 +52,8 @@
 def format_submission(submission: Submission, pseudonymized: bool):
     if pseudonymized:
         for submitter in submission.submitters.all():
-            submitter.user = format_user(submitter.user, pseudonymized=True)
+            pseudo = True
+            format_user(submitter.user, pseudo, submitter)
     return submission
 
 
@@ -76,6 +77,7 @@ def get_common_objects(self) -> None:
         )
         for submission in qs:
             format_submission(submission, self.pseudonymize)
+            print(submission.submitters)
         self.all = self.request.GET.get('all', None)
         self.all_url = self.exercise.get_submission_list_url() + "?all=yes"
         self.submissions = qs if self.all else qs[:self.default_limit]
@@ -127,7 +129,8 @@ def get_common_objects(self) -> None:
         )
         if self.pseudonymize:
             for profile in profiles.values():
-                format_user(profile.user, pseudonymized=True)
+                pseudo = True
+                format_user(profile.user, pseudo, profile)
         # Add UserProfile instances to the dicts in submitter_summaries, so we can
         # use the 'profiles' template tag.
         for submitter_summary in submitter_summaries:
@@ -173,7 +176,7 @@ class InspectSubmissionView(SubmissionBaseView, BaseFormView):
     def get_common_objects(self) -> None:
         super().get_common_objects()
         self.files = list(self.submission.files.all())
-
+        self.pseudonymize = self.request.session.get('pseudonymize', False)
         self.lowest_visible_index = self.index - 10
         self.highest_visible_index = self.index + 10
 
@@ -184,7 +187,7 @@ def get_common_objects(self) -> None:
         self.not_best = False
         self.not_last = False
         for submission in self.submissions:
-            format_submission(submission, self.pseudonymize)
+            format_submission(self.submission, self.pseudonymize)
             if submission.id != self.submission.id:
                 if submission.force_exercise_points:
                     self.not_final = True
@@ -407,8 +410,9 @@ def get_common_objects(self):
         super().get_common_objects()
         self.tags = [USERTAG_INTERNAL, USERTAG_EXTERNAL]
         self.tags.extend(self.instance.usertags.all())
+        self.pseudonymize = self.request.session.get("pseudonymize", False)
         self.note(
-            'tags',
+            'tags', 'pseudonymize',
         )
 
 
@@ -421,8 +425,9 @@ def get_common_objects(self):
         self.tags = list(self.instance.usertags.all())
         self.internal_user_label = settings_text('INTERNAL_USER_LABEL')
         self.external_user_label = settings_text('EXTERNAL_USER_LABEL')
+        self.pseudonymize = self.request.session.get("pseudonymize", False)
         self.note(
-            'tags', 'internal_user_label', 'external_user_label',
+            'tags', 'internal_user_label', 'external_user_label', 'pseudonymize',
         )
 
 
@@ -442,7 +447,7 @@ def get_resource_objects(self):
             User,
             id=self.kwargs[self.user_kw],
         )
-        self.student = format_user(student, self.pseudonymize)
+        self.student = format_user(student, self.pseudonymize, student.userprofile)
         self.note('student')
 
     def get_common_objects(self):

exercise/templates/exercise/_submission_info.html

@@ -33,14 +33,18 @@ <h4 class="panel-title">{% translate "SUBMISSION_INFO" %}</h4>
 				{% translate "SUBMITTERS" %}
 			</dt>
 			<dd>
-			  {% if is_course_staff %}
-			  {% if is_teacher %}
-			  <script src="{% static 'django_colortag.js' %}"></script>
-			  <script src="{% static 'add_tagging_dropdown.js' %}"></script>
-			  {% endif %}
-			  {% profiles submission.submitters.all instance is_teacher %}
+			  {% if not pseudonymize %}
+				  {% if is_course_staff %}
+					  {% if is_teacher %}
+					  <script src="{% static 'django_colortag.js' %}"></script>
+					  <script src="{% static 'add_tagging_dropdown.js' %}"></script>
+					  {% endif %}
+					  {% profiles submission.submitters.all instance is_teacher %}
+					  {% else %}
+					  {{ submission.submitters.all|names }}
+				  {% endif %}
 			  {% else %}
-			  {{ submission.submitters.all|names }}
+				Somebody
 			  {% endif %}
 			</dd>
 		</dl>

exercise/templates/exercise/staff/_assessment_panel.html

@@ -10,9 +10,15 @@
 			<div class="assessment-bar-fill assessment-bar-text">
 				{% if submission.grader %}
 				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
-				{% blocktranslate trimmed with user=submission.grader.user.get_full_name time=submission.grading_time %}
-				ASSESSED_BY -- {{ user }}, {{ time }}
-				{% endblocktranslate %}
+				{% if not pseudonymize %}
+					{% blocktranslate trimmed with user=submission.grader.user.get_full_name time=submission.grading_time %}
+					ASSESSED_BY -- {{ user }}, {{ time }}
+					{% endblocktranslate %}
+				{% else %}
+					{% blocktranslate trimmed with user="Somebody" time=submission.grading_time %}
+					ASSESSED_BY -- {{ user }}, {{ time }}
+					{% endblocktranslate %}
+				{% endif %}
 				{% else %}
 				<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
 				{% translate 'NOT_ASSESSED_MANUALLY' %}

exercise/templates/exercise/staff/analytics.html

@@ -12,6 +12,12 @@
 {% endblock %}
 
 {% block columns %}
+{% if pseudonymize %}
+<div class="alert alert-warning clearfix site-message">
+	{% translate "PSEUDONYMIZATION_ERROR_MSG" %}
+</div>
+{% endif %}
+
 <div class="col-md-12 llama-client">
 
 	<div id="llama-unit-select" role="navigation" aria-label="{% translate 'MODULE_SELECTION' %}">
@@ -107,41 +113,44 @@
 {% endblock %}
 
 {% block scripts %}
+
 {{ block.super }}
 <script src="https://d3js.org/d3.v4.min.js"></script>
 <script src="{% static 'js/d3Stream.min.js' %}"></script>
 <script src="{% static 'js/llama.min.js' %}"></script>
 <link rel="stylesheet" href="{% static 'css/d3Stream.min.css' %}" />
 <link rel="stylesheet" href="{% static 'css/llama.min.css' %}" />
-<script>
-$(function () {
-	new LlamaClient({
-
-		apiUrl: function (filter, download) {
-			var url = '{% url "api:course-aggregatedata-list" version=2 course_id=instance.id %}';
-			var a = '?';
-			if (filter && filter != '#all') {
-				url += '?filter=' + filter.substr(1);
-				a = '&';
-			}
-			if (download) {
-				url += a + 'format=csv';
-			}
-			return url;
-		},
-
-		userUrl: function (uid) {
-			var url = '{% url "user-results" course_slug=course.url instance_slug=instance.url user_id=0 %}';
-			return url.substr(0, url.length - 1) + uid;
-		},
-
-		progressLabels: [
-			'{% translate "NOT_SUBMITTED" %}',
-			'{% translate "PROGRESS_LABEL_<90%_POINTS" %}',
-			'{% translate "PROGRESS_LABEL_>=90%_POINTS" %}'
-		],
-
+{% if not pseudonymize %}
+	<script>
+	$(function () {
+		new LlamaClient({
+
+			apiUrl: function (filter, download) {
+				var url = '{% url "api:course-aggregatedata-list" version=2 course_id=instance.id %}';
+				var a = '?';
+				if (filter && filter != '#all') {
+					url += '?filter=' + filter.substr(1);
+					a = '&';
+				}
+				if (download) {
+					url += a + 'format=csv';
+				}
+				return url;
+			},
+
+			userUrl: function (uid) {
+				var url = '{% url "user-results" course_slug=course.url instance_slug=instance.url user_id=0 %}';
+				return url.substr(0, url.length - 1) + uid;
+			},
+
+			progressLabels: [
+				'{% translate "NOT_SUBMITTED" %}',
+				'{% translate "PROGRESS_LABEL_<90%_POINTS" %}',
+				'{% translate "PROGRESS_LABEL_>=90%_POINTS" %}'
+			],
+
+		});
 	});
-});
-</script>
+	</script>
+{% endif %}
 {% endblock %}

exercise/templates/exercise/staff/results.html

@@ -43,21 +43,27 @@
     results_staff.js is the main script for this page. -->
 <!--<link rel="stylesheet" href="{% static 'exercise/css/loading_animation.css' %}" />-->
 <link rel="stylesheet" href="{% static 'exercise/css/results_staff.css' %}" />
-<script
-	src="{% static 'exercise/results_staff.js' %}"
-	data-exercises-url="{% url 'api:course-exercises-list' version=2 course_id=instance.id %}"
-	data-usertags-url="{% url 'api:course-usertags-list' version=2 course_id=instance.id %}"
-	data-points-url="{% url 'api:course-resultsdata-list' version=2 course_id=instance.id %}"
-	data-points-best-url="{% url 'api:course-resultsdata-best-list' version=2 course_id=instance.id %}"
-	defer>
-</script>
+{% if not pseudonymize %}
+    <script
+        src="{% static 'exercise/results_staff.js' %}"
+        data-exercises-url="{% url 'api:course-exercises-list' version=2 course_id=instance.id %}"
+        data-usertags-url="{% url 'api:course-usertags-list' version=2 course_id=instance.id %}"
+        data-points-url="{% url 'api:course-resultsdata-list' version=2 course_id=instance.id %}"
+        data-points-best-url="{% url 'api:course-resultsdata-best-list' version=2 course_id=instance.id %}"
+        defer>
+    </script>
+{% endif %}
 
 <!--Colortags-->
 <script src="{% static 'django_colortag.js' %}"></script>
 {% endblock scripts %}
 
 {% block columns %}
-
+{% if pseudonymize %}
+<div class="alert alert-warning clearfix site-message">
+	{% translate "PSEUDONYMIZATION_ERROR_MSG" %}
+</div>
+{% endif %}
 <div class="col-md-12">
 	<div id="main-body">
 		<div class="col-md-6 col-sm-12">

exercise/viewbase.py

@@ -256,7 +256,7 @@ def get_summary_user(self) -> Optional[User]:
 
     @cached_property
     def submission_entry(self) -> int:
-            return next(s for s in self.submissions if s.id == self.submission.id)
+        return next(s for s in self.submissions if s.id == self.submission.id)
 
     @cached_property
     def index(self) -> int:

external_services/templatetags/external_services.py

@@ -1,4 +1,5 @@
 import string
+
 from django import template
 
 from lib.errors import TagUsageError

locale/en/LC_MESSAGES/django.po

@@ -1017,6 +1017,19 @@ msgstr "Deadline deviations"
 msgid "SUBMISSION_DEVIATIONS"
 msgstr "Submission deviations"
 
+#: exercise/templates/exercise/staff/results.html
+#: exercise/templates/exercise/staff/analytics.html
+msgid "PSEUDONYMIZATION_ERROR_MSG"
+msgstr "This view is not available when pseudonymization is enabled!"
+
+#: course/templates/course/_course_menu.html
+msgid "UNPSEUDONYMIZE"
+msgstr "Depseudonymize"
+
+#: course/templates/course/_course_menu.html
+msgid "PSEUDONYMIZE"
+msgstr "Pseudonymize"
+
 #: course/templates/course/_enroll_form.html
 msgid "ENROLL_THROUGH_SIS"
 msgstr ""

locale/fi/LC_MESSAGES/django.po

@@ -1023,6 +1023,15 @@ msgstr "Määräaikojen poikkeamat"
 msgid "SUBMISSION_DEVIATIONS"
 msgstr "Palautuskertojen poikkeamat"
 
+#: course/templates/course/_course_menu.html
+msgid "UNPSEUDONYMIZE"
+msgstr "Pseudonymisointi pois päältä"
+
+#: course/templates/course/_course_menu.html
+msgid "PSEUDONYMIZE"
+msgstr "Pseudonymisointi päälle"
+
+
 #: course/templates/course/_enroll_form.html
 msgid "ENROLL_THROUGH_SIS"
 msgstr ""

templates/base.html

@@ -255,9 +255,6 @@ <h4>{% translate "SITE" %}</h4>
 						<li><a href="{% url 'accessibility_statement' %}">{% translate "ACCESSIBILITY_STATEMENT" %}</a></li>
 						<li><a href="{% url 'support_channels' %}">{% translate "SUPPORT" %}</a></li>
 						<li><a href="https://link.webropol.com/s/aplus-feedback" target="_blank">{% translate "FEEDBACK" %}</a></li>
-						{% if is_course_staff %}
-						<li><a href="{% url 'toggle-pseudonymization' %}">{% if pseudonymize %} Unpseudonymize {% else %} Pseudonymize {% endif %} personal data</a></li>
-						{% endif %}
 						<li><p class="navbar-text">{% brand_name %} {{ APLUS_VERSION }}</p></li>
 					</ul>
 				</div>