Added result_percentage

Author: SZonkil

oioioi/programs/handlers.py

@@ -555,6 +555,9 @@ def make_report(env, kind='NORMAL', save_scores=True, **kwargs):
         test_report.score = result['score'] if save_scores else None
         test_report.status = result['status']
         test_report.time_used = result['time_used']
+        percentage = result.get('result_percentage', 0.)
+        if percentage != 100. and percentage != 0.:
+            test_report.result_percentage = percentage
 
         comment = result.get('result_string', '')
         if comment.lower() in ['ok', 'time limit exceeded']:  # Annoying

oioioi/programs/models.py

@@ -326,6 +326,7 @@ class TestReport(models.Model):
     max_score = ScoreField(null=True, blank=True)
     time_used = models.IntegerField(blank=True)
     output_file = FileField(upload_to=make_output_filename, null=True, blank=True)
+    result_percentage = models.FloatField(null=True, blank=True)
 
     test = models.ForeignKey(Test, blank=True, null=True, on_delete=models.SET_NULL)
     test_name = models.CharField(max_length=30)

oioioi/programs/templates/programs/report-comments.html

@@ -5,7 +5,7 @@
     {% for group in groups %}
         {% for record in group.tests %}
         {% with test=record.test %}
-            {% if test.comment and allow_test_comments or test.get_status_display != 'OK' and allow_download_out and test.test %}
+            {% if test.comment or test.result_percentage and allow_test_comments or test.get_status_display != 'OK' and allow_download_out and test.test %}
             <li class="small text-muted">
                 <span>{{ test.test_name }}</span>
                 {% if allow_download_out and test.test %}
@@ -24,7 +24,22 @@
                     {% endif %}
                 {% endif %}
                 {% if allow_test_comments %}
-                    <span>{{ test.comment }}</span>
+                    <span>
+                    {% if test.comment %}
+                        {% if test.result_percentage %}
+                            {% blocktranslate with test.result_percentage as percentage %}
+                                Granted {{ percentage  }}% points, comment:
+                            {% endblocktranslate %}
+                        {% endif %}
+                        {{ test.comment }}
+                    {% else %}
+                        {% if test.result_percentage %}
+                            {% blocktranslate with test.result_percentage as percentage %}
+                                Granted {{ percentage  }}% points.
+                            {% endblocktranslate %}
+                        {% endif %}
+                    {% endif %}
+                    </span>
                 {% endif %}
             </li>
             {% endif %}