|
@@ -123,8 +123,9 @@ public class EditGradesCommand extends AbstractEditCommandHandler {
|
|
|
|
|
|
subjMap.forEach((id, name) ->
|
|
|
System.out.println(String.format(
|
|
|
- "| %-5s | %9s | %s",
|
|
|
+ "| %5s%5s | %-9s | %s",
|
|
|
gradeMap.containsKey(id) ? "✓" : "✕",
|
|
|
+ " ", // padding
|
|
|
id + "",
|
|
|
name
|
|
|
))
|
|
@@ -183,7 +184,8 @@ public class EditGradesCommand extends AbstractEditCommandHandler {
|
|
|
}
|
|
|
|
|
|
var contin = promptQuestion("Would you like to continue edit Subject for the same student? [Y/n]");
|
|
|
- return !contin.equalsIgnoreCase("n");
|
|
|
+ if (contin.equalsIgnoreCase("n"))
|
|
|
+ return true;
|
|
|
} while (true);
|
|
|
}
|
|
|
|
|
@@ -224,10 +226,8 @@ public class EditGradesCommand extends AbstractEditCommandHandler {
|
|
|
}
|
|
|
|
|
|
if (!gradeMap.containsKey(subjID))
|
|
|
- {
|
|
|
System.out.println("Invalid SubjectID. [Does not exist]");
|
|
|
- }
|
|
|
- } while (subjID != -1);
|
|
|
+ } while (subjID == -1);
|
|
|
|
|
|
var selected = gradeMap.get(subjID);
|
|
|
boolean done = false;
|
|
@@ -320,6 +320,6 @@ public class EditGradesCommand extends AbstractEditCommandHandler {
|
|
|
});
|
|
|
|
|
|
var inp = promptQuestion("Want to update another grade? [y/N]: ");
|
|
|
- return inp.equalsIgnoreCase("y");
|
|
|
+ return !inp.equalsIgnoreCase("y");
|
|
|
}
|
|
|
}
|