Skip to content

Commit

Permalink
Add Multiple TableViews feature (#75)
Browse files Browse the repository at this point in the history 
* Pull request (#7)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* [Complete] Implement Schedule class (#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Pull request from team repo (#10)

* Implement view schedule feature (#68)

* Pull request (#7)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* [Complete] Implement Schedule class (#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Implement timeslot sub-command (#65)

* Implement timeslot sub-command with basic error handling

* Fix checkstyle

* Specify Interviewee instead of Person

* Implement dummy code for opening user's mail client

* Remove unused import

* Implement functions for getting interviewee's email from name (#72)

* Pull request from team repo (#11)

* Implement view schedule feature (#68)

* Pull request (#7)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* [Complete] Implement Schedule class (#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Implement timeslot sub-command (#65)

* Implement timeslot sub-command with basic error handling

* Fix checkstyle

* Specify Interviewee instead of Person

* Implement dummy code for opening user's mail client

* Remove unused import

* Implement functions for getting interviewee's email from name (#72)

* Pull request from team repo (#12)

* Implement view schedule feature (#68)

* Pull request (#7)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (#44)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (#54)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (#55)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (#62)

* [Complete] Implement Schedule class (#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Implement timeslot sub-command (#65)

* Implement timeslot sub-command with basic error handling

* Fix checkstyle

* Specify Interviewee instead of Person

* Implement dummy code for opening user's mail client

* Remove unused import

* Implement functions for getting interviewee's email from name (#72)

* Add ScheduleViewPanel.java to display multiple tables

* Travis Fix

* Fix merge conflicts

* Separate column titles from Schedule's observable list (#73) (#13)

* Separate column titles from Schedule's observable list

* Separate column titles from Schedule's observable list

* Fix failing tests

* Fix travis issue

* Edit multiple tableViews

* Add RefreshListener.java and RefreshListenerManager.java

* Edit RefreshListener.java and RefreshListenerManager.java to create feature of refreshing Ui when new data is being imported

* Travis fix

* Edit UserGuide.adoc to modify the UI Display part

* Typo Fix
  • Loading branch information
@mrchensheng21 @ChrisKheng
mrchensheng21 authored and ChrisKheng committed Oct 23, 2019
1 parent 803944d commit 59c0399
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 35 deletions.
26 changes: 11 additions & 15 deletions docs/UserGuide.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,17 @@ Notes:

=== UI Display

==== Viewing Schedules
When the Scheduler starts, interview schedules will be displayed for you. The data will be displayed in a table format,
with each table representing the schedule for each day. In the first column, the date of that interview schedule will be
displayed, the rest of the columns are the departments and the name of their respective person in charge. Subsequent rows
will be be displayed by showing the time slot first, with the person allocated to that time slot. If there are no interviewee
occupying that time slot, it will be displayed as "0".

A sample output of the Schedule UI is shown below:

image::Ui/Schedule.png[width="500", align="left"]

==== Viewing details of interviewees
You can to view the list of interviewees and the following information:
1. Name
Expand All @@ -125,18 +136,6 @@ image::Ui/Interviewee.png[width="500", align="left"]
In this screen, you can edit, add or delete interviewees accordingly by using the other features explained in
this User Guide.

==== Display weekly schedule
Display the interviews that has been scheduled by the application. Allows you to have an weekly overview of
interviews during that week by typing the following command +
Format: `display date DATE (eg. 24/06/2019)`

Doing so will allow the scheduler to show the timetable for that week.

image::Ui/Timetable.png[width="500", align="left"]

The timetable will also show the availability of the interviewer and block out the time slots when the interviewer
is unavailable.

==== Differentiating the importance of timetable slots through colours `[Coming in v2.0]`
As you can see from the timetable above, there are 2 different colours of time slots. This is implemented so you
are able to differentiate which interviews are important by using the colour code as shown in the timetable.
Expand Down Expand Up @@ -251,9 +250,6 @@ Format: `record rank`
|Display list of interviewers/interviewees
|`display interviewees`

|Display weekly schedule
|`display date DATE`

|Get interview schedule for interviewer/interviewee
|`get NAME` +

Expand Down
Binary file added docs/images/Ui/Schedule.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions src/main/java/seedu/address/ui/MainWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class MainWindow extends UiPart<Stage> {
private PersonListPanel personListPanel;
private ResultDisplay resultDisplay;
private HelpWindow helpWindow;
private ScheduleView scheduleView;
private ScheduleViewPanel scheduleViewPanel;

@FXML
private StackPane commandBoxPlaceholder;
Expand Down Expand Up @@ -109,8 +109,8 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
* Fills up all the placeholders of this window.
*/
void fillInnerParts() {
scheduleView = new ScheduleView(logic.getTitlesLists(), logic.getObservableLists());
schedulePanelPlaceholder.getChildren().add(scheduleView.getRoot());
scheduleViewPanel = new ScheduleViewPanel(logic.getTitlesLists(), logic.getObservableLists());
schedulePanelPlaceholder.getChildren().add(scheduleViewPanel.getRoot());

resultDisplay = new ResultDisplay();
resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
Expand Down Expand Up @@ -166,6 +166,10 @@ public PersonListPanel getPersonListPanel() {
return personListPanel;
}

public ScheduleViewPanel getScheduleViewPanel() {
return scheduleViewPanel;
}

/**
* Executes the command and returns the result.
*
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/seedu/address/ui/RefreshListener.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package seedu.address.ui;

import seedu.address.logic.Logic;

/**
* API of refresh listener.
*/
public interface RefreshListener {

/**
* Refresh the Ui when data is imported from .csv file.
*/
void dataImported(MainWindow window, Logic logic);

}
17 changes: 17 additions & 0 deletions src/main/java/seedu/address/ui/RefreshListenerManager.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package seedu.address.ui;

import seedu.address.logic.Logic;

/**
* Refresh the Ui whenever new data is being imported to the Scheduler.
*/
public class RefreshListenerManager implements RefreshListener {

private ScheduleViewPanel scheduleViewPanel;

@Override
public void dataImported(MainWindow window, Logic logic) {
this.scheduleViewPanel = window.getScheduleViewPanel();
this.scheduleViewPanel.fillPanel(logic.getTitlesLists(), logic.getObservableLists());
}
}
24 changes: 8 additions & 16 deletions src/main/java/seedu/address/ui/ScheduleView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,35 @@ public class ScheduleView extends UiPart<Region> {

private static final String FXML = "ScheduleView.fxml";

private List<List<String>> titles;
private List<ObservableList<ObservableList<String>>> scheduleList; // Excluding titles
private List<String> titles;
private ObservableList<ObservableList<String>> schedule; // Excluding titles

@FXML
private TableView tableView;

ScheduleView(List<List<String>> titles, List<ObservableList<ObservableList<String>>> scheduleList) {
ScheduleView(List<String> titles, ObservableList<ObservableList<String>> schedule) {
super(FXML);
this.titles = titles;
this.scheduleList = scheduleList;
this.schedule = schedule;
initialise();
}

/**
* Allow the creation of table.
*/
private void initialise() {
// Currently the code here will only retrieve the first list of titles.
for (int i = 0; i < titles.get(0).size(); i++) {
for (int i = 0; i < this.titles.size(); i++) {
final int finalIdx = i;
TableColumn<ObservableList<String>, String> column =
new TableColumn<ObservableList<String>, String>(
titles.get(0).get(i)
this.titles.get(i)
);
column.setCellValueFactory(param ->
new ReadOnlyObjectWrapper<>(param.getValue().get(finalIdx))
);
this.tableView.getColumns().add(column);
this.tableView.setColumnResizePolicy(this.tableView.CONSTRAINED_RESIZE_POLICY);
}

// the data of the schedule now excludes the titles, so titles is not in the first row of data returned anymore
for (int i = 0; i < this.scheduleList.get(0).size(); i++) {
this.tableView.getItems().add(
this.scheduleList.get(0).get(i)
);
this.tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
}
this.tableView.setItems(this.schedule);
}
}

69 changes: 69 additions & 0 deletions src/main/java/seedu/address/ui/ScheduleViewPanel.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package seedu.address.ui;

import java.util.ArrayList;
import java.util.List;

import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;

/**
* Panel to hold multiple schedule tables together.
*/
public class ScheduleViewPanel extends UiPart<Region> {

private static final String FXML = "ScheduleViewPanel.fxml";

private List<ObservableList<ObservableList<String>>> scheduleList;

private List<ScheduleView> scheduleViewList;

private List<List<String>> titles;

@FXML
private StackPane container;

ScheduleViewPanel(
List<List<String>> titles, List<ObservableList<ObservableList<String>>> scheduleList) {
super(FXML);
this.scheduleList = scheduleList;
this.scheduleViewList = new ArrayList<>();
this.titles = titles;
fillPanel();
}
/**
* Fill the panel with the tables that is retrieved from scheduleView class.
*/
private void fillPanel() {
for (int i = 0; i < this.scheduleList.size(); i++) {
scheduleViewList.add(new ScheduleView(this.titles.get(i), this.scheduleList.get(i)));
}
for (ScheduleView schedule : scheduleViewList) {
container.getChildren().add(schedule.getRoot());
}
}

/**
* Fill the panel when user import data.
* @param titles Lists of titles for the schedules
* @param scheduleList Lists of observable data for TableView.
*/
protected void fillPanel(
List<List<String>> titles,
List<ObservableList<ObservableList<String>>> scheduleList) {
for (int i = 0; i < scheduleList.size(); i++) {
scheduleViewList.add(new ScheduleView(titles.get(i), scheduleList.get(i)));
}
for (ScheduleView schedule : scheduleViewList) {
container.getChildren().add(schedule.getRoot());
}
}

protected void refresh() {
this.scheduleViewList.removeAll(this.scheduleViewList);
}
}



1 change: 0 additions & 1 deletion src/main/resources/view/ScheduleView.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>

<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
Expand Down
9 changes: 9 additions & 0 deletions src/main/resources/view/ScheduleViewPanel.fxml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.layout.VBox?>
<?import javafx.scene.layout.StackPane?>

<StackPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:id="container" VBox.vgrow="ALWAYS">
</StackPane>

0 comments on commit 59c0399

Please sign in to comment.