Merge pull request #177 from AY2223S2-CS2103-W17-1/brian-bug-fixes

Export Bug Fix
nus-cs2103-AY2223S2 · Apr 9, 2023 · f9ddeca · f9ddeca
2 parents ca30887 + 2758d45
commit f9ddeca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/docs/team/astraxq.md b/docs/team/astraxq.md
@@ -10,26 +10,30 @@ MATHUTORING is a desktop application used for private Math tuition teachers to m
 Given below are my contributions to the project.
 
 * **New Feature**:
-    * to be added soon.
+    * Implemented `export` and `import` functionality.
+    * Created the GUI functionality for both import and export.
 
 * **Code contributed**: [RepoSense link](https://nus-cs2103-ay2223s2.github.io/tp-dashboard/?search=astraxq&breakdown=true&sort=groupTitle&sortWithin=title&since=2023-02-17&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other)
 
 * **Project management**:
     * to be added soon.
 
 * **Enhancements to existing features**:
-    * Refactor Person.java to take in an additional attribute `parentPhone`.
-    * Created the `Task` Model.
+    * Added Person.java to take in an additional attribute `parentPhone`.
+    * Created the `Task`, `TaskList`, `Score`, `ScoreList` Model.
+    * Added JUnit Testing for new features.
 
 * **Documentation**:
     * Updated AboutUs page and README page.
+    * Updated UG for Export and Import.
+    * Added Use Cases in DG.
 
 * **Contributions to team-based tasks**:
     * Conceptualized the ideas and came up with v1.1 UI design.
     * Added several GitHub issues and helped manage the issues through adding labels and milestones.
 
 * **Contributions beyond the project team**:
-    * to be added soon.
+    * Handled a multi responsibility PR by breaking it to smaller PRs (cherry picking) to resolve conflicts.
 
 * **Community**:
     * Contributed to forum discussions (examples: [1](https://github.com/nus-cs2103-AY2223S2/forum/issues/171))

diff --git a/src/main/java/seedu/address/logic/commands/ExportDataCommand.java b/src/main/java/seedu/address/logic/commands/ExportDataCommand.java
@@ -38,7 +38,11 @@ public class ExportDataCommand extends Command {
      */
     public ExportDataCommand(String filePath) {
         requireNonNull(filePath);
-        this.filePath = Paths.get(filePath, "data.json");
+        if (filePath.isEmpty()) {
+            this.filePath = Paths.get("data\\data.json");
+        } else {
+            this.filePath = Paths.get(filePath, "data.json");
+        }
     }
 
     @Override