Resolve merge conflict

.gitignore

@@ -8,7 +8,7 @@ src/main/resources/docs/
 /out/
 /*.iml
 
-# Storage/log files
+## Storage/log files
 #/config.json
 #/preferences.json
 #/*.log.*

config.json

@@ -1,4 +1,4 @@
 {
   "logLevel" : "INFO",
   "userPrefsFilePath" : "preferences.json"
-}
+}

docs/AboutUs.md

@@ -25,7 +25,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 <img src="images/jinbesan.png" width="200px">
 
 [[github](http://github.com/jinbesan)]
-[[portfolio](team/gitsac.md)]
+[[portfolio](team/jinbesan.md)]
 
 * Role: Developer
 * Responsibilities: Feature Implementation

docs/team/jinbesan.md

@@ -3,22 +3,48 @@ layout: page
 title: Wen Hong's Project Portfolio Page
 ---
 
-### Project: AddressBook Level 3
+### Overview
 
 FastTrack is a desktop application to help you keep track of daily expenses, optimised for use via a command line interface (CLI). With this app, you can easily add expenses by category, view a summary of what has been spent in total, by category or for the week. The user interface is intuitive and easy-to-use. Overall, FastTrack aims to speed up the time taken to log expenses, saving valuable time for the user.
 
 ### Summary of Contributions
 
-New Feature: to be added soon
+- Code contributed: [RepoSense link](https://nus-cs2103-ay2223s2.github.io/tp-dashboard/?search=jinbesan&breakdown=true&sort=groupTitle%20dsc&sortWithin=title&since=2023-02-17&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other)
 
-Enhancements implemented: to be added soon
+Enhancements implemented:
 
-Contributions to the UG: to be added soon
+- Implementation of `find` Command (Pull request [#90](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/90))
+  - Addition of `ExpenseContainsKeywordsPredicate`
+- Implementation of `list` Command
+  - Addition of `ExpenseInCategoryPredicate` (Pull request [#101](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/101))
+  - Addition of `ExpenseInTimespanPredicate` (Pull request [#104](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/104))
+- Implementation of `lrec` Command (Pull request [#212](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/212))
 
-Contributions to the DG: to be added soon
+- Updated `help` window (Pull request [#66](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/66))
+- Added TestUtils (Pull request [#86](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/86))
 
-Contributions to team-based tasks: to be added soon
+- Helped with implementation of `ParserUtil` class.
 
-Review/Mentoring Contributions: to be added soon
+Contributions to the UG:
+- Wrote about features in initial draft and added tables denoting the parameters used as well as simple explanations. (Pull request [#126](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/126))
+- Wrote Introduction, Why to use FastTrack, Purpose of Guide, Understanding Guide, Quick Start, GUI Walkthrough sections of the User Guide (Pull request [#212](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/212))
+- Rearranged structure of User Guide to be more user-friendly (Pull request [#236](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/236))
+- Reformatting of tables for commands and tips
 
-Contributions beyond team project: to be added soon
+Contributions to the DG:
+- Wrote about features in initial draft and added tables denoting the parameters used as well as some use cases. (Pull request [#105](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/105), Pull request [#127](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/127))
+- Sketched multiple sequence diagrams that were translated through PlantUML to be used in the DG.
+
+Contributions to team-based tasks:
+- Participated in weekly (sometimes biweekly) meetings to discuss project structure and direction.
+- Proposed addition of Recurring Expenses feature to create selling point of app
+- Participated in discussion of project architecture
+- Suggested structure of implementation of Recurring Expenses.
+- Took part actively in debugging other teammate's issues.
+- Helped to regulate pull requests from team-mates and merged them only when they passed CI and internal test cases.
+
+Review/Mentoring Contributions:
+- Reviewed multiple PRs made by teammates ([#146](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/146), [#89](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/89), [#145](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/145)).
+
+Contributions beyond team project:
+- Reported bugs for another team during the PE-Dry run (T15-3): Vimification.

docs/team/nicleejy.md

@@ -10,48 +10,38 @@ FastTrack is a desktop application to help you keep track of daily expenses, opt
 
 - Code contributed: [RepoSense link](https://nus-cs2103-ay2223s2.github.io/tp-dashboard/?search=nicleejy&breakdown=true&sort=groupTitle%20dsc&sortWithin=title&since=2023-02-17&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other)
 
-Enhancements implemented:
-
-
-- Helped with implementation of `Category` class.
-
-    - Defined the `Category` class with its fields. (Pull request [#30](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues?q=is%3Aissue+is%3Aclosed+assignee%3Agitsac))
-    - Edited storage system to accommodate `Category` class. (Pull request [#29](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/29))
-
-
-- Helped with the implementation of `RecurringExpenseManager` class.
-
-    - Edited storage system to accommodate `Category` class. (Pull request [#95](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/95))
-
-
-- Implemented `edit` function for all 3 main classes used (`Category`, `Expense` and `RecurringExpenseManager`)
-
-    - Implemented `EditExpenseCommand` along with its necessary helper parser class. (Pull request [#77](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/79))
-    - Implemented `EditCategoryCommand` along with necessary parser class. (Pull request [#78](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/78))
-    - Implemented `EditRecurringExpenseManagerCommand` along with necessary parser class. (Pull request [#130](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/130))
-
-
-- Added basic startup data that was adapted for FastTrack's usage. (Morphed from AB3's given sample data) (Pull request [#107](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/107))
-
-
-- Added functionality that causes list of `Expense` in FastTrack to be sorted by date upon any operations (adding/deleting expenses) (Pull request [#136](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/136))
 
+Enhancements implemented:
+- Implemented new category autocomplete feature which allows users to autocomplete category names from a list of suggestions using arrow/enter/tab keys (Pull request [#148](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/148))
+- Added new UI screen for recurring expense feature (Pull request [#145](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/145))
+- Implemented the expense summary statistics feature (Pull request [#111](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/111))
+  - Added new UI section for summary statistics data 
+  - Implemented new `AnalyticModelManager` class to manage expense data state
+  - Utilised Observer Pattern to integrate expense statistics data into `StatisticsPanel` UI component, ensuring statistics are updated in real time 
+- Implemented add expense feature  (Pull request [#72](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/72))
+  - Implemented `AddExpenseCommand` which encapsulates the command request details
+  - Added `ExpenseCommandParser` containing various parser methods to parse dates and prices to interpret the command
+- Added sample data for recurring expenses (Morphed from AB3's given sample data) (Pull request [#224](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/224))
 
 Contributions to the UG:
-- Wrote about features in initial draft and added tables denoting the parameters used as well as simple explanations.
+- Wrote introduction section for the initial draft of the UG (Pull request [#124](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/124))
+- Updated second draft of UG (Pull request [#213](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/213))
+  - Update all feature sections
+  - added FAQ section
+  - Added annotated diagrams for each command and GUI walkthrough
 
 Contributions to the DG:
-- Worked on the Implementations portion of the DG.
-- Wrote about the Effort section of the DG.
-- Sketched multiple sequence diagrams that were translated through PlantUML to be used in the DG.
+- Add expense summary feature and implementation details to DG (Pull request [#110](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/110))
+- Sketched and implemented Activity Diagrams in PlantUML for recurring expense (Pull request [#218](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/218))
+- Add writeup for autocompletion feature in the DG (Pull request [#218](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/218))
 
-Contributions to team-based tasks:
+- Contributions to team-based tasks:
 - Participated in weekly (sometimes biweekly) meetings to discuss project structure and direction.
 - Took part actively in debugging other teammate's issues.
-- Fixed several bugs reported from PE Dry Run ([#167](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/167), [#170](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/170), [#179](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues/179)).
+- Fixed [several bugs](https://github.com/AY2223S2-CS2103T-W09-2/tp/issues?q=is%3Aissue+is%3Aclosed+assignee%3Anicleejy+pe-d) reported from PE Dry Run
 
 Review/Mentoring Contributions:
-- Reviewed multiple PRs made by teammates ([#101](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/101), [#90](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/90), [#72](https://github.com/AY2223S2-CS2103T-W09-2/tp/pull/72)).
+- Reviewed [23 PRs](https://github.com/AY2223S2-CS2103T-W09-2/tp/pulls?q=is%3Apr+is%3Aclosed+reviewed-by%3A%40me) made by teammates
 
 Contributions beyond team project:
-- Reported bugs for another team during the PE-Dry run (T11-4): HospiSearch.
+- Reported bugs for another team during the PE-Dry run (F10-1): OfficeConnect.

preferences.json

@@ -1,11 +1,11 @@
 {
   "guiSettings" : {
     "windowWidth" : 1000.0,
-    "windowHeight" : 835.2000122070312,
+    "windowHeight" : 700.0,
     "windowCoordinates" : {
-      "x" : 276,
-      "y" : 78
+      "x" : 214,
+      "y" : 114
     }
   },
-  "expenseTrackerFilePath" : "data\\addressbook.json"
-}
+  "expenseTrackerFilePath" : "data/fastTrack.json"
+}

src/main/java/fasttrack/MainApp.java

@@ -13,7 +13,6 @@
 import fasttrack.commons.util.StringUtil;
 import fasttrack.logic.Logic;
 import fasttrack.logic.LogicManager;
-import fasttrack.model.AnalyticModel;
 import fasttrack.model.ExpenseTracker;
 import fasttrack.model.Model;
 import fasttrack.model.ModelManager;
@@ -45,7 +44,6 @@ public class MainApp extends Application {
     protected Logic logic;
     protected Storage storage;
     protected Model dataModel;
-    protected AnalyticModel analyticModel;
     protected Config config;
 
     @Override
@@ -87,7 +85,6 @@ private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
             if (!expenseTrackerOptional.isPresent()) {
                 logger.info("Data file not found. Will be starting with a sample ExpenseTracker");
             }
-            // TODO update sample data
             initialData = expenseTrackerOptional.orElseGet(SampleExpenseTracker::getSampleExpenseTracker);
         } catch (DataConversionException e) {
             logger.warning("Data file not in the correct format. Will be starting with an empty ExpenseTracker");

src/main/java/fasttrack/ui/UiManager.java

@@ -20,7 +20,7 @@ public class UiManager implements Ui {
     public static final String ALERT_DIALOG_PANE_FIELD_ID = "alertDialogPane";
 
     private static final Logger logger = LogsCenter.getLogger(UiManager.class);
-    private static final String ICON_APPLICATION = "/images/address_book_32.png";
+    private static final String ICON_APPLICATION = "/images/fasttrack_logo.png";
 
     private Logic logic;
     private MainWindow mainWindow;
@@ -36,7 +36,7 @@ public UiManager(Logic logic) {
     public void start(Stage primaryStage) {
         logger.info("Starting UI...");
         //Set the application icon.
-        //primaryStage.getIcons().add(getImage(ICON_APPLICATION));
+        primaryStage.getIcons().add(getImage(ICON_APPLICATION));
 
         try {
             mainWindow = new MainWindow(primaryStage, logic);

src/main/resources/view/MainWindow.fxml

@@ -16,7 +16,7 @@
 
 <fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="FastTrack" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
   <icons>
-    <Image url="@/images/address_book_32.png" />
+    <Image url="@/images/fasttrack_logo.png" />
   </icons>
   <scene>
     <Scene fill="#000026">

src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json

@@ -9,5 +9,5 @@
       "z" : 99
     }
   },
-  "addressBookFilePath" : "fastTrack.json"
+  "expenseTrackerFilePath" : "data/fastTrack.json"
 }

src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json

@@ -7,5 +7,5 @@
       "y" : 100
     }
   },
-  "addressBookFilePath" : "fastTrack.json"
+  "expenseTrackerFilePath" : "data/fastTrack.json"
 }

src/test/java/fasttrack/commons/util/AppUtilTest.java

@@ -9,7 +9,7 @@ public class AppUtilTest {
 
     @Test
     public void getImage_exitingImage() {
-        assertNotNull(AppUtil.getImage("/images/address_book_32.png"));
+        assertNotNull(AppUtil.getImage("/images/fasttrack_logo.png"));
     }
 
     @Test