From 718ceb4d8f2f93ea986ef7ffc10c4edc74c5c0b7 Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Mon, 26 Dec 2022 23:48:13 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 59 ++++++++++++++++++++++++++++++++++ src/main/java/Dish.java | 60 +++++++++++++++++++++++++++++++++++ src/main/java/Main.java | 54 +++++++++++++++++++++++++++++-- 3 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 src/main/java/Calculator.java create mode 100644 src/main/java/Dish.java diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java new file mode 100644 index 000000000..d97bfa03f --- /dev/null +++ b/src/main/java/Calculator.java @@ -0,0 +1,59 @@ +import java.util.ArrayList; + +public class Calculator { + public Calculator(int personCount, ArrayList dishesList) { + calculate(personCount, dishesList); + } + + private void calculate(int personCount, ArrayList dishesList){ + showDishList(dishesList); + totalPriceForPerson(personCount, dishesList); + } + + private void showDishList(ArrayList dishesList){ + System.out.println("Добавленные товары:"); + int a = 0; + String x = "рубль"; + String y = "рубля"; + String z = "рублей"; + for(int i = 0; i < dishesList.size(); i++){ + a = dishesList.get(i).getPrice().intValue(); + String ending = String.valueOf(a); + ending = ending.substring(ending.length() - 1); + if(ending.equals("1")){ + ending = x; + } + if(ending.equals("2") || ending.equals("3") || ending.equals("4")){ + ending = y; + } + if(ending.equals("5") || ending.equals("6") || ending.equals("7") || ending.equals("8") || ending.equals("9") ||ending.equals("0")){ + ending = z; + } + System.out.println("Позиция: " + dishesList.get(i).getName() + " Цена: " + String.format("%.2f", dishesList.get(i).getPrice()) + " " + ending); + } + } + + private void totalPriceForPerson(int personCount, ArrayList dishesList){ + Double totalPrice = 0.0; + for(int i = 0; i < dishesList.size(); i++){ + totalPrice = totalPrice + dishesList.get(i).getPrice(); + } + totalPrice = totalPrice / personCount; + int a = totalPrice.intValue(); + String x = "рубль"; + String y = "рубля"; + String z = "рублей"; + String ending = String.valueOf(a); + ending = ending.substring(ending.length() - 1); + if(ending.equals("1")){ + ending = x; + } + if(ending.equals("2") || ending.equals("3") || ending.equals("4")){ + ending = x; + } + if(ending.equals("5") || ending.equals("6") || ending.equals("7") || ending.equals("8") || ending.equals("9") ||ending.equals("0")){ + ending = z; + } + System.out.println("Итоговая цена для каждой персоны: " + String.format("%.2f", totalPrice) + " " + ending); + } +} diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java new file mode 100644 index 000000000..64729a06e --- /dev/null +++ b/src/main/java/Dish.java @@ -0,0 +1,60 @@ +import java.util.Scanner; + +public class Dish { + private Double price; + private String name; + + public Dish() { + setName(); + setPrice(); + System.out.println("Позиция успешно добавлена!"); + } + + public Double getPrice() { + return price; + } + + public String getName() { + return name; + } + + public void setName() { + Scanner scanner = new Scanner(System.in); + while(true){ + System.out.println("Введите название блюда."); + String line = scanner.nextLine(); + if(line.trim().isEmpty()){ + System.out.println("Ничего не введено. Попробуйте снова"); + continue; + } + else{ + name = line; + break; + } + } + } + + public void setPrice() { + Scanner scanner = new Scanner(System.in); + while(true){ + System.out.println("Укажите стоимость " + name); + String line = scanner.nextLine(); + if(line.trim().isEmpty()){ + System.out.println("Ничего не введено. Попробуйте снова"); + continue; + } + if(!line.equals(line.replaceAll("[^0-9.]", ""))){ + System.out.println("Нужно число без букв. Попробуйте снова"); + continue; + } + price = Double.parseDouble(line); + if(price <= 0.0){ + System.out.println("Цена должна быть положительной. Попробуйте снова"); + continue; + } + else{ + break; + } + } + } +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index a9198c435..991ac01b9 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,8 +1,56 @@ +import java.util.ArrayList; +import java.util.Scanner; + public class Main { public static void main(String[] args) { - // ваш код начнется здесь - // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости - System.out.println("Привет Мир"); + Double price; + String name; + ArrayList dishesList = new ArrayList<>(); + + int personCount = getPersonCount(); + + Scanner scanner = new Scanner(System.in); + String line = ""; + while(true){ + dishesList.add(new Dish()); + System.out.println("Для добавления нового товара введите что угодно. Для завершения введите 'завершить'"); + line = scanner.nextLine(); + if(line.equalsIgnoreCase("завершить")){ + System.out.println("Составление списка успешно завершино"); + break; + } + } + Calculator calculator = new Calculator(personCount, dishesList); + + } + private static int getPersonCount(){ + Scanner scanner = new Scanner(System.in); + while(true){ + System.out.println("На скольких человек необходимо разделить счёт?"); + String line = scanner.nextLine(); + if(line.trim().isEmpty()){ + System.out.println("Ничего не введено. Попробуйте снова"); + continue; + } + if(!line.equals(line.replaceAll("[^0-9.]", ""))){ + System.out.println("Нужно целое число без букв. Попробуйте снова"); + continue; + } + if(line.contains(".") || line.contains(",")){ + System.out.println("Нужно целое число. Попробуйте снова"); + continue; + } + int personCount = Integer.parseInt(line); + if(personCount < 2){ + System.out.println("Число персон должно быть не меньше двух. Попробуйте снова"); + continue; + } + else{ + System.out.println("Счёт будет разделён на " + personCount + " персоны"); + return personCount; + } + } } } + From 365456f903643046ac36245fc09e0086b0cbb5f0 Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Tue, 27 Dec 2022 00:55:15 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 1 + src/main/java/Dish.java | 1 + src/main/java/Main.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index d97bfa03f..dfd3e79a3 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,6 +1,7 @@ import java.util.ArrayList; public class Calculator { + public Calculator(int personCount, ArrayList dishesList) { calculate(personCount, dishesList); } diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java index 64729a06e..19fdbd27f 100644 --- a/src/main/java/Dish.java +++ b/src/main/java/Dish.java @@ -1,6 +1,7 @@ import java.util.Scanner; public class Dish { + private Double price; private String name; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 991ac01b9..1f717f9d5 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -6,6 +6,7 @@ public class Main { public static void main(String[] args) { Double price; String name; + ArrayList dishesList = new ArrayList<>(); int personCount = getPersonCount(); From 6126ccdbc24ed9c390ceafc2611b868f6e99ab6d Mon Sep 17 00:00:00 2001 From: ValentinPside <91324342+ValentinPside@users.noreply.github.com> Date: Tue, 27 Dec 2022 01:10:43 +0300 Subject: [PATCH 3/8] Delete src/main/java directory --- src/main/java/Calculator.java | 60 ---------------------------------- src/main/java/Dish.java | 61 ----------------------------------- src/main/java/Main.java | 57 -------------------------------- 3 files changed, 178 deletions(-) delete mode 100644 src/main/java/Calculator.java delete mode 100644 src/main/java/Dish.java delete mode 100644 src/main/java/Main.java diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java deleted file mode 100644 index dfd3e79a3..000000000 --- a/src/main/java/Calculator.java +++ /dev/null @@ -1,60 +0,0 @@ -import java.util.ArrayList; - -public class Calculator { - - public Calculator(int personCount, ArrayList dishesList) { - calculate(personCount, dishesList); - } - - private void calculate(int personCount, ArrayList dishesList){ - showDishList(dishesList); - totalPriceForPerson(personCount, dishesList); - } - - private void showDishList(ArrayList dishesList){ - System.out.println("Добавленные товары:"); - int a = 0; - String x = "рубль"; - String y = "рубля"; - String z = "рублей"; - for(int i = 0; i < dishesList.size(); i++){ - a = dishesList.get(i).getPrice().intValue(); - String ending = String.valueOf(a); - ending = ending.substring(ending.length() - 1); - if(ending.equals("1")){ - ending = x; - } - if(ending.equals("2") || ending.equals("3") || ending.equals("4")){ - ending = y; - } - if(ending.equals("5") || ending.equals("6") || ending.equals("7") || ending.equals("8") || ending.equals("9") ||ending.equals("0")){ - ending = z; - } - System.out.println("Позиция: " + dishesList.get(i).getName() + " Цена: " + String.format("%.2f", dishesList.get(i).getPrice()) + " " + ending); - } - } - - private void totalPriceForPerson(int personCount, ArrayList dishesList){ - Double totalPrice = 0.0; - for(int i = 0; i < dishesList.size(); i++){ - totalPrice = totalPrice + dishesList.get(i).getPrice(); - } - totalPrice = totalPrice / personCount; - int a = totalPrice.intValue(); - String x = "рубль"; - String y = "рубля"; - String z = "рублей"; - String ending = String.valueOf(a); - ending = ending.substring(ending.length() - 1); - if(ending.equals("1")){ - ending = x; - } - if(ending.equals("2") || ending.equals("3") || ending.equals("4")){ - ending = x; - } - if(ending.equals("5") || ending.equals("6") || ending.equals("7") || ending.equals("8") || ending.equals("9") ||ending.equals("0")){ - ending = z; - } - System.out.println("Итоговая цена для каждой персоны: " + String.format("%.2f", totalPrice) + " " + ending); - } -} diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java deleted file mode 100644 index 19fdbd27f..000000000 --- a/src/main/java/Dish.java +++ /dev/null @@ -1,61 +0,0 @@ -import java.util.Scanner; - -public class Dish { - - private Double price; - private String name; - - public Dish() { - setName(); - setPrice(); - System.out.println("Позиция успешно добавлена!"); - } - - public Double getPrice() { - return price; - } - - public String getName() { - return name; - } - - public void setName() { - Scanner scanner = new Scanner(System.in); - while(true){ - System.out.println("Введите название блюда."); - String line = scanner.nextLine(); - if(line.trim().isEmpty()){ - System.out.println("Ничего не введено. Попробуйте снова"); - continue; - } - else{ - name = line; - break; - } - } - } - - public void setPrice() { - Scanner scanner = new Scanner(System.in); - while(true){ - System.out.println("Укажите стоимость " + name); - String line = scanner.nextLine(); - if(line.trim().isEmpty()){ - System.out.println("Ничего не введено. Попробуйте снова"); - continue; - } - if(!line.equals(line.replaceAll("[^0-9.]", ""))){ - System.out.println("Нужно число без букв. Попробуйте снова"); - continue; - } - price = Double.parseDouble(line); - if(price <= 0.0){ - System.out.println("Цена должна быть положительной. Попробуйте снова"); - continue; - } - else{ - break; - } - } - } -} diff --git a/src/main/java/Main.java b/src/main/java/Main.java deleted file mode 100644 index 1f717f9d5..000000000 --- a/src/main/java/Main.java +++ /dev/null @@ -1,57 +0,0 @@ -import java.util.ArrayList; -import java.util.Scanner; - -public class Main { - - public static void main(String[] args) { - Double price; - String name; - - ArrayList dishesList = new ArrayList<>(); - - int personCount = getPersonCount(); - - Scanner scanner = new Scanner(System.in); - String line = ""; - while(true){ - dishesList.add(new Dish()); - System.out.println("Для добавления нового товара введите что угодно. Для завершения введите 'завершить'"); - line = scanner.nextLine(); - if(line.equalsIgnoreCase("завершить")){ - System.out.println("Составление списка успешно завершино"); - break; - } - } - Calculator calculator = new Calculator(personCount, dishesList); - - } - private static int getPersonCount(){ - Scanner scanner = new Scanner(System.in); - while(true){ - System.out.println("На скольких человек необходимо разделить счёт?"); - String line = scanner.nextLine(); - if(line.trim().isEmpty()){ - System.out.println("Ничего не введено. Попробуйте снова"); - continue; - } - if(!line.equals(line.replaceAll("[^0-9.]", ""))){ - System.out.println("Нужно целое число без букв. Попробуйте снова"); - continue; - } - if(line.contains(".") || line.contains(",")){ - System.out.println("Нужно целое число. Попробуйте снова"); - continue; - } - int personCount = Integer.parseInt(line); - if(personCount < 2){ - System.out.println("Число персон должно быть не меньше двух. Попробуйте снова"); - continue; - } - else{ - System.out.println("Счёт будет разделён на " + personCount + " персоны"); - return personCount; - } - } - } -} - From dd87abb9a99ba20986fcdb652056a2f5556922a6 Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Tue, 27 Dec 2022 01:11:28 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 1 - src/main/java/Dish.java | 1 - src/main/java/Main.java | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index dfd3e79a3..d97bfa03f 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,7 +1,6 @@ import java.util.ArrayList; public class Calculator { - public Calculator(int personCount, ArrayList dishesList) { calculate(personCount, dishesList); } diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java index 19fdbd27f..64729a06e 100644 --- a/src/main/java/Dish.java +++ b/src/main/java/Dish.java @@ -1,7 +1,6 @@ import java.util.Scanner; public class Dish { - private Double price; private String name; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 1f717f9d5..62760efd2 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -2,7 +2,6 @@ import java.util.Scanner; public class Main { - public static void main(String[] args) { Double price; String name; From 8254074578425275e33b658b3ef841c1fa2230b4 Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Tue, 27 Dec 2022 01:23:31 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 1 + src/main/java/Dish.java | 1 + src/main/java/Main.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index d97bfa03f..dfd3e79a3 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,6 +1,7 @@ import java.util.ArrayList; public class Calculator { + public Calculator(int personCount, ArrayList dishesList) { calculate(personCount, dishesList); } diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java index 64729a06e..19fdbd27f 100644 --- a/src/main/java/Dish.java +++ b/src/main/java/Dish.java @@ -1,6 +1,7 @@ import java.util.Scanner; public class Dish { + private Double price; private String name; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 62760efd2..1f717f9d5 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -2,6 +2,7 @@ import java.util.Scanner; public class Main { + public static void main(String[] args) { Double price; String name; From 6792a0d60e326a7c42d26e671e7eee7c0f36a8db Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Tue, 27 Dec 2022 01:32:15 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1=20=D0=B4=D0=BB=D1=8F=20=D0=9F=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 1 - src/main/java/Dish.java | 1 - src/main/java/Main.java | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index dfd3e79a3..d97bfa03f 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,7 +1,6 @@ import java.util.ArrayList; public class Calculator { - public Calculator(int personCount, ArrayList dishesList) { calculate(personCount, dishesList); } diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java index 19fdbd27f..64729a06e 100644 --- a/src/main/java/Dish.java +++ b/src/main/java/Dish.java @@ -1,7 +1,6 @@ import java.util.Scanner; public class Dish { - private Double price; private String name; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 1f717f9d5..62760efd2 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -2,7 +2,6 @@ import java.util.Scanner; public class Main { - public static void main(String[] args) { Double price; String name; From 278f1fc55d9b530e7ce9a203335c0e76048f3c12 Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Tue, 27 Dec 2022 02:44:59 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1=20=D0=B4=D0=BB=D1=8F=20=D0=9F=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 1 + src/main/java/Dish.java | 1 + src/main/java/Main.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index d97bfa03f..dfd3e79a3 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,6 +1,7 @@ import java.util.ArrayList; public class Calculator { + public Calculator(int personCount, ArrayList dishesList) { calculate(personCount, dishesList); } diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java index 64729a06e..19fdbd27f 100644 --- a/src/main/java/Dish.java +++ b/src/main/java/Dish.java @@ -1,6 +1,7 @@ import java.util.Scanner; public class Dish { + private Double price; private String name; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 62760efd2..1f717f9d5 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -2,6 +2,7 @@ import java.util.Scanner; public class Main { + public static void main(String[] args) { Double price; String name; From 5769181f4e91369723f21f29bf7fed1323c4d7f3 Mon Sep 17 00:00:00 2001 From: ValentinPside Date: Tue, 27 Dec 2022 02:53:44 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=E2=84=96?= =?UTF-8?q?1=20=D0=B4=D0=BB=D1=8F=20=D0=9F=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Calculator.java | 1 - src/main/java/Dish.java | 1 - src/main/java/Main.java | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java index dfd3e79a3..d97bfa03f 100644 --- a/src/main/java/Calculator.java +++ b/src/main/java/Calculator.java @@ -1,7 +1,6 @@ import java.util.ArrayList; public class Calculator { - public Calculator(int personCount, ArrayList dishesList) { calculate(personCount, dishesList); } diff --git a/src/main/java/Dish.java b/src/main/java/Dish.java index 19fdbd27f..64729a06e 100644 --- a/src/main/java/Dish.java +++ b/src/main/java/Dish.java @@ -1,7 +1,6 @@ import java.util.Scanner; public class Dish { - private Double price; private String name; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 1f717f9d5..62760efd2 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -2,7 +2,6 @@ import java.util.Scanner; public class Main { - public static void main(String[] args) { Double price; String name;