avoid notifications for quiz updates before release date, fix issue i…

…n quiz generation when title is undefined Signed-off-by: Stephan Krusche <[email protected]>
ls1intum · Apr 23, 2019 · 264511e · 264511e
1 parent e7397b9
commit 264511e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/GroupNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/GroupNotificationService.java
@@ -115,11 +115,11 @@ public void notifyStudentGroupAboutExercisePractice(Exercise exercise) {
     }
 
     public void notifyStudentGroupAboutExerciseUpdate(Exercise exercise) {
-        if (exercise.getReleaseDate() != null && !exercise.getReleaseDate().isBefore(ZonedDateTime.now())) {
+        if (exercise.getReleaseDate() != null && exercise.getReleaseDate().isAfter(ZonedDateTime.now())) {
             return;
         }
         String title = "Exercise updated";
-        String notificationText = "Exercise \"" + exercise.getTitle() + "\" got updated.";
+        String notificationText = "Exercise \"" + exercise.getTitle() + "\" was updated.";
         notifyStudentGroupAboutExerciseChange(exercise, title, notificationText);
     }
 

diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java
@@ -148,7 +148,8 @@ public ResponseEntity<QuizExercise> updateQuizExercise(@RequestBody QuizExercise
         // notify websocket channel of changes to the quiz exercise
         quizExerciseService.sendQuizExerciseToSubscribedClients(result);
 
-        groupNotificationService.notifyStudentGroupAboutExerciseUpdate(result);
+        // NOTE: it does not make sense to notify students here!
+        // groupNotificationService.notifyStudentGroupAboutExerciseUpdate(result);
         return ResponseEntity.ok().headers(HeaderUtil.createEntityUpdateAlert(ENTITY_NAME, quizExercise.getId().toString())).body(result);
     }
 
@@ -390,7 +391,6 @@ public ResponseEntity<QuizExercise> reEvaluateQuizExercise(@RequestBody QuizExer
             quizStatisticService.recalculateStatistics(updatedQuizExercise);
         }
 
-        groupNotificationService.notifyStudentGroupAboutExerciseUpdate(updatedQuizExercise);
         return ResponseEntity.ok().headers(HeaderUtil.createEntityUpdateAlert(ENTITY_NAME, quizExercise.getId().toString())).body(updatedQuizExercise);
     }
 }
diff --git a/src/main/webapp/app/components/util/markdown.service.ts b/src/main/webapp/app/components/util/markdown.service.ts
@@ -75,11 +75,11 @@ export class ArtemisMarkdown {
      * @return {string}
      */
     generateTextHintExplanation(sourceObject: MarkDownElement) {
-        return (
-            sourceObject.text +
-            (sourceObject.hint ? '\n\t' + HintCommand.identifier + ' ' + sourceObject.hint : '') +
-            (sourceObject.explanation ? '\n\t' + ExplanationCommand.identifier + ' ' + sourceObject.explanation : '')
-        );
+        return sourceObject.text
+            ? sourceObject.text
+            : '' +
+                  (sourceObject.hint ? '\n\t' + HintCommand.identifier + ' ' + sourceObject.hint : '') +
+                  (sourceObject.explanation ? '\n\t' + ExplanationCommand.identifier + ' ' + sourceObject.explanation : '');
     }
 
     /**