Added AddClubMenu and modified club and golfer to allow club id's, added menu to UserSettings

3 files changed, 73 insertions, 1 deletions

diff --git a/src/main/java/design/controller/userinput/menus/AddClubMenu.java b/src/main/java/design/controller/userinput/menus/AddClubMenu.java
new file mode 100644
index 0000000..ad22eb3
--- /dev/null
+++ b/src/main/java/design/controller/userinput/menus/AddClubMenu.java
@@ -0,0 +1,70 @@
+package design.controller.userinput.menus;
+
+import design.controller.userinput.Menu;
+import design.controller.userinput.MenuOption;
+import design.model.Club;
+import design.model.Golfer;
+import design.persistence.PersonalDatabase;
+import design.runtime.Session;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Scanner;
+
+public class AddClubMenu extends Menu {
+
+    @Override
+    public String getTitle() {
+        return "add a club";
+    }
+
+    @Override
+    public List<MenuOption> getMenuOptions() {
+        List<MenuOption> opts = new ArrayList<>();
+
+        opts.add(new MenuOption("create new club", () -> {
+            Golfer g = Session.getCurrentGolfer();
+            if (g == null) {
+                System.out.println("No user loaded.");
+                new UserSettings().present();
+                return;
+            }
+
+            Scanner sc = new Scanner(System.in);
+
+            System.out.print("Manufacturer: ");
+            String manufacture = sc.nextLine().trim();
+
+            System.out.print("Nickname: ");
+            String nickname = sc.nextLine().trim();
+
+            // Pick type
+            Club.ClubType[] types = Club.ClubType.values();
+            System.out.println("Club type:");
+            for (int i = 0; i < types.length; i++) {
+                System.out.printf("%d: %s%n", i + 1, types[i]);
+            }
+
+            Club.ClubType type = null;
+            while (type == null) {
+                System.out.print("Select (1.." + types.length + "): ");
+                String line = sc.nextLine().trim();
+                int idx = Integer.parseInt(line);
+                if (idx < 1 || idx > types.length) {
+                    System.out.println("Out of range. Try again.");
+                    continue;
+                }
+                type = types[idx - 1];
+            }
+
+            g.addClub(manufacture, nickname, type);
+
+            new UserSettings().present();
+        }));
+
+        opts.add(new MenuOption("cancel", () -> new UserSettings().present()));
+        return opts;
+    }
+}
diff --git a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
index e12bdfa..34e36f6 100644
--- a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
+++ b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
@@ -50,7 +50,7 @@ public class HolePlayMenu extends Menu {
                 String nick = sc.nextLine().trim();
                 // Defaulted to Driver for now
                 // TODO update logic
-                Club club = new Club("Generic", nick, Club.ClubType.DRIVER);
+                Club club = new Club(0, "Generic", nick, Club.ClubType.DRIVER);
 
                 // Get shot distance (defaults to 0 of not stated)
                 System.out.print("Distance (yds, blank=0): ");
diff --git a/src/main/java/design/controller/userinput/menus/UserSettings.java b/src/main/java/design/controller/userinput/menus/UserSettings.java
index 04ec4d0..34b645d 100644
--- a/src/main/java/design/controller/userinput/menus/UserSettings.java
+++ b/src/main/java/design/controller/userinput/menus/UserSettings.java
@@ -60,6 +60,8 @@ public class UserSettings extends Menu {
             this.present();
         }));
 
+        opts.add(new MenuOption("add a club...", () -> new AddClubMenu().present()));
+
         return opts;
     }
 }