Skip to content

Project completed from team - Xiong, Mike, Hazel, and Lena #39

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

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9235634
Tentative UML finished
Mar 12, 2021
5a019b7
Merge pull request #1 from xyuan04/HazelBranch
xyuan04 Mar 12, 2021
889be64
Began Display/Console
Mar 12, 2021
890237e
created Account classes and wrote some tests
Mar 13, 2021
e41f6a3
Merge pull request #2 from xyuan04/XiongBranch
xyuan04 Mar 13, 2021
1719525
removed setBalance() and fixed deposit() + Unit Test
Mar 13, 2021
a13c9f6
Merge pull request #3 from xyuan04/XiongBranch
xyuan04 Mar 13, 2021
c89fda9
did Customer
Mar 13, 2021
e5d8c4f
Merge pull request #4 from xyuan04/MikesBranch
xyuan04 Mar 13, 2021
e229de1
More console code
Mar 13, 2021
9903397
Merge pull request #5 from xyuan04/HazelBranch
xyuan04 Mar 13, 2021
e28faf5
testInvestment done
CodeHere21 Mar 13, 2021
4e336e3
tests for SavingAccount
CodeHere21 Mar 13, 2021
9c0a4bb
almost done with test missing last one
Mar 13, 2021
1afca0a
updated test complete
Mar 13, 2021
2b31d93
Test complete
xyuan04 Mar 13, 2021
07f6fef
Merge pull request #7 from xyuan04/lenasbranch
xyuan04 Mar 13, 2021
6353206
moved methods for open/close to Customer class
Mar 13, 2021
dab953f
moved methods for open/close to Customer class
xyuan04 Mar 13, 2021
11dfb66
fixed and refactor code
Mar 14, 2021
c7a283c
fixed and refactor code
xyuan04 Mar 14, 2021
86a0e67
Minor refinement of display
Mar 13, 2021
f802066
Split display into another class, workflow
Mar 13, 2021
078fa02
More work on workflow
Mar 13, 2021
76ab0f9
Checkpointing
Mar 13, 2021
cc2f1a3
Checkpointing
Mar 13, 2021
219c957
Filled out workflow
Mar 13, 2021
621a083
Manual update
Mar 13, 2021
6abeec9
Checkpointing for pull. Began workflow test
Mar 14, 2021
7e0fbd5
Fighting git
Mar 14, 2021
9fe8146
Merge pull request #13 from xyuan04/HazelBranch
xyuan04 Mar 14, 2021
36861cb
merged progress
Mar 14, 2021
34f26f6
merged progress
xyuan04 Mar 14, 2021
d1acf68
Shell for engine written out
Mar 14, 2021
065a473
Shell for engine written out
xyuan04 Mar 14, 2021
b987b6e
fixed Console getInteger and getDouble
Mar 14, 2021
b3a5303
fixed Console getInteger and getDouble
xyuan04 Mar 14, 2021
9c5a9ed
Checkpointing
Mar 14, 2021
31b3604
Inserted enterAcctType
Mar 14, 2021
b3a0512
Merge remote-tracking branch 'origin/HazelBranch' into HazelBranch
Mar 14, 2021
bc0e4c8
Merge pull request #17 from xyuan04/HazelBranch
xyuan04 Mar 14, 2021
8a08377
created and tested Creator Class will finish Database later
xyuan04 Mar 14, 2021
afaaeb6
created and tested Database
xyuan04 Mar 14, 2021
600288b
* added methods in Customer and Database + tested
xyuan04 Mar 14, 2021
c3f1160
opening and closing account
CodeHere21 Mar 14, 2021
cccae94
added login menu and create customer
MNinh Mar 14, 2021
17a6e4d
updated main, account, database
xyuan04 Mar 14, 2021
16c4cba
finalized ATM
xyuan04 Mar 15, 2021
45e1d0c
added check account numbers for motherboard + minor fixes
xyuan04 Mar 15, 2021
66928d4
finalized ATM
MNinh Mar 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
did Customer
  • Loading branch information
mike authored and mike committed Mar 13, 2021
commit c89fda92fdd53ed076f02f44b64e75d0338cbacf
43 changes: 43 additions & 0 deletions src/main/java/Customer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import java.util.ArrayList;
import java.util.List;

public class Customer {

private String userName;
private String passWord;
private ArrayList<Customer> accountNumbers = new ArrayList<Customer>();
private Integer accountNum;


public Customer(String userName, String passWord, Integer accountNum){
this.userName = userName;
this.passWord = passWord;
this.accountNum = accountNum;
}

public String getUserName(){
return this.userName;
}

public void setUserName(String userName){
this.userName = userName;
}

public String getPassWord(){
return this.passWord;
}

public void setPassWord(String passWord){
this.userName = passWord;
}

public ArrayList<Customer> getAccountNumbers() {
return accountNumbers;
}

public void setAccountNumbers(String userName, String passWord, Integer accountNum) {
Customer accountNumbers = new Customer(userName, passWord, accountNum);
this.accountNumbers.add(accountNumbers);
}

}