Skip to content

Commit 8fbeb2a

Browse files
ShamanbennyShamanbenny
authored
Merge pull request #192 from Shamanbenny/branch-MinorBugFixes
Branch minor bug fixes
2 parents d327303 + cd1b487 commit 8fbeb2a

3 files changed

Lines changed: 29 additions & 22 deletions

File tree

‎docs/UserGuide.md‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Format: `help`
127127
Adds a person to the address book.
128128

129129
Format:
130-
`add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [l/EDU_LEVEL] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]…​`
130+
`add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [l/EDUCATION] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]…​`
131131

132132
<div markdown="span" class="alert alert-primary">:bulb: **Tip:** Duplicate detection for repeated contacts are
133133
based on **EXACT** matching of name. For example: `Jane Doe` (single-spaced) and `Jane Doe` (double-spaced) will be
@@ -160,7 +160,7 @@ Format: `list`
160160
Edits an existing person in the address book.
161161

162162
Format:
163-
`edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [l/EDU_LEVEL] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]… [t+/TAGS_TO_APPEND]… [t-/TAGS_TO_REMOVE]…`
163+
`edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [l/EDUCATION] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]… [t+/TAGS_TO_APPEND]… [t-/TAGS_TO_REMOVE]…`
164164

165165
* Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed person list.
166166
The index **must be a positive integer** 1, 2, 3, …​
@@ -280,12 +280,12 @@ Format: `find KEYWORD [MORE_KEYWORDS]`
280280

281281
Filters list of persons who match all filter conditions.
282282

283-
Format: `filter [l/EDU_LEVEL] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]…`
283+
Format: `filter [l/EDUCATION] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]…`
284284

285285
* Filters list to persons who fulfill all filter conditions.
286286
* At least one of the optional fields must be provided.
287287
* Empty fields are accepted
288-
* If `[l/EDU_LEVEL] [cg/CURRENT_GRADE] [eg/EXP_GRADE]` are empty e.g. `l/ cg/ eg/`,
288+
* If `[l/EDUCATION] [cg/CURRENT_GRADE] [eg/EXP_GRADE]` are empty e.g. `l/ cg/ eg/`,
289289
filter will show persons without values in respective fields stated.
290290
* `[t/TAG]…` an empty tag field will trigger an error.
291291

@@ -385,24 +385,31 @@ It's strongly recommended to make a backup of your data file before any manual e
385385
application before running the application again.
386386
2. **If you need to see your truncated NAME, EMAIL or ADDRESS**, increase your window size for the application until it
387387
is no longer truncated.
388+
3. **When adding/editing many tags**, in certain scenarios where the tags begin to wrap (especially on lower screen
389+
resolution), the tags may inadvertently overlap onto the remaining Person's information field, as shown in the
390+
screenshot below.
391+
![Example of Tags Overflowing Bug](images/TagsOverflow_1.png)
392+
The remedy is to click on the specific Person's Card, which will trigger a CSS style update, so that the wrapping
393+
works as intended.
394+
![Example of Tags Overflowing Bug Remedy](images/TagsOverflow_2.png)
388395

389396
--------------------------------------------------------------------------------------------------------------------
390397

391398
## Command summary
392399

393-
| Action | Format, Examples |
394-
|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
395-
| **Add** | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [l/ EDUCATION_LEVEL] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXPECTED_GRADE] [t/TAG]…` <br> e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 cg/D t/CS2030C t/friends` |
396-
| **Purge** | `purge` |
397-
| **Delete** | `delete INDEX`<br> e.g., `delete 3` |
398-
| **Clear** | `clear i/START_INDEX...END_INDEX` OR `clear t/TAG [t/TAG]` |
399-
| **Edit** | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXPECTED_GRADE] [t/TAG]… [t+/TAGS_TO_APPEND]… [t-/TAGS_TO_REMOVE]…`<br> e.g.,`edit 2 n/James Lee e/jameslee@example.com t+/CS2040C#1E2C4D` |
400-
| **Untag** | `untag t/TAG [t/TAG]...`<br> e.g., `untag t/Math t/Science` |
401-
| **Payment** | `payment INDEX [f/FEE] [d/PAYMENT_DATE] [s/PAYMENT_STATUS]`<br> e.g., `payment 1 f/1000 d/14-11-2000 s/paid` |
402-
| **Find** | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake` |
403-
| **Sort** | `sort` |
404-
| **Filter** | `filter [l/EDU_LEVEL] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]…` |
405-
| **List** | `list` |
406-
| **Help** | `help` |
407-
| **Switch Theme** | `toggletheme` |
408-
| **Exit** | `exit` |
400+
| Action | Format, Examples |
401+
|------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
402+
| **Add** | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [l/EDUCATION] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXPECTED_GRADE] [t/TAG]…` <br> e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 cg/D t/CS2030C t/friends` |
403+
| **Purge** | `purge` |
404+
| **Delete** | `delete INDEX`<br> e.g., `delete 3` |
405+
| **Clear** | `clear i/START_INDEX...END_INDEX` OR `clear t/TAG [t/TAG]` |
406+
| **Edit** | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [l/EDUCATION] [cy/CURRENT_YEAR] [cg/CURRENT_GRADE] [eg/EXPECTED_GRADE] [t/TAG]… [t+/TAGS_TO_APPEND]… [t-/TAGS_TO_REMOVE]…`<br> e.g.,`edit 2 n/James Lee e/jameslee@example.com t+/CS2040C#1E2C4D` |
407+
| **Untag** | `untag t/TAG [t/TAG]...`<br> e.g., `untag t/Math t/Science` |
408+
| **Payment** | `payment INDEX [f/FEE] [d/PAYMENT_DATE] [s/PAYMENT_STATUS]`<br> e.g., `payment 1 f/1000 d/14-11-2000 s/paid` |
409+
| **Find** | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake` |
410+
| **Sort** | `sort` |
411+
| **Filter** | `filter [l/EDUCATION] [cg/CURRENT_GRADE] [eg/EXP_GRADE] [t/TAG]…` |
412+
| **List** | `list` |
413+
| **Help** | `help` |
414+
| **Switch Theme** | `toggletheme` |
415+
| **Exit** | `exit` |

‎src/main/java/seedu/address/model/person/CurrentGrade.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class CurrentGrade {
1919
* The first character of the Current Grade must not be a whitespace,
2020
* otherwise " " (a blank string) becomes a valid input.
2121
*/
22-
public static final String VALIDATION_REGEX = "^(?:[A-F][+-]?|CS|CU|S|U|Pass|Fail|)$";
22+
public static final String VALIDATION_REGEX = "^(?:[A-F][+-]?|CS|CU|S|U|PASS|FAIL|)$";
2323

2424
public final String value;
2525
public final String color;

‎src/main/java/seedu/address/model/person/ExpectedGrade.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class ExpectedGrade {
2121
* The first character of the address must not be a whitespace,
2222
* otherwise " " (a blank string) becomes a valid input.
2323
*/
24-
public static final String VALIDATION_REGEX = "^(?:[A-F][+-]?|CS|CU|S|U|Pass|Fail|)$";
24+
public static final String VALIDATION_REGEX = "^(?:[A-F][+-]?|CS|CU|S|U|PASS|FAIL|)$";
2525

2626
public final String value;
2727
public final String color;

0 commit comments

Comments
 (0)