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
4 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
3 changes: 3 additions & 0 deletions
.idea/.gitignore
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.
10 changes: 10 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
45 changes: 30 additions & 15 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 |
|---|---|---|
| @@ -1,22 +1,37 @@ | ||
| class Calculator { | ||
| public class Calculator { | ||
| static float itemsSum; | ||
| static float costPerPerson; | ||
|
|
||
| int friendsCount; | ||
|
|
||
| String cart = "Добавленные товары:"; | ||
| double totalPrice = 0; | ||
|
|
||
| Calculator(int friendsCount) { | ||
| this.friendsCount = friendsCount; | ||
| public static void sumCostsOfItems(float cost) { | ||
| itemsSum = itemsSum + cost; | ||
| } | ||
|
|
||
| void addItem(Item item) { | ||
| totalPrice += item.price; | ||
| cart = cart + "\n" + item.name; | ||
|
|
||
| System.out.println(item.name + " в корзине"); | ||
| public static float calculateCostPerPerson(int personsQuantity) { | ||
| costPerPerson = itemsSum / (float) personsQuantity; | ||
| return costPerPerson; | ||
| } | ||
|
|
||
| double divideSum() { | ||
| return totalPrice / friendsCount; | ||
| public static String findRightRoubleWord(int roubles) { | ||
| String roubleName; | ||
| int lastDigit; | ||
| int lastTwoDigits; | ||
| lastTwoDigits = roubles % 100; | ||
| if (lastTwoDigits >= 11 && lastTwoDigits <= 14) { | ||
| roubleName = "рублей"; | ||
| return roubleName; | ||
| } | ||
| lastDigit = roubles % 10; | ||
| if (lastDigit == 1) { | ||
| roubleName = "рубль"; | ||
| return roubleName; | ||
| } else if (lastDigit >= 2 && lastDigit <= 4) { | ||
| roubleName = "рубля"; | ||
| return roubleName; | ||
| } else { | ||
| roubleName = "рублей"; | ||
| return roubleName; | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
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.
16 changes: 16 additions & 0 deletions
src/main/java/ItemsBasket.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,16 @@ | ||
| public class ItemsBasket { | ||
| static String itemsNames = "None"; | ||
|
|
||
| public static void addItemInBasket(String name) { | ||
| if (itemsNames.equals("None")) { | ||
| itemsNames = name; | ||
| } else { | ||
| itemsNames = itemsNames + ", " + name; | ||
| } | ||
| } | ||
|
|
||
| public static void writeItemsFromBasket() { | ||
| System.out.println("Добавленные товары:\n" + itemsNames.replaceAll(", ", "\n")); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
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.