forked from Yandex-Practicum/Java-Module-Project
-
Notifications
You must be signed in to change notification settings - Fork 0
Практическая работа 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
6 commits
Select commit
Hold shift + click to select a range
e1f6893
Remove classes
c521234
Change project name
2567102
Первое практическое задание
TelenkovAleksey a590ea7
Первое практическое задание
TelenkovAleksey 217b08c
Внес изменения, на повторную проверку.
TelenkovAleksey 545868e
Исправил что бы пользователь мог ввести строку и число
TelenkovAleksey 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
3 changes: 3 additions & 0 deletions
.idea/.gitignore
Oops, something went wrong.
1 change: 1 addition & 0 deletions
.idea/.name
Oops, something went wrong.
123 changes: 123 additions & 0 deletions
.idea/codeStyles/Project.xml
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
.idea/codeStyles/codeStyleConfig.xml
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
.idea/compiler.xml
Oops, something went wrong.
18 changes: 18 additions & 0 deletions
.idea/gradle.xml
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
.idea/misc.xml
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
.idea/vcs.xml
Oops, something went wrong.
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
60 changes: 60 additions & 0 deletions
src/main/java/Calculate.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,60 @@ | ||
| import java.util.Scanner; | ||
|
|
||
| public class Calculate { | ||
|
|
||
| public static void product(double person) { | ||
|
|
||
| String food = ""; | ||
| double price = 0.0; | ||
|
|
||
| while (true) { | ||
| System.out.println("Для добавления товара введите название продукта\nДля завершения программы введите \"Завершить\""); | ||
| Scanner scanner = new Scanner(System.in); | ||
| String inputFood = scanner.next(); | ||
| double itog = 0; | ||
|
|
||
| if (inputFood.equalsIgnoreCase("Завершить")) { | ||
| itog = (int) (price / person); | ||
| System.out.println("Покупка завершена, " + String.format("%.0f", person) + " персоны заплатят по " + itog + " " + Matsh.floover(itog)); | ||
| break; | ||
|
|
||
| } else { | ||
| System.out.println("Введите стоимость продукта в формате \"'рубли.копейки' [10.45, 11.40]\""); | ||
| while (!scanner.hasNextInt()) { | ||
| System.out.println("Некорректное значение, введите стоимость продукта в формате \"'рубли.копейки' [10.45, 11.40]\""); | ||
| scanner.next(); | ||
| } | ||
| float inputPrice = (float) scanner.nextDouble(); | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| food = food + "\n" + inputFood; | ||
| price = price + inputPrice; | ||
|
|
||
| System.out.println("Вы успешно добавили продукт:" + food + "\nИтог: " + String.format("%.2f", price) + " " + Matsh.floover(itog)); | ||
|
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. Здесь выводится стоимость товара - price, но расчет окончания слова Рубль берется для числа itog, а должна быть одна и та же переменная 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. Наставница передала твой вопрос, что я имела в виду: |
||
| } | ||
| } | ||
| } | ||
|
|
||
| static class Matsh { | ||
|
|
||
| public static String floover(double price) { | ||
|
|
||
| int amount = (int) price; | ||
|
|
||
| if (amount > 100) | ||
| amount %= 100; | ||
|
|
||
| if (amount > 20) | ||
| amount %= 10; | ||
|
|
||
| switch (amount) { | ||
| case 1: | ||
| return "Рублю"; | ||
| case 2: | ||
| case 3: | ||
| case 4: | ||
| return "Рубля"; | ||
| default: | ||
| return "Рублей"; | ||
| } | ||
| } | ||
| } | ||
| } | ||
22 changes: 0 additions & 22 deletions
src/main/java/Calculator.java
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
src/main/java/Formatter.java
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
src/main/java/Item.java
Oops, something went wrong.
49 changes: 0 additions & 49 deletions
src/main/java/Main.java
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
src/main/java/Menu.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,34 @@ | ||
| import java.util.Scanner; | ||
|
|
||
| public class Menu { | ||
| public static void main(String[] args) { | ||
| inputParameters(); | ||
|
|
||
| } | ||
| public static void inputParameters(){ | ||
| Scanner scanner = new Scanner(System.in); | ||
| System.out.println("На сколько персон делить чек?"); | ||
| int person = 0; | ||
|
|
||
| while (!scanner.hasNextInt()) { | ||
| System.out.println("Некорректное значение для подсчёта, попробуйте еще раз"); | ||
| scanner.next(); | ||
| } | ||
| while (true) { | ||
| person = scanner.nextInt(); | ||
| if (person > 1) { | ||
| System.out.println("Давайте посчитаем!"); | ||
| Calculate.product(person); | ||
| } | ||
| if (person == 1) { | ||
| System.out.println("Вы оплачиваете счет сами"); | ||
| Calculate.product(person); | ||
| } | ||
| if (person < 1) { | ||
| System.out.println("Некорректное значение для подсчёта, попробуйте еще раз"); | ||
|
|
||
|
|
||
| } | ||
| } | ||
| } | ||
| } |
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.