2martens
/
dis
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Reintroduced newContract parts from prev commit 

Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens 2017-04-24 17:56:39 +02:00
parent aac2115421
commit 6e7c1ed8bd
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
02/src/de/dis2017/Main.java
View File

@ -545,10 +545,12 @@ public class Main {
*/
private static void newContract() {
printListOfPersons();
Contract contract;
String place = FormUtil.readString("Place");
String date = FormUtil.readString("Date");
int person = FormUtil.readInt("Person ID");
Contract contract = new Contract();
contract.setPerson(FormUtil.readInt("Person ID"));
contract.setPlace(FormUtil.readString("Place"));
System.out.println("Please enter the date of the contract.");
contract.setDate(Date.valueOf(FormUtil.readInt("Year") + "-" + FormUtil.readInt("Month") + "-"
+ FormUtil.readInt("Day")));
String input = FormUtil.readString("Purchase Contract(P) / Tenancy Contract(T)");
boolean isTenancy = input.equals("T") || input.equals("t");
if (isTenancy) {
@ -558,15 +560,16 @@ public class Main {
return;
}
TenancyContract tenancyContract = new TenancyContract();
contract = tenancyContract;
TenancyContract tenancyContract = new TenancyContract(contract);
tenancyContract.setApartment(FormUtil.readInt("Apartment ID"));
tenancyContract.setPlace(place);
tenancyContract.setDate(Date.valueOf(date));
tenancyContract.setPerson(person);
tenancyContract.setStartDate(Date.valueOf(FormUtil.readString("Start Date")));
Date endDate = Date.valueOf(FormUtil.readString("End Date"));
long duration = endDate.getTime() - tenancyContract.getStartDate().getTime();
System.out.println("Please enter the start date of the tenancy.");
Date startDate = Date.valueOf(FormUtil.readInt("Year") + "-" + FormUtil.readInt("Month") + "-"
+ FormUtil.readInt("Day"));
tenancyContract.setStartDate(startDate);
System.out.println("Please enter the end date of the tenancy.");
Date endDate = Date.valueOf(FormUtil.readInt("Year") + "-" + FormUtil.readInt("Month") + "-"
+ FormUtil.readInt("Day"));
long duration = endDate.getTime() - startDate.getTime();
tenancyContract.setDuration(Duration.ofMillis(duration));
tenancyContract.setAdditionalCost(FormUtil.readInt("Additional Costs"));
}
@ -577,11 +580,7 @@ public class Main {
return;
}
PurchaseContract purchaseContract = new PurchaseContract();
contract = purchaseContract;
purchaseContract.setPlace(place);
purchaseContract.setDate(Date.valueOf(date));
purchaseContract.setPerson(person);
PurchaseContract purchaseContract = new PurchaseContract(contract);
purchaseContract.setHouse(FormUtil.readInt("House ID"));
purchaseContract.setNoOfInstallments(FormUtil.readInt("No of Installments"));
purchaseContract.setInterestRate(FormUtil.readInt("Interest Rate"));