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

Porting Tasks branch to Master branch #78

Closed
wants to merge 109 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
7f8cd8e
Modified readMe and aboutUs pages
chel-seyy Sep 17, 2018
aa283cf
Minor changes in readMe + aboutUs
chel-seyy Sep 17, 2018
86a4cdc
Updated UG and DG for addTask + addDeadline
chel-seyy Sep 20, 2018
1a9c0eb
Merge pull request #1 from chelseyong/master (UG & DG)
chel-seyy Sep 22, 2018
361031b
Modified aboutUs page: Ks
emobeany Sep 26, 2018
caa9970
Updated UG and DG for viewDate + selectDate
emobeany Sep 26, 2018
f998030
Updated Jeremy's profile on AboutUs.adoc
JeremyAw Sep 26, 2018
fd217c0
Updated UG and DG for viewDate + selectDate (#2)
emobeany Sep 26, 2018
4a50798
Commands to understand things better (CC)
ChanChunCheong Sep 26, 2018
7d8edfb
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
ChanChunCheong Sep 26, 2018
066fbea
changed github account link
ChanChunCheong Sep 26, 2018
f785bdb
Merge branch 'CC'
ChanChunCheong Sep 26, 2018
872ba67
About us - Chan Chun Cheong
ChanChunCheong Sep 26, 2018
51d2f4e
Profile Picture
ChanChunCheong Sep 26, 2018
762993d
Delete profile picture.jpeg
ChanChunCheong Sep 26, 2018
b478ae8
ChanChunCheong
ChanChunCheong Sep 26, 2018
fe336f5
Edited About Us to enable the picture
ChanChunCheong Sep 26, 2018
89c1ac3
Edited the User Guide
ChanChunCheong Sep 26, 2018
3586e92
Edited the developer guide
ChanChunCheong Sep 26, 2018
fb43601
corrected developer guide
ChanChunCheong Sep 26, 2018
83d1e5e
Added user stories
ChanChunCheong 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
d1e26a5
Resolved conflicts after syncing fork
chel-seyy Sep 27, 2018
74e1692
Added new feature: defer deadline
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
680ab2e
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/main
ChanChunCheong Sep 29, 2018
6b605ef
Solved Merged conflict
ChanChunCheong Sep 29, 2018
161a811
edited the developer guide
ChanChunCheong Sep 29, 2018
bb8d513
edited developers guide again to solve merge conflict
ChanChunCheong 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
75e3b55
Renamed AddressBook to TaskBook
chel-seyy Oct 3, 2018
66ac1f8
Added Tasks + AddTask with some refactoring, still have errors in bui…
chel-seyy Oct 5, 2018
bf3566f
Added PriorityLevel into Task
chel-seyy Oct 5, 2018
9563a04
Merge branch 'tasks' into tasks
chel-seyy Oct 5, 2018
ed37435
Merge pull request #17 from chelseyong/tasks
chel-seyy Oct 5, 2018
3279428
Added Complete Task feature w/o tests
chel-seyy Oct 6, 2018
3d68cce
Changed profile pics to png format
chel-seyy Oct 7, 2018
78bfc62
Merge branch 'tasks' of https://github.com/CS2113-AY1819S1-W13-3/main…
JeremyAw Oct 8, 2018
6b4d651
Merge branch 'master' of https://github.com/CS2113-AY1819S1-W13-3/mai…
emobeany Oct 8, 2018
a3334e3
Merge branch 'tasks' of https://github.com/CS2113-AY1819S1-W13-3/main…
emobeany Oct 8, 2018
30a309d
Added Deadline class + minor edits to License
emobeany Oct 9, 2018
2e2fe18
Merge branch 'tasks' of https://github.com/CS2113-AY1819S1-W13-3/main…
ChanChunCheong Oct 9, 2018
a0e71d4
Added new "AddMilestoneCommand" feature for TaskBook
JeremyAw Oct 9, 2018
ac095fa
Added Milestone as a subclass of Task
JeremyAw Oct 9, 2018
38cf461
Copied Khasim's Deadline class and teach the app to accept 'remark' b…
ChanChunCheong Oct 9, 2018
fdccd91
Teach the app to accept 'defer deadline' but do nothing (include test…
ChanChunCheong Oct 9, 2018
6fe583d
Refactored testutils and added unit tests for AddTaskCommand
chel-seyy Oct 12, 2018
019ac83
Most of the project is able to build with UI. HelpWindow is buggy.
chel-seyy Oct 13, 2018
e7f645b
Modified UI to show Tasks in cardview
chel-seyy Oct 13, 2018
153ade6
Fixed CompleteTaskCommand + Added CommandParser interface for TaskBoo…
chel-seyy Oct 13, 2018
0b926ad
Fixed checkstyle issues by adding a space before the {
JeremyAw Oct 13, 2018
1c741f2
Merge branch 'tasks' of https://github.com/chelseyong/addressbook-lev…
chel-seyy Oct 14, 2018
d0e5869
Updated Milestone class by changing name of Order to Rank instead
JeremyAw Oct 14, 2018
afa9747
Tests modified, incomplete
chel-seyy Oct 14, 2018
3f1e36c
Added @@author tag for JeremyInElysium
JeremyAw Oct 15, 2018
4e2ab5f
Added SelectDeadline
emobeany Oct 15, 2018
0d435db
Merge branch 'master' into tasks
chel-seyy Oct 15, 2018
b34f562
Merge pull request #1 from chelseyong/tasks
chel-seyy Oct 15, 2018
85accd2
Merge pull request #25 from chelseyong/master
chel-seyy Oct 15, 2018
a37293d
Merge branch 'tasks' into milestone(Ks)
chel-seyy Oct 15, 2018
0fe3fe7
Completed AddMilestoneCommand for v1.2 (add a single milestone only)
JeremyAw Oct 15, 2018
07685aa
Updated UG Command Summary and Features to include add_milestone feature
JeremyAw Oct 15, 2018
7301cb2
Fixed checkstyles issues & removed checkstyleTest from travis check
chel-seyy Oct 16, 2018
4265ac9
Merge pull request #28 from chelseyong/master
chel-seyy Oct 16, 2018
e4ed764
Merge branch 'tasks' into milestone(Ks)
chel-seyy Oct 16, 2018
4e98293
Merge pull request #23 from emobeany/milestone(Ks)
chel-seyy Oct 16, 2018
9ae90f9
Merge branch 'tasks' into milestone_feature
chel-seyy Oct 16, 2018
43f2558
Merge pull request #20 from JeremyInElysium/milestone_feature
chel-seyy Oct 16, 2018
3c21ab4
Modified Jeremy & Kha Sim's code & Moved some folders
chel-seyy Oct 16, 2018
3d3d6b9
Added comments for better understanding.
ChanChunCheong Oct 16, 2018
77ea979
Merge branch 'tasks' of https://github.com/CS2113-AY1819S1-W13-3/main…
ChanChunCheong Oct 16, 2018
3924d44
prevent changes in taskbook parser
ChanChunCheong Oct 16, 2018
6e38bd2
With the unrefactored folders + Modified changes for SelectDeadline &…
chel-seyy Oct 16, 2018
add3c73
Merge pull request #33 from chelseyong/folders-intact
chel-seyy Oct 16, 2018
c0914af
Trying to resolve Eof error
chel-seyy Oct 16, 2018
2e79494
Trying to resolve Eof error + some DG changes
chel-seyy Oct 16, 2018
b64595d
Merge pull request #34 from chelseyong/folders-intact
chel-seyy Oct 16, 2018
553759b
Fixed checkstyle and moved main/java/../unrefactored folder
chel-seyy Oct 16, 2018
37d1e68
Displayed invalid command format. Attempted to modify the model compo…
ChanChunCheong Oct 16, 2018
1023862
Implemented deferdeadline and changes is reflected on UI
ChanChunCheong Oct 16, 2018
f82d25e
Merge branch 'tasks' into MileStoneV1.2
chel-seyy Oct 16, 2018
e4e7b46
updated UGDG
ChanChunCheong Oct 16, 2018
4d1b407
Merge branch 'MileStoneV1.2' of https://github.com/ChanChunCheong/mai…
ChanChunCheong Oct 16, 2018
b102488
solved
ChanChunCheong Oct 16, 2018
3bb8b9c
Merge pull request #36 from chelseyong/merging-to-master
chel-seyy Oct 16, 2018
2a555ef
Merge branch 'tasks' into MileStoneV1.2
chel-seyy Oct 16, 2018
25c586b
0 Checkstyle errors
chel-seyy Oct 16, 2018
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
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 headless nonGuiTests coverage coveralls asciidoctor

deploy:
skip_cleanup: true
Expand Down
24 changes: 10 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,40 +1,36 @@
= 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]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
image::docs/images/Ui.JPG[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/Ui.JPG[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
21 changes: 9 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
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 @@ -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
44 changes: 18 additions & 26 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,45 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
Task Book was developed by the team. +
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Chelsey Ong
image::chelseyong.png[width="150", align="left"]
{empty} [https://github.com/chelseyong[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Responsibilities: Deadline & Task features

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Jeremy Aw
image::jeremyaw.png[width="150", align="left"]
{empty}[http://github.com/jeremyinelysium[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Deadline features

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Beh Kha Sim
image::behkhasim.png[width="150", align="left"]
{empty}[https://github.com/emobeany[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Date features

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Chan Chun Cheong
image::ChanChunCheong.png[width="150", align="left"]
{empty}[https://github.com/ChanChunCheong[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Task features

'''

Loading