Improve body measurement field

docs/UserGuide.md

@@ -151,7 +151,7 @@ A client can have any number of tags (including 0). The remark is also optional.
 
 Examples:
 * `add n/John Doe p/98765432 e/[email protected] a/John street Blk 92 g/M m/170_100_40`
-* `add n/Betsy Crowe e/[email protected] a/Sesame Street p/1234567 t/important g/F d/160_85_35_81`
+* `add n/Betsy Crowe e/[email protected] a/Sesame Street p/1234567 t/important g/F m/160_85_35_81`
 
 ### Deleting a client : `delete`
 
@@ -171,7 +171,7 @@ Examples:
 
 Edits an existing client in the application.
 
-Format: `edit INDEX n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS m/MEASUREMENT g/GENDER [r/REMARK] [t/TAG]…​`
+Format: `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [m/MEASUREMENT] [g/GENDER] [r/REMARK] [t/TAG]…​`
 
 <div markdown="span" class="alert alert-primary">:information_source: **Note:**
 Do not forget to edit the body measurements when you modify the client's gender.
@@ -470,7 +470,7 @@ Action | Format, Examples
 **ListClient** | `list`
 **AddClient** | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS m/MEASUREMENT g/GENDER [r/REMARK] [t/TAG]…​` <br> e.g., `add n/John Doe p/98765432 e/[email protected] a/John street Blk 92 g/M m/170_100_40 t/friend`
 **DeleteClient** | `delete INDEX`<br> e.g., `delete 3`
-**EditClient** | `edit INDEX n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS m/MEASUREMENT g/GENDER [r/REMARK] [t/TAG]…​`<br> e.g.,`edit 2 n/James Lee e/[email protected]`
+**EditClient** | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [m/MEASUREMENT] [g/GENDER] [r/REMARK] [t/TAG]…​`<br> e.g.,`edit 2 n/James Lee e/[email protected]`
 **FindClients** | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake`
 
 ### Task Commands
@@ -480,7 +480,7 @@ Action | Format, Examples
 **ListTasks** | `listtask`
 **AddTask** | `addtask l/LABEL d/DATE [t/TASKTAG]` e.g., `addtask l/sew buttons onto blazer d/20 August 2021 t/SO1`
 **DeleteTask** | `deletetask INDEX` e.g., `deletetask 1`
-**EditTask** | `edittask INDEX l/LABEL d/DATE [t/TASKTAG]` e.g., `edittask 1 l/order cloth d/19 September 2021 t/General`
+**EditTask** | `edittask INDEX [l/LABEL] [d/DATE] [t/TASKTAG]` e.g., `edittask 1 l/order cloth d/19 September 2021 t/General`
 **MarkTask** | `marktask INDEX` e.g., `marktask 2`
 **FindTasks** | `findtask KEYWORD [MORE_KEYWORDS]`<br> e.g., `findtask buttons`
 **CompletedTasks** | `completedtasks`

src/main/java/seedu/address/logic/Logic.java

@@ -47,6 +47,16 @@ public interface Logic {
      */
     Path getAddressBookFilePath();
 
+    /**
+     * Returns the user prefs' task book file path.
+     */
+    Path getTaskBookFilePath();
+
+    /**
+     * Returns the user prefs' order book file path.
+     */
+    Path getOrderBookFilePath();
+
     /**
      * Returns the user prefs' GUI settings.
      */

src/main/java/seedu/address/logic/LogicManager.java

@@ -85,6 +85,16 @@ public Path getAddressBookFilePath() {
         return model.getAddressBookFilePath();
     }
 
+    @Override
+    public Path getTaskBookFilePath() {
+        return model.getTaskBookFilePath();
+    }
+
+    @Override
+    public Path getOrderBookFilePath() {
+        return model.getOrderBookFilePath();
+    }
+
     @Override
     public GuiSettings getGuiSettings() {
         return model.getGuiSettings();

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -103,6 +103,9 @@ public static Measurement parseMeasurement(String measurement, Gender gender) th
         if (!Measurement.isValidMeasurement(trimmedMeasurement, gender.value)) {
             throw new ParseException(Measurement.getMessageConstraints(gender.value));
         }
+        if (!Measurement.isValidRange(trimmedMeasurement)) {
+            throw new ParseException(Measurement.RANGE_MESSAGE_CONSTRAINTS);
+        }
         return new Measurement(trimmedMeasurement);
     }
 
@@ -118,6 +121,9 @@ public static Measurement parseMeasurement(String measurement) throws ParseExcep
         if (!Measurement.isValidMeasurement(trimmedMeasurement)) {
             throw new ParseException(Measurement.GENERAL_MESSAGE_CONSTRAINTS);
         }
+        if (!Measurement.isValidRange(trimmedMeasurement)) {
+            throw new ParseException(Measurement.RANGE_MESSAGE_CONSTRAINTS);
+        }
         return new Measurement(trimmedMeasurement);
     }
 

src/main/java/seedu/address/model/Model.java

@@ -97,7 +97,7 @@ public interface Model {
     /**
      * Returns the user prefs' UniqueTaskList file path.
      */
-    Path getTaskListFilePath();
+    Path getTaskBookFilePath();
 
     /**
      * Sets the user prefs' UniqueTaskList file path.
@@ -153,7 +153,7 @@ public interface Model {
     /**
      * Returns the user prefs' Order books  file path.
      */
-    Path getOrderPath();
+    Path getOrderBookFilePath();
 
     /**
      * Sets the user prefs' Order books  file path.

src/main/java/seedu/address/model/ModelManager.java

@@ -130,7 +130,7 @@ public void setPerson(Person target, Person editedPerson) {
     //=========== Task Management ==================================================================================
 
     @Override
-    public Path getTaskListFilePath() {
+    public Path getTaskBookFilePath() {
         return userPrefs.getTaskBookPath();
     }
 
@@ -209,7 +209,7 @@ public boolean markTask(Task toMark) {
     //=========== Order Management ==================================================================================
 
     @Override
-    public Path getOrderPath() {
+    public Path getOrderBookFilePath() {
         return userPrefs.getOrderBookFilePath();
     }
 

src/main/java/seedu/address/model/person/Measurement.java

@@ -3,6 +3,8 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.AppUtil.checkArgument;
 
+import java.text.DecimalFormat;
+
 /**
  * Represents a Person's body measurements in the address book.
  * Guarantees: immutable; is valid as declared in {@link #isValidMeasurement(String, GenderType)}
@@ -16,7 +18,8 @@ public class Measurement {
     public static final String FEMALE_MESSAGE_CONSTRAINTS =
             "A female's body measurements should be of the format height_waist_shoulder_bust in cm,"
                     + " and it should not be blank";
-    public static final String IS_NUMBER_REGEX = "\\d+";
+    public static final String RANGE_MESSAGE_CONSTRAINTS =
+            "The measurement of each dimension must be a positive value and not larger than 300cm";
     public final String value;
 
     /**
@@ -27,9 +30,24 @@ public class Measurement {
     public Measurement(String measurement) {
         requireNonNull(measurement);
         checkArgument(isValidMeasurement(measurement), GENERAL_MESSAGE_CONSTRAINTS);
+        checkArgument(isValidRange(measurement), RANGE_MESSAGE_CONSTRAINTS);
         value = measurement;
     }
 
+    public String getValue() {
+        String[] measurements = value.split("_");
+        formatMeasurements(measurements);
+        return String.join("_", measurements);
+    }
+
+    private void formatMeasurements(String[] args) {
+        DecimalFormat df = new DecimalFormat("#.##");
+        for (int i = 0; i < args.length; i++) {
+            double value = Double.parseDouble(args[i]);
+            args[i] = df.format(value);
+        }
+    }
+
     /**
      * Returns true if a given string is a valid measurement.
      */
@@ -50,6 +68,25 @@ public static boolean isValidMeasurement(String test) {
         return isArgsNumber && (args.length == 3 || args.length == 4);
     }
 
+    /**
+     * Returns true if the measurements is within a valid range.
+     */
+    public static boolean isValidRange(String test) {
+        requireNonNull(test);
+        String[] args = test.split("_");
+        return isValidRange(args);
+    }
+
+    private static boolean isValidRange(String[] args) {
+        for (String i: args) {
+            double value = Double.parseDouble(i);
+            if (value <= 0 || value > 300) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Returns message constraints based on gender type.
      */
@@ -64,7 +101,9 @@ public static String getMessageConstraints(GenderType genderType) {
 
     private static boolean isNumber(String[] args) {
         for (String i: args) {
-            if (!i.matches(IS_NUMBER_REGEX)) {
+            try {
+                Double.parseDouble(i);
+            } catch (NumberFormatException e) {
                 return false;
             }
         }

src/main/java/seedu/address/storage/JsonAdaptedPerson.java

@@ -124,6 +124,9 @@ public Person toModelType() throws IllegalValueException {
         if (!Measurement.isValidMeasurement(measurement, modelGender.value)) {
             throw new IllegalValueException(Measurement.GENERAL_MESSAGE_CONSTRAINTS);
         }
+        if (!Measurement.isValidRange(measurement)) {
+            throw new IllegalValueException(Measurement.RANGE_MESSAGE_CONSTRAINTS);
+        }
         final Measurement modelMeasurement = new Measurement(measurement);
 
         if (address == null) {

src/main/java/seedu/address/ui/MainWindow.java

@@ -129,7 +129,9 @@ void fillInnerParts() {
         resultDisplay = new ResultDisplay();
         resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
 
-        StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getAddressBookFilePath());
+        StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getAddressBookFilePath(),
+                logic.getTaskBookFilePath(),
+                logic.getOrderBookFilePath());
         statusbarPlaceholder.getChildren().add(statusBarFooter.getRoot());
 
         CommandBox commandBox = new CommandBox(this::executeCommand);

src/main/java/seedu/address/ui/PersonCard.java

@@ -59,7 +59,7 @@ public PersonCard(Person person, int displayedIndex) {
         phone.setText(person.getPhone().value);
         email.setText(person.getEmail().value);
         address.setText(person.getAddress().value);
-        measurement.setText(person.getMeasurement().value);
+        measurement.setText(person.getMeasurement().getValue());
         remark.setText(person.getRemark().value);
         person.getTags().stream()
                 .sorted(Comparator.comparing(tag -> tag.tagName))

src/main/java/seedu/address/ui/StatusBarFooter.java

@@ -20,9 +20,16 @@ public class StatusBarFooter extends UiPart<Region> {
     /**
      * Creates a {@code StatusBarFooter} with the given {@code Path}.
      */
-    public StatusBarFooter(Path saveLocation) {
+    public StatusBarFooter(Path addressBookLocation, Path taskBookLocation, Path orderBookLocation) {
         super(FXML);
-        saveLocationStatus.setText(Paths.get(".").resolve(saveLocation).toString());
+        String paths = getPath(addressBookLocation) + "; "
+                + getPath(taskBookLocation) + "; "
+                + getPath(orderBookLocation);
+        saveLocationStatus.setText(paths);
+    }
+
+    private String getPath(Path location) {
+        return Paths.get(".").resolve(location).toString();
     }
 
 }

src/test/java/seedu/address/ModelStub.java

@@ -101,7 +101,7 @@ public void updateFilteredPersonList(Predicate<Person> predicate) {
     }
 
     @Override
-    public Path getTaskListFilePath() {
+    public Path getTaskBookFilePath() {
         throw new AssertionError("This method should not be called.");
     }
 
@@ -146,7 +146,7 @@ public boolean markTask(Task task) {
     }
 
     @Override
-    public Path getOrderPath() {
+    public Path getOrderBookFilePath() {
         throw new AssertionError("This method should not be called.");
     }