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

[W13-3] Task Book #31

Open
wants to merge 256 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
f998030
Updated Jeremy's profile on AboutUs.adoc
JeremyAw Sep 26, 2018
d898884
checkstyle: add SingleSpaceSeparator
pyokagan Aug 15, 2018
6483ac5
HelpWindowTest: fix bogus "focus on another stage" code
pyokagan Sep 7, 2018
612848f
Modified readMe and aboutUs pages
chel-seyy Sep 17, 2018
7f43788
Minor changes in readMe + aboutUs
chel-seyy Sep 17, 2018
2fbdbed
changed github account link
ChanChunCheong Sep 26, 2018
79b9a81
Added comments to Commands to understand things better (CC)
ChanChunCheong Sep 26, 2018
6fab2a5
Updated UG and DG for addTask + addDeadline
chel-seyy Sep 20, 2018
7a4a5b7
Updated UG and DG for viewDate + selectDate (#2)
emobeany Sep 26, 2018
9f8481e
About us - Chan Chun Cheong
ChanChunCheong Sep 26, 2018
a79adae
Edited the UG + DG
ChanChunCheong Sep 26, 2018
5df5b71
Updated DeveloperGuide for Remove Deadline feature use case and added…
JeremyAw Sep 27, 2018
8e9b99c
Updated UserGuide for Remove Deadline feature under Features and Comm…
JeremyAw Sep 27, 2018
9d07add
Resolved merge conflicts in documentation
chel-seyy Sep 27, 2018
4173a8e
Merge branch 'JeremyInElysium-admin'
chel-seyy Sep 27, 2018
297e03f
added Defer Deadline feature (#5)
chel-seyy Sep 27, 2018
c39cf42
Minor modification in DG
chel-seyy Sep 27, 2018
0ebad8c
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main
JeremyAw Sep 28, 2018
6c79912
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Sep 28, 2018
a7fa819
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main
emobeany Sep 28, 2018
71a8ec5
Minor adjustments to DG
emobeany Sep 28, 2018
646e1a0
Replaced AB Ui with TB mockup Ui
emobeany Sep 28, 2018
94f1ea7
Modifications made in UG, DG and added mockup UI
chel-seyy Sep 27, 2018
d95ae71
minor doc changes
chel-seyy Sep 29, 2018
532f2dd
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main
JeremyAw Oct 1, 2018
8e4020d
Merge branch 'master' of https://github.com/emobeany/addressbook-level4
emobeany Oct 2, 2018
6b4d651
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Oct 8, 2018
8af38ea
Changed profile picture to png format
chel-seyy Oct 9, 2018
2bab4a9
Changed github username for pictures and Ui pic-> png format
chel-seyy Oct 10, 2018
5dfb387
Renaming lowercase of profile pics
chel-seyy Oct 10, 2018
11a4de2
Porting Tasks branch to Master branch (#38)
chel-seyy Oct 16, 2018
31156f1
Rectified Travis errors
chel-seyy Oct 16, 2018
0e4e6d6
Tests are failing travis checks
chel-seyy Oct 16, 2018
8f5b058
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Oct 17, 2018
73a2f7e
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main
JeremyAw Oct 17, 2018
e5acdfb
Implemented AddMilestoneCommandParser for the milestone feature
JeremyAw Oct 17, 2018
3dec2ef
Updated LogicManager to accomodate AddMilestoneCommand
JeremyAw Oct 18, 2018
d98739f
Configured RepoSense
chel-seyy Oct 20, 2018
e079256
Removed 1 line
chel-seyy Oct 20, 2018
20eff38
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Oct 21, 2018
2358060
Corrected Jeremy's githubId and authorName
JeremyAw Oct 21, 2018
73162e7
Updated DG and its diagrams
chel-seyy Oct 21, 2018
d11a9c6
Revert "Corrected Jeremy's githubId and authorName"
JeremyAw Oct 21, 2018
92e129f
Changed Milestone class to no longer be a subclass of the Task class
JeremyAw Oct 22, 2018
b29439c
Edited Task constructor to include a Set to store the add milestones
JeremyAw Oct 22, 2018
81a2785
Improved AddMilestoneCommand to be able to select a task from the cur…
JeremyAw Oct 22, 2018
6256868
Commented out previously used code for addMilestone
JeremyAw Oct 22, 2018
db77676
Fixed minor checkstyle issues
JeremyAw Oct 22, 2018
0e0fa6b
Added tests for AddTask, CompleteTask, Delete and Clear
chel-seyy Oct 22, 2018
47fcf15
Released jar file v1.2.5
chel-seyy Oct 23, 2018
57a9bf4
Allows adding of tasks to include number of expected hours
chel-seyy Oct 23, 2018
b807c48
Allows users to fill in completed num of hours. Calculate_productivit…
chel-seyy Oct 24, 2018
5664911
Able to track productivity for completed tasks
chel-seyy Oct 24, 2018
4498348
Integrated Deadline and SelectDeadline - Kha Sim (#50)
emobeany Oct 24, 2018
d9b5ed4
Added tests in.
chel-seyy Oct 24, 2018
07fc945
Merge branch 'master' into milestoneV1.3
chel-seyy Oct 24, 2018
58642b4
Merge pull request #51 from chelseyong/milestoneV1.3
chel-seyy Oct 24, 2018
5f77d67
Resolved issues in tests
chel-seyy Oct 24, 2018
dad1080
Merge branch 'chelseyong-productivity_feature'
chel-seyy Oct 24, 2018
db04c82
Still fixing line endings :(
chel-seyy Oct 24, 2018
99e3fee
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Oct 24, 2018
ef39ea4
Still fixing line endings :(
chel-seyy Oct 24, 2018
6d7e638
Fixed a renaming issue in storage tests
chel-seyy Oct 25, 2018
b39ea0d
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Oct 25, 2018
4ec5da9
Fixed checkstyle in tests
chel-seyy Oct 26, 2018
e3fc426
Fixed null deadline bug when TB is launched
chel-seyy Oct 26, 2018
c91bd99
Fixed bug when command is invalid
chel-seyy Oct 26, 2018
4068210
Updated documentation
chel-seyy Oct 26, 2018
ea6ce91
Added parser tests
chel-seyy Oct 27, 2018
8f64386
Logic & Model tests mostly included
chel-seyy Oct 27, 2018
5cec967
Added more tests for CompleteTask and found some bugs for defer/complete
chel-seyy Oct 27, 2018
62227fc
Merge pull request #53 from chelseyong/master
chel-seyy Oct 27, 2018
62fc13e
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Oct 27, 2018
d1e14a7
Partial implementation of AddMilestoneCommand UI
JeremyAw Oct 28, 2018
8a9c20b
Merged
chel-seyy Oct 28, 2018
441da75
Resolved buggy milestone UI
chel-seyy Oct 28, 2018
24a16c7
AddMilestone feature is functional
chel-seyy Oct 28, 2018
015a0d5
Sort Tasks feature is completed (#46)
ChanChunCheong Oct 28, 2018
db0da03
Adds task with moduleCodes now
chel-seyy Oct 28, 2018
71a9d73
Merged Jeremy's add_milestone feature
chel-seyy Oct 28, 2018
ee9c96d
Merged Jeremy's add_milestone feature
chel-seyy Oct 28, 2018
754015d
Trigger
chel-seyy Oct 28, 2018
d3ef05f
Added Tests for Deadline and SelectDeadline
emobeany Oct 28, 2018
aaccc68
Added tests for SelectDeadlineCommandParser
emobeany Oct 28, 2018
62896c6
Update user guide
chel-seyy Oct 29, 2018
8d65f0e
Fixed checkstyle tests
chel-seyy Oct 29, 2018
2125f4c
Merged conflicts with selectDeadline tests
chel-seyy Oct 29, 2018
154daf4
Merge branch 'emobeany-milestone1.3Tests'
chel-seyy Oct 29, 2018
c9e76d1
Update docs
chel-seyy Oct 29, 2018
e36cf17
Improved date validity checking + tests included
emobeany Oct 29, 2018
fefc405
Updated UG
emobeany Oct 29, 2018
7a67d39
Improved UI design
chel-seyy Oct 29, 2018
b15b206
Deadline UI implemented
chel-seyy Oct 29, 2018
231961c
Changed colours
chel-seyy Oct 29, 2018
4385192
Created collate folder
chel-seyy Oct 29, 2018
7edf3a1
Merge pull request #63 from chelseyong/collate-code
chel-seyy Oct 29, 2018
658d36e
Updated sample data
chel-seyy Oct 29, 2018
b903f11
Prevent adding of duplicate ranks when adding milestones
JeremyAw Oct 29, 2018
c6f6974
Updated User Guide
chel-seyy Oct 30, 2018
8f8d5ba
minor merge conflicts
chel-seyy Oct 30, 2018
35f81b1
Updated User Guide (#64)
chel-seyy Oct 30, 2018
dc23abe
Merge branch 'master' into milestone1.3ImproveDateValidity
chel-seyy Oct 30, 2018
46ebb15
Sort milestones with respect to rank
JeremyAw Oct 30, 2018
07472f6
Merge pull request #60 from emobeany/milestone1.3ImproveDateValidity
chel-seyy Oct 30, 2018
69aa798
Fixed minor checkstyle issues
JeremyAw Oct 30, 2018
9a22c63
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Oct 30, 2018
af00260
Edited Duplicate Rank error message
JeremyAw Oct 30, 2018
cc3acf2
Added more tasks for sampleDataUtil
chel-seyy Oct 30, 2018
55c5bc3
Started on EditTask feature and parser
emobeany Oct 30, 2018
652d0d5
Dummy commit (#67) (#68)
chel-seyy Oct 31, 2018
97debcc
Edit command is now working. Bugs for UI
emobeany Oct 31, 2018
d99ba65
Changed deferDeadline Command input format and edited UG (#69)
ChanChunCheong Nov 1, 2018
a98688a
Removed extra details from UG
chel-seyy Nov 1, 2018
4ad1b03
Fixes #87, fixes #88
chel-seyy Nov 3, 2018
9e1e57a
Fixes #85 regarding deferDeadline
chel-seyy Nov 3, 2018
2d0c2c3
Fixes #81, fixes #83
chel-seyy Nov 3, 2018
b210bfd
Fixes #70
chel-seyy Nov 3, 2018
37b2a02
Minor checkstyle
chel-seyy Nov 3, 2018
ae32154
Fixed deadline test issue
chel-seyy Nov 3, 2018
4fec026
Merge pull request #90 from chelseyong/bugs
chel-seyy Nov 3, 2018
78aaea5
Fixes #74
chel-seyy Nov 3, 2018
61fe6a0
Added Jeremy's Project Portfolio Page
JeremyAw Nov 4, 2018
ec3cd07
Updated Jeremy's Project Portfolio Page
JeremyAw Nov 4, 2018
8fddf80
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 4, 2018
b400c80
Created Module Code class
chel-seyy Nov 4, 2018
472e7e5
Fixed edge-case bugs for Deadline
chel-seyy Nov 4, 2018
10b5658
Validation of module code is added
chel-seyy Nov 4, 2018
4f99013
Modified module code to be an optional input
chel-seyy Nov 4, 2018
dcd29b7
Updated UG and DG for editTaskCommand
emobeany Nov 4, 2018
3150700
Started on individual portfolio Ks
emobeany Nov 4, 2018
71eb927
Added more tests
chel-seyy Nov 4, 2018
fa9825c
Merge pull request #92 from chelseyong/module-code
chel-seyy Nov 4, 2018
ef4048c
Fixed bug for editTask
emobeany Nov 4, 2018
968ca80
Fixed bugs where wrong messages are thrown in EditTaskCommand
emobeany Nov 4, 2018
c6dea0c
Merged conflict
chel-seyy Nov 5, 2018
266bc90
Changed String to Module Code in editCommand
chel-seyy Nov 5, 2018
4aa8639
Merge branch 'emobeany-milestone1.4EditFeature'
chel-seyy Nov 5, 2018
b85cada
Empty titles, descriptions and module codes
chel-seyy Nov 5, 2018
35955ef
More tests
chel-seyy Nov 5, 2018
ea8f85c
Fixing bugs from merges
chel-seyy Nov 5, 2018
8c4c37a
Merge pull request #93 from chelseyong/master
chel-seyy Nov 5, 2018
92b4dfa
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 5, 2018
3d3d963
Fixed minor checkstyle issues.
JeremyAw Nov 5, 2018
8731128
Fixed the change from Set to List for milestone
JeremyAw Nov 5, 2018
cf96fb6
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 5, 2018
acdc131
Merge branch 'v1.3_Jeremy' of https://github.com/JeremyInElysium/main…
JeremyAw Nov 5, 2018
2993bf7
Squashed commit of the following:
chel-seyy Nov 5, 2018
1ee654e
Fixed buggy milestones
chel-seyy Nov 5, 2018
24557ba
Empty index
chel-seyy Nov 5, 2018
80f1a4e
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 5, 2018
6a21066
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 5, 2018
c341083
Fixed merging error.
JeremyAw Nov 5, 2018
444b9e8
Fixed #73, updated regex for Rank
JeremyAw Nov 5, 2018
fa3e098
Fixed #86, updated AddMilestoneCommand to prevent adding of duplicate…
JeremyAw Nov 5, 2018
d7cac56
Case-insensitive module code
chel-seyy Nov 5, 2018
cc29616
Implemented padding for milestone description in each Milestone to al…
JeremyAw Nov 5, 2018
d8eecbf
Updated parser for AddMilestoneCommand to ensure that user cannot key…
JeremyAw Nov 5, 2018
90f5422
Fixed AddMilestoneCommand (#97)
JeremyAw Nov 6, 2018
917f754
Allows users to input different deadlines (#96)
emobeany Nov 6, 2018
8d39678
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 6, 2018
0f4b81a
Fixed bugs in select deadline (#98)
emobeany Nov 7, 2018
178bf4b
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 7, 2018
e3e81da
Created new PPP to change filename for jeremyinelysium
JeremyAw Nov 7, 2018
d7862d4
Added AddMilestoneCommandTest
JeremyAw Nov 7, 2018
09654e9
Fixed minor checkstyle issues.
JeremyAw Nov 8, 2018
b2a197f
Added tests for AddMilestoneCommand (#100)
JeremyAw Nov 9, 2018
85372e9
Added AddTagCommand, RemoveTagCommand, SelectTagCommand & Edited Defe…
ChanChunCheong Nov 9, 2018
8d1d37a
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 9, 2018
95bf5ba
Updated Jeremy's name in AboutUs
JeremyAw Nov 9, 2018
a6f002a
Added tests for AddMilestoneCommandParser
JeremyAw Nov 9, 2018
ee9554d
Updated error messages for index and rank
JeremyAw Nov 9, 2018
39c1fd7
Added more tests for AddMilestoneCommandParserTest to test for invali…
JeremyAw Nov 9, 2018
7a14588
Edited AddMilestoneCommand to check for invalid rank in AddMilestoneC…
JeremyAw Nov 9, 2018
df29568
Added more tests for AddMilestoneCommandParserTest
JeremyAw Nov 9, 2018
3b4290b
Fixed minor checkstyle issues.
JeremyAw Nov 9, 2018
6bad0b7
Fixed checkstyle issues by removing trailing whitespace.
JeremyAw Nov 9, 2018
8ee3f3d
Fixed minor checkstyle issues.
JeremyAw Nov 9, 2018
a80321c
Added more tests for AddMilestoneCommandTest
JeremyAw Nov 9, 2018
e2626d1
Fixed minor checkstyle issues.
JeremyAw Nov 9, 2018
c551da7
Added tests for AddMilestoneCommandParser (#102)
JeremyAw Nov 10, 2018
e464a16
Case-insensitive module code
chel-seyy Nov 5, 2018
d4d0070
fix null module codes
chel-seyy Nov 10, 2018
403e02f
Added parser tests for completing task
chel-seyy Nov 10, 2018
f4485df
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 10, 2018
73a5f21
More tests for xml storage
chel-seyy Nov 10, 2018
820cc48
Removed browser panel
chel-seyy Nov 10, 2018
e0e9817
Merge branch 'master' of https://github.com/chelseyong/addressbook-le…
chel-seyy Nov 10, 2018
ed768fc
Updated app name
chel-seyy Nov 10, 2018
726ce2f
Updated tests for AddMilestoneCommandTest and added TypicalMilestones
JeremyAw Nov 10, 2018
41ac394
Added tests for MilestoneTest
JeremyAw Nov 10, 2018
f732ce1
Added more tests for milestones (#108)
JeremyAw Nov 10, 2018
ebdeb62
App name updated + more parser & storage tests: Merged #107 from chel…
chel-seyy Nov 10, 2018
5c2cf3c
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 10, 2018
73b9d9d
Added more tests for AddMilestoneCommandTest
JeremyAw Nov 10, 2018
ff51e29
Added tests for EditTaskCommand
emobeany Nov 10, 2018
c4c07ee
Updated UG for add_milestone command
JeremyAw Nov 10, 2018
50744fa
Fixed minor errors in UG
JeremyAw Nov 10, 2018
2141e33
Updated major enhancement for Jeremy's PPP
JeremyAw Nov 10, 2018
4ce30b5
Described the add_milestone feature with details regarding Rank
JeremyAw Nov 10, 2018
87c432c
Added undo redo tests for EditTaskCommand
emobeany Nov 10, 2018
4997bd8
Added EditTaskCommandParser Tests
emobeany Nov 10, 2018
7454fa6
Minor adjustments to author
emobeany Nov 10, 2018
79d315b
Added more tests for AddMilestoneCommandTest & Updated UG (#109)
JeremyAw Nov 11, 2018
9a9d7b1
Fixed duplicate task exception test for editTaskCommand
emobeany Nov 11, 2018
38815cc
Fixed checkstyle issue
emobeany Nov 11, 2018
495d933
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 11, 2018
0ee9d26
Merged conflicts
chel-seyy Nov 11, 2018
77b28cc
Merge branch 'emobeany-milestone1.4EditTaskTests'
chel-seyy Nov 11, 2018
2a586ca
reconfigured reposense
chel-seyy Nov 11, 2018
033695e
Fixed images and warning formatting for add_milestone feature
JeremyAw Nov 11, 2018
1f640a2
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 11, 2018
ccc45f8
Updated Introduction section of UG
JeremyAw Nov 11, 2018
d4cd09b
Updated Jeremy's PPP
JeremyAw Nov 11, 2018
1cef942
Fixed AddMilestoneCommandTest for invalidIndex
JeremyAw Nov 11, 2018
0422287
Fixed tests
chel-seyy Nov 11, 2018
e092bdb
Checkstyle fixes (#113)
chel-seyy Nov 11, 2018
b5616fc
Removed redundant code in AddMilestoneCommand
JeremyAw Nov 11, 2018
5662758
Updated Summary of Contributions for Jeremy's PPP
JeremyAw Nov 11, 2018
d7d0cb6
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
JeremyAw Nov 11, 2018
c75ab8c
Merge pull request #111 from JeremyInElysium/v1.3_Jeremy
JeremyAw Nov 11, 2018
8833395
UG: Fixed image proportions for add_milestone
JeremyAw Nov 11, 2018
af761b6
Rectified some storage bugs
chel-seyy Nov 11, 2018
86e5b01
Made more changes for Jeremy's PPP
JeremyAw Nov 11, 2018
6f19a5f
Updated to include link to Jeremy's PPP
JeremyAw Nov 11, 2018
59d99b9
Updated error message to be in sync with the one shown in the UG
JeremyAw Nov 11, 2018
0d0acc0
Revised definition of add_milestone feature
JeremyAw Nov 11, 2018
40a35dd
Gave more examples for add_milestone in UG
JeremyAw Nov 11, 2018
9079783
Added v2.0 feature in continuation of add_milestone feature
JeremyAw Nov 11, 2018
36ebce9
Added FAQ for add_milestone feature in UG and updated Jeremy's PPP to…
JeremyAw Nov 11, 2018
dc45bf9
Merge pull request #114 from JeremyInElysium/v1.3_Jeremy
JeremyAw Nov 11, 2018
56c20c1
Adjusted flow of UG and DG to be more user friendly
emobeany Nov 11, 2018
28d1343
Solved DeferDeadline & Tag bugs. Added Test Cases. (#106)
ChanChunCheong Nov 11, 2018
32ca1b4
Updated UG/Dg, added personal portfolio. Solved deferdeadline bug (#118)
ChanChunCheong Nov 12, 2018
38cb9ef
Updated UG and DG and PPP for Ks (#117)
emobeany Nov 12, 2018
faf88ac
Updated UGDG and PPP (#116)
JeremyAw Nov 12, 2018
3a29313
Removed print lines
chel-seyy Nov 12, 2018
088a046
Added in manual testing test cases
emobeany Nov 12, 2018
6f1c594
Minor adjustments to UG and PPP
emobeany Nov 12, 2018
897f095
Minor adjustments to formatting in UG and DG
emobeany Nov 12, 2018
f3b567f
Documentation edited to fit 10 page of PPP
emobeany Nov 12, 2018
39e1a10
Merge pull request #120 from emobeany/DocumentationModifications
chel-seyy Nov 12, 2018
3d46f46
Minor fixes for documentation (#119)
JeremyAw Nov 12, 2018
b2a7d37
Changed UI pic
chel-seyy Nov 12, 2018
6f08720
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main
chel-seyy Nov 12, 2018
84e8a50
edited PPP, UG/DG (#121)
ChanChunCheong Nov 12, 2018
fa60828
Portfolio updated
chel-seyy Nov 12, 2018
3c07d09
merged conflicts
chel-seyy Nov 12, 2018
e0ddafd
fix broken links in aboutus
chel-seyy Nov 12, 2018
ec2772a
Reposense edit
ChanChunCheong Nov 15, 2018
e7635ee
Merge pull request #125 from ChanChunCheong/newbranch
ChanChunCheong Nov 15, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lib/*
*.log
*.log.*
*.csv
config.json
/config.json
src/test/data/sandbox/
preferences.json
.DS_Store
Expand All @@ -17,4 +17,5 @@ classes/
/data/
/bin/
src/main/resources/docs/
src/main/resources/HelpWindow.html
out/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

script: >-
./config/travis/run-checks.sh &&
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless nonGuiTests coverage coveralls asciidoctor

deploy:
skip_cleanup: true
Expand Down
20 changes: 8 additions & 12 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Address Book (Level 4)
= Task Book
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://travis-ci.org/CS2113-AY1819S1-W13-3/main[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
Expand All @@ -15,26 +15,22 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop Task Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is an app for busy students to *manage their daily tasks* and ultimately, *lead a more productive life*.
* If you can type fast, TB can get your management of tasks done *faster than traditional paper notebooks or a mobile application*.


== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Some parts of this sample application were inspired by the excellent https://github.com/se-edu/addressbook-level4[Address Book (Level 4)] by
_se-edu_.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
Expand Down
28 changes: 28 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"formats": ["java", "fxml", "adoc"],
"authors":
[
{
"githubId": "Jeremyinelysium",
"displayName": "AW ...HEN",
"authorNames": ["Jeremyinelysium", "Jeremy Aw", "Aw Meng Shen"]
},
{
"githubId": "emobeany",
"displayName": "BEH...SIM",
"authorNames": ["emobeany", "Kha Sim"]
},
{
"githubId": "ChanChunCheong",
"displayName": "CHA...ONG",
"authorNames": ["ChanChunCheong", "DESKTOP-UO2M0FH\\chanc"]
},
{
"githubId": "chelseyong",
"displayName": "CHE...HEE",
"authorNames": ["chelseyong"]
}
]


}
27 changes: 12 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'taskbook.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -116,17 +116,17 @@ tasks.coveralls {
onlyIf { System.env.'CI' }
}

task(guiTests)
//task(guiTests)
task(nonGuiTests)

// Run `test` task if `guiTests` or `nonGuiTests` is specified
guiTests.dependsOn test
//guiTests.dependsOn test
nonGuiTests.dependsOn test

task(allTests)

// `allTests` implies both `guiTests` and `nonGuiTests`
allTests.dependsOn guiTests
//allTests.dependsOn guiTests
allTests.dependsOn nonGuiTests

test {
Expand All @@ -148,26 +148,27 @@ test {
}

doFirst {
boolean runGuiTests = gradle.taskGraph.hasTask(guiTests)
// boolean runGuiTests = gradle.taskGraph.hasTask(guiTests)
boolean runNonGuiTests = gradle.taskGraph.hasTask(nonGuiTests)

if (!runGuiTests && !runNonGuiTests) {
runGuiTests = true
if (!runNonGuiTests) {
//!runGuiTests &&
// runGuiTests = true
runNonGuiTests = true
}

if (runNonGuiTests) {
test.include 'seedu/address/**'
}

if (runGuiTests) {
/*if (runGuiTests) {
test.include 'systemtests/**'
test.include 'seedu/address/ui/**'
}

if (!runGuiTests) {
test.exclude 'seedu/address/ui/**'
}
}*/
}
}

Expand Down Expand Up @@ -207,8 +208,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-name': 'TaskBook',
'site-githuburl': 'https://github.com/CS2113-AY1819S1-W13-3/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down Expand Up @@ -236,10 +237,6 @@ task deployOfflineDocs(type: Copy) {
}
}

task copyDummySearchPage(type: Copy) {
from 'docs/DummySearchPage.html'
into "${buildDir}/docs/html5"
}

deployOfflineDocs.dependsOn asciidoctor
processResources.dependsOn deployOfflineDocs
Expand Down
Loading