Merge pull request #223 from lm-44/Update-UG

Update UG

docs/UserGuide.md

@@ -122,7 +122,7 @@ Format: `list`
 
 Edits an existing student in the app.
 
-Format: `edit_student INDEX [n/NAME] [p/PHONE] [e/EMAIL] [t/TAG]…​ [r/REMARK]`
+Format: `edit_student INDEX [n/NAME] [p/PHONE] [e/EMAIL] [t/TAG]…​`
 
 * Edits the student at the specified `INDEX`. The index refers to the index number shown in the displayed student list. The index **must be a positive integer** 1, 2, 3, …​
 * At least one of the optional fields must be provided.
@@ -133,8 +133,8 @@ Format: `edit_student INDEX [n/NAME] [p/PHONE] [e/EMAIL] [t/TAG]…​ [r/REMARK
 
 Examples:
 *  `edit_student 1 p/91234567 e/[email protected]` Edits the phone number and email address of the 1st student to be `91234567` and `[email protected]` respectively.
-*  `edit_student 2 n/Betsy Crower t/` Edits the name of the 2nd student to be `Betsy Crower` and clears all existing tags.
-*  `edit_student 3 r/Weak in Science` Edits the remark of the 3rd student to be `Weak in Science`
+   ![result for 'edit_student 1 p/91234567 e/[email protected]'](images/editStudent.png) 
+* `edit_student 2 n/Betsy Crower t/` Edits the name of the 2nd student to be `Betsy Crower` and clears all existing tags.
 
 ### Locating students by name: `find`
 
@@ -178,7 +178,7 @@ Examples:
 * `list` followed by `add_assignment si/3 an/Assignment 1 ms/100` adds an assignment to the
   3rd student in the app.
 * `add_assignment si/1 an/Assignment 1 ms/100`
-  ![result for 'add_assignment si/1 an/Assignment 1 ms/100'](images/add_assignment_image.jpg)
+  ![result for 'add_assignment si/1 an/Assignment 1 ms/100'](images/addAssignment.jpg)
 
 ### Deleting an assignment: `delete_assignment`
 
@@ -189,6 +189,7 @@ Format: `delete_assignment si/INDEX ai/INDEX`
 Examples:
 * `find John` followed by `delete_assignment si/1 ai/1` deletes the 1st assignment of the 1st student in the results of the `find` command.
 * `delete_assignment si/1 ai/1`
+  ![result for 'delete_assignment si/1 ai/1'](images/deleteAssignment.png)
 
 ### Marking an assignment as submitted: `mark`
 
@@ -211,7 +212,7 @@ Examples:
 
 ### Grading an assignment: `grade`
 
-Edits the score of an assignment belonging to a student and marks it as submitted.
+Edits the s of an assignment belonging to a student and marks it as submitted.
 
 Format: `grade si/INDEX ai/INDEX s/ASSIGNMENT_SCORE`
 

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

@@ -32,7 +32,7 @@ public class DeleteAssignmentCommand extends Command {
             + PREFIX_STUDENT_INDEX + "1 "
             + PREFIX_ASSIGNMENT_INDEX + "1 ";
     public static final String MESSAGE_DELETE_SUCCESS = "Deleted Assignment: %1$s belonging "
-            + "to Student: %1$s";
+            + "to Student: %2$s";
     private final Index studentIndex;
     private final Index assignmentIndex;
     /**

src/main/resources/view/HelpWindow.css

@@ -1,19 +1,32 @@
+.root {
+    -blue-darkest: #455e7e;
+    -blue-dark: #426695;
+    -blue-light: #4ba1f1;
+    -white-dark: #d4e2ee;
+    -white-light: #eef4fa;
+    -white-border: #C8C2C2;
+    -tag-color: #db6b3d;
+    -text-dark: #1d1b1a;
+    -status-submitted: #54be56;
+    -status-unsubmitted: #d55050;
+}
+
 #copyButton, #helpMessage {
-    -fx-text-fill: white;
+    -fx-text-fill: #ffffff;
 }
 
 #copyButton {
-    -fx-background-color: dimgray;
+    -fx-background-color: -blue-dark;
 }
 
 #copyButton:hover {
-    -fx-background-color: gray;
+    -fx-background-color: derive(-fx-focus-color, 30%);
 }
 
 #copyButton:armed {
-    -fx-background-color: darkgray;
+    -fx-background-color: -fx-focus-color;
 }
 
 #helpMessageContainer {
-    -fx-background-color: derive(#1d1d1d, 20%);
+    -fx-background-color: derive(-blue-dark, 20%);
 }