Fixed #16 - add time later --> button "now" for endtime

src/userInterface/InsertTimeController.java

@@ -14,6 +14,8 @@ import java.util.Date;
 
 import core.LogObject;
 import core.SQL;
+import fontAwesome.FontIcon;
+import fontAwesome.FontIconType;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
@@ -25,6 +27,7 @@ import javafx.scene.control.DateCell;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
+import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.util.Callback;
 import logger.Logger;
@@ -33,17 +36,18 @@ import tools.ConvertTo;
 
 public class InsertTimeController 
 {
-	@FXML DatePicker datePicker1;
-	@FXML DatePicker datePicker2;
-	@FXML Parent timePicker1;
-	@FXML TimePickerController timePicker1Controller;	
-	@FXML Parent timePicker2;
-	@FXML TimePickerController timePicker2Controller;	
-	@FXML Button buttonAdd;
-	@FXML Button buttonCancel;	
-	@FXML Label labelDuration;	
-	@FXML ComboBox<String> comboBoxProject;
-	@FXML ComboBox<String> comboBoxTask;
+	@FXML private DatePicker datePicker1;
+	@FXML private DatePicker datePicker2;
+	@FXML private Parent timePicker1;
+	@FXML private TimePickerController timePicker1Controller;	
+	@FXML private Parent timePicker2;
+	@FXML private TimePickerController timePicker2Controller;	
+	@FXML private Button buttonUseCurrentTime;
+	@FXML private Button buttonAdd;
+	@FXML private Button buttonCancel;
+	@FXML private Label labelDuration;	
+	@FXML private ComboBox<String> comboBoxProject;
+	@FXML private ComboBox<String> comboBoxTask;
 	
 	private Stage stage;
 	private UserInterfaceController controller;
@@ -57,6 +61,8 @@ public class InsertTimeController
 		this.controller = controller;		
 		this.icon = icon;
 		
+		buttonUseCurrentTime.setGraphic(new FontIcon(FontIconType.CLOCK_ALT, 14, Color.BLACK));
+		
 		ArrayList<String> objects = new ArrayList<String>();
 		
 		SQL sql = new SQL(savePath);
@@ -159,12 +165,13 @@ public class InsertTimeController
 		comboBoxProject.requestFocus();		
 	}
 	
+	@FXML
 	public void buttonAdd()
 	{
 		String project = comboBoxProject.getValue();		
 		String task = comboBoxTask.getValue(); 	
 		
-		if(!project.equals("") && !task.equals(""))
+		if(project != null && !project.equals("") && task != null && !task.equals(""))
 		{	
 			if(isEndDateAfterStartDate())
 			{
@@ -219,11 +226,21 @@ public class InsertTimeController
 		}
 	}
 	
+	@FXML
 	public void buttonCancel()
 	{
 		stage.close();
 	}
 	
+	@FXML
+	public void useCurrentTime()
+	{
+		LocalDateTime now = LocalDateTime.now();
+		timePicker2Controller.setTime(now.getHour(), now.getMinute(), now.getSecond());	
+		timePicker2Controller.init();
+		setLabelDuration();
+	}
+	
 	public void refresh(TimePickerController controller, int hours, int minutes, int seconds, String item, String direction)
 	{
 		if(controller == timePicker1Controller)

src/userInterface/InsertTimeGUI.fxml

@@ -5,9 +5,10 @@
 <?import javafx.scene.control.DatePicker?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="400.0" prefWidth="540.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="userInterface.InsertTimeController">
+<AnchorPane prefHeight="400.0" prefWidth="540.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="userInterface.InsertTimeController">
    <children>
       <Label layoutX="35.0" layoutY="128.0" text="Startdatum:">
          <font>
@@ -30,11 +31,16 @@
             <fx:include fx:id="timePicker2" source="TimePicker.fxml" />
          </children>
       </AnchorPane>
-      <Label layoutX="321.0" layoutY="218.0" text="Endzeit:">
+      <VBox alignment="TOP_CENTER" layoutX="321.0" layoutY="218.0" spacing="3.0">
+         <children>
+            <Label text="Endzeit:">
                <font>
                   <Font name="System Bold" size="18.0" />
                </font>
             </Label>
+            <Button fx:id="buttonUseCurrentTime" mnemonicParsing="false" onAction="#useCurrentTime" />
+         </children>
+      </VBox>
       <DatePicker fx:id="datePicker2" layoutX="154.0" layoutY="219.0" prefHeight="25.0" prefWidth="134.0" />
       <Label layoutX="48.0" layoutY="218.0" text="Enddatum:">
          <font>