Reintroduced newContract parts from prev commit
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
parent
aac2115421
commit
6e7c1ed8bd
|
@ -545,10 +545,12 @@ public class Main {
|
||||||
*/
|
*/
|
||||||
private static void newContract() {
|
private static void newContract() {
|
||||||
printListOfPersons();
|
printListOfPersons();
|
||||||
Contract contract;
|
Contract contract = new Contract();
|
||||||
String place = FormUtil.readString("Place");
|
contract.setPerson(FormUtil.readInt("Person ID"));
|
||||||
String date = FormUtil.readString("Date");
|
contract.setPlace(FormUtil.readString("Place"));
|
||||||
int person = FormUtil.readInt("Person ID");
|
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)");
|
String input = FormUtil.readString("Purchase Contract(P) / Tenancy Contract(T)");
|
||||||
boolean isTenancy = input.equals("T") || input.equals("t");
|
boolean isTenancy = input.equals("T") || input.equals("t");
|
||||||
if (isTenancy) {
|
if (isTenancy) {
|
||||||
|
@ -558,15 +560,16 @@ public class Main {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
TenancyContract tenancyContract = new TenancyContract();
|
TenancyContract tenancyContract = new TenancyContract(contract);
|
||||||
contract = tenancyContract;
|
|
||||||
tenancyContract.setApartment(FormUtil.readInt("Apartment ID"));
|
tenancyContract.setApartment(FormUtil.readInt("Apartment ID"));
|
||||||
tenancyContract.setPlace(place);
|
System.out.println("Please enter the start date of the tenancy.");
|
||||||
tenancyContract.setDate(Date.valueOf(date));
|
Date startDate = Date.valueOf(FormUtil.readInt("Year") + "-" + FormUtil.readInt("Month") + "-"
|
||||||
tenancyContract.setPerson(person);
|
+ FormUtil.readInt("Day"));
|
||||||
tenancyContract.setStartDate(Date.valueOf(FormUtil.readString("Start Date")));
|
tenancyContract.setStartDate(startDate);
|
||||||
Date endDate = Date.valueOf(FormUtil.readString("End Date"));
|
System.out.println("Please enter the end date of the tenancy.");
|
||||||
long duration = endDate.getTime() - tenancyContract.getStartDate().getTime();
|
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.setDuration(Duration.ofMillis(duration));
|
||||||
tenancyContract.setAdditionalCost(FormUtil.readInt("Additional Costs"));
|
tenancyContract.setAdditionalCost(FormUtil.readInt("Additional Costs"));
|
||||||
}
|
}
|
||||||
|
@ -577,11 +580,7 @@ public class Main {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PurchaseContract purchaseContract = new PurchaseContract();
|
PurchaseContract purchaseContract = new PurchaseContract(contract);
|
||||||
contract = purchaseContract;
|
|
||||||
purchaseContract.setPlace(place);
|
|
||||||
purchaseContract.setDate(Date.valueOf(date));
|
|
||||||
purchaseContract.setPerson(person);
|
|
||||||
purchaseContract.setHouse(FormUtil.readInt("House ID"));
|
purchaseContract.setHouse(FormUtil.readInt("House ID"));
|
||||||
purchaseContract.setNoOfInstallments(FormUtil.readInt("No of Installments"));
|
purchaseContract.setNoOfInstallments(FormUtil.readInt("No of Installments"));
|
||||||
purchaseContract.setInterestRate(FormUtil.readInt("Interest Rate"));
|
purchaseContract.setInterestRate(FormUtil.readInt("Interest Rate"));
|
||||||
|
|
Loading…
Reference in New Issue