From 0b5208b6666b25949f0cef72f679fad7d0da983b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20Daniel=20Da=CC=88hne?=
<janis.daehne2@student.uni-halle.de>
Date: Thu, 14 Nov 2019 23:05:21 +0100
Subject: [PATCH] - added property to assessmentFullBase so that we can decide
if the assessment is null on the backend or not
---
src/ClientServer/Config/Constants.cs | 2 +-
.../Controllers/Core/Exercises/SubmissionController.cs | 8 ++++++++
.../Core/Exercises/TutorViewAssessmentController.cs | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/ClientServer/Config/Constants.cs b/src/ClientServer/Config/Constants.cs
index f253644..4aa8566 100644
--- a/src/ClientServer/Config/Constants.cs
+++ b/src/ClientServer/Config/Constants.cs
@@ -13,7 +13,7 @@ namespace ClientServer.Helpers
/// </summary>
public static class Constants
{
- public static string VersionString = "2.5.9";
+ public static string VersionString = "2.5.10";
/// <summary>
/// this is only set once at program.cs!!
diff --git a/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs b/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs
index 267e5f2..c2fb058 100644
--- a/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/SubmissionController.cs
@@ -1679,6 +1679,7 @@ namespace ClientServer.Controllers.Core.Exercises
var assessment = new AssessmentFullBase()
{
+ HasAssessment = solution.Assessment != null,
Token = participation.User.Token,
FirstName = participation.User.FirstName,
LastName = participation.User.LastName,
@@ -1876,6 +1877,7 @@ namespace ClientServer.Controllers.Core.Exercises
var assessment = new AssessmentFullBase()
{
+ HasAssessment = solution.Assessment != null,
Token = participation.User.Token,
FirstName = participation.User.FirstName,
LastName = participation.User.LastName,
@@ -2190,6 +2192,12 @@ namespace ClientServer.Controllers.Core.Exercises
/// </summary>
public class AssessmentFullBase
{
+ /// <summary>
+ /// true: assessment was != null in the backend
+ /// false: assessment was null e.g. because the automatic assessment hasn't finished yet
+ /// </summary>
+ public bool HasAssessment { get; set; }
+
/// <summary>
/// the token from the user
/// </summary>
diff --git a/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs b/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs
index fcf1e5c..4c359f7 100644
--- a/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/TutorViewAssessmentController.cs
@@ -505,6 +505,7 @@ namespace ClientServer.Controllers.Core.Exercises
var assessment = new AssessmentFullBase()
{
+ HasAssessment = solution.Assessment != null,
Token = userReleaseParticipation.User.Token,
FirstName = userReleaseParticipation.User.FirstName,
LastName = userReleaseParticipation.User.LastName,
--
GitLab