Fix deadline printing.

Author: Aleksi Salmela

scripts/stub.sh

@@ -103,6 +103,7 @@ EOM
 	PROFILE_FILE=$(tmc_detect_profile)
 
 	# get the aliases
+	#TODO remove this and use global variables
 	set +euo pipefail
 	source $PROFILE_FILE
 	set -euo pipefail

src/main/java/fi/helsinki/cs/tmc/cli/backend/CourseInfo.java

@@ -87,6 +87,13 @@ public Exercise getExercise(String name) {
         return null;
     }
 
+    public static String getExerciseDeadline(Exercise exercise) {
+        if (exercise.getDeadline() == null) {
+            return "none";
+        }
+        return exercise.getDeadlineDate().toString();
+    }
+
     public void setExercises(List<Exercise> exercises) {
         this.course.setExercises(exercises);
     }

src/main/java/fi/helsinki/cs/tmc/cli/command/InfoCommand.java

@@ -184,7 +184,9 @@ private void printExercise(Exercise exercise) {
 
     private void printExerciseShort(Exercise exercise) {
         io.println("Exercise: " + exercise.getName());
-        io.println("Deadline: " + exercise.getDeadlineDate());
+        if (exercise.getDeadline() != null) {
+            io.println("Deadline: " + exercise.getDeadlineDate());
+        }
 
         if (exercise.hasDeadlinePassed() && !exercise.isCompleted()) {
             io.println(ColorUtil.colorString("deadline passed", Color.PURPLE));
@@ -234,7 +236,7 @@ private void printExerciseFull(Exercise exercise) {
         io.println("    Exercise id: " + exercise.getId());
         io.println("    Is locked: " + exercise.isLocked());
         io.println("    Deadline description: " + exercise.getDeadlineDescription());
-        io.println("    Deadline: " + exercise.getDeadlineDate());
+        io.println("    Deadline: " + CourseInfo.getExerciseDeadline(exercise));
         io.println("    Deadline passed: " + exercise.hasDeadlinePassed());
         io.println("    Is returnable: " + exercise.isReturnable());
         io.println("    Review required: " + exercise.requiresReview());

src/main/java/fi/helsinki/cs/tmc/cli/command/ListExercisesCommand.java

@@ -136,7 +136,7 @@ private String getExercisesAsString(String courseName, List<Exercise> exercises)
         String prevDeadline = "";
 
         for (Exercise exercise : exercises) {
-            String deadline = getDeadline(exercise);
+            String deadline = CourseInfo.getExerciseDeadline(exercise);
             if (!deadline.equals(prevDeadline)) {
                 sb.append("\nDeadline: " + deadline + "\n");
                 prevDeadline = deadline;
@@ -146,16 +146,6 @@ private String getExercisesAsString(String courseName, List<Exercise> exercises)
         return sb.toString();
     }
 
-    //TODO duplicate code existed in info command!!!!!!!
-    private String getDeadline(Exercise exercise) {
-        String deadline = exercise.getDeadline();
-        if (deadline == null) {
-            return "not available";
-        }
-        deadline = deadline.substring(0, 19);
-        return deadline.replace("T", " at ");
-    }
-
     private String getExerciseStatus(Exercise exercise) {
         // Check the exercise status in order of flag importance, for example there's
         // no need to check if deadline has passed if the exercise has been submitted