forked from Yandex-Practicum/Java-Module-Project-YP
-
Notifications
You must be signed in to change notification settings - Fork 0
Спринт 2. Проектная работа No1 #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
17 changes: 17 additions & 0 deletions
src/main/java/Calculator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| public class Calculator { | ||
| int members; | ||
| double price; | ||
| double totalPrice; | ||
|
|
||
|
|
||
| double calculate (int members, double productPrice) { | ||
| this.members = members; | ||
| this.price = productPrice; | ||
| totalPrice += price; | ||
| System.out.println("Товар добавлен в общий счет"); | ||
| return totalPrice; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } |
21 changes: 21 additions & 0 deletions
src/main/java/Formatter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| public class Formatter { | ||
| String numFormat (double num) { | ||
| double lastNumber = (int) Math.floor(num); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Можно тип сделать int |
||
| int ruble =(int) Math.floor(lastNumber); | ||
| if (lastNumber % 100 >= 11 && lastNumber % 100 <= 14) { | ||
| return " рублей"; | ||
| } | ||
| switch (ruble % 10) { | ||
|
Comment on lines
+5
to
+8
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Все правильно. Молодец! 👍
Owner
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Спасибо! |
||
| case 1: | ||
| return "рубль"; | ||
| case 2: | ||
| case 3: | ||
| case 4: | ||
| return "рубля"; | ||
| default: | ||
| return "рублей"; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
66 changes: 63 additions & 3 deletions
src/main/java/Main.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,68 @@ | ||
| import java.util.Scanner; | ||
|
|
||
| // dev branch for Y.Practicum | ||
| public class Main { | ||
|
|
||
| public static void main(String[] args) { | ||
| // ваш код начнется здесь | ||
| // вы не должны ограничиваться только классом Main и можете создавать свои классы по необходимости | ||
| System.out.println("Привет Мир"); | ||
| int members = 0; | ||
|
|
||
| Scanner scanner= new Scanner(System.in); | ||
|
|
||
| System.out.println("Пожалуйства введите количество человек"); | ||
| while (members <= 1) { | ||
| if (scanner.hasNextInt()) { | ||
| members = scanner.nextInt(); | ||
| if (members <= 1) { | ||
| System.out.println("Количетсво введенных пользователей меньше или равно 1, пожалуйства попробуйте снова"); | ||
| } | ||
| } else { | ||
| System.out.println("Нужно ввести число!"); | ||
| scanner.next(); | ||
|
|
||
| } | ||
| } //конец цикла подсчета участников | ||
| Product product = new Product(); //объект продукт | ||
| Calculator calculator = new Calculator(); | ||
|
|
||
| while (true) { //начало подсчета товара | ||
| System.out.println("Введите название товара"); | ||
| product.name = scanner.next(); | ||
|
|
||
|
|
||
| if (product.name.equalsIgnoreCase("Завершить")) { | ||
| break; | ||
| } | ||
|
|
||
| System.out.println("Введите цену товара"); | ||
| while (!scanner.hasNextDouble()) { | ||
| System.out.println("Неккоректный ввод, попробуйте снова"); | ||
| scanner.next(); | ||
| } | ||
| product.price = scanner.nextDouble(); | ||
|
|
||
| while (product.price <= 0) { | ||
| System.out.println("Пожалуйства введите цену больше 0"); | ||
| while (!scanner.hasNextDouble()) { | ||
| System.out.println("Неккоректный ввод, попробуйте снова"); | ||
| scanner.next(); | ||
| } | ||
| product.price = scanner.nextDouble(); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| product.priceList = calculator.calculate(members, product.price); | ||
| product.nameList = product.productList(product.name); | ||
| System.out.println("Вы хотите добавить новый товар?, либо введите Завершить"); | ||
|
|
||
| } //конец подсчета | ||
|
|
||
| Formatter formatter = new Formatter(); | ||
| //объект формата строки | ||
| System.out.println("Ваш товар: " + " \n" + product.nameList); | ||
|
|
||
| System.out.println("На сумму: " + String.format("%.2f", product.priceList) + " " + formatter.numFormat(product.priceList)); | ||
|
|
||
| System.out.println("Каждый должен заплатить: " + String.format("%.2f", (product.priceList/members)) + " " + formatter.numFormat(product.priceList/members)); | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
src/main/java/Product.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| public class Product { | ||
| String name = ""; | ||
| String nameList = ""; | ||
| double price = 0; | ||
| double priceList; | ||
|
|
||
| String productList (String name) { | ||
| this.name = name; | ||
| return nameList += name + " \n"; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.