Add schedule start time setting
This commit is contained in:
parent
b4ade494d0
commit
9cb0eae10f
@ -5,8 +5,10 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
|||||||
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
|
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Optional;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalTime;
|
||||||
|
import java.util.Optional;
|
||||||
import javafx.beans.property.BooleanProperty;
|
import javafx.beans.property.BooleanProperty;
|
||||||
import javafx.beans.property.IntegerProperty;
|
import javafx.beans.property.IntegerProperty;
|
||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.property.ObjectProperty;
|
||||||
@ -45,6 +47,7 @@ public class MainSettingsController {
|
|||||||
private StringProperty stationAddress = new SimpleStringProperty();
|
private StringProperty stationAddress = new SimpleStringProperty();
|
||||||
private StringProperty stationName = new SimpleStringProperty();
|
private StringProperty stationName = new SimpleStringProperty();
|
||||||
private ObjectProperty<LocalDate> scheduleStartDate = new SimpleObjectProperty<>();
|
private ObjectProperty<LocalDate> scheduleStartDate = new SimpleObjectProperty<>();
|
||||||
|
private StringProperty scheduleStartTime = new SimpleStringProperty();
|
||||||
private StringProperty username = new SimpleStringProperty();
|
private StringProperty username = new SimpleStringProperty();
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
@ -86,6 +89,9 @@ public class MainSettingsController {
|
|||||||
@FXML
|
@FXML
|
||||||
private RadioButton scpRadioButton;
|
private RadioButton scpRadioButton;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private TextField scheduleStartTimeField;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private RadioButton externalProgramRadioButton;
|
private RadioButton externalProgramRadioButton;
|
||||||
|
|
||||||
@ -114,6 +120,7 @@ public class MainSettingsController {
|
|||||||
stationAddressField.textProperty().bindBidirectional(stationAddress);
|
stationAddressField.textProperty().bindBidirectional(stationAddress);
|
||||||
passwordField.textProperty().bindBidirectional(password);
|
passwordField.textProperty().bindBidirectional(password);
|
||||||
scheduleStartDatePicker.valueProperty().bindBidirectional(scheduleStartDate);
|
scheduleStartDatePicker.valueProperty().bindBidirectional(scheduleStartDate);
|
||||||
|
scheduleStartTimeField.textProperty().bindBidirectional(scheduleStartTime);
|
||||||
usernameField.textProperty().bindBidirectional(username);
|
usernameField.textProperty().bindBidirectional(username);
|
||||||
|
|
||||||
digitsPerGroupSpinner.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 100, 1));
|
digitsPerGroupSpinner.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 100, 1));
|
||||||
@ -122,6 +129,63 @@ public class MainSettingsController {
|
|||||||
digitsPerGroupSpinner.getValueFactory().valueProperty().bindBidirectional(digitsPerGroup.asObject());
|
digitsPerGroupSpinner.getValueFactory().valueProperty().bindBidirectional(digitsPerGroup.asObject());
|
||||||
messageLengthSpinner.getValueFactory().valueProperty().bindBidirectional(messageLength.asObject());
|
messageLengthSpinner.getValueFactory().valueProperty().bindBidirectional(messageLength.asObject());
|
||||||
|
|
||||||
|
scheduleStartTimeField.addEventFilter(KeyEvent.ANY, event -> {
|
||||||
|
int cursorPosition = scheduleStartTimeField.getCaretPosition();
|
||||||
|
|
||||||
|
String character = event.getCharacter();
|
||||||
|
KeyCode code = event.getCode();
|
||||||
|
|
||||||
|
String str = event.getText();
|
||||||
|
|
||||||
|
// Consume the event to block the default behavior
|
||||||
|
if (!(code == KeyCode.LEFT ||
|
||||||
|
code == KeyCode.RIGHT ||
|
||||||
|
code == KeyCode.UP ||
|
||||||
|
code == KeyCode.DOWN ||
|
||||||
|
code == KeyCode.HOME ||
|
||||||
|
code == KeyCode.END ||
|
||||||
|
code == KeyCode.PAGE_UP ||
|
||||||
|
code == KeyCode.PAGE_DOWN)) {
|
||||||
|
event.consume();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.getEventType() == KeyEvent.KEY_PRESSED &&
|
||||||
|
(code == KeyCode.DIGIT0 ||
|
||||||
|
code == KeyCode.DIGIT1 ||
|
||||||
|
code == KeyCode.DIGIT2 ||
|
||||||
|
code == KeyCode.DIGIT3 ||
|
||||||
|
code == KeyCode.DIGIT4 ||
|
||||||
|
code == KeyCode.DIGIT5 ||
|
||||||
|
code == KeyCode.DIGIT6 ||
|
||||||
|
code == KeyCode.DIGIT7 ||
|
||||||
|
code == KeyCode.DIGIT8 ||
|
||||||
|
code == KeyCode.DIGIT9)) {
|
||||||
|
|
||||||
|
String editedTime = scheduleStartTimeField.getText();
|
||||||
|
|
||||||
|
if (cursorPosition < scheduleStartTimeField.getLength()) {
|
||||||
|
char currentChar = scheduleStartTimeField.getText().charAt(cursorPosition);
|
||||||
|
if (currentChar == ':') {
|
||||||
|
cursorPosition++;
|
||||||
|
}
|
||||||
|
editedTime = editedTime.substring(0, cursorPosition) + str + editedTime.substring(cursorPosition + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate the time format
|
||||||
|
String[] timeParts = editedTime.split(":");
|
||||||
|
if (timeParts.length == 3) {
|
||||||
|
int hours = Integer.parseInt(timeParts[0]);
|
||||||
|
int minutes = Integer.parseInt(timeParts[1]);
|
||||||
|
int seconds = Integer.parseInt(timeParts[2]);
|
||||||
|
|
||||||
|
if (!(hours < 0 || hours > 23 || minutes < 0 || minutes > 59 || seconds < 0 || seconds > 59)) {
|
||||||
|
scheduleStartTimeField.setText(editedTime);
|
||||||
|
scheduleStartTimeField.positionCaret(cursorPosition + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
messageMethodGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
|
messageMethodGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
|
||||||
if (newValue == ftpRadioButton) {
|
if (newValue == ftpRadioButton) {
|
||||||
messageMethod.set(StationSettings.MessageMethod.FTP);
|
messageMethod.set(StationSettings.MessageMethod.FTP);
|
||||||
@ -219,6 +283,14 @@ public class MainSettingsController {
|
|||||||
settings.setScheduleStartDate(scheduleStartDatePicker.getValue());
|
settings.setScheduleStartDate(scheduleStartDatePicker.getValue());
|
||||||
settings.setUsername(username.get());
|
settings.setUsername(username.get());
|
||||||
|
|
||||||
|
try {
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
|
||||||
|
LocalTime startTime = LocalTime.parse(scheduleStartTimeField.getText(), formatter);
|
||||||
|
settings.setScheduleStartTime(startTime);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
ex.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
Node node = (Node) e.getSource();
|
Node node = (Node) e.getSource();
|
||||||
Stage stage = (Stage) node.getScene().getWindow();
|
Stage stage = (Stage) node.getScene().getWindow();
|
||||||
stage.setUserData(true);
|
stage.setUserData(true);
|
||||||
@ -250,5 +322,11 @@ public class MainSettingsController {
|
|||||||
System.out.println(settings.getPrefixes());
|
System.out.println(settings.getPrefixes());
|
||||||
prefixListView.getItems().addAll(settings.getPrefixes());
|
prefixListView.getItems().addAll(settings.getPrefixes());
|
||||||
scheduleStartDate.set(settings.getScheduleStartDate());
|
scheduleStartDate.set(settings.getScheduleStartDate());
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
|
||||||
|
LocalTime startTime = settings.getScheduleStartTime();
|
||||||
|
if (startTime == null) {
|
||||||
|
startTime = LocalTime.now();
|
||||||
|
}
|
||||||
|
scheduleStartTime.set(startTime.format(formatter));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -150,7 +150,7 @@
|
|||||||
</RadioButton>
|
</RadioButton>
|
||||||
<DatePicker fx:id="scheduleStartDatePicker" layoutX="115.0" layoutY="34.0" />
|
<DatePicker fx:id="scheduleStartDatePicker" layoutX="115.0" layoutY="34.0" />
|
||||||
<Label layoutX="115.0" layoutY="8.0" text="Starting from:" />
|
<Label layoutX="115.0" layoutY="8.0" text="Starting from:" />
|
||||||
<TextField layoutX="115.0" layoutY="64.0" text="23:24:49" />
|
<TextField fx:id="scheduleStartTimeField" layoutX="115.0" layoutY="64.0" text="23:24:49" />
|
||||||
<Label layoutX="48.0" layoutY="102.0" text="TODO: Jitter" />
|
<Label layoutX="48.0" layoutY="102.0" text="TODO: Jitter" />
|
||||||
|
|
||||||
</children>
|
</children>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package name.nathanmcrae.numbersstation;
|
package name.nathanmcrae.numbersstation;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class StationSettings {
|
public class StationSettings {
|
||||||
@ -15,6 +16,7 @@ public class StationSettings {
|
|||||||
private String password;
|
private String password;
|
||||||
private ArrayList<String> prefixes;
|
private ArrayList<String> prefixes;
|
||||||
private LocalDate scheduleStartDate;
|
private LocalDate scheduleStartDate;
|
||||||
|
private LocalTime scheduleStartTime;
|
||||||
private String username;
|
private String username;
|
||||||
|
|
||||||
public enum MessageMethod {
|
public enum MessageMethod {
|
||||||
@ -125,6 +127,14 @@ public class StationSettings {
|
|||||||
scheduleStartDate = newScheduleStartDate;
|
scheduleStartDate = newScheduleStartDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LocalTime getScheduleStartTime() {
|
||||||
|
return scheduleStartTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setScheduleStartTime(LocalTime newScheduleStartTime) {
|
||||||
|
scheduleStartTime = newScheduleStartTime;
|
||||||
|
}
|
||||||
|
|
||||||
public String getUsername() {
|
public String getUsername() {
|
||||||
return username;
|
return username;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user