Skip to content

Commit 5f1e2ed

Browse files
author
“Drake
committed
empty employee remove method
1 parent 56eb513 commit 5f1e2ed

File tree

4 files changed

+20
-25
lines changed

4 files changed

+20
-25
lines changed

{code}pendent/src/Customer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ public class Customer {
88

99
Helper helper=new Helper();
1010

11-
ArrayList<Customer> customerList;
12-
1311

1412
// Default Constructor
1513
Customer() {

{code}pendent/src/DartController.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ public class DartController {
1717
private ArrayList<Game> games = new ArrayList<>();
1818
private ArrayList<Customer> customerList = new ArrayList<>();
1919

20+
public ArrayList<Employee> getEmployees(){return employees;}
2021
public ArrayList<Customer> getCustomers() {
2122
return customerList;
2223
}
24+
2325
public void addCustomer(){
2426
this.customerList.add(customer.addCustomer());
2527
System.out.println(customerList.toString());
@@ -43,7 +45,10 @@ public void addEmployee(){
4345
this.employees.add(employee.addEmployee());
4446
menu.managerMenu();
4547
}
46-
public void removeEmployee(){
48+
public void removeEmployee(Employee employee) {
49+
String check = helper.getInput("ID: ");
50+
removeEmployee(check);
51+
employees.remove(employee);
4752
}
4853
public void viewEmployee(){
4954
for (Employee employee : employees){

{code}pendent/src/Employee.java

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@ private String genEmployeeID() {
4141

4242
public Employee addEmployee(){
4343
String name = tools.getInput("Name: ");
44-
int birthYear = tools.getInt("birth year: ");
44+
int birthYear = tools.getInt("Birth year: ");
4545
String address = tools.getInput("Address: ");
4646
double monthlySalary = tools.getDouble("Monthly gross salary: ");
4747
grossSalary = monthlySalary * 12;
4848
Employee employee = new Employee(name, birthYear, address, grossSalary);
4949
return employee;
5050
}
51+
public Employee removeEmployee(){
5152

53+
}
54+
/*
5255
public Employee[] removeEmployee() {
5356
viewEmployees();
5457
String enteredID = tools.getInput("Which employee should be removed? ID: ");
@@ -64,14 +67,7 @@ public Employee[] removeEmployee() {
6467
}
6568
return employees;
6669
}
67-
68-
69-
public void viewEmployees() {
70-
for (Employee employee : employees) { // for-each loop
71-
if (employee == null) return;
72-
System.out.println(employee.toString());
73-
}
74-
}
70+
*/
7571

7672

7773
public double netSalary() {
@@ -101,33 +97,27 @@ public double netSalary() {
10197
return netSalary / 12;
10298
}
10399
// getters
104-
public String getName() {
105-
100+
public String getName(){
106101
return name;
107102
}
108103

109-
public double getSalary() {
110-
104+
public double getSalary(){
111105
return netSalary();
112106
}
113107

114-
public int getBirthYear() {
115-
108+
public int getBirthYear(){
116109
return birthYear;
117110
}
118111

119-
public String getAddress() {
120-
112+
public String getAddress(){
121113
return address;
122114
}
123115

124-
public String getEmployeeID() {
125-
116+
public String getEmployeeID(){
126117
return employeeID;
127118
}
128119

129-
public Employee[] getEmployees() {
130-
120+
public Employee[] getEmployees(){
131121
return employees;
132122
}
133123

{code}pendent/src/Menus.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public void managerMenu() {
7676
dartController.addEmployee();
7777
break;
7878
case "2":
79-
System.out.println("removes an employee (make new remove to work with arraylsit)");
79+
helper.getInput("ID: ");
80+
dartController.removeEmployee();
81+
managerMenu();
8082
break;
8183
case "3":
8284
System.out.println("All employees"); // not currently working

0 commit comments

Comments
 (0)