-
Notifications
You must be signed in to change notification settings - Fork 4
#188: Add Ability to Manually Add Work Entries #190
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
MomdAli
wants to merge
2
commits into
feature/PTBAS-741_mappingDialogAdjustment
Choose a base branch
from
feature/#188_manualTaskCreation
base: feature/PTBAS-741_mappingDialogAdjustment
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
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
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
116 changes: 116 additions & 0 deletions
116
src/main/java/de/doubleslash/keeptime/view/TimePickerComboBox.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,116 @@ | ||
| package de.doubleslash.keeptime.view; | ||
|
Collaborator
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. I think I wanted to revert the timepicker changes. only keep the add work button. |
||
|
|
||
| import javafx.application.Platform; | ||
| import javafx.beans.property.ObjectProperty; | ||
| import javafx.beans.property.SimpleObjectProperty; | ||
| import javafx.scene.control.ComboBox; | ||
| import javafx.scene.control.Label; | ||
| import javafx.scene.layout.HBox; | ||
| import javafx.util.StringConverter; | ||
|
|
||
| import java.time.LocalTime; | ||
| import java.util.stream.IntStream; | ||
|
|
||
| public class TimePickerComboBox extends HBox { | ||
|
|
||
| private final ComboBox<Integer> hourBox = new ComboBox<>(); | ||
| private final ComboBox<Integer> minuteBox = new ComboBox<>(); | ||
|
|
||
| private final ObjectProperty<LocalTime> value = new SimpleObjectProperty<>(this, "value"); | ||
|
|
||
| private boolean updating = false; | ||
|
|
||
| public TimePickerComboBox() { | ||
| init24HourControls(); | ||
| attachListeners(); | ||
| setSpacing(4); | ||
| } | ||
|
|
||
| public ObjectProperty<LocalTime> valueProperty() { | ||
| return value; | ||
| } | ||
|
|
||
| public LocalTime getValue() { | ||
| return value.get(); | ||
| } | ||
|
|
||
| public void setValue(LocalTime time) { | ||
| value.set(time); | ||
| } | ||
|
|
||
| private void attachListeners() { | ||
| hourBox.valueProperty().addListener((obs, ov, nv) -> updateValueFromUi()); | ||
| minuteBox.valueProperty().addListener((obs, ov, nv) -> updateValueFromUi()); | ||
| value.addListener((obs, ov, nv) -> updateUiFromValue(nv)); | ||
| } | ||
|
|
||
| private void init24HourControls() { | ||
| // Populate hours 0-23 | ||
| hourBox.getItems().setAll(IntStream.range(0, 24).boxed().toList()); | ||
| // Populate minutes 0-59 | ||
| minuteBox.getItems().setAll(IntStream.range(0, 60).boxed().toList()); | ||
|
|
||
| // Two-digit formatting for hour/minute | ||
| StringConverter<Integer> twoDigitConverter = new StringConverter<>() { | ||
| @Override public String toString(Integer object) { | ||
| return object == null ? "" : String.format("%02d", object); | ||
| } | ||
| @Override public Integer fromString(String string) { | ||
| try { return Integer.valueOf(string); } catch (Exception e) { return null; } | ||
| } | ||
| }; | ||
| hourBox.setConverter(twoDigitConverter); | ||
| minuteBox.setConverter(twoDigitConverter); | ||
| // Ensure editors exist for formatting updates | ||
| hourBox.setEditable(true); | ||
| minuteBox.setEditable(true); | ||
|
|
||
| getChildren().clear(); | ||
| getChildren().addAll(hourBox, new Label(":"), minuteBox); | ||
| } | ||
|
|
||
| private void updateValueFromUi() { | ||
| if (updating) return; | ||
|
|
||
| Integer hSel = hourBox.getValue(); | ||
| Integer mSel = minuteBox.getValue(); | ||
| if (hSel == null || mSel == null) { | ||
| value.set(null); | ||
| return; | ||
| } | ||
|
|
||
| int hour24 = hSel; | ||
|
|
||
| updating = true; | ||
| try { | ||
| value.set(LocalTime.of(hour24, mSel)); | ||
| } finally { | ||
| updating = false; | ||
| } | ||
| } | ||
|
|
||
| private void updateUiFromValue(LocalTime t) { | ||
| if (updating) return; | ||
|
|
||
| updating = true; | ||
| try { | ||
| if (t == null) { | ||
| hourBox.getSelectionModel().clearSelection(); | ||
| minuteBox.getSelectionModel().clearSelection(); | ||
| return; | ||
| } | ||
|
|
||
| int h24 = t.getHour(); | ||
| int m = t.getMinute(); | ||
| hourBox.setValue(h24); | ||
| minuteBox.setValue(m); | ||
|
|
||
| Platform.runLater(() -> { | ||
| minuteBox.getEditor().setText(minuteBox.getConverter().toString(minuteBox.getValue())); | ||
| hourBox.getEditor().setText(hourBox.getConverter().toString(hourBox.getValue())); | ||
| }); | ||
| } finally { | ||
| updating = false; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
check not needed