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.

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

[CS2103-W09-4] ExecutivePro #95

Open
wants to merge 667 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
667 commits
Select commit Hold shift + click to select a range
d1987c2
Fix Checkstyle
yanlings Apr 9, 2023
33333c4
Merge pull request #242 from yanlings/branch-DeveloperGuide
gyulong1 Apr 9, 2023
9bbb86e
Update UG and PPP
gyulong1 Apr 9, 2023
4ac6aad
Fix images showing incorrectly
abenx162 Apr 9, 2023
e025e40
Merge branch 'master' into setpicture_nopicture_bugfix
abenx162 Apr 9, 2023
4471005
Fixed testcases relating to PicturePath
abenx162 Apr 9, 2023
fd01e9e
Update DG for Leave Command
gyulong1 Apr 9, 2023
142962b
Merge pull request #243 from abenx162/setpicture_nopicture_bugfix
gyulong1 Apr 9, 2023
1a9713c
Merge pull request #244 from gyulong1/master
abenx162 Apr 9, 2023
1484d50
Update Ben Xuan's PPP as of 9 April 2023
abenx162 Apr 9, 2023
583e716
Update UG
yanlings Apr 9, 2023
41cc40f
Update UG
yanlings Apr 9, 2023
db40829
Merge branch 'master' into Branch-UG
yanlings Apr 9, 2023
681efd5
Update PPP based on contributions
yanlings Apr 9, 2023
79efb58
Merge pull request #247 from yanlings/Branch-UG
JunHao247 Apr 9, 2023
370a2d5
Merge pull request #248 from yanlings/Branch-PPP
JunHao247 Apr 9, 2023
c57e53f
Changes to DG
abenx162 Apr 9, 2023
893ed31
Add test for NameContainsAllKeywordsPredicate
panavdua Apr 9, 2023
5be0d46
Add commands for find test without asterisk
panavdua Apr 9, 2023
6224260
Add test for find command with asterisk
panavdua Apr 9, 2023
4ce78e1
Merge pull request #250 from panavdua/branch-findTest
yanlings Apr 9, 2023
931bb9c
Fix checkstyle erros
panavdua Apr 9, 2023
2601d25
Add tests for filter parser
panavdua Apr 9, 2023
cda962a
Add tests for FilterByPayrollPredicate of FilterCommand
panavdua Apr 9, 2023
7dde383
Add tests for FilterByLeaveCountPredicate in FilterCommand
panavdua Apr 9, 2023
de87e76
Update setpicture command to work similarly to edit command by making…
abenx162 Apr 9, 2023
114614b
Fix checkstyle errors
panavdua Apr 9, 2023
56297b4
Merge pull request #253 from abenx162/branch-setpicture-like-edit
panavdua Apr 9, 2023
e6cbe80
Merge branch 'master' into update-bx-ppp
abenx162 Apr 9, 2023
f6c71b2
Merge pull request #251 from panavdua/branch-findTest
abenx162 Apr 9, 2023
182c99b
Merge pull request #252 from panavdua/branch-filterTest
abenx162 Apr 9, 2023
b83ab90
Merge pull request #245 from abenx162/update-bx-ppp
panavdua Apr 9, 2023
de15deb
UML diagram and DG for setpicture command
abenx162 Apr 9, 2023
3a353fb
Merge pull request #254 from abenx162/branch-UGDG-9Apr23
JunHao247 Apr 9, 2023
e044fac
Remove unnecessary images and update Ui images in UserGuide
JunHao247 Apr 9, 2023
584f11e
Merge branch 'master' into branch-updateuserguide
JunHao247 Apr 9, 2023
2fa0190
Update typicalEmployeesExecutiveProDb.json with the same fields as
JunHao247 Apr 9, 2023
0f54abe
Fix checkstyle errors
JunHao247 Apr 9, 2023
6c6f80b
Merge pull request #255 from JunHao247/branch-updateuserguide
yanlings Apr 10, 2023
52f1284
Merge pull request #257 from JunHao247/branch-TestFiles
yanlings Apr 10, 2023
2fd3ff2
Fix link for PPP
yanlings Apr 10, 2023
ecd4bd6
Merge pull request #259 from yanlings/Branch-PPP
JunHao247 Apr 10, 2023
a6b24e2
Update UserGuide, DeveloperGuide to include invalid file type error
JunHao247 Apr 10, 2023
9520d18
Update DG to include sectioning between different sections and update
JunHao247 Apr 10, 2023
d4e5263
Merge pull request #260 from JunHao247/branch-updateuserguide
yanlings Apr 10, 2023
5a43939
Add javadocs
panavdua Apr 10, 2023
c5d55b9
Add images for FilterCommand
panavdua Apr 10, 2023
9b3a20a
Update diagram for BatchExport
yanlings Apr 10, 2023
50bce24
Fix checkstyle error
yanlings Apr 10, 2023
1b98a2f
Merge pull request #263 from yanlings/branch-DeveloperGuide
JunHao247 Apr 10, 2023
dd6f431
Merge pull request #262 from panavdua/branch-codeQuality
JunHao247 Apr 10, 2023
9d4a80e
Add images for FindCommand in UG
panavdua Apr 10, 2023
4a90505
Fix typo
panavdua Apr 10, 2023
1952f0a
Merge pull request #265 from panavdua/branch-documentation
JunHao247 Apr 10, 2023
5be0ed4
Update javadocs for BatchAddCommand, BatchExportCommand and ClearCommand
JunHao247 Apr 10, 2023
3201426
Merge branch 'master' into branch-javadoc
JunHao247 Apr 10, 2023
2f0b111
fix checkstyle errors
JunHao247 Apr 10, 2023
64322fe
Update config yml to change toc format
JunHao247 Apr 10, 2023
2132aee
Merge pull request #266 from JunHao247/branch-javadoc
gyulong1 Apr 10, 2023
d4c00db
Updated images in docs folder
abenx162 Apr 10, 2023
24de6c0
Removed instances of AddressBook
yanlings Apr 10, 2023
3dc5344
Merge pull request #268 from abenx162/branch-javadocs-10apr23
yanlings Apr 10, 2023
55a261f
Merge pull request #269 from yanlings/branch-javadoc
abenx162 Apr 10, 2023
a07f1e1
Update DG and javadocs
gyulong1 Apr 10, 2023
4713685
Merge pull request #270 from gyulong1/master
abenx162 Apr 10, 2023
b9d76f7
Implement test case to increase code cov
yanlings Apr 10, 2023
62dae20
Fix checkstyle error
yanlings Apr 10, 2023
cf1742d
Fix checkstyle error
yanlings Apr 10, 2023
2da672b
check codecov for batchadd
yanlings Apr 10, 2023
b92d601
Fix checkstyle error
yanlings Apr 10, 2023
05ee7a3
Merge pull request #271 from yanlings/Branch-Test
JunHao247 Apr 10, 2023
a66d991
Update DG and UML diagrams for leave and edit command
gyulong1 Apr 10, 2023
b4fa7c6
UGDG standardisation
abenx162 Apr 10, 2023
ec00e25
Merge pull request #274 from abenx162/branch-UGDG-10apr23
yanlings Apr 10, 2023
b3d1589
Update UG and all Ui images
JunHao247 Apr 10, 2023
b2e188f
Update UG and DG
gyulong1 Apr 10, 2023
9b49f93
Update UG (Editing the data file) in order to address JSON file modif…
JunHao247 Apr 10, 2023
0ef8e12
Merge pull request #275 from JunHao247/branch-updateuserguide
panavdua Apr 10, 2023
79a29d4
Update UG leave command and field format table
gyulong1 Apr 10, 2023
3adff1a
Merge branch 'AY2223S2-CS2103T-W09-4:master' into master
gyulong1 Apr 10, 2023
4470936
Merge pull request #273 from gyulong1/master
panavdua Apr 10, 2023
de33c7f
Update setpicture UG pictures
abenx162 Apr 10, 2023
ca471c9
Merge branch 'master' into branch-updateUGimages
abenx162 Apr 10, 2023
20dc21c
Update UserGuide, edit command's Ui image, and batchadd's Ui image
JunHao247 Apr 10, 2023
a627ea2
Update UG for leave command
gyulong1 Apr 10, 2023
dfd03ea
Merge branch 'master' into branch-updateuserguide
JunHao247 Apr 10, 2023
e7ee211
Fix unused imports and broken javadocs links
gyulong1 Apr 10, 2023
1f329cb
Merge pull request #276 from abenx162/branch-updateUGimages
gyulong1 Apr 10, 2023
22a11f6
Merge pull request #277 from JunHao247/branch-updateuserguide
gyulong1 Apr 10, 2023
e5d3f4a
Merge branch 'AY2223S2-CS2103T-W09-4:master' into master
gyulong1 Apr 10, 2023
b48267f
UG style fix
abenx162 Apr 10, 2023
eb06413
Update PPP
yanlings Apr 10, 2023
a8d27de
Merge pull request #278 from abenx162/branch-changestuff
JunHao247 Apr 10, 2023
ccda82b
Change pictures for UG to include highlight box
gyulong1 Apr 10, 2023
f3c37c6
Merge pull request #279 from yanlings/Branch-PPP
JunHao247 Apr 10, 2023
f0c3dba
Merge branch 'AY2223S2-CS2103T-W09-4:master' into master
gyulong1 Apr 10, 2023
a1b4087
Update PPP's PR
JunHao247 Apr 10, 2023
350b970
Add highlight box to UG
gyulong1 Apr 10, 2023
8252835
Merge pull request #280 from JunHao247/branch-PPP
gyulong1 Apr 10, 2023
164cc56
Update DG
gyulong1 Apr 10, 2023
d8b0774
Merge pull request #281 from gyulong1/master
JunHao247 Apr 10, 2023
8dd8029
Update PPP
gyulong1 Apr 10, 2023
58467f9
Fix checkstyle errors
gyulong1 Apr 10, 2023
95cf0e7
Fix bulb error for UG
gyulong1 Apr 10, 2023
1d759a9
Merge pull request #282 from gyulong1/master
abenx162 Apr 10, 2023
314c578
Update README.md
gyulong1 Apr 10, 2023
840d96f
Update tags and department roles for sample data
JunHao247 Apr 10, 2023
94b3410
Merge pull request #283 from JunHao247/branch-TagsRoles
gyulong1 Apr 10, 2023
03339fa
Update Ui image
JunHao247 Apr 10, 2023
7e150df
Merge branch 'master' into branch-TagsRoles
JunHao247 Apr 10, 2023
f3a6cf1
Update userguide tag guidance
JunHao247 Apr 10, 2023
469c468
Merge pull request #285 from JunHao247/branch-TagsRoles
gyulong1 Apr 10, 2023
9b46b60
Update Ui image
JunHao247 Apr 10, 2023
d6e2c48
Merge branch 'master' into branch-TagsRoles
JunHao247 Apr 10, 2023
6dbed47
Merge pull request #286 from JunHao247/branch-TagsRoles
gyulong1 Apr 10, 2023
02e598a
Add Glossary section to the UG
panavdua Apr 13, 2023
151b8a9
Typo fix
panavdua Apr 13, 2023
e30cc44
Add more definitions
panavdua Apr 13, 2023
fac547f
Add JSON definition
panavdua Apr 13, 2023
9c4b5fd
Checkstyle fix
panavdua Apr 13, 2023
088eb13
Merge pull request #287 from panavdua/branch-UG
panavdua Apr 13, 2023
251a6df
Update UserGuide with UserInterface and update headings
JunHao247 Apr 13, 2023
517f34d
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 13, 2023
173ac0f
Merge pull request #288 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
c0a95cd
Update phrasing for quick start
JunHao247 Apr 13, 2023
4681d4a
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 13, 2023
ac174cf
Update User Guide to add Ui images
JunHao247 Apr 13, 2023
3c2383a
Merge pull request #289 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
f33ddcc
Update hyperlinks for add and batchadd features
JunHao247 Apr 13, 2023
d2ad2db
Merge pull request #290 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
ea1100d
Update jarfile images and labelledgui
JunHao247 Apr 13, 2023
ba7e814
Merge pull request #291 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
42d70ce
Update UG with relevant messages
JunHao247 Apr 13, 2023
6323fc1
Merge pull request #292 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
dd983a3
Update UG
JunHao247 Apr 13, 2023
025e9db
Merge pull request #293 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
a0b569e
Update UG
JunHao247 Apr 13, 2023
9c29edb
Merge pull request #294 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
2a400d9
add page breaks
JunHao247 Apr 13, 2023
aff559c
Merge pull request #295 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
40e9684
Update UG
JunHao247 Apr 13, 2023
64487d9
Merge pull request #296 from JunHao247/CS2101-UGEdit
JunHao247 Apr 13, 2023
ce37529
Update Help section and phrasing of UG
gyulong1 Apr 14, 2023
36df4c5
Merge pull request #297 from gyulong1/master
gyulong1 Apr 14, 2023
b0bb50e
Change phrasing of UG
gyulong1 Apr 14, 2023
7384ea9
Merge pull request #298 from gyulong1/master
gyulong1 Apr 14, 2023
ecb1240
Change phrasing of UG
gyulong1 Apr 14, 2023
b237cce
Merge branch 'AY2223S2-CS2103T-W09-4:master' into master
gyulong1 Apr 14, 2023
1520bdc
Merge pull request #299 from gyulong1/master
gyulong1 Apr 14, 2023
84c80a6
Updated Introduction, FAQ and planned enhancements
yanlings Apr 14, 2023
6ea6002
Merge pull request #300 from yanlings/Branch-UG
yanlings Apr 14, 2023
81a5837
Add explanation of employee details
abenx162 Apr 14, 2023
e581474
Merge pull request #301 from abenx162/branch-explain-employee
abenx162 Apr 14, 2023
949f22c
Improve description of employees
abenx162 Apr 14, 2023
7ab3ce1
Reorder sections in UG
gyulong1 Apr 14, 2023
a0722fc
Merge remote-tracking branch 'origin/master'
gyulong1 Apr 14, 2023
84f9583
Merge pull request #302 from abenx162/master
abenx162 Apr 14, 2023
8059284
Merge remote-tracking branch 'origin/master'
gyulong1 Apr 14, 2023
b9fed87
Merge pull request #303 from gyulong1/master
gyulong1 Apr 14, 2023
7961f6f
Fix broken hyperlink for correct fields
abenx162 Apr 14, 2023
e117cc2
Merge pull request #304 from abenx162/master
abenx162 Apr 14, 2023
32d6e70
Update Ui resizing image
JunHao247 Apr 14, 2023
93aa976
Merge pull request #305 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
ba7a9ca
fix list inside employee alert
abenx162 Apr 14, 2023
ea0603d
Update UG
gyulong1 Apr 14, 2023
c0b20c1
Merge pull request #306 from abenx162/master
abenx162 Apr 14, 2023
e0d8b6a
Merge branch 'AY2223S2-CS2103T-W09-4:master' into master
gyulong1 Apr 14, 2023
f7abff0
Merge pull request #307 from gyulong1/master
JunHao247 Apr 14, 2023
c00c4fb
Update Ui images
JunHao247 Apr 14, 2023
8accc1a
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
2fa1d9d
Merge pull request #308 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
544502a
Update Ui images
JunHao247 Apr 14, 2023
e7976fb
rearrange sections
abenx162 Apr 14, 2023
332a459
Merge pull request #309 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
a8ad07e
Merge branch 'master' into master
abenx162 Apr 14, 2023
dcdedff
Merge pull request #310 from abenx162/master
abenx162 Apr 14, 2023
82edfd1
Update Ui images
JunHao247 Apr 14, 2023
be78f4b
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
ce44439
Merge pull request #311 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
6a92c23
Update CLI explanation in UG
gyulong1 Apr 14, 2023
77a04cf
update UG
JunHao247 Apr 14, 2023
2b2eb82
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
347333b
Merge pull request #312 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
7e36d6f
Update CLI explanation in UG
gyulong1 Apr 14, 2023
4f41a5d
Improve Introduction
abenx162 Apr 14, 2023
cc33c28
Merge pull request #313 from abenx162/master
abenx162 Apr 14, 2023
788f17c
Merge remote-tracking branch 'origin/master'
gyulong1 Apr 14, 2023
8e2e70c
Merge pull request #314 from gyulong1/master
gyulong1 Apr 14, 2023
65fbf0a
Update all images
JunHao247 Apr 14, 2023
dffe5f1
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
1ddb35e
Update CLI image
JunHao247 Apr 14, 2023
75ae1c6
Merge pull request #315 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
6c84dee
Update CLI explanation in bulb
gyulong1 Apr 14, 2023
79c6f32
Merge remote-tracking branch 'origin/master'
gyulong1 Apr 14, 2023
f377d7e
Merge pull request #316 from gyulong1/master
gyulong1 Apr 14, 2023
168235d
Update UG image
JunHao247 Apr 14, 2023
58c1af9
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
844fe49
Merge pull request #317 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
d576a6c
Update CLI explanation in bulb
gyulong1 Apr 14, 2023
2df005a
Merge pull request #318 from gyulong1/master
gyulong1 Apr 14, 2023
8c63867
Update ug
JunHao247 Apr 14, 2023
32e72b2
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
902cb64
Merge pull request #319 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
da8a3ca
improve setpicture UG
abenx162 Apr 14, 2023
35c87bf
Change minor spacing issues
gyulong1 Apr 14, 2023
3564a36
Merge pull request #321 from gyulong1/master
gyulong1 Apr 14, 2023
ce34d32
Merge branch 'master' into master
abenx162 Apr 14, 2023
79b72a9
Merge pull request #320 from abenx162/master
abenx162 Apr 14, 2023
ea2fe59
update image dimension
JunHao247 Apr 14, 2023
831abdc
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
3717da9
Update the hyperlink back to TOC
JunHao247 Apr 14, 2023
cadc25a
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
569a5d9
Change order of list to filter
JunHao247 Apr 14, 2023
4220055
Merge pull request #322 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
3745471
Update toc links
JunHao247 Apr 14, 2023
af5e93b
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
6a80d57
Merge pull request #323 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
dd5f784
Update sizes of images
JunHao247 Apr 14, 2023
b5d154b
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
3cc4712
Update UG
JunHao247 Apr 14, 2023
9696b75
Merge pull request #324 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
78864bf
Resize images
JunHao247 Apr 14, 2023
2ce0572
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
4a003e6
minor style fixes
abenx162 Apr 14, 2023
182652b
Merge pull request #325 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
14b1139
Change phrasing of UG
gyulong1 Apr 14, 2023
44f0257
Merge pull request #326 from abenx162/master
abenx162 Apr 14, 2023
15d24b9
Merge remote-tracking branch 'origin/master'
gyulong1 Apr 14, 2023
29310fd
Merge pull request #327 from gyulong1/master
gyulong1 Apr 14, 2023
3358451
Update sizes
JunHao247 Apr 14, 2023
5659216
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
2c1d927
Merge pull request #328 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
4879c9c
UG edit
panavdua Apr 14, 2023
8e2853d
Update UG
JunHao247 Apr 14, 2023
8ae317a
Merge pull request #329 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
2433c4b
Merge pull request #330 from panavdua/branch-UG
panavdua Apr 14, 2023
1daaafe
Add extra line in CLI
gyulong1 Apr 14, 2023
52295ad
Merge pull request #331 from gyulong1/master
gyulong1 Apr 14, 2023
f560026
Update UG
JunHao247 Apr 14, 2023
54ba964
Merge pull request #332 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
88b5f5f
Update UG
JunHao247 Apr 14, 2023
0810819
Update UG
JunHao247 Apr 14, 2023
fb7874f
Merge branch 'master' into CS2101-UGEdit
JunHao247 Apr 14, 2023
272f76b
Merge pull request #333 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
209ce5f
Update image
JunHao247 Apr 14, 2023
01212bb
Merge pull request #334 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
a2c17e2
Update UG
JunHao247 Apr 14, 2023
6dec55f
Merge pull request #335 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
1d3d2d6
Update ug
JunHao247 Apr 14, 2023
5590c72
Merge pull request #336 from JunHao247/CS2101-UGEdit
JunHao247 Apr 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
check codecov for batchadd
yanlings committed Apr 10, 2023
commit 2da672b5d49b581cefd22b884e92ea3d5378eb74
Original file line number Diff line number Diff line change
@@ -52,19 +52,6 @@ void execute_batchAddFileMissingFields_throwsCommandException() {
assertCommandFailure(batchAddCommand, model, BatchAddCommand.MESSAGE_MISSING_NEEDED_FIELDS);
}

@Test
void execute_batchAdd_success() {
Model emptyDatabase = new ModelManager(new ExecutiveProDb(), new UserPrefs());
Path testData = Paths.get("src", "test", "data", "BatchAddTest", "validEmployees.csv");
BatchAddCommand batchAddCommand = new BatchAddCommand("validEmployees.csv");
batchAddCommand.setFilePath(testData);

// Update the expectedMessage with the correct number of employees in the "validEmployees.csv" file
String expectedMessage = String.format(BatchAddCommand.MESSAGE_WORKS, 2);
Model expectedModel = emptyDatabase;

assertCommandSuccess(batchAddCommand, emptyDatabase, expectedMessage, expectedModel);
}


}