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.

Sign up for GitHub

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

Jump to bottom

History and statistic #246

Merged
merged 55 commits into from
Nov 11, 2019
Merged

History and statistic #246

merged 55 commits into from
Nov 11, 2019

Commits on Oct 17, 2019

  1. added a skeleton of view DriverTasks command

    @Krit-K
    Krit-K committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    a9f0c0c View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2019

  1. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main 

    # Conflicts:
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
    @Krit-K
    Krit-K committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    f54a5b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2019

  1. extra spacing

    @Krit-K
    Krit-K committed Oct 19, 2019
    Configuration menu
    Copy the full SHA
    d9440d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2019

  1. fixed bugs

    @Krit-K
    Krit-K committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    90abad3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into add-ui-feature

# Conflicts:
#	src/main/java/seedu/address/model/ModelManager.java
    @Krit-K
    Krit-K committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    3befb6a View commit details
    Browse the repository at this point in the history

  3. added TaskList onto the right of the Ui

    @Krit-K
    Krit-K committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    ef2d62a View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2019

  1. Updated CustomerList and TaskList UI display

    @Krit-K
    Krit-K committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    e128700 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into add-ui-feature
    @Krit-K
    Krit-K committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    6036ee1 View commit details
    Browse the repository at this point in the history

  3. UI update for assigned and unassigned task

    @Krit-K
    Krit-K committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    7d716b1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into add-ui-feature

# Conflicts:
#	src/main/java/seedu/address/model/CustomerManager.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
    @Krit-K
    Krit-K committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    71b2eea View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2019

  1. fix test driver and customer sample

    @Krit-K
    Krit-K committed Oct 25, 2019
    Configuration menu
    Copy the full SHA
    e68ba80 View commit details
    Browse the repository at this point in the history

  2. Fix unassigned and assigned tasklist taking the same list ID

    @Krit-K
    Krit-K committed Oct 25, 2019
    Configuration menu
    Copy the full SHA
    6fb33be View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2019

  1. Rename taskList to AssignedTaskList 

    Added Headings for each list
Added description under each lists
    @Krit-K
    Krit-K committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    3491068 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2019

  1. fixed display layout example for assign 

    Use driver Index instead of the deprecated Index class
    @Krit-K
    Krit-K committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    bc6b1e6 View commit details
    Browse the repository at this point in the history

  2. deleted sample and reset back before merge

    @Krit-K
    Krit-K committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    6b619d1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into add-ui-feature

# Conflicts:
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/model/task/TaskManager.java
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
    @Krit-K
    Krit-K committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    ebfe1a8 View commit details
    Browse the repository at this point in the history

  4. remove redundant set tasks

    @Krit-K
    Krit-K committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    52e5eef View commit details
    Browse the repository at this point in the history

  5. Added toString for TaskList.

    @junnbang
    junnbang committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    0c9156f View commit details
    Browse the repository at this point in the history

  6. Fixed tasks not showing in UI.

    @junnbang
    junnbang committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    3fe6a44 View commit details
    Browse the repository at this point in the history

  7. update checkstyle.

    @junnbang
    junnbang committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    afd4b95 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'add-ui-feature' of https://github.com/AY1920S1-CS2103T-… 

    …F14-4/main into fix-ui
    @junnbang
    junnbang committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    0af8201 View commit details
    Browse the repository at this point in the history

  9. Added Send button under the commandbox

    @Krit-K
    Krit-K committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    817ffb9 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into add-ui-feature
    @Krit-K
    Krit-K committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f736538 View commit details
    Browse the repository at this point in the history

  2. Re-format Driver List, Unassigned and Assigned TaskLists and Customer… 

    …List
    @Krit-K
    Krit-K committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    5fe5283 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into fixCardandTaskID
    @Krit-K
    Krit-K committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    d139564 View commit details
    Browse the repository at this point in the history

  4. fix checkstyle issues

    @Krit-K
    Krit-K committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    2102e5a View commit details
    Browse the repository at this point in the history

  5. New layout and removed Assigned: for Incomplete Delivery task list

    @Krit-K
    Krit-K committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    8cda4bb View commit details
    Browse the repository at this point in the history

  6. Remove person list and update check style

    @Krit-K
    Krit-K committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    1ede2a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. added Completed TaskListPanel and rename TaskList to AssignedTaskList

    @Krit-K
    Krit-K committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    65c4ca9 View commit details
    Browse the repository at this point in the history

  2. created completed taskList panel

    @Krit-K
    Krit-K committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    bf61919 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into ViewCompletedTasks
    @Krit-K
    Krit-K committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    15d15e7 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2019

  1. change command format from viewC to viewC c/[index number]

    @Krit-K
    Krit-K committed Nov 2, 2019
    Configuration menu
    Copy the full SHA
    5ce75c1 View commit details
    Browse the repository at this point in the history

  2. update the parser for driver and customer find command

    @Krit-K
    Krit-K committed Nov 2, 2019
    Configuration menu
    Copy the full SHA
    15c69d5 View commit details
    Browse the repository at this point in the history

  3. added updateCompleteTask function

    @Krit-K
    Krit-K committed Nov 2, 2019
    Configuration menu
    Copy the full SHA
    8b9e968 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2019

  1. remove unnecessary imports

    @Krit-K
    Krit-K committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    9e4fc4b View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into ViewCompletedTasks

# Conflicts:
#	src/main/java/seedu/address/logic/commands/AssignCommand.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/resources/view/MainWindow.fxml
    @Krit-K
    Krit-K committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    2ee42ef View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Completed navigation command and fix view driver/customer command

    @Krit-K
    Krit-K committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    f73e902 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. fix list to update completed task also

    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    8ee350b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into ViewCompletedTasks

# Conflicts:
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/logic/commands/ListCommand.java
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    d03398d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into ViewCompletedTasks

# Conflicts:
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    8cd2b93 View commit details
    Browse the repository at this point in the history

  4. removed a line

    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    0fd19bd View commit details
    Browse the repository at this point in the history

  5. fixed checkstyle

    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    53a25e2 View commit details
    Browse the repository at this point in the history

  6. removed white space

    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    7c106dc View commit details
    Browse the repository at this point in the history

  7. changes all class to use one static tab name, remove unused methods, … 

    …update javadocs
    @Krit-K
    Krit-K committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    7059c4d View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. added observable command list

    @Krit-K
    Krit-K committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    df2bbf6 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2019

  1. add show all commands predicate and update statistic tab

    @Krit-K
    Krit-K committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    449aefb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into historyCommands

# Conflicts:
#	src/main/java/seedu/address/logic/Logic.java
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/logic/commands/GoCommand.java
#	src/main/java/seedu/address/logic/commands/ViewCustomerTaskCommand.java
#	src/main/java/seedu/address/logic/commands/ViewDriverTaskCommand.java
#	src/main/java/seedu/address/logic/parser/GoCommandParser.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/ui/MainWindow.java
#	src/main/resources/view/MainWindow.fxml
#	src/test/java/seedu/address/logic/commands/CommandResultTest.java
#	src/test/java/seedu/address/logic/commands/ExitCommandTest.java
#	src/test/java/seedu/address/logic/commands/HelpCommandTest.java

Fix send button and statistic tab can now be displayed with data
    @Krit-K
    Krit-K committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    30bdfac View commit details
    Browse the repository at this point in the history

  3. Added 2 bar graphs for customer and driver statistics

    @Krit-K
    Krit-K committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    e887998 View commit details
    Browse the repository at this point in the history

  4. add more sample data

    @Krit-K
    Krit-K committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    51c7603 View commit details
    Browse the repository at this point in the history

  5. Rename the chart title and fix driver using same ID

    @Krit-K
    Krit-K committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    1def965 View commit details
    Browse the repository at this point in the history

  6. Updated User guide doc

    @Krit-K
    Krit-K committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    675aa9b View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Added DG and fix bar chart display

    @Krit-K
    Krit-K committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    aafc563 View commit details
    Browse the repository at this point in the history

  2. fix Event time displaying the same time

    @Krit-K
    Krit-K committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    eb38cfb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F14-4/main… 

    … into historyCommands

# Conflicts:
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/model/Model.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/test/java/seedu/address/logic/commands/AddCommandTest.java
    @Krit-K
    Krit-K committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    357d2c3 View commit details
    Browse the repository at this point in the history

  4. Changed to use global clock

    @tysg
    tysg committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    bf39b7b View commit details
    Browse the repository at this point in the history