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

Added Snooze function #69

Open
wants to merge 560 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
560 commits
Select commit Hold shift + click to select a range
f259649
Merge pull request #97 from calebtay/master
calebtay Oct 25, 2019
14f5a0b
Added comments for sorting function
calebtay Oct 25, 2019
b9af90e
Merge pull request #98 from calebtay/master
calebtay Oct 25, 2019
4e343b0
further modularization of methods in TaskCreator.java
Oct 26, 2019
e17dc88
add function to update tasks
Oct 26, 2019
1f78c02
Merge branch 'master' into master
benitokun123 Oct 26, 2019
566d493
Merge pull request #100 from benitokun123/master
benitokun123 Oct 26, 2019
2984def
Merge pull request #15 from AY1920S1-CS2113T-F14-3/master
benitokun123 Oct 26, 2019
b581827
Merge pull request #20 from AY1920S1-CS2113T-F14-3/master
calebtay Oct 27, 2019
4ea4b62
add function to create and write log files
Oct 27, 2019
1e16fce
Merge pull request #102 from benitokun123/master
benitokun123 Oct 27, 2019
b5dc003
add logs folder
Oct 27, 2019
95f11ff
Merge pull request #103 from benitokun123/master
benitokun123 Oct 27, 2019
5564929
Create log1
benitokun123 Oct 27, 2019
ebfd81f
Delete log1
benitokun123 Oct 27, 2019
2459953
add auto generate logs folder
Oct 28, 2019
23bce6e
Merge pull request #104 from benitokun123/master
benitokun123 Oct 28, 2019
1b496bf
Merge pull request #18 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Oct 29, 2019
f2147c4
added tests
TehZiHuai Oct 29, 2019
b9ded9d
Merge pull request #105 from TehZiHuai/master
TehZiHuai Oct 29, 2019
e589cff
Nil
calebtay Oct 29, 2019
514eb49
Merge pull request #21 from AY1920S1-CS2113T-F14-3/master
calebtay Oct 29, 2019
5df4943
Merge branch 'master' of https://github.com/calebtay/main
calebtay Oct 29, 2019
e1ba2e6
delete old tests
Oct 29, 2019
f821883
Add files via upload
benitokun123 Oct 29, 2019
dccb436
Merge pull request #16 from AY1920S1-CS2113T-F14-3/master
benitokun123 Oct 29, 2019
c4918f5
updated tests for taskcreator
TehZiHuai Oct 29, 2019
821005c
Merge pull request #106 from TehZiHuai/master
TehZiHuai Oct 29, 2019
fbda534
Added CheckAnomalyTest & test.txt
calebtay Oct 29, 2019
7836cf2
Merge pull request #107 from calebtay/master
calebtay Oct 29, 2019
14df2cb
Merge pull request #19 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Oct 29, 2019
e6d2391
Merge pull request #15 from AY1920S1-CS2113T-F14-3/master
tyeryan Oct 29, 2019
9ef614e
updated CheckAnomalyTest and TaskCreatorTest
TehZiHuai Oct 29, 2019
348a43d
Added Test Code for Leave and Progress bar class
tyeryan Oct 29, 2019
ed25282
Merge pull request #108 from TehZiHuai/master
tyeryan Oct 29, 2019
e34189d
Merge pull request #22 from AY1920S1-CS2113T-F14-3/master
calebtay Oct 29, 2019
37433a1
Added subTaskCreatorTest
calebtay Oct 29, 2019
7211684
Merge remote-tracking branch 'origin/master'
calebtay Oct 29, 2019
471ffb1
Merge pull request #110 from calebtay/master
calebtay Oct 29, 2019
77e6464
Added new UI pic
calebtay Oct 29, 2019
86d60af
Merge pull request #111 from calebtay/master
calebtay Oct 29, 2019
a348aa0
Added new UI pic
calebtay Oct 29, 2019
6ca77ff
Merge pull request #112 from calebtay/master
calebtay Oct 29, 2019
fc514db
updated 30/10
tyeryan Oct 29, 2019
97be87c
Updated the help page
tyeryan Oct 29, 2019
f22faaf
Merge pull request #20 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Oct 30, 2019
90d38b1
deconflict of code
TehZiHuai Oct 30, 2019
afa448f
Merge pull request #113 from TehZiHuai/master
TehZiHuai Oct 30, 2019
42376ef
Merge pull request #109 from tyeryan/master
TehZiHuai Oct 30, 2019
848e1b5
Merge pull request #16 from AY1920S1-CS2113T-F14-3/master
tyeryan Oct 30, 2019
629b775
Merge remote-tracking branch 'origin/master'
tyeryan Oct 30, 2019
a4db317
abstraction of list subroutine
TehZiHuai Oct 30, 2019
a1b96d3
Merge pull request #114 from TehZiHuai/master
TehZiHuai Oct 30, 2019
b383d74
Merge pull request #23 from AY1920S1-CS2113T-F14-3/master
calebtay Oct 30, 2019
7da1ecb
Nil
calebtay Oct 30, 2019
0018619
Merge branch 'master' of https://github.com/calebtay/main
calebtay Oct 30, 2019
5f959d9
Fixed sorting bug
calebtay Oct 30, 2019
117eac7
Merge pull request #115 from calebtay/master
calebtay Oct 30, 2019
a7d8e17
Merge pull request #21 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Oct 30, 2019
acafab8
Updated UI help
tyeryan Oct 30, 2019
0638573
Minor changes to javadoc comments
tyeryan Oct 30, 2019
20c3b81
Merge branch 'master' into master
tyeryan Oct 30, 2019
c0985d5
Merge pull request #116 from tyeryan/master
tyeryan Oct 30, 2019
4c1572e
Merge branch 'master' into master
benitokun123 Oct 31, 2019
7e9c05a
Merge pull request #17 from AY1920S1-CS2113T-F14-3/master
benitokun123 Oct 31, 2019
a4800ba
update "update" function
Oct 31, 2019
4c4fbff
Merge branch 'master' of https://github.com/benitokun123/main
Oct 31, 2019
a0da30f
Refine TaskListTest.java and add test for snooze
Oct 31, 2019
0c62a13
Merge pull request #117 from benitokun123/master
benitokun123 Oct 31, 2019
23524b3
Merge pull request #22 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Oct 31, 2019
c6cd017
minor change to reorder help
TehZiHuai Oct 31, 2019
b8bda0a
added and checked javadocs
TehZiHuai Oct 31, 2019
3621d85
Merge pull request #118 from TehZiHuai/master
TehZiHuai Oct 31, 2019
3a692d2
v1.3 release
TehZiHuai Oct 31, 2019
aef3384
Merge pull request #119 from TehZiHuai/master
TehZiHuai Oct 31, 2019
0a67332
add updateTask test for TaskCreatorTest.java
Oct 31, 2019
d52104e
Merge pull request #120 from benitokun123/master
benitokun123 Oct 31, 2019
af28b74
Merge pull request #18 from AY1920S1-CS2113T-F14-3/master
benitokun123 Oct 31, 2019
33d5648
Added test code for storage
tyeryan Oct 31, 2019
d99dd52
Merge remote-tracking branch 'origin/master'
tyeryan Oct 31, 2019
dd9076d
Merge pull request #121 from tyeryan/master
calebtay Oct 31, 2019
6979ca5
minor change to ui for changing sort type
TehZiHuai Oct 31, 2019
7f157de
Merge pull request #23 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Oct 31, 2019
11f5550
Merge branch 'master' of https://github.com/TehZiHuai/main
TehZiHuai Oct 31, 2019
3891fe2
Merge pull request #24 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 1, 2019
ee651de
added UG and DG
TehZiHuai Nov 1, 2019
d1aef42
Merge pull request #125 from TehZiHuai/master
TehZiHuai Nov 1, 2019
f4daed1
update UG
benitokun123 Nov 1, 2019
d67a879
fix UI format and minor subtask
Nov 1, 2019
3103cb7
Merge branch 'master' into master
benitokun123 Nov 1, 2019
099f18a
fix snooze function to not allow negative time value
Nov 1, 2019
762215d
Merge pull request #131 from benitokun123/master
benitokun123 Nov 3, 2019
dd7d60a
fix error: range-based done and delete to accept out-of-bound second …
Nov 3, 2019
5332337
update input processing to only accept one line command
Nov 3, 2019
98143eb
Merge pull request #188 from benitokun123/master
benitokun123 Nov 3, 2019
4f029f3
Merge pull request #25 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 3, 2019
c3d8366
Fixed sorting bug, timeclash bug, detects duplicates for subtask and …
calebtay Nov 4, 2019
6916f6e
Merge pull request #189 from calebtay/master
calebtay Nov 4, 2019
3d3244e
Merge pull request #24 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 4, 2019
98021b5
standardise ui printing of list
TehZiHuai Nov 4, 2019
6723bdd
added new logo
TehZiHuai Nov 4, 2019
cc08467
Set seconds to 0 when inputting tmr
calebtay Nov 4, 2019
8a188cf
Merge pull request #190 from calebtay/master
calebtay Nov 4, 2019
1b9d580
added better exception handling for storage class
TehZiHuai Nov 4, 2019
59b38d4
revert changes in task creator
TehZiHuai Nov 4, 2019
3a25ba3
added sanitisation of inputs for both description, assignee and subtasks
TehZiHuai Nov 4, 2019
6aaeaa7
Merge pull request #191 from TehZiHuai/master
TehZiHuai Nov 4, 2019
9232465
Merge pull request #19 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 4, 2019
b293ac6
Leave cannot be set to done
calebtay Nov 4, 2019
a4f9960
Merge branch 'master' into master
calebtay Nov 4, 2019
fadb408
Merge pull request #192 from calebtay/master
calebtay Nov 4, 2019
b6b6dad
sanitising the inputs for dates
TehZiHuai Nov 4, 2019
59bb174
fix error: accepting negative duration for add and update command
Nov 4, 2019
80a7aeb
Merge pull request #193 from benitokun123/master
benitokun123 Nov 4, 2019
3e489fa
Merge pull request #20 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 4, 2019
3cf45ab
fixed bug in storage on priority
TehZiHuai Nov 4, 2019
82cdef4
Merge pull request #25 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 4, 2019
e4a2167
Merge branch 'master' of https://github.com/TehZiHuai/main
TehZiHuai Nov 4, 2019
75e0395
Merge pull request #194 from TehZiHuai/master
TehZiHuai Nov 4, 2019
7f6f6fe
Merge pull request #18 from AY1920S1-CS2113T-F14-3/master
tyeryan Nov 4, 2019
54a8288
Merge pull request #26 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 4, 2019
c2f0516
Added overdue list and updated progress bar
tyeryan Nov 4, 2019
fc21bf1
Merge pull request #195 from tyeryan/master
tyeryan Nov 4, 2019
ee96bca
Fixed double list shown bug
calebtay Nov 4, 2019
37f7e8e
Merge pull request #196 from calebtay/master
calebtay Nov 4, 2019
73d1559
List shows priority
calebtay Nov 4, 2019
11f9f2b
Merge branch 'master' into master
calebtay Nov 4, 2019
208138b
Merge pull request #26 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 5, 2019
98055d2
Merge pull request #197 from calebtay/master
benitokun123 Nov 5, 2019
e4af35b
Merge pull request #21 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 5, 2019
07765de
fix error: adding or update a task accept invalid date or time
Nov 5, 2019
48118ad
Merge pull request #198 from benitokun123/master
benitokun123 Nov 5, 2019
3366a58
Fixed Leave Dates bug
tyeryan Nov 5, 2019
3275a10
Merge branch 'master' into master
tyeryan Nov 5, 2019
f8f19f0
Merge pull request #199 from tyeryan/master
tyeryan Nov 5, 2019
030be7d
Shows restore list when attempting to restore tasks
tyeryan Nov 6, 2019
7b05494
Merge remote-tracking branch 'origin/master'
tyeryan Nov 6, 2019
77cb9c4
Merge pull request #200 from tyeryan/master
tyeryan Nov 6, 2019
f5c3393
Merge pull request #19 from AY1920S1-CS2113T-F14-3/master
tyeryan Nov 6, 2019
7c1ba11
Printing out tasks twice
tyeryan Nov 6, 2019
ccda195
Merge pull request #201 from tyeryan/master
tyeryan Nov 6, 2019
759c471
Revert "Printing out tasks twice "
tyeryan Nov 6, 2019
b8b0619
Merge pull request #202 from AY1920S1-CS2113T-F14-3/revert-201-master
tyeryan Nov 6, 2019
e01c844
Printing tasks twice
tyeryan Nov 6, 2019
0830c8a
Merge branch 'master' into master
tyeryan Nov 6, 2019
3c9c0b0
Merge pull request #203 from tyeryan/master
tyeryan Nov 6, 2019
45e0559
Added rescheduling for overdued tasks
tyeryan Nov 6, 2019
56f92b2
Merge pull request #27 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 6, 2019
018a510
Merge branch 'master' into master
tyeryan Nov 6, 2019
875fc25
Merge pull request #204 from tyeryan/master
tyeryan Nov 6, 2019
e7a283d
Merge pull request #20 from AY1920S1-CS2113T-F14-3/master
tyeryan Nov 6, 2019
b4771c7
Merge pull request #28 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 6, 2019
7b34c26
Updated help page
tyeryan Nov 6, 2019
d0a936a
Changed overdue tasks
tyeryan Nov 6, 2019
d124460
Merge pull request #205 from tyeryan/master
tyeryan Nov 6, 2019
26c7fe3
changed checking of tasks for duplicates and clashes
TehZiHuai Nov 6, 2019
92f182c
Merge pull request #29 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 6, 2019
449db90
Merge branch 'master' of https://github.com/TehZiHuai/main
TehZiHuai Nov 6, 2019
57629af
added more robustness to checkDuplicates()
TehZiHuai Nov 6, 2019
40c1330
Merge pull request #206 from TehZiHuai/master
TehZiHuai Nov 6, 2019
018f793
Merge pull request #22 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 6, 2019
05a4ed0
Merge pull request #27 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 6, 2019
fc23022
Changed the order of the 'help' list to tally with the UG
calebtay Nov 6, 2019
686849e
Merge pull request #207 from calebtay/master
calebtay Nov 6, 2019
32617be
Merge pull request #30 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 6, 2019
8d249e4
added list by tags
TehZiHuai Nov 6, 2019
501af97
bug fix on logic in calculation for completed task percentages based …
TehZiHuai Nov 6, 2019
d317acc
Merge pull request #208 from TehZiHuai/master
TehZiHuai Nov 6, 2019
a7cd926
added viewing for deleted tasks
TehZiHuai Nov 6, 2019
9cf05b5
Merge pull request #209 from TehZiHuai/master
TehZiHuai Nov 6, 2019
beb2ce3
bug fix on friendly date formats
TehZiHuai Nov 7, 2019
be4ef02
showing deleted list will no longer need new command. leave can have …
TehZiHuai Nov 7, 2019
a10183d
Merge pull request #210 from TehZiHuai/master
TehZiHuai Nov 7, 2019
51a9b51
Updated overdue and automatic removal of leave
tyeryan Nov 7, 2019
97c505c
Merge branch 'master' into master
tyeryan Nov 7, 2019
d6bf73c
Merge pull request #211 from tyeryan/master
tyeryan Nov 7, 2019
699c16b
Merge pull request #31 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 7, 2019
34b220b
fixed bug in leave checking
TehZiHuai Nov 7, 2019
c5af6a1
Merge pull request #212 from TehZiHuai/master
TehZiHuai Nov 7, 2019
17fa573
new implementation of overdue list checking
TehZiHuai Nov 7, 2019
52c8c75
Merge pull request #213 from TehZiHuai/master
TehZiHuai Nov 7, 2019
eb4eaa1
Merge pull request #21 from AY1920S1-CS2113T-F14-3/master
tyeryan Nov 8, 2019
4c05c07
Merge pull request #23 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 8, 2019
8f3dd7a
Added sort type
calebtay Nov 8, 2019
c98ff98
Merge pull request #28 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 8, 2019
a8d8d76
Merge branch 'master' of https://github.com/calebtay/main
calebtay Nov 8, 2019
598f485
Merge pull request #215 from calebtay/master
calebtay Nov 8, 2019
70b2af8
Merge pull request #32 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 8, 2019
47096e4
Need to make new exception class
calebtay Nov 8, 2019
3705f51
Added the ability to complete subtasks
calebtay Nov 8, 2019
442e87e
Changed the order of the 'help' list to tally with the UG
calebtay Nov 8, 2019
6e54d6a
Merge branch 'master' of https://github.com/calebtay/main
calebtay Nov 8, 2019
ad80473
Prints task number when anomaly detected
calebtay Nov 8, 2019
5b63940
Merge pull request #221 from calebtay/master
calebtay Nov 8, 2019
98cd341
Added documentation
calebtay Nov 8, 2019
ba9c5a9
Merge pull request #222 from calebtay/master
calebtay Nov 8, 2019
cf82632
Merge pull request #24 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 9, 2019
179a24c
no message
Nov 9, 2019
e0a982d
Merge branch 'master' of https://github.com/benitokun123/main
Nov 9, 2019
f5473bc
Merge pull request #22 from AY1920S1-CS2113T-F14-3/master
tyeryan Nov 9, 2019
5e3b9bd
Auto deletion of leave tasks, re add completed task
tyeryan Nov 9, 2019
ebbe23c
bug fix for update
tyeryan Nov 9, 2019
708bdcb
Merge pull request #223 from tyeryan/master
tyeryan Nov 9, 2019
a53e102
Merge pull request #224 from tyeryan/master
tyeryan Nov 9, 2019
6e04615
Merge pull request #33 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 9, 2019
5e4a406
Merge pull request #25 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 9, 2019
a803b9c
clean up RoomShare.java code
Nov 9, 2019
84fd2a3
Merge branch 'master' of https://github.com/benitokun123/main
Nov 9, 2019
f8deb2c
added reopen function
TehZiHuai Nov 9, 2019
f190f5d
Merge pull request #225 from TehZiHuai/master
TehZiHuai Nov 9, 2019
741bf8e
added robustness for the update function
TehZiHuai Nov 9, 2019
9b6f811
Merge pull request #226 from TehZiHuai/master
TehZiHuai Nov 9, 2019
7e65005
fixed minor subtask errors in casting
TehZiHuai Nov 9, 2019
a8db808
checkstyle adjustments
TehZiHuai Nov 9, 2019
8d4e3f8
Merge pull request #227 from TehZiHuai/master
TehZiHuai Nov 9, 2019
8a072d2
Fix done subtask error and clean up RoomShare.java code
Nov 10, 2019
1113fad
Merge branch 'master' into master
benitokun123 Nov 10, 2019
b96b379
Merge pull request #26 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 10, 2019
aadcd8a
Merge pull request #228 from benitokun123/master
benitokun123 Nov 10, 2019
774430d
Merge pull request #29 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 10, 2019
c1f3266
fix index out of bound error for reopen command
Nov 10, 2019
b32a3d6
clean up checkstyle and deleted unused enums
Nov 10, 2019
6a443cd
Merge pull request #229 from benitokun123/master
benitokun123 Nov 10, 2019
5639911
edited the help functions, added range based rescheduling
tyeryan Nov 10, 2019
03b24ee
Merge branch 'master' into master
tyeryan Nov 10, 2019
c5986ef
Merge pull request #230 from tyeryan/master
tyeryan Nov 10, 2019
27042c4
Merge pull request #34 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 10, 2019
979877e
ui fix on show command
TehZiHuai Nov 10, 2019
75de2ea
bugfix in logic of CheckDuplicatesOverdue
TehZiHuai Nov 10, 2019
36b9440
Merge pull request #231 from TehZiHuai/master
TehZiHuai Nov 10, 2019
9638418
Merge pull request #30 from AY1920S1-CS2113T-F14-3/master
calebtay Nov 10, 2019
b6a673e
Reordered help list
calebtay Nov 10, 2019
2a008bb
Merge pull request #232 from calebtay/master
calebtay Nov 10, 2019
d8875f1
Merge pull request #35 from AY1920S1-CS2113T-F14-3/master
TehZiHuai Nov 10, 2019
e967ad8
Add files via upload
TehZiHuai Nov 10, 2019
e8c7c71
Delete TehZiHuai.png
TehZiHuai Nov 10, 2019
c521421
added Ui.png
TehZiHuai Nov 10, 2019
b71a47a
Delete Ui.PNG
TehZiHuai Nov 10, 2019
0d8fc5f
added Ui.png
TehZiHuai Nov 10, 2019
dde2f8d
style enforcing, bug fix on checkAnomaly
TehZiHuai Nov 11, 2019
cfd337c
Merge branch 'master' of https://github.com/TehZiHuai/main
TehZiHuai Nov 11, 2019
5f48424
Merge pull request #235 from TehZiHuai/master
TehZiHuai Nov 11, 2019
42ba536
improved accuracy of descriptions in help
TehZiHuai Nov 11, 2019
b504cda
Merge pull request #236 from TehZiHuai/master
TehZiHuai Nov 11, 2019
b66dac4
Merge pull request #27 from AY1920S1-CS2113T-F14-3/master
benitokun123 Nov 11, 2019
c9f8f0b
update help menu and structure with color coded texts
Feb 5, 2020
7557062
Implement single flag when adding a new task
Feb 6, 2020
7dec4e6
update list routine for better visualization
Feb 6, 2020
d0ca5d6
finished implementing single flag input
Feb 6, 2020
abebb04
added color code for different priority
Feb 6, 2020
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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ src/main/resources/docs/
.DS_Store
*.iml
bin/

#data files from program
/data.txt/
data.txt
/recurringData.txt/
recurringData.txt
/overdue.txt
47 changes: 13 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,18 @@
# Setting up
# ROOMSHARE - Your friendly personal assistant

**Prerequisites**
---
## Introduction

* JDK 11
* Recommended: IntelliJ IDE
* Fork this repo to your GitHub account and clone the fork to your computer
* RoomShare is personal assistant software in the form of Command Line Interface (CLI). It is designed for you to keep track of your daily tasks and other people sharing your house or apartment. With RoomShare, your can group your tasks into different categories, assign their priorities, mark tasks to be informed to your housemates and many other functions.

**Importing the project into IntelliJ**
![](https://github.com/AY1920S1-CS2113T-F14-3/main/blob/master/RoomShareUI.png)

1. Open IntelliJ (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project dialog first).
1. Set up the correct JDK version.
* Click `Configure` > `Structure for new Projects` (in older versions of Intellij:`Configure` > `Project Defaults` > `Project Structure`).
* If JDK 11 is listed in the drop down, select it. If it is not, click `New...` and select the directory where you installed JDK 11.
* Click `OK`.
1. Click `Import Project`.
1. Locate the project directory and click `OK`.
1. Select `Create project from existing sources` and click `Next`.
1. Rename the project if you want. Click `Next`.
1. Ensure that your src folder is checked. Keep clicking `Next`.
1. Click `Finish`.
## Features
* Roomshare allows you to add tasks into a task list, and track their progress.
* Supports adding and deleting tasks
* RoomShare will also help to check if some of your time sensitive tasks have overlap, to prevent you from scheduling clashing events
* Look for tasks with the in built search
* Once you're done with the task, just mark it as done!
* Also supports recurring tasks, so you won't need to manually add the same tasks everytime!

# Tutorials

Duke Increment | Tutorial
---------------|---------------
`A-Gradle` | [Gradle Tutorial](tutorials/gradleTutorial.md)
`A-TextUiTesting` | [Text UI Testing Tutorial](tutorials/textUiTestingTutorial.md)
`Level-10` | JavaFX tutorials:<br>→ [Part 1: Introduction to JavaFX][fx1]<br>→ [Part 2: Creating a GUI for Duke][fx2]<br>→ [Part 3: Interacting with the user][fx3]<br>→ [Part 4: Introduction to FXML][fx4]

[fx1]: <tutorials/javaFxTutorialPart1.md>
[fx2]: <tutorials/javaFxTutorialPart2.md>
[fx3]: <tutorials/javaFxTutorialPart3.md>
[fx4]: <tutorials/javaFxTutorialPart4.md>

# Feedback, Bug Reports

* If you have feedback or bug reports, please post in [se-edu/duke issue tracker](https://github.com/se-edu/duke/issues).
* We welcome pull requests too.
## Roomshare helps you to organise your tasks, so you can keep your mind on things that matter more!
84 changes: 84 additions & 0 deletions RoomShare.ipr
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactManager">
<artifact type="jar" name="RoomShare:jar">
<output-path>$PROJECT_DIR$/out/artifacts/RoomShare_jar</output-path>
<root id="archive" name="RoomShare.jar">
<element id="module-output" name="main" />
<element id="extracted-dir" path="$PROJECT_DIR$/release/RoomShare-0.1.3.jar" path-in-jar="/" />
</root>
</artifact>
</component>
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
</profile>
<version value="1.0" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/src/main/main.iml" filepath="$PROJECT_DIR$/src/main/main.iml" />
<module fileurl="file://$PROJECT_DIR$/src/test/test.iml" filepath="$PROJECT_DIR$/src/test/test.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
<component name="libraryTable">
<library name="gradle-wrapper">
<CLASSES>
<root url="jar://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="RoomShare-0.1.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/release/RoomShare-0.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
<component name="masterDetails">
<states>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>11</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
159 changes: 159 additions & 0 deletions RoomShare.iws
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="RoomShare:jar" />
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="846dbe40-968d-40d3-9ee9-214945a1b6e7" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Enum" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="1SvhmJSszojl70fVdEMT3j1DfDf" />
<component name="PropertiesComponent">
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
<component name="RecentsManager">
<key name="IntroduceConstantDialog.RECENTS_KEY">
<recent name="Enums.HelpMessage" />
<recent name="CustomExceptions.RoomShareException" />
<recent name="Operations.Ui" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Application.RoomShare">
<configuration name="RoomShare" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="RoomShare" />
<module name="main" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskCreatorTest.create" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="test" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="TaskCreatorTest" />
<option name="METHOD_NAME" value="create" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskCreatorTest.extractDate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="test" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="TaskCreatorTest" />
<option name="METHOD_NAME" value="extractDate" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskCreatorTest.extractType" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="test" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="TaskCreatorTest" />
<option name="METHOD_NAME" value="extractType" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskCreatorTest.updateTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="test" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="TaskCreatorTest" />
<option name="METHOD_NAME" value="updateTask" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.RoomShare" />
<item itemvalue="JUnit.TaskCreatorTest.updateTask" />
<item itemvalue="JUnit.TaskCreatorTest.create" />
<item itemvalue="JUnit.TaskCreatorTest.extractDate" />
<item itemvalue="JUnit.TaskCreatorTest.extractType" />
</list>
</recent_temporary>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="846dbe40-968d-40d3-9ee9-214945a1b6e7" name="Default Changelist" comment="" />
<created>1572320628790</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1572320628790</updated>
</task>
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/test/java/TaskListTest.java</url>
<line>38</line>
<properties class="TaskListTest" method="add">
<option name="EMULATED" value="true" />
</properties>
<option name="timeStamp" value="2" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/test/java/TaskListTest.java</url>
<line>92</line>
<properties class="TaskListTest" method="reorder">
<option name="EMULATED" value="true" />
</properties>
<option name="timeStamp" value="3" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/test/java/TaskListTest.java</url>
<line>106</line>
<option name="timeStamp" value="4" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>
Binary file added RoomShareUI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading