Repository navigation
console calculator is done #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
dashanutikova
wants to merge
2
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 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
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 +1 @@ | ||
| # Пустой репозиторий для работы с Java кодом в Android Studio | ||
| # Консольное приложение, которое считывает товары и их стоимость. А затем делит общую сумму на указанное количество людей |
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,28 @@ | ||
| import java.util.ArrayList; | ||
| import java.util.InputMismatchException; | ||
| import java.util.Scanner; | ||
|
|
||
| public class Calculator { | ||
|
|
||
| public void addCostToTheOrder(Scanner scanner,ArrayList<Position> listOfOrder, String positionName) { | ||
| System.out.println("Укажите стоимость товара"); | ||
|
|
||
| while (true) { | ||
| try { | ||
| double cost = scanner.nextDouble(); | ||
|
|
||
| if (cost < 0) { | ||
| System.out.println("Цена не может быть отрицательной! Попробуйте еще раз"); | ||
| continue; | ||
| } | ||
| listOfOrder.add(new Position(cost, positionName)); | ||
| System.out.println("Товар " + positionName + " стоимостью " + cost + " добавлен в калькулятор. Нужно ли добавить еще? Если нет, введите Завершить"); | ||
| break; | ||
| } catch (InputMismatchException e) { | ||
| System.out.println("Стоимость должна быть в формате рубли.копейки, например 10.45 или 11.40. Попробуйте еще"); | ||
| scanner.next(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
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,6 +1,53 @@ | ||
| import java.util.ArrayList; | ||
| import java.util.InputMismatchException; | ||
| import java.util.Scanner; | ||
|
|
||
| public class Main { | ||
| public static void main(String[] args) { | ||
| System.out.println("Hello world!"); | ||
| Scanner scanner = new Scanner(System.in); | ||
| ArrayList<Position> listOfOrders = new ArrayList(); | ||
| Calculator calculator = new Calculator(); | ||
| RubleFormatter formatter = new RubleFormatter(); | ||
|
|
||
| while (true) { | ||
| System.out.println("На сколько человек будем делить счет?"); | ||
| try { | ||
| int guestCount = scanner.nextInt(); | ||
| if (guestCount == 1) | ||
| System.out.println("Нет необходимости делить счет для одного гостя. Попробуйте еще раз."); | ||
| else if (guestCount < 1) | ||
| System.out.println("Количество гостей должно быть больше 1. Попробуйте еще раз."); | ||
| else { | ||
| System.out.println("Количество гостей получено"); | ||
|
|
||
| while (true) { | ||
| System.out.println("Введите товар"); | ||
| String positionName = scanner.next(); | ||
| if (positionName.equalsIgnoreCase("Завершить")) { | ||
| double totalCost = 0.0; | ||
| ArrayList<String> totalName = new ArrayList<>(); | ||
|
|
||
| for (Position position : listOfOrders) { | ||
| totalCost += position.cost; | ||
| totalName.add(position.name); | ||
| } | ||
|
|
||
| double payment = totalCost / guestCount; | ||
|
|
||
| System.out.println("Общая сумма в заказе: " + totalCost); | ||
| System.out.println("Добавленные товары: \n" + String.join(System.lineSeparator(), totalName)); | ||
| System.out.println("Каждый человек должен заплатить по " + formatter.formatterPayment(payment) + " " + formatter.rubleFormatter(payment)); | ||
| break; | ||
| } | ||
|
|
||
| calculator.addCostToTheOrder(scanner, listOfOrders, positionName); | ||
| } | ||
| break; | ||
| } | ||
| } catch (InputMismatchException e) { | ||
| System.out.println("Нужно ввести число!"); | ||
| scanner.next(); | ||
| } | ||
| } | ||
| } | ||
| } |
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,10 @@ | ||
| public class Position { | ||
| double cost; | ||
| String name; | ||
|
|
||
| public Position(double cost, String name) { | ||
| this.cost = cost; | ||
| this.name = name; | ||
| } | ||
|
|
||
| } |
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 RubleFormatter { | ||
| public String formatterPayment(double payment) { | ||
| return String.format("%.2f", payment); | ||
| } | ||
|
|
||
| public String rubleFormatter(double payment) { | ||
| int intPayment = (int) payment; | ||
| int twoLastNumbers = intPayment % 100; | ||
| int lastNumber = intPayment % 10; | ||
|
|
||
| if (twoLastNumbers >= 11 && twoLastNumbers <= 14) { | ||
| return "рублей"; | ||
| } | ||
|
|
||
| return switch (lastNumber) { | ||
| case 1 -> "рубль"; | ||
| case 2, 3, 4 -> "рубля"; | ||
| default -> "рублей"; | ||
| }; | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Здорово, что форматтер вынесен в отдельный класс, молодец!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
спасибо ;)