History and statistic #246
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/test/java/seedu/address/logic/commands/AddCommandTest.java
… into add-ui-feature # Conflicts: # src/main/java/seedu/address/model/ModelManager.java
… into add-ui-feature
… into add-ui-feature # Conflicts: # src/main/java/seedu/address/model/CustomerManager.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/test/java/seedu/address/logic/commands/AddCommandTest.java
Added Headings for each list Added description under each lists
Use driver Index instead of the deprecated Index class
… into add-ui-feature # Conflicts: # src/main/java/seedu/address/logic/LogicManager.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/model/task/TaskManager.java # src/test/java/seedu/address/logic/commands/AddCommandTest.java
… into add-ui-feature
… into fixCardandTaskID
… into ViewCompletedTasks # Conflicts: # src/main/java/seedu/address/logic/commands/AssignCommand.java # src/main/java/seedu/address/model/ModelManager.java # src/main/resources/view/MainWindow.fxml
… into ViewCompletedTasks # Conflicts: # src/main/java/seedu/address/logic/LogicManager.java # src/main/java/seedu/address/logic/commands/ListCommand.java # src/main/java/seedu/address/logic/parser/AddressBookParser.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java
… into ViewCompletedTasks # Conflicts: # src/test/java/seedu/address/logic/commands/AddCommandTest.java
… into historyCommands # Conflicts: # src/main/java/seedu/address/logic/Logic.java # src/main/java/seedu/address/logic/LogicManager.java # src/main/java/seedu/address/logic/commands/GoCommand.java # src/main/java/seedu/address/logic/commands/ViewCustomerTaskCommand.java # src/main/java/seedu/address/logic/commands/ViewDriverTaskCommand.java # src/main/java/seedu/address/logic/parser/GoCommandParser.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/ui/MainWindow.java # src/main/resources/view/MainWindow.fxml # src/test/java/seedu/address/logic/commands/CommandResultTest.java # src/test/java/seedu/address/logic/commands/ExitCommandTest.java # src/test/java/seedu/address/logic/commands/HelpCommandTest.java Fix send button and statistic tab can now be displayed with data
… into historyCommands # Conflicts: # src/main/java/seedu/address/logic/LogicManager.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/test/java/seedu/address/logic/commands/AddCommandTest.java
tysg
approved these changes
Nov 11, 2019
19 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
close #240
close #237
close #238
close #235
close #185
close #145