From 3b3e3fd084fe1e312d18a99c12ebf8621ce93bdf Mon Sep 17 00:00:00 2001 From: Spenny Date: Mon, 9 Nov 2020 19:37:41 +0100 Subject: [PATCH] fixed readme, added calculation --- .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/workspace.xml | 204 +++++++++++++----- README.md | 1 + .../autovermietung/Main.class | Bin 3343 -> 3433 bytes .../autovermietung/helper/Shop.class | Bin 9530 -> 10377 bytes src/autovermietung/Main.java | 6 + src/autovermietung/helper/Shop.java | 27 +++ 7 files changed, 184 insertions(+), 59 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..df5f35d --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4d61f16..530eaa4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,8 +6,14 @@ - + + + + + + + - + - + - - + + @@ -40,8 +46,8 @@ - - + + @@ -49,15 +55,6 @@ - - - - - - - - - @@ -65,7 +62,7 @@ - + @@ -77,8 +74,8 @@ - - + + @@ -89,8 +86,8 @@ - - + + @@ -149,13 +146,19 @@ + + + + - @@ -241,7 +244,7 @@ - + @@ -305,26 +308,30 @@ - - + + + - + - + + + + - + @@ -351,6 +358,10 @@ + + + @@ -439,9 +450,24 @@ + + + + + + + + + + + + + + + - + @@ -449,13 +475,6 @@ - - - - - - - @@ -470,10 +489,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -482,31 +534,14 @@ - - + + - - - - - - - - - - - - - - - - - @@ -583,4 +618,55 @@ + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 8d8dffe..2ef1304 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Es gibt eine database.properties Datei, in dieser sind alle nötigen Verbindungs Sonst könnt Ihr die ganze Suppe mit der Jar-File einfach in der cmd/PowerShell oder was auch immer Ihr benutzt mit `java -jar autovermietung.jar` ausführen. ### Aufsetzen der MySQL Datenbank +____ Zum erstellen der Datenbank wird diese Struktur verwendet. ```sql diff --git a/out/production/autovermietung-int/autovermietung/Main.class b/out/production/autovermietung-int/autovermietung/Main.class index df5439f18f21e0bfd493cf526b2e40b588ade7f7..1188cecb2310d58488782c2b5b64a6b22feb1a8e 100644 GIT binary patch delta 1444 zcmZ{jYiv|i5XXP#cJE$xduX6g=!2G4icq>ml(t|C)mB<4AP;%8O3|WSv;|sP%d0+C zP<)~Y*9W444`dZ2fnb`eCWwijG{z75#l%l0hL{*7CL{)=b!NN4X!PdJ|Ndv@oVhb+ z=Iqb^IY05`&?o1BIeZvp8jGVWVX4CH3d^D_XGN5i+@Wlh!s;kZtWmaB9WBaQ)pn=H zUAk$VDs5_Buk7wj7IKe5yLvaM<6edP6c%(S#yvKw^L~W~)Y7TYrLak1v&R&5-dvA|m#5m%;!$Jsz?=te!_KkCL!FMww+d zdn}Lhgk>*JTAt!*%QHM{d5(Sl%8a6_=Xt@hpM91W)qH@17N3_aFY}7!RrMayK(BGw z@;Yx=-sFgXG^1qlQQoq=t?-U6c$Z_A_jJK=ju;C3-OdER-EqfTlDu#EK;eY0JW1Kv ztWea+v|Bpk{qcr)yt~6c={EUY;g+n?8@BcLG&szK+N&5ly!?77Lg-lFc-sxg)tu5}H@-#?qPO2NWo;U`$JFkpIpieu=M}9bpMnb$7yC0 zP{|im@f9^(pq5{l$8XH%cL{ijdM?voifJ@uG?^I9W)_Q0B}>d4mYMl1H_fatD_CPT zv)1&|V)|({J6M-61GJe0>&-FR%_%mR({z}Rh?{_o=2JS&=X9B`*<`+>$6REqxkRt| zgFbVGZDxq=j$xM*V!)Bh>&UHj#*#=4a+~z-^=xZEt28OBP$T44@3=Bm_KBjXWrvZT^FIkboqkqNGo5PFQo;v3mne{E;OwVk(# zcY&;0MgFkl682~m&B$dKmXuWWXsQ>HSFN?y7Uutn>#^`Mg-%6gH1}^U_7BaC%KsKg IG>7KD0P`0JSpWb4 delta 1428 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 diff --git a/src/autovermietung/Main.java b/src/autovermietung/Main.java index 409f404..03f2d5c 100644 --- a/src/autovermietung/Main.java +++ b/src/autovermietung/Main.java @@ -40,6 +40,12 @@ public class Main { Shop.autoAnzeigen(pkws, modelle, kunden); Tastatur.liesString(); break; + // Auto miete beenden und Preis ausrechnen + case 3: + toDelete = Shop.mieteBeenden(pkws, modelle, kunden); + Database.deletePkw(pkws.get(toDelete)); + pkws.remove(toDelete); + break; // Auto löschen aus der Datenbank case 9: toDelete = Shop.autoEntfernen(pkws, modelle, kunden); diff --git a/src/autovermietung/helper/Shop.java b/src/autovermietung/helper/Shop.java index 6f5dfaa..253a90b 100644 --- a/src/autovermietung/helper/Shop.java +++ b/src/autovermietung/helper/Shop.java @@ -60,6 +60,7 @@ public class Shop { menuText(); System.out.println("1.\tAutos vermieten"); System.out.println("2.\tAutos anzeigen"); + System.out.println("3.\tMiete eines Autos beenden"); System.out.println("9.\tAuto entfernen"); menuEnde(); } @@ -211,6 +212,32 @@ public class Shop { return Tastatur.liesInt() - 1; } + public static int mieteBeenden(ArrayList autos, ArrayList modelle, ArrayList kunden) { + clearScreen(); + int autoNr; + int neuerTacho; + float kostenoP; + float kosten; + System.out.println("Liste der Autos:"); + for (int i = 0; i < autos.size(); i++) { + System.out.print(i + 1 + ": "); + autos.get(i).getInformation(); + System.out.print("\t" + modelle.get(autos.get(i).getMnr() - 1).getModellname()); + System.out.println("\t" + kunden.get(autos.get(i).getKnr() - 1).getNachname()); + } + System.out.print("Bitte die Nummer des Autos abgeben: "); + autoNr = Tastatur.liesInt() - 1; + + System.out.print("Bitte den momentanen Tachostand angeben: "); + neuerTacho = Tastatur.liesInt(); + + kostenoP = (neuerTacho - autos.get(autoNr).getTachostand()) * modelle.get(autos.get(autoNr).getMnr() - 1).getKmpreis(); + kosten = kostenoP + modelle.get(autos.get(autoNr).getMnr() - 1).getPauschale(); + System.out.println("Der Preis beträgt: " + kosten); + + return autoNr; + } + public static void programmBeendet() { clearScreen(); System.out.println("Das Programm wurde durch den User beendet!");