Merge branch 'v4.1'

helpers/Dojo/DojoBackendHelper.ts

@@ -4,19 +4,19 @@ import ClientsSharedConfig from '../../config/ClientsSharedConfig.js';
 
 class DojoBackendHelper {
     public getApiUrl(route: ApiRoute, options?: Partial<{ assignmentNameOrUrl: string, exerciseIdOrUrl: string, gitlabProjectId: string }>): string {
-        const url = `${ ClientsSharedConfig.apiURL }${ route }`;
+        let url = `${ ClientsSharedConfig.apiURL }${ route }`;
 
         if ( options ) {
             if ( options.assignmentNameOrUrl ) {
-                return url.replace('{{assignmentNameOrUrl}}', encodeURIComponent(options.assignmentNameOrUrl));
+                url = url.replace('{{assignmentNameOrUrl}}', encodeURIComponent(options.assignmentNameOrUrl));
             }
 
             if ( options.exerciseIdOrUrl ) {
-                return url.replace('{{exerciseIdOrUrl}}', encodeURIComponent(options.exerciseIdOrUrl));
+                url = url.replace('{{exerciseIdOrUrl}}', encodeURIComponent(options.exerciseIdOrUrl));
             }
 
             if ( options.gitlabProjectId ) {
-                return url.replace('{{gitlabProjectId}}', encodeURIComponent(options.gitlabProjectId));
+                url = url.replace('{{gitlabProjectId}}', encodeURIComponent(options.gitlabProjectId));
             }
         }
 

models/Exercise.ts

@@ -18,6 +18,7 @@ interface Exercise {
 
     isCorrection: boolean;
     correctionCommit: Gitlab.CommitSchema | undefined;
+    correctionDescription: string | undefined;
 }
 
 

types/Dojo/ApiRoute.ts

 enum ApiRoute {
-    LOGIN                        = '/login',
-    REFRESH_TOKENS               = '/refresh_tokens',
-    TEST_SESSION                 = '/test_session',
-    GITLAB_CHECK_TEMPLATE_ACCESS = '/gitlab/project/{{gitlabProjectId}}/checkTemplateAccess',
-    ASSIGNMENT_GET               = '/assignments/{{assignmentNameOrUrl}}',
-    ASSIGNMENT_CREATE            = '/assignments',
-    ASSIGNMENT_PUBLISH           = '/assignments/{{assignmentNameOrUrl}}/publish',
-    ASSIGNMENT_UNPUBLISH         = '/assignments/{{assignmentNameOrUrl}}/unpublish',
-    ASSIGNMENT_CORRECTION_LINK   = '/assignments/{{assignmentNameOrUrl}}/corrections',
-    ASSIGNMENT_CORRECTION_UPDATE = '/assignments/{{assignmentNameOrUrl}}/corrections/{{exerciseIdOrUrl}}',
-    EXERCISE_CREATE              = '/assignments/{{assignmentNameOrUrl}}/exercises',
-    EXERCISE_ASSIGNMENT          = '/exercises/{{exerciseIdOrUrl}}/assignment',
-    EXERCISE_RESULTS             = '/exercises/{{exerciseIdOrUrl}}/results'
+    LOGIN                               = '/login',
+    REFRESH_TOKENS                      = '/refresh_tokens',
+    TEST_SESSION                        = '/test_session',
+    GITLAB_CHECK_TEMPLATE_ACCESS        = '/gitlab/project/{{gitlabProjectId}}/checkTemplateAccess',
+    ASSIGNMENT_GET                      = '/assignments/{{assignmentNameOrUrl}}',
+    ASSIGNMENT_CREATE                   = '/assignments',
+    ASSIGNMENT_PUBLISH                  = '/assignments/{{assignmentNameOrUrl}}/publish',
+    ASSIGNMENT_UNPUBLISH                = '/assignments/{{assignmentNameOrUrl}}/unpublish',
+    ASSIGNMENT_CORRECTION_LINK          = '/assignments/{{assignmentNameOrUrl}}/corrections',
+    ASSIGNMENT_CORRECTION_UPDATE_DELETE = '/assignments/{{assignmentNameOrUrl}}/corrections/{{exerciseIdOrUrl}}',
+    EXERCISE_CREATE                     = '/assignments/{{assignmentNameOrUrl}}/exercises',
+    EXERCISE_ASSIGNMENT                 = '/exercises/{{exerciseIdOrUrl}}/assignment',
+    EXERCISE_RESULTS                    = '/exercises/{{exerciseIdOrUrl}}/results'
 }