-
Notifications
You must be signed in to change notification settings - Fork 1.5k
try1 #1479
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
Dazai-osa
wants to merge
16
commits into
mate-academy:master
Choose a base branch
from
Dazai-osa:feature/try1
base: master
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
try1 #1479
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
138c663
try1
Dazai-osa 7636a6f
try2
Dazai-osa 351e5a6
try3
Dazai-osa 82b425b
try4
Dazai-osa 86f930e
try5
Dazai-osa d09277d
try6
Dazai-osa df5693b
try7
Dazai-osa 3b18b84
try8
Dazai-osa 2ad7a12
try9
Dazai-osa 3ad197a
try10
Dazai-osa 14746c3
try11
Dazai-osa c565171
try11
Dazai-osa 999291e
try12
Dazai-osa 6df8c0c
try13
Dazai-osa 789ce3f
try14
Dazai-osa af66392
try15
Dazai-osa 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,7 +1,34 @@ | ||
| package core.basesyntax; | ||
|
|
||
| import java.time.LocalDate; | ||
| import java.time.format.DateTimeFormatter; | ||
|
|
||
| public class SalaryInfo { | ||
| public String getSalaryInfo(String[] names, String[] data, String dateFrom, String dateTo) { | ||
| return null; | ||
| private static final DateTimeFormatter FORMATTER = | ||
| DateTimeFormatter.ofPattern("dd.MM.yyyy"); | ||
|
|
||
| public String getSalaryInfo(String[] names, String[] data, String dateFrom, | ||
| String dateTo) { | ||
| StringBuilder salaryReport = new StringBuilder("Report for period " | ||
| + dateFrom + " - " + dateTo + System.lineSeparator()); | ||
| LocalDate firstDate = LocalDate.parse(dateFrom, FORMATTER); | ||
| LocalDate lastDate = LocalDate.parse(dateTo, FORMATTER); | ||
| for (String name : names) { | ||
| int fullSalary = 0; | ||
| for (String entry : data) { | ||
| String[] parts = entry.split(" "); | ||
| LocalDate date = LocalDate.parse(parts[0], FORMATTER); | ||
| if (!date.isBefore(firstDate) && !date.isAfter(lastDate) | ||
| && name.equals(parts[1])) { | ||
| int hours = Integer.parseInt(parts[2]); | ||
| int salaryPerHour = Integer.parseInt(parts[3]); | ||
| fullSalary += hours * salaryPerHour; | ||
| } | ||
| } | ||
| salaryReport.append(name).append(" - ").append(fullSalary) | ||
| .append(System.lineSeparator()); | ||
| } | ||
| salaryReport.deleteCharAt(salaryReport.length() - 1); | ||
| return salaryReport.toString(); | ||
| } | ||
|
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. Returning |
||
| } | ||
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.
The date range check uses
isAfter(firstDate)andisBefore(lustDate), which excludes the boundary dates. According to the checklist, the range should be inclusive, so you should use!date.isBefore(firstDate) && !date.isAfter(lastDate).