Add Exercise class and attribute classes implementation #83

Yonggiee · 2020-03-22T15:07:52Z

tests implementation not done

AaronCQL

Perhaps we should be more consistent with the file namings under the seedu.address.model.exercise package. For the sake of consistency with the other files in this package, should we rename Sets and Reps to ExerciseSets and ExerciseReps instead?

# Conflicts: # src/main/java/seedu/address/model/client/Client.java

AaronCQL

LGTM

…T-F11-2/main into AddExerciseClass

ziyingli · 2020-03-31T07:46:16Z

src/main/java/seedu/address/logic/commands/AddExerciseCommand.java

+    public static final String COMMAND_WORD = "add-e";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an exercise done by a client in FitBiz. "
+        + "Parameters: INDEX (must be a positive integer) "


shld not have le

ziyingli · 2020-03-31T07:48:27Z

src/main/java/seedu/address/logic/commands/AddExerciseCommand.java

+        + "[" + PREFIX_REPS + "REPS] "
+        + "[" + PREFIX_EXERCISE_WEIGHT + "EXERCISE_WEIGHT] "
+        + "[" + PREFIX_SETS + "SETS]\n"
+        + "Example: " + COMMAND_WORD + " 1 "


the + " 1 " also

AaronCQL

Wanky

AaronCQL · 2020-03-31T11:24:30Z

src/main/java/seedu/address/logic/commands/AddExerciseCommand.java

@@ -24,13 +24,12 @@
    public static final String COMMAND_WORD = "add-e";

    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an exercise done by a client in FitBiz. "
-        + "Parameters: INDEX (must be a positive integer) "


Why is the "Parameters: " also removed?

AaronCQL · 2020-03-31T11:24:38Z

src/main/java/seedu/address/logic/commands/AddExerciseCommand.java

        + PREFIX_NAME + "EXERCISE_NAME "
        + PREFIX_DATE + "DATE "
        + "[" + PREFIX_REPS + "REPS] "
        + "[" + PREFIX_EXERCISE_WEIGHT + "EXERCISE_WEIGHT] "
        + "[" + PREFIX_SETS + "SETS]\n"
-        + "Example: " + COMMAND_WORD + " 1 "
+        + "Example: "


Why did you remove the COMMAND_WORD?

Yonggiee added 14 commits March 22, 2020 22:40

add Reps class

e994df5

add Sets class

9dc8439

add ExerciseWeight class

f592424

add ExerciseName class

077c3e2

add Exercise class

087b2e4

fix checkstyle

a60cc46

change javadoc comments

26f69ce

add exercise attributes to CliSyntax

eac5769

add add-e command

6af8369

add add-e command parser and command class

d245fed

change model to accept AddExerciseCommand

857563b

fix checkstyle

753df56

add Date class

609ab05

fix checkstyle

5e99cac

AaronCQL reviewed Mar 23, 2020

View reviewed changes

Yonggiee and others added 5 commits March 23, 2020 23:43

add UniqueExerciseList and exceptions

e4f76d4

change Exercise attributes naming for consistency

72625a6

Hook add exercise command, storage not yet done

ed13eb0

Working storage for exercise

ab9937a

Fix tests

e7bad5f

AaronCQL added this to the v1.3 milestone Mar 24, 2020

This was linked to issues Mar 24, 2020

Add exercise command (add-e) #78

Closed

As a coach, I can record the exercise type and intensity my clients have done for the day #80

Closed

AaronCQL assigned AaronCQL and Yonggiee Mar 24, 2020

Yonggiee added 5 commits March 24, 2020 21:20

fun

0af5f64

add new slide plane for view-c

f629a57

Add schedule panel and card

9e9b431

change gui milestone 1

cdf7f16

remove unnecessary import

12fd646

AaronCQL and others added 14 commits March 30, 2020 22:51

Remove paddings

9aeeba0

add ExerciseRepsTest

20c5bdf

add ExerciseWeightTest

eacee8c

Tweak layouts

b900be9

add ExerciseSetsTest

77bfdd4

Tweak card background colours

3755b83

fix javadocs for Exercise

6f42f7d

add ExerciseTest: ExerciseTest, ExerciseDateTest, UniqueExerciseListTest

13728c1

fix checkstyle

fd4a080

Merge branch 'master' into AddExerciseClass

b73f5ff

# Conflicts: # src/main/java/seedu/address/model/client/Client.java

Merge branch 'YJPlaysWithGUI' into AddExerciseClass

dd86120

Fix style

ea55b2e

Merge branch 'YJPlaysWithGUI' into AddExerciseClass

b7110d4

Fix more styles

cd88a9e

AaronCQL approved these changes Mar 31, 2020

View reviewed changes

Yonggiee added 2 commits March 31, 2020 14:50

remove trailing whitespace

3aa5f5d

Merge branch 'AddExerciseClass' of https://github.com/AY1920S2-CS2103…

8d152b9

…T-F11-2/main into AddExerciseClass

ziyingli reviewed Mar 31, 2020

View reviewed changes

remove index from AddExerciseCommand

a153786

AaronCQL requested changes Mar 31, 2020

View reviewed changes

Yonggiee added 2 commits March 31, 2020 19:40

fix find-c -> view-c -> add-e

57d17e8

fix message usage

978f152

Yonggiee requested a review from AaronCQL March 31, 2020 11:46

Test exclude ui coverage

06be8e7

AaronCQL approved these changes Mar 31, 2020

View reviewed changes

Exclude ui and model util classes from tests

e0ecc43

AaronCQL merged commit 63fea46 into master Mar 31, 2020

ziyingli deleted the AddExerciseClass branch April 2, 2020 07:02

nus-se-bot mentioned this pull request Apr 2, 2020

Feedback on week 11 project progress for CS2103T-F11-2 #152

Open

28 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Exercise class and attribute classes implementation #83

Add Exercise class and attribute classes implementation #83

Yonggiee commented Mar 22, 2020 •

edited

Loading

AaronCQL left a comment

AaronCQL left a comment

ziyingli Mar 31, 2020

Yonggiee Mar 31, 2020

ziyingli Mar 31, 2020

Yonggiee Mar 31, 2020

AaronCQL left a comment

AaronCQL Mar 31, 2020

Yonggiee Mar 31, 2020

AaronCQL Mar 31, 2020 •

edited

Loading

Add Exercise class and attribute classes implementation #83

Add Exercise class and attribute classes implementation #83

Conversation

Yonggiee commented Mar 22, 2020 • edited Loading

AaronCQL left a comment

Choose a reason for hiding this comment

AaronCQL left a comment

Choose a reason for hiding this comment

ziyingli Mar 31, 2020

Choose a reason for hiding this comment

Yonggiee Mar 31, 2020

Choose a reason for hiding this comment

ziyingli Mar 31, 2020

Choose a reason for hiding this comment

Yonggiee Mar 31, 2020

Choose a reason for hiding this comment

AaronCQL left a comment

Choose a reason for hiding this comment

AaronCQL Mar 31, 2020

Choose a reason for hiding this comment

Yonggiee Mar 31, 2020

Choose a reason for hiding this comment

AaronCQL Mar 31, 2020 • edited Loading

Choose a reason for hiding this comment

Yonggiee commented Mar 22, 2020 •

edited

Loading

AaronCQL Mar 31, 2020 •

edited

Loading