-
Notifications
You must be signed in to change notification settings - Fork 103
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.
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
[CS2113-T17-2] PlanIT #14
Open
Brandon-OS
wants to merge
298
commits into
nus-cs2113-AY2223S1:master
Choose a base branch
from
AY2223S1-CS2113-T17-2:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
298 commits
Select commit
Hold shift + click to select a range
b586b21
developer guide mcs
ishitamandal06 238b7a9
Merge pull request #32 from ishitamandal06/master
ishitamandal06 1593298
added View in Developer Guide
cc2c5af
Merge pull request #33 from insafhere/master
insafhere b925fbf
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 6bab83e
partial javadoc and uml
ishitamandal06 222130a
Merge pull request #34 from ishitamandal06/master
ishitamandal06 2cecb45
JAVADOC comments
ishitamandal06 3d5bd15
Merge pull request #35 from ishitamandal06/master
ishitamandal06 cb1ef0d
Added find function
Brandon-OS 63867cb
Merge pull request #36 from Brandon-OS/master
Brandon-OS 2e23aa2
added exceptions into find function
Brandon-OS e1c5d45
added checks for NOC and SEP eligibility
Brandon-OS 463b038
Merge pull request #37 from Brandon-OS/master
Brandon-OS b8ef50f
Finished Check Function
Brandon-OS 5d4801a
Merge pull request #43 from Brandon-OS/master
Brandon-OS 2f68905
Added UserGuide
cdb4c42
added javadoc comments to find and check commands
Brandon-OS 3d77eb2
Merge pull request #45 from insafhere/master
insafhere e0db7a9
Merge pull request #46 from Brandon-OS/master
Brandon-OS 6b1235f
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 494cfc6
Added help feature
Zhai-Yuxin 5f54f27
Merge pull request #47 from Zhai-Yuxin/master
Zhai-Yuxin 4f66117
edits to find and some javadoc
Zhai-Yuxin 2ea64dc
Merge pull request #48 from Zhai-Yuxin/master
Zhai-Yuxin beb02c7
minor edits
Zhai-Yuxin 36ef2f3
Merge pull request #49 from Zhai-Yuxin/master
Zhai-Yuxin 18bbe39
Fixed error with find function
Brandon-OS b687137
Merge pull request #50 from Brandon-OS/master
Brandon-OS 4fb3007
Updated DG and edited check feature
Zhai-Yuxin 846dc56
Merge pull request #51 from Zhai-Yuxin/master
Zhai-Yuxin 8eb6740
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 89668c1
Updates to example i/o in UG
Zhai-Yuxin 198afec
Merge pull request #57 from Zhai-Yuxin/master
Zhai-Yuxin 5b34db4
Added lines in DG an changed Class Diagram
Brandon-OS 3250645
Merge pull request #59 from Brandon-OS/master
Brandon-OS c0adbcf
storage class with javadoc
ishitamandal06 b980cc9
Merge pull request #60 from ishitamandal06/master
ishitamandal06 e4f288f
Invalid Mcs
ishitamandal06 b984c21
only numeric MC accepted
ishitamandal06 8efb418
Merge pull request #110 from ishitamandal06/master
ishitamandal06 cfed6ba
Invalid grade check
ishitamandal06 254bf46
Merge pull request #111 from ishitamandal06/master
ishitamandal06 133aa86
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin ed6db74
added semester requirements
165b9d0
Merge pull request #112 from insafhere/master
insafhere 5047f2a
updates to UI
Zhai-Yuxin f9b1468
Merge pull request #113 from Zhai-Yuxin/master
Zhai-Yuxin bf2ca93
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin ae41447
updated noc/sep ineligibility message
76243c0
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
04b6368
Merge pull request #114 from insafhere/master
insafhere b6c7306
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 7a3a900
added text to welcome message
5b0aa65
Merge pull request #115 from insafhere/master
insafhere c110a22
modified help message
f502594
Merge pull request #116 from insafhere/master
insafhere fee1c65
Check for repetition fields in input
Zhai-Yuxin 8fc1758
Merge pull request #117 from Zhai-Yuxin/master
Zhai-Yuxin 149333e
modify to be able to search any keyword
69ec049
ensures uppercase in add
Zhai-Yuxin 7d5bbb9
Merge pull request #118 from insafhere/master
insafhere 2c8c869
minor edit
Zhai-Yuxin c810506
Merge pull request #119 from Zhai-Yuxin/master
Zhai-Yuxin 69fa5a2
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 8bf6ca7
minor
Zhai-Yuxin 0292181
Merge pull request #120 from Zhai-Yuxin/master
Zhai-Yuxin abfee7c
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin bf50eea
solved spacing for find keyword
Zhai-Yuxin dd6c1f6
Merge pull request #121 from Zhai-Yuxin/master
Zhai-Yuxin 672fc48
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 9913c49
added trim() to check
Zhai-Yuxin 3801a15
Merge pull request #122 from Zhai-Yuxin/master
Zhai-Yuxin 9f8813f
Added skeletal to PPP
Zhai-Yuxin 1099d75
Merge pull request #123 from Zhai-Yuxin/master
Zhai-Yuxin 772e2cd
edit to check grade
Zhai-Yuxin 2a6c1c8
Merge pull request #132 from Zhai-Yuxin/master
Zhai-Yuxin ad122d0
Invalid year and semester
ishitamandal06 fd8835f
cannot accept semester greater than 4
ishitamandal06 bf97ea8
Merge pull request #133 from ishitamandal06/master
ishitamandal06 d8e58a1
Added glossary for NOC and SEP
Brandon-OS c7f112b
Merge pull request #134 from Brandon-OS/master
Brandon-OS 0aa928a
changes to valid semester
ishitamandal06 03a7b36
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
ishitamandal06 a8e847a
Merge pull request #135 from ishitamandal06/master
ishitamandal06 4081272
long number for mc not accepted
ishitamandal06 b0b86fd
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
ishitamandal06 5758d98
Merge pull request #136 from ishitamandal06/master
ishitamandal06 5fa3213
Fixed #61 - Missing link to jar file
Brandon-OS 4157e1a
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin e4f9527
Changed to recognise all exceptions
7976477
Able to view all exceptions at once
1db75d8
added getMessage
9ffd994
added getMessage
83cf135
added getMessage
9e478e4
added getMessage
dee6992
added getMessage
9299bbc
added getMessage
96fdbd3
added getMessage
3a56bcb
changed exception name for overallInput
56dfce4
Removed UI messages for exception
bfc519b
Added new Exception for overall input check
eeac365
changes to Add class for Exception
da07916
Merge pull request #140 from insafhere/master
insafhere 240cccc
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 1a3f473
adding view all modules feature
Zhai-Yuxin 7de7da7
Merge pull request #141 from Zhai-Yuxin/master
Zhai-Yuxin 07d2946
Update last semesters for noc and sep elibility
02fa7a2
Merge pull request #142 from insafhere/master
insafhere 1300f99
Added exceptions for wrong semester input
3208a31
changed from issues to issue(S)
4dcb6f3
Merge pull request #145 from insafhere/master
insafhere 7e7d4c3
changed from issues to issue
02b8c12
changed from issues to issue
8ddd03c
Merge pull request #146 from insafhere/master
insafhere b0afbbf
Added exception for incorrect semester input
d0f71c5
Merge pull request #147 from insafhere/master
insafhere fca4409
updated help command summary
f8f1cd8
Merge pull request #148 from insafhere/master
insafhere 2d49bce
exception for ASCII Art Generator
eb0ef83
Added PlanIT! ASCII Art
d435e1d
imported ASCII Art Generator class
800daa8
Merge pull request #149 from insafhere/master
insafhere a3f5573
Added clear and clearAll functions
7e901a8
added clear command
664cd41
Added UI messages needed for clear command
47ba5b8
Added clear class
df01053
Merge pull request #151 from insafhere/master
insafhere 40496fa
Added storage save method after every input
d840747
Merge pull request #153 from insafhere/master
insafhere 42bb5f9
Created calculateCap function
5dfc4ca
updated cap calculation
fcd808f
Merge pull request #154 from insafhere/master
insafhere f037fd4
Added overview command class
d520981
Added more functions for MC calculation
b139955
Added overview command in switch case
3dde4e8
Added conversions from sem number to Sem in string
c9746f6
Added ui for overview feature
b3a140c
update for overview feature
8d49abe
added overview in command summary
370765e
Merge pull request #157 from insafhere/master
insafhere e2a19de
Update clear functions
63a9fae
added UI for clear function
590868a
updated overview feature
667d00e
Merge pull request #158 from insafhere/master
insafhere c6ff830
added clear and overview features
7b20afb
removed isFound printing
062602d
Merge pull request #159 from insafhere/master
insafhere 8b9372a
Added PPP for insaf
cf96660
changes to user guide
ishitamandal06 25293d7
Merge pull request #160 from ishitamandal06/master
ishitamandal06 ad259be
Junit tests for invalid input, find, and clear
ishitamandal06 0b60f68
Merge pull request #161 from ishitamandal06/master
ishitamandal06 2f9137f
fixed checkstyle errors
ishitamandal06 d5fcd66
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
ishitamandal06 f349722
Merge pull request #162 from ishitamandal06/master
ishitamandal06 cb00e29
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 088f5be
Updated javadoc for methods
21b42db
update to docs
1f3de93
Merge branch 'master' into master
insafhere e86049e
Merge pull request #163 from insafhere/master
insafhere 1a8b17d
Update to modulelist for javadoc
b34b1b0
Merge branch 'master' of https://github.com/insafhere/tp
3efb604
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
1cf0ea0
updated java doc
93ddd0d
Merge pull request #164 from insafhere/master
insafhere bcfa499
Updated javdoc
492bdd6
Merge pull request #165 from insafhere/master
insafhere 5ca10ee
update javadoc
0da9263
update javadoc
51ed816
update javadoc
8ec1777
update javadoc
3a88aec
update javadoc
37b3c76
update javadoc
f8e13e6
Merge pull request #166 from insafhere/master
insafhere d05f3ef
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 158e555
Added help section in the User Guide
Brandon-OS b83ec07
Added ppp draft (yx)
Zhai-Yuxin 7969f89
Merge pull request #167 from Zhai-Yuxin/master
Zhai-Yuxin 78b8a3b
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 340ae3f
Updated class diagrams and DG
Brandon-OS aa7ce85
solved empty row output issue
Zhai-Yuxin 7635f9b
Merge pull request #168 from Zhai-Yuxin/master
Zhai-Yuxin 45d8415
Added JUnit Test for Check command
Brandon-OS 51378bc
Merge branch 'master' into master
Brandon-OS 96b41ff
Merge pull request #169 from Brandon-OS/master
Brandon-OS 277d336
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 14a3c40
resolved bug for checking mc string
Zhai-Yuxin 8809337
Merge pull request #170 from Zhai-Yuxin/master
Zhai-Yuxin 1af017b
user guide done, resolved bug for check
Zhai-Yuxin 0f710b2
Merge pull request #171 from Zhai-Yuxin/master
Zhai-Yuxin fc69107
Added user stories to DG and changes to PPP
Brandon-OS f011077
Merge pull request #172 from Brandon-OS/master
Brandon-OS d3867bf
Minor edits to PPP
Brandon-OS 7d9a478
Merge pull request #173 from Brandon-OS/master
Brandon-OS 70cd42b
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin d96bc40
javadoc comments, PPP, and instructions for manual testing in DG
ishitamandal06 a63dc41
Merge pull request #174 from ishitamandal06/master
ishitamandal06 b3e97d0
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin dc880fb
DG write ups for features
ishitamandal06 79042b3
Merge pull request #175 from ishitamandal06/master
ishitamandal06 16a2b61
about us
ishitamandal06 5a66948
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
ishitamandal06 bd4639b
Merge pull request #176 from ishitamandal06/master
ishitamandal06 1cd9152
Updates to all sequence diagrams of DG
Zhai-Yuxin f37e80e
Merge pull request #177 from Zhai-Yuxin/master
Zhai-Yuxin 0ccf83a
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin b909074
Updated DG with diagrams and corrections to texts
Zhai-Yuxin 18a0528
Merge pull request #178 from Zhai-Yuxin/master
Zhai-Yuxin 56bad8f
remove wrong name
1e8b1dd
Create PPP for insaf
dade811
Merge pull request #179 from insafhere/master
insafhere ea7cd25
PPP completed (yx)
Zhai-Yuxin 5d398a3
Merge pull request #180 from Zhai-Yuxin/master
Zhai-Yuxin f36897c
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin 74d3d30
remove Wrong PPP File insaf
827663a
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
4c02fce
solving pr checks error
Zhai-Yuxin 9783881
solve pr check errors
Zhai-Yuxin 07e08d8
solve pr check issues in tests
Zhai-Yuxin cf213e7
Merge pull request #183 from Zhai-Yuxin/master
Zhai-Yuxin b74e58b
updated expected.txt
Zhai-Yuxin b927115
Merge pull request #184 from Zhai-Yuxin/master
Zhai-Yuxin 0fae13e
fix CI
Zhai-Yuxin fabe19c
Update to Insaf PPP
58c6937
Merge pull request #186 from insafhere/master
insafhere c5251ab
Update to Insaf PPP
26072db
final update to ppp (yx)
Zhai-Yuxin c3f1e26
Merge pull request #185 from Zhai-Yuxin/master
Zhai-Yuxin 81f26ae
Merge pull request #187 from insafhere/master
insafhere 3f29f1d
Merge branch 'master' of https://github.com/AY2223S1-CS2113-T17-2/tp
Zhai-Yuxin f74596c
Update to Insaf PPP
72d792a
Update to aboutUs for insaf
39cce6a
Merge pull request #188 from insafhere/master
insafhere 5660e14
updated ppp
Zhai-Yuxin 0dcf92d
Merge pull request #189 from Zhai-Yuxin/master
Zhai-Yuxin fc9cb36
Update to Insaf PPP
b758c2d
Update to Insaf PPP
6f0cd57
Added links to PPP
Brandon-OS 90ab496
Merge pull request #190 from insafhere/master
insafhere 64da252
Merge pull request #191 from Brandon-OS/master
Brandon-OS 493a0f9
Update to Insaf PPP
73fa5a7
Merge pull request #192 from insafhere/master
insafhere b3f859c
Added criteria for Module Code
d623fce
Merge pull request #193 from insafhere/master
insafhere 64254f0
Changed to proper naming convention for module code and grade
df6d865
Changed number in notes for input format
54b067b
Merge pull request #195 from insafhere/master
insafhere d89abe3
Update to Insaf PPP
1887568
Merge pull request #196 from insafhere/master
insafhere File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,10 +52,25 @@ blah blah by insuf | |
|
||
### Mcs feature | ||
|
||
blah blah by ishita | ||
|
||
The mcs mechanism is facilitated by 'Parser', 'Mcs', 'ModuleList', and 'UI', where the user enters | ||
a semester and the total number of mcs taken that semester is calculated and displayed. | ||
|
||
Below is an example usage scenario and how the mcs mechanism behaves at each step. | ||
|
||
Step 1: Assume that the user has already added two modules to y2s1: | ||
The first module is CS2113, a 4 MC module which was added using the following command "add m/cs2113 s/y2s1 mc/4 g/a" | ||
The second module is CS2030, a 4 MC module which was added using the following command "add m/cs2030 s/y2s1 mc/4 g/a" | ||
|
||
Step 2: The user input of "mcs s/y2s1" will be taken in for the parser and an object of class 'Mcs' will be returned. | ||
|
||
Step 3: The execute method of MCs class that is overrides will be called with parameter of the semester and will iterate through | ||
the moduleList. If the semester in which a particular module is taken matches the semester given as the argument, then mcsCount variable | ||
will be increased by the number of Mcs of the module taken. In the end, mcsCount will be returned. | ||
|
||
The sequence diagram below illustrates this mcs mechanism. | ||
|
||
![McsUML.png](McsUML.png) | ||
|
||
|
||
## Product scope | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Target user not specified. (Explanation bug) |
||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
'https://plantuml.com/sequence-diagram | ||
|
||
@startuml | ||
activate Duke | ||
[-> Duke: User input | ||
Duke -> Parser: parse(input) | ||
activate Parser | ||
Parser -> Parser: specificCase(commandWord, content) | ||
activate Parser | ||
Parser -> Mcs: new Mcs(content) | ||
activate Mcs | ||
return c: Mcs | ||
return c: Mcs | ||
return c: Mcs | ||
deactivate Parser | ||
Duke -> Mcs: c.execute(moduleList) | ||
activate Mcs | ||
activate ModuleList | ||
Mcs -> ModuleList: mc(semester) | ||
deactivate Mcs | ||
ModuleList -> ModuleList: check mod.getSemesterTaken().matches(semester) | ||
activate ModuleList | ||
return mcsCount: integer | ||
ModuleList -> UI: mcMessage(semester, mcsCount) | ||
activate UI | ||
deactivate UI | ||
|
||
@enduml |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No value proposition not specified. (Explanation bug)