Merge pull request nus-cs2113-AY2324S1#8 from AY2324S1-CS2113-F11-3/master

Update

Author: Cheezeblokz

data/flashcards/flashcard.txt

@@ -1,13 +1,2 @@
-<<<<<<< HEAD
-d | a | - | - | -
-dfdf | dfdf | - | - | -
-dfdf | asdfdf | - | - | -
-ddf | dfdf | - | - | -
-hello | bye | - | - | -
-hello | bye | - | - | -
-end program | hello | - | - | -
-hello | world | - | - | -
-=======
-ddd | dfdf | - | - | -
-ddff | a | - | - | -
->>>>>>> 261fd825cf1feb1bc2f840634aa32b90d2497208
+2 | d | a | - | 2023-11-02T00:03:45.242754100 # MODERATE/2023-11-02T00:03:47.250188600 # EASY/2023-11-02T00:03:49.267332500 # HARD/2023-11-02T00:16:31.511531100 # MODERATE/2023-11-02T00:18:58.600168500 # MODERATE/2023-11-02T00:19:05.649443900 # MODERATE | -
+4 | Hello | Duke | - | - | -

docs/DeveloperGuide.md

@@ -45,7 +45,7 @@ As such, computer science students represent good target users of TaskLinker.
 
 TaskLinker is a CLI-tool for helping university students memorize flashcards
 and track their flashcard and general academic progress in the courses they are
-taking.
+taking. 
 
 
 ## User Stories

docs/Diagrams/FlashcardStorage.puml

@@ -0,0 +1,5 @@
+@startuml
+activate FlashcardStorage
+
+
+@enduml

docs/UserGuide.md

@@ -9,9 +9,9 @@ taking.
 ## Quick Start
 
 1. Ensure that you have Java 11 or above installed.
-1. Down the latest jar from [the latest release on GitHub]
+2. Down the latest jar from [the latest release on GitHub]
    (https://github.com/AY2324S1-CS2113-F11-3/tp/releases).
-1. Run the jar via `java -jar duke.jar`
+3. Run the jar via `java -jar duke.jar`
 
 ## General explanation of flashcards
 
@@ -80,11 +80,39 @@ of pressing <ENTER> to reveal the back page.
 
 Format: `create flashcard`
 
+## General explanation of calendar features
+
+## Features
+- `add event` , `delete event`
+- `list events` , `find event`
+- `delete all events`
+
+### Add an Event to the Calendar: `add event`
+
+- **Adds an event to the calendar with start and end time** 
+
+Format: `add event`
+
+* The `DEADLINE` can be in a natural language format.
+* The `TODO_NAME` cannot contain punctuation.
+
+Example of usage:
+
+`todo n/Write the rest of the User Guide d/next week`
+
+`todo n/Refactor the User Guide to remove passive voice d/13/04/2020`
+
 ## FAQ
 
+**Q**: Where can I find my flashcard and caldendar data?
+
+**A**: You can find it in `data/flashcards` and `data/events` folder.
+
+Every event and flashcard are automatically save after each command.
+
 **Q**: How do I transfer my data to another computer? 
 
-**A**: {your answer here}
+**A**: You can transfer your data by copying & pasting the data folder.
 
 ## Command Summary
 

src/main/java/seedu/duke/calendar/CalendarCommandParser.java

@@ -3,10 +3,12 @@
 package seedu.duke.calendar;
 
 import seedu.duke.calendar.command.AddEventCommand;
+import seedu.duke.calendar.command.DeleteAllEvents;
 import seedu.duke.calendar.command.DeleteEventCommand;
 import seedu.duke.calendar.command.EventCommand;
-import seedu.duke.calendar.command.ListCalendarEventsCommand;
 import seedu.duke.calendar.command.UnknownCommand;
+import seedu.duke.calendar.command.FindEvent;
+import seedu.duke.calendar.command.ListCalendarEventsCommand;
 
 public class CalendarCommandParser {
     public EventCommand parseInput(String input) {
@@ -16,8 +18,12 @@ public EventCommand parseInput(String input) {
             return new AddEventCommand();
         } else if (input.startsWith("delete event")) {
             return new DeleteEventCommand();
-        } else if (input.startsWith("list event")) {
+        } else if (input.startsWith("list events")) {
             return new ListCalendarEventsCommand();
+        } else if (input.startsWith("delete all events")) {
+            return new DeleteAllEvents();
+        } else if (input.startsWith("find event")) {
+            return new FindEvent();
         }
 
         return new UnknownCommand();

src/main/java/seedu/duke/calendar/CalendarManager.java

@@ -23,12 +23,12 @@ public CalendarManager(ArrayList<Event> events) {
         EventDirectory eventdirectory = new EventDirectory();
         eventdirectory.listEventFiles();
 
-        storage = new EventStorage("./data/events/event.txt");
+        storage = new EventStorage(eventdirectory.defaultDirectory());
 
         try{
             eventList = storage.loadEvents();
         } catch (FileNotFoundException e){
-            System.out.println("Making new file for Events");
+            //System.out.println("Making new file for Events");
             eventList = new EventList(events);
         }
 

src/main/java/seedu/duke/calendar/EventDirectory.java

@@ -1,6 +1,8 @@
 package seedu.duke.calendar;
 
 import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * directory for directory
@@ -10,21 +12,27 @@
  */
 
 public class EventDirectory {
+    private static Logger logger; // for logging
     String path;
     File file;
 
     public EventDirectory(){
+        logger = Logger.getLogger("flashDir");
+
         path = "./data/events";
 
         file = new File(path);
         if(!file.exists()){
             if(file.mkdir()){
-                System.out.println("    Created events directory");
+                logger.log(Level.INFO, "Created events directory");
+                //System.out.println("    Created events directory");
             } else{
-                System.out.println("    Failed to create directory");
+                logger.log(Level.INFO, "Failed to create directory");
+                //System.out.println("    Failed to create directory");
             }
         } else{
-            System.out.println("    Using data/events directory");
+            logger.log(Level.INFO, "Using data/events directory");
+            //System.out.println("    Using data/events directory");
         }
     }
 
@@ -35,12 +43,15 @@ public EventDirectory(){
     public void listEventFiles(){
         String[] eventFiles = file.list();
         if(eventFiles == null){
-            System.out.println("Failed to find files");
+            logger.log(Level.INFO, "Failed to find files");
+            //System.out.println("Failed to find files");
         } else if(eventFiles.length == 0){
-            System.out.println("No files exist");
+            logger.log(Level.INFO, "No files exist");
+            //System.out.println("No files exist");
         } else{
             for(String eventFile : eventFiles){
-                System.out.println("        "+eventFile);
+                logger.log(Level.INFO, eventFile);
+                //System.out.println("        "+eventFile);
             }
         }
     }

src/main/java/seedu/duke/calendar/EventList.java

@@ -1,5 +1,6 @@
-package seedu.duke.calendar;
+//@@ kherlenbayasgalan
 
+package seedu.duke.calendar;
 
 import java.util.ArrayList;
 
@@ -18,11 +19,28 @@ public ArrayList<Event> getEvent() {
         return eventList;
     }
 
-    public int getSize(){ return eventList.size();}
+    // for logging
+    public int getSize() {
+        return eventList.size();
+    }
+
+    public void findEvent(String keyword) {
+        int count = 0;
+        for (Event event: eventList) {
+            if (event.getName().contains(keyword)) {
+                System.out.println((++count) + ". " + event);
+            }
+        }
+    }
 
     public void deleteEvent(String name) {
         eventList.removeIf(event -> event.getName().equals(name));
     }
+
+    public void deleteAllEvents() {
+        eventList.clear();
+    }
+
     @Override
     public String toString() {
         return "EventStorage{" +

src/main/java/seedu/duke/calendar/EventStorage.java

@@ -7,16 +7,21 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Scanner;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 
 /**
  * storage for Events
  * One storage manages one file
  */
 public class EventStorage {
+    private static Logger logger; // for logging
     protected String path;
 
     public EventStorage(String path){
         this.path = path;
+        logger = Logger.getLogger("flash");
     }
 
 
@@ -58,14 +63,22 @@ public EventList loadEvents() throws FileNotFoundException{
             eventList.addEvent(loadEvent(eventTokens));
         }
 
-        System.out.println(String.format(
+        logger.log(Level.INFO, String.format(
                 "    There are currently %d events in the savefile",
                 eventList.getSize()));
+        //System.out.println(String.format(
+        //        "    There are currently %d events in the savefile",
+        //        eventList.getSize()));
 
         return eventList;
 
     }
 
+    /**
+     * saveEvents method
+     * save all events to file
+     * @param eventList
+     */
     public void saveEvents(ArrayList<Event> eventList) {
 
         try {
@@ -78,7 +91,8 @@ public void saveEvents(ArrayList<Event> eventList) {
             }
             fw.close();
         } catch (IOException e){
-            System.out.println("Failed to save.");
+            //System.out.println("Failed to save.");
+            logger.log(Level.WARNING, "problem: failed to save");
         }
     }
 

src/main/java/seedu/duke/calendar/command/AddEventCommand.java

@@ -8,7 +8,7 @@
 import java.util.Scanner;
 import java.time.LocalDateTime;
 
-public class AddEventCommand extends EventCommand{
+public class AddEventCommand extends EventCommand {
     public void execute(Scanner scanner, EventList eventList) {
         System.out.print("What's the event?: ");
         String eventName = scanner.nextLine();