-
Notifications
You must be signed in to change notification settings - Fork 4
Bugfix/#170 show active work instant in report #176
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
JonathanWekesser
wants to merge
2
commits into
develop
Choose a base branch
from
bugfix/#170_showActiveWorkInstantInReport
base: develop
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
108 changes: 108 additions & 0 deletions
108
src/main/java/de/doubleslash/keeptime/controller/report/Report.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,108 @@ | ||
| package de.doubleslash.keeptime.controller.report; | ||
|
|
||
| import de.doubleslash.keeptime.common.DateFormatter; | ||
| import de.doubleslash.keeptime.controller.Controller; | ||
| import de.doubleslash.keeptime.model.Model; | ||
| import de.doubleslash.keeptime.model.Project; | ||
| import de.doubleslash.keeptime.model.Work; | ||
|
|
||
| import java.time.LocalDate; | ||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class Report { | ||
| private final LocalDate date; | ||
| private final Model model; | ||
| private final Controller controller; | ||
| private List<Work> workItems; | ||
| private long workItemsSeconds; | ||
| private SortedSet<Project> workedProjectsSet; | ||
| private long presentTime; | ||
| private long workTime; | ||
| private Map<Long, Long> projectWorkSecondsMap; | ||
|
|
||
| public Report(LocalDate date, Model model, Controller controller) { | ||
| this.date = date; | ||
| this.model = model; | ||
| this.controller = controller; | ||
|
|
||
| fetchWorkItems(); | ||
|
|
||
| fetchProjects(); | ||
|
|
||
| calculateSeconds(); | ||
|
|
||
| } | ||
|
|
||
| public LocalDate getDate() { | ||
| return date; | ||
| } | ||
|
|
||
| public String getDateString() { | ||
| return DateFormatter.toDayDateString(this.date); | ||
| } | ||
|
|
||
| public List<Work> getWorkItems() { | ||
| return workItems; | ||
| } | ||
|
|
||
| public long getWorkItemsSeconds() { | ||
| return workItemsSeconds; | ||
| } | ||
|
|
||
| public SortedSet<Project> getWorkedProjectsSet() { | ||
| return workedProjectsSet; | ||
| } | ||
|
|
||
| public String getPresentTimeString() { | ||
| return DateFormatter.secondsToHHMMSS(this.presentTime); | ||
| } | ||
|
|
||
| public String getWorkTimeString() { | ||
| return DateFormatter.secondsToHHMMSS(this.workTime); | ||
| } | ||
|
|
||
| public Map<Long, Long> getProjectWorkSecondsMap() { | ||
| return this.projectWorkSecondsMap; | ||
| } | ||
|
|
||
| private void fetchWorkItems() { | ||
| this.workItems = model.getWorkRepository().findByStartDateOrderByStartTimeAsc(date); | ||
|
|
||
| if (date.equals(LocalDate.now())) { | ||
| Work activeWorkItem = model.activeWorkItem.get(); | ||
| if (activeWorkItem != null && !this.workItems.contains(activeWorkItem)) { | ||
| this.workItems.add(activeWorkItem); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void fetchProjects() { | ||
| this.workedProjectsSet = workItems.stream() | ||
| .map(Work::getProject) | ||
| .collect(Collectors.toCollection( | ||
| () -> new TreeSet<>(Comparator.comparing(Project::getIndex)))); | ||
| } | ||
|
|
||
| private void calculateSeconds() { | ||
| this.workItemsSeconds = this.controller.calcSeconds(this.workItems); | ||
|
|
||
| this.projectWorkSecondsMap = new HashMap<>(); | ||
|
|
||
| for (final Project project : workedProjectsSet) { | ||
| final List<Work> onlyCurrentProjectWork = workItems.stream() | ||
| .filter(w -> w.getProject() == project) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| final long projectWorkSeconds = this.controller.calcSeconds(onlyCurrentProjectWork); | ||
|
|
||
| projectWorkSecondsMap.put(project.getId(), projectWorkSeconds); | ||
|
|
||
| presentTime += projectWorkSeconds; | ||
| if (project.isWork()) { | ||
| workTime += projectWorkSeconds; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
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
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.
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.
reminder for me: I do not like having this check still in the view-controller. Idea was that view just stupidly can show what the "view-model" presents it. no special logic needed.
this is why we did not merge it yet - as we now have logic in 2 places (Report.java and this class)