Skip to content

Commit

Permalink
Merge pull request #206 from khooroko/Update_Portfolio
Browse files Browse the repository at this point in the history
Update portfolio
  • Loading branch information
khooroko authored Nov 2, 2017
2 parents 2a13e88 + e3826d5 commit 04693d0
Show file tree
Hide file tree
Showing 12 changed files with 607 additions and 64 deletions.
368 changes: 342 additions & 26 deletions collated/main/khooroko.md

Large diffs are not rendered by default.

252 changes: 223 additions & 29 deletions collated/test/khooroko.md

Large diffs are not rendered by default.

32 changes: 30 additions & 2 deletions docs/team/weiping.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ ifdef::env-github,env-browser[:outfilesuffix: .adoc]
:stylesDir: ../stylesheets

== Project: Codii
[https://github.com/CS2103AUG2017-T17-B1/main[Codii]] is a desktop address book application targeted at debt collectors. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 6kLoC.
[https://github.com/CS2103AUG2017-T17-B1/main[Codii]] is a desktop address book application specially designed for debt collectors to manage debtors in a simple manner. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).

Codii is enhanced from [https://github.com/nus-cs2103-AY1718S1/addressbook-level4[AddressBook - Level 4]] which is a desktop address book application used for teaching Software Engineering principles.
Debt collectors can store information such as the amount owed, debt borrow date and debt cleared date in addition to debtor’s personal information.

Unique features such as an interest calculator help debt collectors manage debts more efficiently.

Codii is evolved from [https://github.com/nus-cs2103-AY1718S1/addressbook-level4[AddressBook - Level 4]] which is a desktop address book application used for teaching Software Engineering principles.

*Code contributed*: [https://github.com/CS2103AUG2017-T17-B1/main/tree/master/collated/main/khooroko.md[Functional code]] [https://github.com/CS2103AUG2017-T17-B1/main/tree/master/collated/test/khooroko.md[Test code]]

Expand Down Expand Up @@ -55,6 +59,27 @@ include::../UserGuide.adoc[tag=sort]

Debt collectors would want to sort their contacts in various ways for easier viewing.

=== Enhancement Added: Cluster field

==== External behaviour

`Clusters` are generated based on postal districts.

==== Justification

An easy way to group contacts is needed for a debt collector to better plan his/her trips.

==== Implementation

---
#Start of Extract [from: Developer Guide]#

include::../DeveloperGuide.adoc[tag=cluster]

#End of Extract#

---

=== Enhancement Added: Nearby command

==== External behavior
Expand All @@ -79,6 +104,9 @@ Debt collectors may want to see details of nearby contacts to plan a more effect
* Replacing the browser with full information panel
* Creating the nearby persons panel inside the full information panel

==== Miscellaneous
* Assist teammates with debugging tests

== Project: Dog Mario

[https://github.com/DogMario/Dog-Mario[Dog Mario]] is a game developed with [https://github.com/tbhbhbh[Tan Bing Hwang]] as an independent project for Orbital 2017.
2 changes: 2 additions & 0 deletions src/main/java/seedu/address/logic/LogicManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
}
}

//@@author khooroko
/**
* Updates the selected person.
* @param person the person that has been selected.
Expand All @@ -70,6 +71,7 @@ public ObservableList<ReadOnlyPerson> getAllPersons() {
return model.getAllPersons();
}

//@@author
@Override
public ObservableList<ReadOnlyPerson> getFilteredPersonList() {
return model.getFilteredPersonList();
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/seedu/address/model/ModelManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ public ReadOnlyPerson deductDebtFromPerson(ReadOnlyPerson target, Debt amount) t
indicateAddressBookChanged();
return repayingPerson;
}
//@@author

//@@author
@Override
public void changeListTo(String listName) {
raise(new ChangeInternalListEvent(listName));
Expand Down Expand Up @@ -490,7 +490,7 @@ public int updateFilteredOverduePersonList(Predicate<ReadOnlyPerson> predicate)
return filteredOverduePersons.size();
}

//@@author
//@@author khooroko
/**
* Obtains and updates the list of persons that share the same cluster as {@param selectedPerson}.
*/
Expand Down Expand Up @@ -534,6 +534,7 @@ public void sortBy(String order) throws IllegalArgumentException {
indicateAddressBookChanged();
}

//@@author
@Override
public boolean equals(Object obj) {
// short circuit if same object
Expand Down
1 change: 1 addition & 0 deletions src/main/java/seedu/address/model/person/Handphone.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import seedu.address.commons.exceptions.IllegalValueException;

//@@author khooroko
/**
* Represents a Person's handphone number in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/seedu/address/model/person/HomePhone.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import seedu.address.commons.exceptions.IllegalValueException;

//@@author khooroko
/**
* Represents a Person's home number in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/seedu/address/model/person/OfficePhone.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import seedu.address.commons.exceptions.IllegalValueException;

//@@author khooroko
/**
* Represents a Person's office phone number in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/seedu/address/ui/InfoPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ private void resetDebtRepaymentProgressBar(ReadOnlyPerson person) {
debtRepaymentProgressBar = new DebtRepaymentProgressBar(person);
progressBarPlaceholder.getChildren().add(debtRepaymentProgressBar.getRoot());
}
//@@author

//@@author jaivigneshvenugopal
/**
Expand All @@ -181,8 +180,8 @@ private void resetDebtorProfilePicture(ReadOnlyPerson person) {
debtorProfilePicture = new DebtorProfilePicture(person);
profilePicPlaceholder.getChildren().add(debtorProfilePicture.getImageView());
}
//@@author jaivigneshvenugopal

//@@author khooroko
/**
* Binds the individual UI elements to observe their respective {@code Person} properties
* so that they will be notified of any changes.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/ui/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ void fillInnerPartsForStartUp() {
commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
});
}
//@@author

//@@author jaivigneshvenugopal
/**
* Fills up the placeholders of PersonListPanel with the given list name.
* Should only display welcome page without contacts.
Expand Down
1 change: 1 addition & 0 deletions src/main/java/seedu/address/ui/UiManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public void handleLogoutAppRequestEvent(LogoutAppRequestEvent event) {
}
}

//@@author jaivigneshvenugopal
/**
* Handles change internal list event.
* Displays the list that user requested(e.g masterlist, blacklist etc)
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/view/InfoPanel.fxml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- @@author khooroko -->

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.FlowPane?>
Expand All @@ -11,6 +9,7 @@
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>

<!-- @@author khooroko -->
<StackPane fx:id="infoPanel" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1">
<StackPane.margin>
<Insets />
Expand Down

0 comments on commit 04693d0

Please sign in to comment.