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

[AY1920S1-CS2113-F14-4] SpinBox #42

Open
wants to merge 149 commits into
base: master
Choose a base branch
from

Conversation

rssujay
Copy link

@rssujay rssujay commented Sep 12, 2019

rssujay and others added 30 commits September 12, 2019 22:32
Port over Phase 1 codebase
Add post-port consistency changes
* Added library natty

Added library natty in build.gradle.
Changed some classes to accomodate changes.
DateTime now wraps java.util.Date

* fixed checkstyle error

* Change date format in error message
* Add Fixed Duration Tasks Extension

* Add JavaDoc comment for Fixed.java

* Update FixedTest with correct expected output

* Edit typo in AddCommand and change test unit names
* fix bug when done has no index

* Fix done and delete no index inputted bug
* Fix storage and empty string bug

* Rename methods, make Tasks abstract

* Add Reminders for tasks

* Troubleshoot unit test

* Fix unit test relying on timezone
* add do-within-period feature

* checkstyle update

* checkstyle update

* fixed output message in exception handling in AddCommand

* fix WithinTest dates check
* temp for view-schedule

* Added view-schedule feature

* Checkstyle update

* Checkstyle update

* change compareTo to compareEquals to get rid of instanceof

* update compareEquals

* update ViewScheduleTest
* Implement recurring tasks

* Add unit tests

* Reorganize test cases
* add tentative scheduling

* took out system.out debugging

* save task after SetCommand
* Added library natty

Added library natty in build.gradle.
Changed some classes to accomodate changes.
DateTime now wraps java.util.Date

* fixed checkstyle error

* Change date format in error message

* Add Snooze Command

Add SnoozeCommand class.
Modified Parser class.
Add setBy method into Deadline class.
Add setStart and setEnd method into Event class.

* Add JUnit Test for B-Snooze

* Edit SnoozeTest.java
lackmoo and others added 27 commits November 9, 2019 18:21
Add Exception Handling for Schedulable Tasks.
Schedulable Tasks are now unable to add something with start date in the
past.

* Fix tests where date is earlier than now
* Add assertations and fortify GUI

* Propagate corrupted data GUI warning
* Incorporate logging

* Modify error message to reference logfile
* Extract out filehandlers

* Extract out methods
* Refactor Parser
* Fix Assertion Statements
Check date and time string input to DateTime object to ensure correct
input. throws DateFormatException in the event of wrong input by user.
* Edit Test Module Name and Add Integration Tests

* Create Integration Tests for Help Command and HelpList
* refactor view command

* reduce complex bool
* Improve Calendar GUI and view command

Add selection function for calendar view command.
Add scrolling funtionality for large amounts of task in a single day for
Calendar GUI.
GUI slight resizing.

* Update header and help command
* slight refactoring
* find whitespace bug and log
* find duplication code

* remove unused import
* Refactor Parser

* More Refactoring on Parser

* Fix Checkstyle

* Fix Assertion Statements

* Refactor Test Codes

* Refactor SetDateCommand

* Fix set-name command

* Fix set-name command

* Fix set-name command bugs
* List classes

* checkstyle and test update

* deconflict

* deconflict

* typo
* List classes

* checkstyle and test update

* deconflict

* deconflict

* refactor view
* Update Documentation

* Update Documentation

* DG
* Update Documentation

* Update Documentation

* PPP
nishanthelango pushed a commit to nishanthelango/Duchess that referenced this pull request Nov 23, 2021
* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule
nishanthelango pushed a commit to nishanthelango/Duchess that referenced this pull request Nov 23, 2021
* test

* test

* test

* test

* test

* test

* test

* image

* image

* image

* image

* update

* update

* update

* update

* update

* update

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* add academic context to date

* modify ViewScheduleCommand to accept date range

* add academic context to date

* update to latest (nusCS2113-AY1920S1#5)

* merge to latest (nusCS2113-AY1920S1#3)

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* Refactor Schedule class to TimeFrame  (nusCS2113-AY1920S1#40)

* Refactor TimeFrame class (nusCS2113-AY1920S1#42)

* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* Add date context (nusCS2113-AY1920S1#4)

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* Refactor Schedule class to TimeFrame  (nusCS2113-AY1920S1#40)

* Refactor TimeFrame class (nusCS2113-AY1920S1#42)

* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* add academic context to date

* modify ViewScheduleCommand to accept date range

* add academic context to date

* add week view

* improve code quality

* refactor Date to LocalDateTime, fix bug causing incorrect date resets

* Add week view

* Update javadoc

* remove time run

* remove time run

* Merge branch 'master' of https://github.com/AY1920S1-CS2113T-T09-2/main into add_weekView

# Conflicts:
#	src/main/java/Duke.java
#	src/main/java/duchess/logic/commands/ViewScheduleCommand.java

* fix checkstyle indentation
nishanthelango pushed a commit to nishanthelango/Duchess that referenced this pull request Nov 23, 2021
* Add schedule command

* Yellow flag handling

* Add ui to show schedule

* Add ViewSchedule command

* Add view schedule message

* Add command allowing user to view time specific tasks

* Change Date states to public

* Change Date states to public

* Add test for ViewScheduleCommand

* Add ViewScheduleCommand

* Change back to private states

* Change back to private states

* Add test for ViewScheduleCommand

* Add overload showSearchResult method

* Add ViewScheduleCommand

* ViewScheduleCommand displays separate events and deadlines for any given time period

* ViewScheduleCommand displays separate events and deadlines for any given time period

* Add getDate methods

* Add getDate methods

* Add ViewScheduleCommand

* Add javadoc

* Add javadoc

* Add javadoc

* Organise imports

* Expand imports for checkstyle :(

* Bug fix

* Add abstract boolean isWithinTimeFrame

* Change schedule ui

* Add abstract method isWithinTimeFrame

* Add abstract method isWithinTimeFrame

* Add abstract method isWithinTimeFrame

* Test ViewScheduleCommand

* Add new abtract method isWithinTimeFrame

* Add new abtract method isWithinTimeFrame

* Add new abtract method isWithinTimeFrame

* Add Schedule for printing time table

* Add ViewScheduleCommand

* Add timetable interface

* Add abstract Schedule method

* Add abstract Schedule method

* Add abstract Schedule method

* Add abstract Schedule method

* Organise imports

* Update with ui image, features and commands

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Update

* Add javadoc and format code

* Change nested loop

* Add javadoc

* Organise imports

* Organise imports

* im so technically challenged

* Add test for Schedule

* Add test for Schedule

* Update features and commands

* update link to Ui.png

* test

* test

* test

* test

* test

* test

* test

* test

* image

* image

* image

* image

* update

* update

* update

* update

* update

* update

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* merge to latest (nusCS2113-AY1920S1#3)

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* Refactor Schedule class to TimeFrame  (nusCS2113-AY1920S1#40)

* Refactor TimeFrame class (nusCS2113-AY1920S1#42)

* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* add academic context to date

* modify ViewScheduleCommand to accept date range

* add academic context to date

* Add date context (nusCS2113-AY1920S1#4)

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* Refactor Schedule class to TimeFrame  (nusCS2113-AY1920S1#40)

* Refactor TimeFrame class (nusCS2113-AY1920S1#42)

* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* add academic context to date

* modify ViewScheduleCommand to accept date range

* add academic context to date

* update to latest (nusCS2113-AY1920S1#5)

* merge to latest (nusCS2113-AY1920S1#3)

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* Refactor Schedule class to TimeFrame  (nusCS2113-AY1920S1#40)

* Refactor TimeFrame class (nusCS2113-AY1920S1#42)

* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* Add date context (nusCS2113-AY1920S1#4)

* refactor Schedule to TimeFrame

* Add implements Comparable<TimeFrame>

* 092919 ui fix (nusCS2113-AY1920S1#2)

* udate

* udate

* refactor Schedule to TimeFrame

* Refactor Schedule class to TimeFrame  (nusCS2113-AY1920S1#40)

* Refactor TimeFrame class (nusCS2113-AY1920S1#42)

* Reimplement TimeFrameClass

* Refactor ViewScheduleCommand

* Allow for instantaneous tasks

* Implement printing of schedule

* update

* update

* update change in schedule command

* fix merge conflict and bug

* minor code change

* add academic context to date

* modify ViewScheduleCommand to accept date range

* add academic context to date

* add week view

* update with V2.0 features

* update with V2.0 features

* improve code quality

* refactor Date to LocalDateTime, fix bug causing incorrect date resets

* Add week view

* Update javadoc

* remove time run

* remove time run

* Merge branch 'master' of https://github.com/AY1920S1-CS2113T-T09-2/main into add_weekView

# Conflicts:
#	src/main/java/Duke.java
#	src/main/java/duchess/logic/commands/ViewScheduleCommand.java

* fix checkstyle indentation

* add academic context to date

* update

* update

* update

* update

* update

* update

* update

* update

* add junit tests

* fix checkstyle

* fix checkstyle

* edit according to review

* change according to requested changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants