Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Find command #31

Merged
merged 24 commits into from Oct 13, 2019
Merged

Find command #31

merged 24 commits into from Oct 13, 2019

Conversation

CowSaysBaa
Copy link

@CowSaysBaa CowSaysBaa commented Oct 12, 2019 •
edited

Major changes

Unfinished

  • Test cases unimplemented.
  • Ability to add not implemented.
  • Delete is not implemented properly.

@CowSaysBaa
added some images and changed AboutUs.adoc
af73025
@CowSaysBaa
updated photos and AboutUs.adoc
a1954ad
@CowSaysBaa
Added all photos and updated AboutUs.adoc
c56dff4
@CowSaysBaa
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W13-1/main
f3728b9
@CowSaysBaa
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W13-1/main
97f6e74 
# Conflicts:
#	docs/AboutUs.adoc (resolved)
@CowSaysBaa
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W13-1/main
6e04c0b
@CowSaysBaa
Merge branch 'master' of https://github.com/CowSaysBaa/main
87d2ac4
@CowSaysBaa
Changed the logic for the find command to search within ArchivedModul…
9676c5a 
…eList instead of ModuleList

Added ArchivedNameContainsKeywordsPredicate.java
@CowSaysBaa
Added some fullstops to javadocs.
fb7501b
@CowSaysBaa
Updated ModuleBook to copy ArchiveModuleList as well.
fbfc56a
@CowSaysBaa
Renamed: Module -> TrackedModule.
4bf410d
@CowSaysBaa
Added: Module.java interface.
e3d07f4
@CowSaysBaa
Type migrated TrackedModule to Module in NameContainsKeywordsPredicat…
80710d3 
…e.java
@CowSaysBaa
Deleted ArchivedNameContainsKeywordsPredicate.java.
b0864d2 
Made some type migration.
@CowSaysBaa
Added displayedList to ModelManager.java.
3a34e62 
Changed UI to display displayedList instead.
@CowSaysBaa
Changed how displayedList works to dislay ArchivedList and TrackedList.
bd178cc 
List and Find command should work now.
@CowSaysBaa
Reverted checkstyle.xml.
7a460c9
@CowSaysBaa CowSaysBaa added this to the v1.2 milestone Oct 12, 2019
@CowSaysBaa CowSaysBaa added priority.High Must do type.Story A user story labels Oct 12, 2019
geshuming
geshuming requested changes Oct 13, 2019
View reviewed changes
Copy link

@geshuming geshuming left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some issues need to be ironed out. Otherwise it looks ok.

src/test/java/seedu/module/storage/JsonArchivedModuleListTest.java Outdated Show resolved Hide resolved
src/main/java/seedu/module/model/Model.java Outdated Show resolved Hide resolved
src/main/java/seedu/module/logic/commands/ListCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/module/logic/commands/FindCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/module/storage/JsonAdaptedModule.java Outdated Show resolved Hide resolved
src/main/resources/view/MainWindow.fxml Outdated Show resolved Hide resolved
src/test/java/seedu/module/logic/commands/CommandTestUtil.java Outdated Show resolved Hide resolved
geshuming
geshuming approved these changes Oct 13, 2019
View reviewed changes
Copy link

@geshuming geshuming left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@CowSaysBaa CowSaysBaa merged commit 66f99db into AY1920S1-CS2103T-W13-1:master Oct 13, 2019
@CowSaysBaa CowSaysBaa deleted the Find-Command branch October 13, 2019 06:18
geshuming added a commit to geshuming/main that referenced this pull request Oct 13, 2019
@geshuming
Update ModelClassDiagram for AY1920S1-CS2103T-W13-1#31
eac4cae
geshuming added a commit to geshuming/main that referenced this pull request Oct 13, 2019
@geshuming
Update ModelClassDiagram for AY1920S1-CS2103T-W13-1#31
c9c0fb0
@nus-se-bot nus-se-bot mentioned this pull request Oct 16, 2019
Closed
26 tasks
@geshuming geshuming mentioned this pull request Oct 20, 2019
Merged
geshuming added a commit that referenced this pull request Oct 20, 2019
@geshuming
Update ModelClassDiagram and DeveloperGuide (#29)
99ff595 
* Update ModelClassDiagram

* Update ModelClassDiagram for #31

* Update ModelClassDiagram for #31

* Update DeveloperGuide
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geshuming geshuming geshuming approved these changes

@bitterg0d bitterg0d Awaiting requested review from bitterg0d

Assignees
No one assigned
Labels
priority.High Must do type.Story A user story
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.

As a student, I want to find a module from the institution
2 participants
@CowSaysBaa @geshuming