Ver código fonte

BugFix @ EditGradesCommand

BlackPhreak 5 anos atrás
pai
commit
a17b324bd1

+ 2 - 2
src/me/blackphreak/CommandHandling/CommandHandler.java

@@ -26,7 +26,7 @@ public class CommandHandler {
 			
 			AtomicInteger i = new AtomicInteger();
 			commandMap.forEach((cmd, handler) -> System.out.println(String.format(
-					"  %2s. %-15s %s",
+					"  %2s. %-30s %s",
 					i.incrementAndGet() + "",  // ++i
 					cmd,
 					handler.description
@@ -34,7 +34,7 @@ public class CommandHandler {
 			
 			// exit option
 			System.out.println(String.format(
-					"  %2s. %-15s %s",
+					"  %2s. %-30s %s",
 					"99",
 					"Exit",
 					"Close this application"

+ 6 - 6
src/me/blackphreak/CommandHandling/Handlers/EditGradesCommand.java

@@ -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");
 	}
 }

BIN
students.db