Skip to content

Commit

Permalink
Merge branch 'master' into fix-DG-bug
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/DeveloperGuide.md
#	docs/UserGuide.md
#	docs/images/UiQuickAccessButton.png
  • Loading branch information
Yufannnn committed Apr 10, 2023
2 parents 121b269 + 837fe3e commit 84d7805
Show file tree
Hide file tree
Showing 7 changed files with 238 additions and 171 deletions.
398 changes: 231 additions & 167 deletions docs/UserGuide.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs/diagrams/CreateLessonSequenceDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ box Logic LOGIC_COLOR_T1
participant ":Logic Manager" as lm LOGIC_COLOR
participant ":AddressBookParser" as abp LOGIC_COLOR
participant ":CreateLessonCommandParser" as clp LOGIC_COLOR
participant ":c:CreateLessonCommand" as clc LOGIC_COLOR
participant "c:CreateLessonCommand" as clc LOGIC_COLOR
participant ":CommandResult" as cr LOGIC_COLOR
end box

Expand Down Expand Up @@ -35,16 +35,16 @@ create clc
clp -> clc
activate clc

clc --> clp : d
clc --> clp : c
deactivate clc

clp --> abp : d
clp --> abp : c
deactivate clp
'Hidden arrow to position the destroy marker below the end of the activation bar.
clp -[hidden]-> abp
destroy clp

abp --> lm : d
abp --> lm : c
deactivate abp

lm -> clc : execute()
Expand Down
Binary file modified docs/images/CreateLessonSequenceDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/view-exam.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static seedu.address.logic.parser.CliSyntax.PREFIX_LESSON;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
import static seedu.address.logic.parser.CliSyntax.PREFIX_STARTTIME;
import static seedu.address.logic.parser.ParserUtil.checkUniqueNotNUllName;

import java.time.LocalDateTime;
import java.util.ArrayList;
Expand Down Expand Up @@ -37,6 +38,8 @@ public CreateLessonCommand parse(String args) throws ParseException {
ArgumentMultimap argMultimap =
ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_LESSON, PREFIX_STARTTIME, PREFIX_ENDTIME);

checkUniqueNotNUllName(argMultimap);

if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_LESSON, PREFIX_STARTTIME, PREFIX_ENDTIME)
|| !argMultimap.getPreamble().isEmpty()) {
throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
Expand Down

0 comments on commit 84d7805

Please sign in to comment.