diff --git a/.gitignore b/.gitignore index 45b3c29..72ea2eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -OnlineShop/.settings/* \ No newline at end of file +OnlineShop/.settings/* +*.bkp +*.dtmp \ No newline at end of file diff --git a/OnlineShop/src/backend/Bestellung.java b/OnlineShop/src/backend/Bestellung.java index 7e2a91f..5ee8b89 100644 --- a/OnlineShop/src/backend/Bestellung.java +++ b/OnlineShop/src/backend/Bestellung.java @@ -4,6 +4,18 @@ public class Bestellung { public int id; public Warenkorb bestellungen; public Boolean storniert; + + public Bestellung(int id, Warenkorb bestellungen) { + this.id = id; + this.bestellungen = bestellungen; + this.storniert = false; + }; + + public Bestellung(int id, Warenkorb bestellungen, Boolean storniert) { + this.id = id; + this.bestellungen = bestellungen; + this.storniert = storniert; + }; public void StorniereBestellung(Warenkorb storniert) { diff --git a/OnlineShop/src/backend/Kunde.java b/OnlineShop/src/backend/Kunde.java index 39a8e58..cce4cd1 100644 --- a/OnlineShop/src/backend/Kunde.java +++ b/OnlineShop/src/backend/Kunde.java @@ -3,4 +3,9 @@ package backend; public class Kunde { public String name; public String Adresse; + + public Kunde(String name, String Adresse) { + this.name = name; + this.Adresse = Adresse; + }; } diff --git a/OnlineShop/src/backend/OnlineShop.java b/OnlineShop/src/backend/OnlineShop.java index db11bd2..e3b8dfb 100644 --- a/OnlineShop/src/backend/OnlineShop.java +++ b/OnlineShop/src/backend/OnlineShop.java @@ -8,9 +8,9 @@ public class OnlineShop { public Warenkorb aktuellerWarenkorb; public OnlineShop() { - lager = new ArrayList(); - bestellungen = new ArrayList(); - aktuellerWarenkorb = new Warenkorb(); + this.lager = new ArrayList(); + this.bestellungen = new ArrayList(); + this.aktuellerWarenkorb = new Warenkorb(); }; public void AddProdukt(Produkt neu){ diff --git a/OnlineShop/src/backend/Produkt.java b/OnlineShop/src/backend/Produkt.java index 3a5ad80..76a5884 100644 --- a/OnlineShop/src/backend/Produkt.java +++ b/OnlineShop/src/backend/Produkt.java @@ -9,6 +9,15 @@ public class Produkt { public int netto; public int mwStSatz; public int lagerbestand; + + public Produkt(int id, String name, int transportGewicht, int netto, int mwStSatz, int lagerbestand) { + this.id = id; + this.name = name; + this.transportGewicht = transportGewicht; + this.netto = netto; + this.mwStSatz = mwStSatz; + this.lagerbestand = lagerbestand; + }; public void UpdateProdukt(Produkt update) { }; diff --git a/OnlineShop/src/backend/Warenkorb.java b/OnlineShop/src/backend/Warenkorb.java index feea496..25eb6b6 100644 --- a/OnlineShop/src/backend/Warenkorb.java +++ b/OnlineShop/src/backend/Warenkorb.java @@ -6,6 +6,12 @@ public class Warenkorb { public ArrayList inhalt; public ArrayList anzahl; public Kunde kunde; + + public Warenkorb(Kunde kunde) { + this.inhalt = new ArrayList(); + this.anzahl = new ArrayList(); + this.kunde = kunde; + }; public int NettoPreis(){ return 0;}; diff --git a/README.md b/README.md index 2444d52..8bd8e44 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,9 @@ https://app.diagrams.net/#Uhttps%3A%2F%2Fgitty.informatik.hs-mannheim.de%2F30292 Or download and open it with drawio. Time Chart: + 1:40 for UML and understanding of the Exercise + 0:40 for Creating Java project with UML defined Classes. + +0:06 creating constructors \ No newline at end of file