Currency update - Added JSON Support for Currency #77
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
…into currency-update * 'master' of https://github.com/AY1920S1-CS2103-T14-4/main: Revert "Fix" Fix Fix Prepare for release v1.2.1 Update developer guide update developer guide diagrams update Developerguide update Userguide fixed checkstyle error fix checkstyle error Arrange fixed expenselist storage inside budget and checkstyle errors Fixed test cases for add budget Fix reading logic and caret selection issue Add autocomplete for user input added add budget function, checks to prevent budget period clashes, expenses to auto include into budget if date falls into budget period revert removeAddr merge Remove trailing white space from contactus doc safe delete Address class # Conflicts: # docs/DeveloperGuide.adoc # src/main/java/seedu/address/MainApp.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/model/UserPrefs.java # src/main/java/seedu/address/storage/Storage.java # src/main/java/seedu/address/storage/StorageManager.java # src/test/java/seedu/address/logic/LogicManagerTest.java # src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java # src/test/java/seedu/address/logic/commands/AddCommandTest.java # src/test/java/seedu/address/logic/commands/ClearCommandTest.java # src/test/java/seedu/address/logic/commands/DeleteCommandTest.java # src/test/java/seedu/address/logic/commands/EditCommandTest.java # src/test/java/seedu/address/logic/commands/FindCommandTest.java # src/test/java/seedu/address/logic/commands/ListCommandTest.java # src/test/java/seedu/address/model/ModelManagerTest.java # src/test/java/seedu/address/storage/StorageManagerTest.java
…into currency-update
Fix budget and update UI
…/main into Add_Budget # Conflicts: # src/main/java/seedu/address/logic/Logic.java # src/main/java/seedu/address/logic/LogicManager.java # src/main/java/seedu/address/logic/commands/AddBudgetCommand.java # src/main/java/seedu/address/logic/commands/ClearCommand.java # src/main/java/seedu/address/logic/commands/CommandResult.java # src/main/java/seedu/address/logic/commands/DeleteCommand.java # src/main/java/seedu/address/logic/commands/EditBudgetCommand.java # src/main/java/seedu/address/logic/commands/EditCommand.java # src/main/java/seedu/address/logic/commands/ViewBudgetCommand.java # src/main/java/seedu/address/logic/commands/ViewBudgetListCommand.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/model/budget/Budget.java # src/main/java/seedu/address/model/expense/Amount.java # src/main/java/seedu/address/model/expense/Expense.java # src/main/java/seedu/address/ui/MainWindow.java # src/main/java/seedu/address/ui/StatsDisplay.java # src/main/resources/view/MainWindow.fxml # src/test/java/seedu/address/logic/commands/AddCommandTest.java # src/test/java/seedu/address/testutil/BudgetBuilder.java
… periods, update edit command to show correct error message
…commands to display centre panel properly
…into currency-update # Conflicts: # docs/UserGuide.adoc
-Added new logic for currency conversion -Added Singleton to expose conversion data
…/main into currency-update # Conflicts: # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/model/expense/Amount.java # src/main/java/seedu/address/model/expense/Currency.java # src/test/java/seedu/address/logic/commands/AddCommandTest.java # src/test/java/seedu/address/logic/commands/EditCommandTest.java
14 tasks
16 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.
No description provided.