Updated System Test and Commands with the latest date format.

Chronos/src/application/Logic.java

@@ -39,8 +39,6 @@ public boolean checkForClashes(Task taskToCheck) {
 	}
 
 	public static Instruction getCommandInstruction(String commandString) {
-		//String[] inputs = _parse.parseUserContent(commandString);
-		//return CommandCreator.generateInstructions(inputs[CommandCreator.COMMAND_INDEX_COMMAND]);
 		return CommandCreator.generateInstructions(commandString);
 	}
 }

Chronos/src/application/SearchCommand.java

@@ -1,5 +1,8 @@
 package application;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 
@@ -44,21 +47,27 @@ private boolean isMatchingEntry(Task entryItem, String[] searchCriteria) {
 			} else if (searchCriteria[i].contains(CATEGORY_HEADER)) {
 				return entryItem.getCategory().contains(searchCriteria[i].substring(2));
 			} else { 
-				return searchDates(searchCriteria[i], entryItem);
+				try {
+					return searchDates(searchCriteria[i], entryItem);
+				} catch (ParseException e) {
+					return false;
+				}
 			}
 		}
 		return false;
 	}
 
-	private boolean searchDates(String dateString, Task entryItem) {		
+	private boolean searchDates(String dateString, Task entryItem) throws ParseException {		
 		if (dateString.equalsIgnoreCase(entryItem.DEFAULT_END_DATE)) {
 			return dateString.equals(entryItem.getEndDate());
 		} else {
 			if(entryItem.getEndDate().equals(entryItem.DEFAULT_END_DATE)) {
 				return false;
 			} else { 
 				Calendar searchEndDate = Chronic.parse(dateString).getBeginCalendar();
-				Calendar endDate = Chronic.parse(entryItem.getEndDate()).getBeginCalendar();
+				DateFormat dateFormat = new SimpleDateFormat();
+				Calendar endDate = Calendar.getInstance();
+				endDate.setTime(dateFormat.parse(entryItem.getEndDate()));
 				if (isSameDay(searchEndDate, endDate)) {
 					return true;
 				} else if (entryItem instanceof Event) {

Chronos/src/application/UpdateCommand.java

@@ -60,7 +60,7 @@ private int findEntry(String id) {
 	private void updateEntry(JSONObject entry, ArrayList<String> updateDetails) {
 		String field,value;
 		Span aSpan;
-		DateFormat dateFormat = new SimpleDateFormat(); 
+		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy hh:mm a"); 
 		for (int j=1; j<updateDetails.size();j++){
 			field = updateDetails.get(j);
 			value = updateDetails.get(++j);

Chronos/src/gui/CommandBarController.java

@@ -16,7 +16,7 @@ public class CommandBarController extends BorderPane {
 
 	private static final String COMMAND_BAR_LAYOUT_FXML = "CommandBarLayout.fxml";
 	private GUI gui;
-	private boolean hasAComma = false;
+	boolean hasAComma = false;
 
 	@FXML
 	private TextField commandBar;
@@ -80,8 +80,6 @@ public void updateCommandBar(String requiredField) {
 			commandBar.requestFocus(); // get focus first
 			commandBar.setEditable(false);
 			String commandText = commandBar.getText();
-			System.out.println(commandText);
-			System.out.println(hasAComma);
 			int startingRange = commandText.length();
 			if (hasAComma) {
 				commandBar.appendText(", " + requiredField);

Chronos/src/gui/GUI.java

@@ -53,7 +53,6 @@ public static void main(String[] args) {
 
 	@Override
 	public void start(Stage primaryStage) {
-
 		try {
 			initRootLayout();
 			initPrimaryStage(primaryStage);
@@ -194,11 +193,11 @@ public void handleCommandPattern() {
 		//display command pattern to Command Bar (ideal)
 		commandBarController.updateCommandBar(currentInstruction.getNextRequiredField());
 
-		//if all goes well, go to the next step
 		currentInstruction.nextStep();
 
 		if(currentInstruction.isFinished()) {
 			isHandlingCommand = false;
+			commandBarController.hasAComma = false;
 		} 
 	}
 

Chronos/src/gui/stylesheet.css

@@ -28,6 +28,7 @@
 
 .done .text {
 	-fx-strikethrough: true;
+	-fx-fill: gray;
 }
 
 .txtFlow {