diff --git a/Shop/resources/Quellen b/Shop/resources/quellen.txt similarity index 80% rename from Shop/resources/Quellen rename to Shop/resources/quellen.txt index 7e82ea4..f612cc3 100644 --- a/Shop/resources/Quellen +++ b/Shop/resources/quellen.txt @@ -11,3 +11,6 @@ https://www.w3schools.com/java/java_encapsulation.asp Code Gym - Get and Set https://codegym.cc/de/groups/posts/getter-und-setter-in-java + +Bro Code - How to read a File +https://www.youtube.com/watch?v=eHjbvgw4hsI \ No newline at end of file diff --git a/Shop/src/main/java/shoppackage/Cart.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/Cart.java similarity index 52% rename from Shop/src/main/java/shoppackage/Cart.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/Cart.java index 3ea544a..a38b86d 100644 --- a/Shop/src/main/java/shoppackage/Cart.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/Cart.java @@ -1,4 +1,9 @@ -package shoppackage; +package shop; public class Cart { + + + + + } diff --git a/Shop/src/main/java/shoppackage/CartPosition.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/CartPosition.java similarity index 71% rename from Shop/src/main/java/shoppackage/CartPosition.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/CartPosition.java index fe50573..7a7e913 100644 --- a/Shop/src/main/java/shoppackage/CartPosition.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/CartPosition.java @@ -1,4 +1,4 @@ -package shoppackage; +package shop; /* @@ -6,13 +6,14 @@ Cart Pos speichert die Menge der Products ---> bekommt product und menge (quanti */ public class CartPosition { - //Produkt ist eine referenz auf Product + //Produkt ist eine referenz auf product private Product product; //Die menge der produkte die gekauft werden sollen private int quantity; - public CartPosition(Product product, int quantity){ + public CartPosition(Product product, int quantity) { this.product = product; this.quantity = quantity; } } + diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/OnlineShop.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/OnlineShop.java new file mode 100644 index 0000000..d997d51 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/OnlineShop.java @@ -0,0 +1,46 @@ +package shop; +/* +Controller Klasse des Projektes. +TODO +Lager bestand für ein x beliebiges product bauen ----> Herr Hummels ansatz aus VL ausarbeiten +Cart übergeben +Order klasse integrieren +Logik ---> Product suchen & Kauf abschluss? + + + */ + +import java.io.File; +import java.io.FileNotFoundException; +import java.util.ArrayList; +import java.util.Scanner; + +public class OnlineShop { + ArrayList lager; + +//ArrayList + + public OnlineShop() { + lager = new ArrayList(); + + } + + public String[] produktListe() { + String[] produkt = new String[lager.size()]; + for (int i = 0; i < lager.size(); i++) + produkt[i] = lager.get(i).toString(); + + return produkt; + } + public static ArrayList readFile(String path) throws FileNotFoundException { + ArrayList lines = new ArrayList<>(); + Scanner sc = new Scanner(new File(path)); + + while (sc.hasNextLine()) { + lines.add(sc.nextLine()); + } + + sc.close(); + return lines; + } +} diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/Order.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/Order.java new file mode 100644 index 0000000..98a8966 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/Order.java @@ -0,0 +1,6 @@ +package shop; +/* +TODO Kassenbon System + */ +public class Order { +} diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/Product.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/Product.java new file mode 100644 index 0000000..6df03ca --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/Product.java @@ -0,0 +1,81 @@ +package shop; + +/* +TODO +Setter getter tutorial schauen + + + + */ +public class Product { + private int prodID; + private String name; + private double transportWeight; + private double netPrice; + private double mwst; // <----- Maybe final setzen + private int lagerbestand; + + public Product(int prodID, String name, double transportWeight, double netPrice, double mwst, int lagerbestand) { + this.prodID = prodID; + this.name = name; + this.transportWeight = transportWeight; + this.netPrice = netPrice; + this.mwst = mwst; + this.lagerbestand = lagerbestand; + + } + + //Aus den Vorlesungen + @Override + public boolean equals(Object o) { + if (!(o instanceof Product)) + return false; + + if (!this.name.equals(((Product) o).name) || this.netPrice != ((Product) o).netPrice) + return false; + + return true; + } + + //Get ---> Methoden zum abrufen der Vals + public String getName() { + return name; + } + + public int getLagerbestand() { + return lagerbestand; + } + + public int getProdID() { + return prodID; + } + + public double getNetPrice() { + return netPrice; + } + + public double getMwst() { + return mwst; + } + + public double getTransportWeight() { + return transportWeight; + } + + public String toString() { + return "ID:" + prodID + " | " + name + " | " + netPrice + "€"; + } + + //mwst berechnung + + public double mwstCalc() { + double Steuerbetrag = this.netPrice * (19 / 100); + return Math.round(Steuerbetrag * 100) / 100; + + } + + public void setLagerbestand(int neuerLagerbestand) { + this.lagerbestand = neuerLagerbestand; + } + +} \ No newline at end of file diff --git a/Shop/src/main/java/shoppackage/ShopTUI.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/ShopTUI.java similarity index 61% rename from Shop/src/main/java/shoppackage/ShopTUI.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/ShopTUI.java index 19d70dd..80cc538 100644 --- a/Shop/src/main/java/shoppackage/ShopTUI.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/ShopTUI.java @@ -1,4 +1,4 @@ -package shoppackage; +package shop; import java.util.Scanner; @@ -12,10 +12,31 @@ getName ect.. */ public class ShopTUI { static Scanner scanner = new Scanner(System.in); +private static OnlineShop onlineShop; void main(){ + OnlineShop shop = new OnlineShop(); + + System.out.println("Hello Shop!"); } + public static void menu(){ + /* + TODO + Product angebot + Product suche + Cartbar + Exit + */ + + + + + + } + + + } diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/CartTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/CartTest.java new file mode 100644 index 0000000..350153d --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/CartTest.java @@ -0,0 +1,5 @@ +package shop; + +class CartTest { + +} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/OnlineShopTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/OnlineShopTest.java new file mode 100644 index 0000000..a3080c5 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/OnlineShopTest.java @@ -0,0 +1,5 @@ +package shop; + +class OnlineShopTest { + +} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/OrderTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/OrderTest.java new file mode 100644 index 0000000..33b051b --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/OrderTest.java @@ -0,0 +1,5 @@ +package shop; + +class OrderTest { + +} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/ProductsTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/ProductsTest.java new file mode 100644 index 0000000..5a734a6 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/ProductsTest.java @@ -0,0 +1,18 @@ +package shop; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class ProductsTest { + + @Test + void testConstr(){ + Product p1 = new Product(1, "Bier", 2.2, 2.90,19,2); + assertEquals(0.19, p1.mwstCalc()); + } + + + + +} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/ShopTUITest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/ShopTUITest.java new file mode 100644 index 0000000..be19438 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/ShopTUITest.java @@ -0,0 +1,5 @@ +package shop; + +class ShopTUITest { + +} \ No newline at end of file diff --git a/Shop/src/main/java/shoppackage/OnlineShop.java b/Shop/src/main/java/shoppackage/OnlineShop.java deleted file mode 100644 index 3ea2d0c..0000000 --- a/Shop/src/main/java/shoppackage/OnlineShop.java +++ /dev/null @@ -1,25 +0,0 @@ -package shoppackage; -/* -Controller Klasse des Projektes. -TODO -Lager bestand für ein x beliebiges product bauen ----> Herr Hummels ansatz aus VL ausarbeiten -Cart übergeben -Order klasse integrieren -Logik ---> Product suchen & Kauf abschluss? <---- Oder doch in TUI? - - - */ -import java.util.ArrayList; - -public class OnlineShop { - ArrayList lager; - -//ArrayList - - public OnlineShop() { - lager = new ArrayList(); - lager.add(new Product(1, "Riesling 0.7 l", - 1.1, 4.20, 19, 87)); - - } -} \ No newline at end of file diff --git a/Shop/src/main/java/shoppackage/Order.java b/Shop/src/main/java/shoppackage/Order.java deleted file mode 100644 index fca2d12..0000000 --- a/Shop/src/main/java/shoppackage/Order.java +++ /dev/null @@ -1,4 +0,0 @@ -package shoppackage; - -public class Order { -} diff --git a/Shop/src/main/java/shoppackage/Product.java b/Shop/src/main/java/shoppackage/Product.java deleted file mode 100644 index 765087e..0000000 --- a/Shop/src/main/java/shoppackage/Product.java +++ /dev/null @@ -1,60 +0,0 @@ -package shoppackage; -/* -TODO -Setter getter tutorial schauen - - - - */ -public class Product { - private int prodID; - private String name; - private double transportWeight; - private double netto; - private double mwst; // <----- Maybe final setzen - private int lagerbestand; - - public Product(int prodID, String name, double transportWeight, double netto, double mwst, int lagerbestand) { - this.prodID = prodID; - this.name = name; - this.transportWeight = transportWeight; - this.netto = netto; - this.mwst = mwst; - this.lagerbestand = lagerbestand; - - } - //Aus den Vorlesungen - public boolean equals(Object o) { - if (!(o instanceof Product)) - return false; - - if (!this.name.equals(((Product)o).name)|| this.netto != ((Product)o).netto) - return false; - - return true; - } - //Get ---> Methoden zum abrufen der Vals - public String getName() { - return name; - } - public int getLagerbestand(){ - return lagerbestand; - } - public int getProdID(){ - return prodID; - } - - public double getNetto() { - return netto; - } - - public double getMwst() { - return mwst; - } - public double getTransportWeight(){ - return transportWeight; - } - - - -} \ No newline at end of file diff --git a/Shop/src/test/java/shoppackage/CartTest.java b/Shop/src/test/java/shoppackage/CartTest.java deleted file mode 100644 index 693b444..0000000 --- a/Shop/src/test/java/shoppackage/CartTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package shoppackage; - -import static org.junit.jupiter.api.Assertions.*; - -class CartTest { - -} \ No newline at end of file diff --git a/Shop/src/test/java/shoppackage/OnlineShopTest.java b/Shop/src/test/java/shoppackage/OnlineShopTest.java deleted file mode 100644 index 86d468b..0000000 --- a/Shop/src/test/java/shoppackage/OnlineShopTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package shoppackage; - -import static org.junit.jupiter.api.Assertions.*; - -class OnlineShopTest { - -} \ No newline at end of file diff --git a/Shop/src/test/java/shoppackage/OrderTest.java b/Shop/src/test/java/shoppackage/OrderTest.java deleted file mode 100644 index 59a24d8..0000000 --- a/Shop/src/test/java/shoppackage/OrderTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package shoppackage; - -import static org.junit.jupiter.api.Assertions.*; - -class OrderTest { - -} \ No newline at end of file diff --git a/Shop/src/test/java/shoppackage/ProductsTest.java b/Shop/src/test/java/shoppackage/ProductsTest.java deleted file mode 100644 index e746cbc..0000000 --- a/Shop/src/test/java/shoppackage/ProductsTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package shoppackage; - -import static org.junit.jupiter.api.Assertions.*; - -class ProductsTest { - -} \ No newline at end of file diff --git a/Shop/src/test/java/shoppackage/ShopTUITest.java b/Shop/src/test/java/shoppackage/ShopTUITest.java deleted file mode 100644 index 0a46249..0000000 --- a/Shop/src/test/java/shoppackage/ShopTUITest.java +++ /dev/null @@ -1,7 +0,0 @@ -package shoppackage; - -import static org.junit.jupiter.api.Assertions.*; - -class ShopTUITest { - -} \ No newline at end of file