diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..efdffc77467e4762e0c9b8440c75ff498fd03b58
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+class/
\ No newline at end of file
diff --git a/class/charts/BarChartGenerator$1.class b/class/charts/BarChartGenerator$1.class
deleted file mode 100644
index 1223c0dafe47004fbdef244d8ca6e0869991c9a7..0000000000000000000000000000000000000000
Binary files a/class/charts/BarChartGenerator$1.class and /dev/null differ
diff --git a/class/charts/BarChartGenerator$2.class b/class/charts/BarChartGenerator$2.class
deleted file mode 100644
index 3e55a49f96c806b5c0b414277c76f00f003100ff..0000000000000000000000000000000000000000
Binary files a/class/charts/BarChartGenerator$2.class and /dev/null differ
diff --git a/class/charts/BarChartGenerator.class b/class/charts/BarChartGenerator.class
deleted file mode 100644
index 3a222390a23c2cd22219c7110110ea0c134bcd5e..0000000000000000000000000000000000000000
Binary files a/class/charts/BarChartGenerator.class and /dev/null differ
diff --git a/class/charts/Chart.css b/class/charts/Chart.css
deleted file mode 100644
index 49e56f3d5f69680c6296f4dad7c164336fbf1967..0000000000000000000000000000000000000000
--- a/class/charts/Chart.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.default-color0.chart-area-symbol { -fx-background-color: #fba71b, #fba71b55; }
-.default-color1.chart-area-symbol { -fx-background-color: #f3622d, #f3622d55; }
-.default-color2.chart-area-symbol { -fx-background-color: #dda0dd, #d8bfd855; }
-
-.default-color0.chart-series-area-line { -fx-stroke: #fba71b; }
-.default-color1.chart-series-area-line { -fx-stroke: #f3622d; }
-.default-color2.chart-series-area-line { -fx-stroke: #dda0dd; }
-
-.default-color0.chart-series-area-fill { -fx-fill: #fba71b33; }
-.default-color1.chart-series-area-fill { -fx-fill: #f3622d33; }
-.default-color2.chart-series-area-fill { -fx-fill: #d8bfd844; }
-
-
-.chart-vertical-grid-lines {
- -fx-stroke: #787878;
-}
-.chart-horizontal-grid-lines {
- -fx-stroke: #787878;
-}
-
-.axis-label {
- -fx-text-fill: #787878;
-}
-
-.axis {
- -fx-font-size: 1.4em;
- -fx-tick-label-fill: #787878;
- -fx-font-family: Tahoma;
-}
-
-.axis-tick-mark {
- -fx-stroke: #787878;
-
-}
-.axis-minor-tick-mark {
- -fx-stroke: #787878;
-}
\ No newline at end of file
diff --git a/class/charts/ChartGUIController$1.class b/class/charts/ChartGUIController$1.class
deleted file mode 100644
index fc7fe7fe6ff8f01f83e9a88f29e08a28ebf6b912..0000000000000000000000000000000000000000
Binary files a/class/charts/ChartGUIController$1.class and /dev/null differ
diff --git a/class/charts/ChartGUIController$2.class b/class/charts/ChartGUIController$2.class
deleted file mode 100644
index 15bf757eb95d48d5c2c73fe50ce96db6bf0654d4..0000000000000000000000000000000000000000
Binary files a/class/charts/ChartGUIController$2.class and /dev/null differ
diff --git a/class/charts/ChartGUIController$3.class b/class/charts/ChartGUIController$3.class
deleted file mode 100644
index 2080971d82d6bbba508c26f60833e1865c46fe46..0000000000000000000000000000000000000000
Binary files a/class/charts/ChartGUIController$3.class and /dev/null differ
diff --git a/class/charts/ChartGUIController$4.class b/class/charts/ChartGUIController$4.class
deleted file mode 100644
index a895c7f641517817c6c49fa0c7c401488ffb069f..0000000000000000000000000000000000000000
Binary files a/class/charts/ChartGUIController$4.class and /dev/null differ
diff --git a/class/charts/ChartGUIController.class b/class/charts/ChartGUIController.class
deleted file mode 100644
index aef9c5c19ad0edf4826c5d3a6c2493bd6a5555c5..0000000000000000000000000000000000000000
Binary files a/class/charts/ChartGUIController.class and /dev/null differ
diff --git a/class/charts/PieChartGenerator$1.class b/class/charts/PieChartGenerator$1.class
deleted file mode 100644
index fa19cbd9c68f1a3ecb28e4f00fbe3d4d194d178d..0000000000000000000000000000000000000000
Binary files a/class/charts/PieChartGenerator$1.class and /dev/null differ
diff --git a/class/charts/PieChartGenerator$2.class b/class/charts/PieChartGenerator$2.class
deleted file mode 100644
index 585e1642e8feb00ace6d78295ce8993268f3bf9f..0000000000000000000000000000000000000000
Binary files a/class/charts/PieChartGenerator$2.class and /dev/null differ
diff --git a/class/charts/PieChartGenerator.class b/class/charts/PieChartGenerator.class
deleted file mode 100644
index c13b647bbea6e0caed705f6e531e076cb04d99d8..0000000000000000000000000000000000000000
Binary files a/class/charts/PieChartGenerator.class and /dev/null differ
diff --git a/class/charts/SummaryGenerator.class b/class/charts/SummaryGenerator.class
deleted file mode 100644
index dcd19a79e23871b465d44d5a8f2a6de0c96262f0..0000000000000000000000000000000000000000
Binary files a/class/charts/SummaryGenerator.class and /dev/null differ
diff --git a/class/charts/chartGUI.fxml b/class/charts/chartGUI.fxml
deleted file mode 100644
index 3a2dbc7619434b70a33f6b926096e2f181296e67..0000000000000000000000000000000000000000
--- a/class/charts/chartGUI.fxml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="charts.ChartGUIController">
- <children>
- <VBox prefHeight="600.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <children>
- <AnchorPane prefHeight="150.0" prefWidth="800.0">
- <children>
- <HBox alignment="CENTER" layoutX="70.0" layoutY="29.0" spacing="25.0" AnchorPane.leftAnchor="70.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="30.0">
- <children>
- <VBox alignment="CENTER">
- <children>
- <Label prefHeight="25.0" prefWidth="64.0" text="Projekt:">
- <font>
- <Font name="System Bold" size="16.0" />
- </font>
- </Label>
- <ComboBox fx:id="projectBox" prefWidth="150.0">
- <VBox.margin>
- <Insets top="11.0" />
- </VBox.margin>
- </ComboBox>
- </children>
- </VBox>
- <VBox alignment="CENTER">
- <children>
- <Label prefHeight="25.0" prefWidth="64.0" text="Task:">
- <font>
- <Font name="System Bold" size="16.0" />
- </font>
- </Label>
- <ComboBox fx:id="taskBox" prefWidth="150.0">
- <VBox.margin>
- <Insets top="11.0" />
- </VBox.margin>
- </ComboBox>
- </children>
- </VBox>
- <VBox alignment="CENTER">
- <children>
- <Label prefHeight="25.0" prefWidth="64.0" text="Jahr:">
- <font>
- <Font name="System Bold" size="16.0" />
- </font>
- </Label>
- <ComboBox fx:id="yearBox" prefWidth="150.0">
- <VBox.margin>
- <Insets top="11.0" />
- </VBox.margin>
- </ComboBox>
- </children>
- </VBox>
- <VBox alignment="CENTER">
- <children>
- <Label prefHeight="25.0" prefWidth="64.0" text="Monat:">
- <font>
- <Font name="System Bold" size="16.0" />
- </font>
- </Label>
- <ComboBox fx:id="monthBox" prefWidth="150.0">
- <VBox.margin>
- <Insets top="11.0" />
- </VBox.margin>
- </ComboBox>
- </children>
- </VBox>
- </children>
- </HBox>
- </children>
- </AnchorPane>
- <AnchorPane fx:id="chartPane" prefHeight="450.0" prefWidth="800.0" VBox.vgrow="ALWAYS" />
- </children>
- </VBox>
- </children>
-</AnchorPane>
diff --git a/class/core/ConvertToTime.class b/class/core/ConvertToTime.class
deleted file mode 100644
index 0c261276953526f83b5ecfca2fc99df70e884acb..0000000000000000000000000000000000000000
Binary files a/class/core/ConvertToTime.class and /dev/null differ
diff --git a/class/core/Counter.class b/class/core/Counter.class
deleted file mode 100644
index f23259f5ca9348e680bce6e9d18999eeee00fe43..0000000000000000000000000000000000000000
Binary files a/class/core/Counter.class and /dev/null differ
diff --git a/class/core/Exporter.class b/class/core/Exporter.class
deleted file mode 100644
index 24587bd87e6fd20f6245d755c330eecb7787f8a9..0000000000000000000000000000000000000000
Binary files a/class/core/Exporter.class and /dev/null differ
diff --git a/class/core/Importer.class b/class/core/Importer.class
deleted file mode 100644
index 6febb4ae4a1f6239f67a4f4a6a8d7b63383dc125..0000000000000000000000000000000000000000
Binary files a/class/core/Importer.class and /dev/null differ
diff --git a/class/core/LogObject.class b/class/core/LogObject.class
deleted file mode 100644
index e0bf5295873466037356b5e1570afb5047144724..0000000000000000000000000000000000000000
Binary files a/class/core/LogObject.class and /dev/null differ
diff --git a/class/core/LogObjectOld.class b/class/core/LogObjectOld.class
deleted file mode 100644
index 03ad562a91e1fcc719c2427522cfd38d14f03942..0000000000000000000000000000000000000000
Binary files a/class/core/LogObjectOld.class and /dev/null differ
diff --git a/class/core/ReadFromFile.class b/class/core/ReadFromFile.class
deleted file mode 100644
index abf666d7b7e91c8652bf9bd50e1df244745ddf98..0000000000000000000000000000000000000000
Binary files a/class/core/ReadFromFile.class and /dev/null differ
diff --git a/class/core/SQL.class b/class/core/SQL.class
deleted file mode 100644
index 9296981be1b70be85611f47a57456ca72ce7ce90..0000000000000000000000000000000000000000
Binary files a/class/core/SQL.class and /dev/null differ
diff --git a/class/userInterface/EditController$1.class b/class/userInterface/EditController$1.class
deleted file mode 100644
index 587860930ec59c0684582326846fb3873b186aba..0000000000000000000000000000000000000000
Binary files a/class/userInterface/EditController$1.class and /dev/null differ
diff --git a/class/userInterface/EditController.class b/class/userInterface/EditController.class
deleted file mode 100644
index 1dac47a43a9bfb7d938bd99fb28e39d51c7095f4..0000000000000000000000000000000000000000
Binary files a/class/userInterface/EditController.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeController$1.class b/class/userInterface/InsertTimeController$1.class
deleted file mode 100644
index 30b1befa0407c01f5ff1a62d8828c9b8b6f9dd25..0000000000000000000000000000000000000000
Binary files a/class/userInterface/InsertTimeController$1.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeController$2$1.class b/class/userInterface/InsertTimeController$2$1.class
deleted file mode 100644
index 32aa837d7c593cc94fa0903ad1b4772ea74ad565..0000000000000000000000000000000000000000
Binary files a/class/userInterface/InsertTimeController$2$1.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeController$2.class b/class/userInterface/InsertTimeController$2.class
deleted file mode 100644
index 69eac5e03be26480b98d63991fbcb5e5e1b947ea..0000000000000000000000000000000000000000
Binary files a/class/userInterface/InsertTimeController$2.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeController$3.class b/class/userInterface/InsertTimeController$3.class
deleted file mode 100644
index 0011999136486fbf678c43245cbc56093a90582c..0000000000000000000000000000000000000000
Binary files a/class/userInterface/InsertTimeController$3.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeController$4.class b/class/userInterface/InsertTimeController$4.class
deleted file mode 100644
index 96af08ecbe8f5cff5871b8d5d28658f7a3dd11c5..0000000000000000000000000000000000000000
Binary files a/class/userInterface/InsertTimeController$4.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeController.class b/class/userInterface/InsertTimeController.class
deleted file mode 100644
index caceb7828e7f769569bfee56826142bdc3d1ff7d..0000000000000000000000000000000000000000
Binary files a/class/userInterface/InsertTimeController.class and /dev/null differ
diff --git a/class/userInterface/InsertTimeGUI.fxml b/class/userInterface/InsertTimeGUI.fxml
deleted file mode 100644
index f52c030cd5ff4c6c71b3b2006ff76b4e2b84e5dc..0000000000000000000000000000000000000000
--- a/class/userInterface/InsertTimeGUI.fxml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?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">
- <children>
- <Label layoutX="35.0" layoutY="128.0" text="Startdatum:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <DatePicker fx:id="datePicker1" layoutX="151.0" layoutY="129.0" prefHeight="25.0" prefWidth="134.0" />
- <Label layoutX="313.0" layoutY="128.0" text="Startzeit:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <AnchorPane layoutX="409.0" layoutY="105.0">
- <children>
- <fx:include fx:id="timePicker1" source="TimePicker.fxml" />
- </children>
- </AnchorPane>
- <AnchorPane layoutX="407.0" layoutY="195.0">
- <children>
- <fx:include fx:id="timePicker2" source="TimePicker.fxml" />
- </children>
- </AnchorPane>
- <Label layoutX="321.0" layoutY="218.0" text="Endzeit:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <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>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <Label layoutX="157.0" layoutY="299.0" text="Arbeitszeit:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <Label fx:id="labelDuration" layoutX="284.0" layoutY="299.0" text="0 h 0 min 0 sek">
- <font>
- <Font size="18.0" />
- </font>
- </Label>
- <Button fx:id="buttonAdd" layoutX="174.0" layoutY="348.0" mnemonicParsing="false" onAction="#buttonAdd" text="Hinzufügen">
- <font>
- <Font name="System Bold" size="13.0" />
- </font>
- </Button>
- <Button fx:id="buttonCancel" layoutX="302.0" layoutY="348.0" mnemonicParsing="false" onAction="#buttonCancel" text="Abbrechen">
- <font>
- <Font name="System Bold" size="13.0" />
- </font>
- </Button>
- <Label layoutX="35.0" layoutY="42.0" text="Projekt:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <Label layoutX="278.0" layoutY="42.0" text="Task:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <ComboBox fx:id="comboBoxProject" editable="true" layoutX="114.0" layoutY="43.0" prefWidth="150.0" />
- <ComboBox fx:id="comboBoxTask" editable="true" layoutX="332.0" layoutY="43.0" prefWidth="150.0" />
- </children>
-</AnchorPane>
diff --git a/class/userInterface/Main$1.class b/class/userInterface/Main$1.class
deleted file mode 100644
index 557c62230ba33ef7b4a25673f6ba71f997c6f054..0000000000000000000000000000000000000000
Binary files a/class/userInterface/Main$1.class and /dev/null differ
diff --git a/class/userInterface/Main.class b/class/userInterface/Main.class
deleted file mode 100644
index 3d269fae5eafb2aebf1eb1bc7413b30f21d81118..0000000000000000000000000000000000000000
Binary files a/class/userInterface/Main.class and /dev/null differ
diff --git a/class/userInterface/ProjektFensterController$1.class b/class/userInterface/ProjektFensterController$1.class
deleted file mode 100644
index d7b908b1582ac27277943c6eacec72a3092870e0..0000000000000000000000000000000000000000
Binary files a/class/userInterface/ProjektFensterController$1.class and /dev/null differ
diff --git a/class/userInterface/ProjektFensterController.class b/class/userInterface/ProjektFensterController.class
deleted file mode 100644
index 36c998a5453177ed6cd023b133a52f2edf7dc1c1..0000000000000000000000000000000000000000
Binary files a/class/userInterface/ProjektFensterController.class and /dev/null differ
diff --git a/class/userInterface/TimePicker.fxml b/class/userInterface/TimePicker.fxml
deleted file mode 100644
index 4d9f1797da2e768a94e76ba4d061e8ace152b585..0000000000000000000000000000000000000000
--- a/class/userInterface/TimePicker.fxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.AnchorPane?>
-
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="userInterface.TimePickerController">
- <children>
- <HBox fx:id="hbox" alignment="CENTER" />
- </children>
-</AnchorPane>
diff --git a/class/userInterface/TimePickerController$1.class b/class/userInterface/TimePickerController$1.class
deleted file mode 100644
index e55c8159fa44d3800cb1970b91790dd493e96399..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController$1.class and /dev/null differ
diff --git a/class/userInterface/TimePickerController$2.class b/class/userInterface/TimePickerController$2.class
deleted file mode 100644
index 5819634d1b12c2b45c6bdbbf0fba9bec9e63274d..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController$2.class and /dev/null differ
diff --git a/class/userInterface/TimePickerController$3.class b/class/userInterface/TimePickerController$3.class
deleted file mode 100644
index c6e6608d245eb2f6dd1f9899597525cd80c0bd61..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController$3.class and /dev/null differ
diff --git a/class/userInterface/TimePickerController$4.class b/class/userInterface/TimePickerController$4.class
deleted file mode 100644
index 143a13c7b70ef759e9047c8691769f92ce60ad67..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController$4.class and /dev/null differ
diff --git a/class/userInterface/TimePickerController$5.class b/class/userInterface/TimePickerController$5.class
deleted file mode 100644
index 3f72ce10fa3227506f228096b2be8ac53e5da26c..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController$5.class and /dev/null differ
diff --git a/class/userInterface/TimePickerController$6.class b/class/userInterface/TimePickerController$6.class
deleted file mode 100644
index 04d2e311302ee138531adb1daeacecfa022af102..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController$6.class and /dev/null differ
diff --git a/class/userInterface/TimePickerController.class b/class/userInterface/TimePickerController.class
deleted file mode 100644
index c80ba38afc4a4122d22396446e4f9485eb34c2f8..0000000000000000000000000000000000000000
Binary files a/class/userInterface/TimePickerController.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$1.class b/class/userInterface/UserInterfaceController$1.class
deleted file mode 100644
index 5b89d20bb425d769d7b50a6a37b29e2248330479..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$1.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$2.class b/class/userInterface/UserInterfaceController$2.class
deleted file mode 100644
index ff9c0970867a9b4ba466604013f5a5cc2b3115cd..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$2.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$3.class b/class/userInterface/UserInterfaceController$3.class
deleted file mode 100644
index f773891ce2a6322c4c9a36a20f79c196f28b7a90..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$3.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$4.class b/class/userInterface/UserInterfaceController$4.class
deleted file mode 100644
index caf56af598306f95248b1330ad6907e1b8ac6a59..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$4.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$5.class b/class/userInterface/UserInterfaceController$5.class
deleted file mode 100644
index bd2a44b359e709795c7029302b60c94b5243ccae..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$5.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$6.class b/class/userInterface/UserInterfaceController$6.class
deleted file mode 100644
index b1d6ae4f69590a96e15c905ac7259cadb231f1ed..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$6.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$7.class b/class/userInterface/UserInterfaceController$7.class
deleted file mode 100644
index e65c291961e2ccccc86e9e64bf248976ddd9bb50..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$7.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$8.class b/class/userInterface/UserInterfaceController$8.class
deleted file mode 100644
index ce731de66b43d5ac2e533239183aa6f9e7b56c72..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$8.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController$9.class b/class/userInterface/UserInterfaceController$9.class
deleted file mode 100644
index 748f5236bf86ea29a442afeb65b5502cd5822882..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController$9.class and /dev/null differ
diff --git a/class/userInterface/UserInterfaceController.class b/class/userInterface/UserInterfaceController.class
deleted file mode 100644
index 03255cd485892493d7b8604970f406ca9ea36497..0000000000000000000000000000000000000000
Binary files a/class/userInterface/UserInterfaceController.class and /dev/null differ
diff --git a/class/userInterface/_de.properties b/class/userInterface/_de.properties
deleted file mode 100644
index a3e72481213f74aaf179af72c3e48cdb62bcc72d..0000000000000000000000000000000000000000
--- a/class/userInterface/_de.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-app.name=SmartTime
-version.code=29
-version.name=5.0.3
-version.date=10.07.16
\ No newline at end of file
diff --git a/class/userInterface/application.css b/class/userInterface/application.css
deleted file mode 100644
index f21a2f70c496c0b64289b9b8d67c1156ef9882b3..0000000000000000000000000000000000000000
--- a/class/userInterface/application.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.combo-box {
- -fx-font-family: "Arial";
- -fx-font-size: 18px;
-}
diff --git a/class/userInterface/editGUI.fxml b/class/userInterface/editGUI.fxml
deleted file mode 100644
index 414f412407a6c1e10b7e89f584786585bae36290..0000000000000000000000000000000000000000
--- a/class/userInterface/editGUI.fxml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="455.0" stylesheets="@../../class/userInterface/application.css" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="userInterface.EditController">
- <children>
- <Button layoutX="66.0" layoutY="221.0" mnemonicParsing="false" onAction="#okButton" prefWidth="92.0" text="OK">
- <font>
- <Font size="14.0" />
- </font>
- </Button>
- <Button fx:id="abbrechenButton" layoutX="298.0" layoutY="221.0" mnemonicParsing="false" onAction="#abbrechenButtond" prefHeight="30.0" prefWidth="92.0" text="Abbrechen">
- <font>
- <Font size="14.0" />
- </font>
- </Button>
- <ComboBox fx:id="dropdown" editable="true" layoutX="144.0" layoutY="63.0" prefHeight="37.0" prefWidth="258.0" visibleRowCount="7" />
- <Label layoutX="34.0" layoutY="65.0" text="Projekt:">
- <font>
- <Font name="System Bold" size="22.0" />
- </font>
- </Label>
- <Label layoutX="60.0" layoutY="132.0" text="Task:">
- <font>
- <Font name="System Bold" size="21.0" />
- </font>
- </Label>
- <ComboBox fx:id="dropdownTasks" editable="true" layoutX="144.0" layoutY="128.0" prefHeight="37.0" prefWidth="258.0" visibleRowCount="7" />
- <Button layoutX="183.0" layoutY="221.0" mnemonicParsing="false" onAction="#buttonDelete" prefHeight="30.0" prefWidth="92.0" text="Löschen">
- <font>
- <Font size="14.0" />
- </font>
- </Button>
- </children>
-</AnchorPane>
diff --git a/class/userInterface/icon.png b/class/userInterface/icon.png
deleted file mode 100644
index adda60842424d26b524d45e0e0b169cddb0855bc..0000000000000000000000000000000000000000
Binary files a/class/userInterface/icon.png and /dev/null differ
diff --git a/class/userInterface/projektFenster.fxml b/class/userInterface/projektFenster.fxml
deleted file mode 100644
index ffe339d64a6ee3e9349ac76c07a7daccad40bb75..0000000000000000000000000000000000000000
--- a/class/userInterface/projektFenster.fxml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="455.0" stylesheets="@../../class/userInterface/application.css" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="userInterface.ProjektFensterController">
- <children>
- <Button layoutX="109.0" layoutY="223.0" mnemonicParsing="false" onAction="#okButton" prefWidth="100.0" text="OK">
- <font>
- <Font size="16.0" />
- </font>
- </Button>
- <Button fx:id="abbrechenButton" layoutX="253.0" layoutY="223.0" mnemonicParsing="false" onAction="#abbrechenButtond" prefWidth="100.0" text="Abbrechen">
- <font>
- <Font size="16.0" />
- </font>
- </Button>
- <ComboBox fx:id="dropdown" editable="true" layoutX="144.0" layoutY="63.0" prefHeight="37.0" prefWidth="258.0" visibleRowCount="7" />
- <Label layoutX="34.0" layoutY="65.0" text="Projekt:">
- <font>
- <Font name="System Bold" size="22.0" />
- </font>
- </Label>
- <Label layoutX="60.0" layoutY="132.0" text="Task:">
- <font>
- <Font name="System Bold" size="21.0" />
- </font>
- </Label>
- <ComboBox fx:id="dropdownTasks" editable="true" layoutX="144.0" layoutY="128.0" prefHeight="37.0" prefWidth="258.0" visibleRowCount="7" />
- </children>
-</AnchorPane>
diff --git a/class/userInterface/userInterface.fxml b/class/userInterface/userInterface.fxml
deleted file mode 100644
index 7cb9dce06cd26e597f9fd983aa193e1e6fe96c3a..0000000000000000000000000000000000000000
--- a/class/userInterface/userInterface.fxml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Accordion?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TitledPane?>
-<?import javafx.scene.control.ToggleButton?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Line?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="userInterface.UserInterfaceController">
- <children>
- <VBox layoutX="143.0" layoutY="69.0" prefHeight="800.0" prefWidth="650.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <children>
- <MenuBar>
- <menus>
- <Menu mnemonicParsing="false" text="Datei">
- <items>
- <MenuItem mnemonicParsing="false" onAction="#insertTime" text="Zeit nachträglich einfügen" />
- <MenuItem mnemonicParsing="false" onAction="#deleteDB" text="Datenbank löschen" />
- </items></Menu>
- <Menu mnemonicParsing="false" text="Import">
- <items>
- <MenuItem mnemonicParsing="false" onAction="#importFromSmartTime" text="von SmartTime bis Version 4.5.0" />
- <MenuItem mnemonicParsing="false" onAction="#importFromDB" text="von SmartTime Datenbank" />
- <MenuItem mnemonicParsing="false" onAction="#importFromJSON" text="von JSON" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Export">
- <items>
- <MenuItem mnemonicParsing="false" onAction="#exportAsDB" text="als SmartTime Datenbank" />
- <MenuItem mnemonicParsing="false" onAction="#exportAsJSON" text="als JSON" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="?">
- <items>
- <MenuItem mnemonicParsing="false" onAction="#about" text="Über" />
- </items>
- </Menu>
- </menus>
- </MenuBar>
- <Pane prefHeight="121.0" prefWidth="650.0">
- <children>
- <Label layoutX="48.0" layoutY="25.0" text="aktuelles Projekt:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <Label layoutX="48.0" layoutY="73.0" text="aktuelle Aufgabe:">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Label>
- <Button layoutX="613.0" layoutY="67.0" mnemonicParsing="false" onAction="#openProjectGUI" prefHeight="39.0" prefWidth="107.0" text="Ändern">
- <font>
- <Font size="16.0" />
- </font>
- </Button>
- <Label fx:id="aktuellesProjektAusgabe" layoutX="239.0" layoutY="25.0" text=" ">
- <font>
- <Font size="18.0" />
- </font>
- </Label>
- <Label fx:id="aktuellerTaskAusgabe" layoutX="239.0" layoutY="73.0" text=" ">
- <font>
- <Font size="18.0" />
- </font>
- </Label>
- </children>
- </Pane>
- <Line endX="790.0" fill="BLACK" stroke="#cdc6c6" strokeWidth="1.5" translateX="5.0">
- <VBox.margin>
- <Insets top="10.0" />
- </VBox.margin>
- </Line>
- <Pane prefHeight="100.0" prefWidth="652.0">
- <children>
- <ToggleButton fx:id="startButton" layoutX="49.0" layoutY="23.0" mnemonicParsing="false" prefHeight="49.0" prefWidth="116.0" text="Start">
- <font>
- <Font size="16.0" />
- </font>
- </ToggleButton>
- <Label fx:id="labelTime" layoutX="240.0" layoutY="23.0" prefHeight="49.0" prefWidth="326.0" text=" ">
- <font>
- <Font name="Arial" size="28.0" />
- </font>
- </Label>
- <Button layoutX="614.0" layoutY="30.0" mnemonicParsing="false" onAction="#charts" prefHeight="40.0" prefWidth="107.0" text="Diagramme">
- <font>
- <Font size="15.0" />
- </font>
- </Button>
- </children>
- </Pane>
- <Accordion fx:id="accordion" prefHeight="516.0" prefWidth="652.0">
- <panes>
- <TitledPane fx:id="Projekte" animated="false" minHeight="250.0" prefHeight="283.0" prefWidth="652.0" text="Projekte gesamt">
- <content>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="650.0" />
- </content>
- <font>
- <Font size="14.0" />
- </font>
- </TitledPane>
- <TitledPane fx:id="gesamtesLog" animated="false" text="letzte Aktivitäten">
- <content>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
- <children>
- <ScrollPane fx:id="scrollPane" layoutX="11.199999809265137" layoutY="11.199999809265137" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <content>
- <TableView fx:id="table" prefHeight="430.0" prefWidth="784.0" />
- </content>
- </ScrollPane>
- </children></AnchorPane>
- </content>
- <font>
- <Font size="14.0" />
- </font>
- </TitledPane>
- </panes>
- </Accordion>
- </children>
- </VBox>
- </children>
-</AnchorPane>
diff --git a/src/charts/BarChartGenerator.java b/src/charts/BarChartGenerator.java
index 459a9b0907c61fe713f62e1e1eac3710488adcdf..10d39ff3834fea260a188f8022c094e723321e92 100644
--- a/src/charts/BarChartGenerator.java
+++ b/src/charts/BarChartGenerator.java
@@ -16,6 +16,7 @@ import javafx.scene.control.Tooltip;
import javafx.scene.input.MouseEvent;
import core.LogObject;
import core.SQL;
+import core.Utils;
public class BarChartGenerator
{
@@ -50,46 +51,13 @@ public class BarChartGenerator
return numDays;
}
- private String getMonthName(int month)
- {
- switch(month)
- {
- case 1:
- return "Januar";
- case 2:
- return "Februar";
- case 3:
- return "M�rz";
- case 4:
- return "April";
- case 5:
- return "Mai";
- case 6:
- return "Juni";
- case 7:
- return "Juli";
- case 8:
- return "August";
- case 9:
- return "September";
- case 10:
- return "Oktober";
- case 11:
- return "November";
- case 12:
- return "Dezember";
- default:
- return null;
- }
- }
-
@SuppressWarnings("unchecked")
public BarChart<String, Number> getBarChart(String project, String task, int year, int month) throws Exception
{
final CategoryAxis xAxis = new CategoryAxis();
final NumberAxis yAxis = new NumberAxis();
final BarChart<String, Number> chart = new BarChart<String, Number>(xAxis, yAxis);
- chart.setTitle(project + " - " + task + " - " + getMonthName(month) + " " + year);
+ chart.setTitle(project + " - " + task + " - " + Utils.getMonthName(month) + " " + year);
xAxis.setLabel("Tag");
yAxis.setLabel("Zeit in Minuten");
chart.setCategoryGap(2);
diff --git a/src/charts/ChartGUIController.java b/src/charts/ChartGUIController.java
index b1c5c7d68c645a96771334f03e814f302f9a2b7f..551ecfb890ce805498938b83a27e8f58411f75c8 100644
--- a/src/charts/ChartGUIController.java
+++ b/src/charts/ChartGUIController.java
@@ -19,6 +19,7 @@ import javafx.scene.layout.VBox;
import javafx.stage.Stage;
import core.LogObject;
import core.SQL;
+import core.Utils;
@SuppressWarnings("rawtypes")
public class ChartGUIController
@@ -38,12 +39,13 @@ public class ChartGUIController
private Image icon;
private PieChartGenerator generator;
private SummaryGenerator summaryGenerator;
- private BarChartGenerator barChartGenertator;
+ private BarChartGenerator barChartGenertator;
public void init(String savePath, Stage stage, Image icon)
{
try
{
+ this.stage = stage;
this.icon = icon;
sql = new SQL(savePath);
@@ -340,7 +342,7 @@ public class ChartGUIController
{
try
{
- showPieChart(generator.getChart0011(Integer.parseInt(selectedYear), getMonthNumber(selectedMonth), "Alle Projekte - " + selectedMonth + " " + selectedYear));
+ showPieChart(generator.getChart0011(Integer.parseInt(selectedYear), Utils.getMonthNumber(selectedMonth), "Alle Projekte - " + selectedMonth + " " + selectedYear));
}
catch(Exception e)
{
@@ -372,7 +374,7 @@ public class ChartGUIController
{
try
{
- showPieChart(generator.getChart1011(selectedProject, Integer.parseInt(selectedYear), getMonthNumber(selectedMonth), selectedProject + " - " + selectedMonth + " " + selectedYear));
+ showPieChart(generator.getChart1011(selectedProject, Integer.parseInt(selectedYear), Utils.getMonthNumber(selectedMonth), selectedProject + " - " + selectedMonth + " " + selectedYear));
}
catch(Exception e)
{
@@ -402,7 +404,7 @@ public class ChartGUIController
{
try
{
- showBarChart(barChartGenertator.getBarChart(selectedProject, selectedTask, Integer.parseInt(selectedYear), getMonthNumber(selectedMonth)));
+ showBarChart(barChartGenertator.getBarChart(selectedProject, selectedTask, Integer.parseInt(selectedYear), Utils.getMonthNumber(selectedMonth)));
}
catch(Exception e)
{
@@ -423,20 +425,6 @@ public class ChartGUIController
showErrorMessage();
}
}
-
- // public void zeigenButton()
- // {
- // charts.Projects.getChart(Main.dates, Main.projects, Main.differences);
- // BarChart chart = charts.Projects.getSpecificChart(monthBox.getValue(),
- // yearBox.getValue(), projectBox.getValue());
- // chartPane.getChildren().clear();
- // chartPane.getChildren().add(chart);
- // AnchorPane.setBottomAnchor(chart, 14.0);
- // AnchorPane.setTopAnchor(chart, 0.0);
- // AnchorPane.setLeftAnchor(chart, 14.0);
- // AnchorPane.setRightAnchor(chart, 14.0);
- // chartPane.setMaxHeight(Double.MAX_VALUE);
- // }
private void showErrorMessage()
{
@@ -513,71 +501,13 @@ public class ChartGUIController
ArrayList<Integer> monthsList = new ArrayList<Integer>(months2);
- ArrayList<String> monthNames = new ArrayList<String>();
+ ArrayList<String> monthNames = new ArrayList<String>();
for(int k = 0; k < monthsList.size(); k++)
{
- switch(monthsList.get(k))
- {
- case 1:
- monthNames.add("Januar");
- break;
- case 2:
- monthNames.add("Februar");
- break;
- case 3:
- monthNames.add("M�rz");
- break;
- case 4:
- monthNames.add("April");
- break;
- case 5:
- monthNames.add("Mai");
- break;
- case 6:
- monthNames.add("Juni");
- break;
- case 7:
- monthNames.add("Juli");
- break;
- case 8:
- monthNames.add("August");
- break;
- case 9:
- monthNames.add("September");
- break;
- case 10:
- monthNames.add("Oktober");
- break;
- case 11:
- monthNames.add("November");
- break;
- case 12:
- monthNames.add("Dezember");
- break;
- }
+ monthNames.add(Utils.getMonthName(k));
}
return monthNames;
- }
-
- private int getMonthNumber(String monthName)
- {
- switch(monthName)
- {
- case "Januar": return 1;
- case "Februar": return 2;
- case "M�rz": return 3;
- case "April": return 4;
- case "Mai": return 5;
- case "Juni": return 6;
- case "Juli": return 7;
- case "August": return 8;
- case "September": return 9;
- case "Oktober": return 10;
- case "November": return 11;
- case "Dezember": return 12;
- default: return 0;
- }
- }
+ }
}
\ No newline at end of file
diff --git a/src/core/Counter.java b/src/core/Counter.java
index c1586b481a154d35e2555f91b20531e0aacb13e9..baff59f5b40a54989297a61bec29623cc83f1520 100644
--- a/src/core/Counter.java
+++ b/src/core/Counter.java
@@ -4,7 +4,7 @@ import javafx.application.Platform;
import userInterface.UserInterfaceController;
/**
- * Thread f�r die zeitgleiche Ausf�hrung der Zeitmessung ohne Beeintr�chtigung der Hauptanwendung
+ * Thread für die zeitgleiche Ausführung der Zeitmessung ohne Beeinträchtigung der Hauptanwendung
* @author Robert
*
*/
@@ -17,9 +17,9 @@ public class Counter extends Thread
@Override
public void run()
{
- //l�scht zu Beginn den Text des Labels
+ //löscht zu Beginn den Text des Labels
uic.labelTime.setText("");
- //initialisiert die Z�hlvariable
+ //initialisiert die Zählvariable
ausgabe = 0;
while (running)
@@ -32,12 +32,12 @@ public class Counter extends Thread
uic.labelTime.setText(ConvertToTime.ConvertMillisToTime(ausgabe));
});
- //schl�ft 1000 Millisekunden
+ //schläft 1000 Millisekunden
Thread.sleep(1000);
- //erh�ht die Z�hlvariable um 1000 Millisekunden
+ //erhöht die Zählvariable um 1000 Millisekunden
ausgabe = ausgabe + 1000;
}
- //reagiert auf eine InterruptedException, die ausgel�st wird, wenn der Stopp-Button gedr�ckt wird
+ //reagiert auf eine InterruptedException, die ausgelöst wird, wenn der Stopp-Button gedrückt wird
catch (InterruptedException e)
{
running = false;
diff --git a/src/core/LogObject.java b/src/core/LogObject.java
index 03471e141d95d99ff1f7834e4a8c996895fa8682..01b2fb6d180a586d9d3a518dff2744dcd62a8a35 100644
--- a/src/core/LogObject.java
+++ b/src/core/LogObject.java
@@ -4,7 +4,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
- * Klasse "Logobject" - generiert Objekte, die alle wichtigen Eigenschaften f�r das Logfile enthalten
+ * Klasse "Logobject" - generiert Objekte, die alle wichtigen Eigenschaften für das Logfile enthalten
* @author Robert
*
*/
diff --git a/src/core/LogObjectOld.java b/src/core/LogObjectOld.java
index b94af4e256ae60a675680e23d8c7c9fe9fb92fe3..073c9a1f5c7c610b9f562e3243722d29ee5749d0 100644
--- a/src/core/LogObjectOld.java
+++ b/src/core/LogObjectOld.java
@@ -5,7 +5,7 @@ import java.util.Calendar;
import java.util.Date;
/**
- * Klasse "Logobject" - generiert Objekte, die alle wichtigen Eigenschaften f�r das Logfile enthalten
+ * Klasse "Logobject" - generiert Objekte, die alle wichtigen Eigenschaften für das Logfile enthalten
* @author Robert
*
*/
@@ -60,7 +60,7 @@ public class LogObjectOld
}
/**
- * toString f�r Ausgabe in Datei
+ * toString für Ausgabe in Datei
* @return String - date + starttime + endtime + startUhtzeit + endUhrzeit + project + task + differenz + time
*/
public String toString()
@@ -69,7 +69,7 @@ public class LogObjectOld
}
/**
- * toString f�r Ausgabe im Programm
+ * toString für Ausgabe im Programm
* @return String - date + startUhtzeit + endUhrzeit + project + task + time
*/
public String toString2()
@@ -124,7 +124,7 @@ public class LogObjectOld
}
/**
- * gibt den Projektnamen zur�ck
+ * gibt den Projektnamen zurück
* @return String - Projektname
*/
public String getProject()
@@ -133,7 +133,7 @@ public class LogObjectOld
}
/**
- * gibt den Tasknamen zur�ck
+ * gibt den Tasknamen zurück
* @return String - Taskname
*/
public String getTask()
@@ -142,7 +142,7 @@ public class LogObjectOld
}
/**
- * gibt die Differenz in Millisekundne zur�ck
+ * gibt die Differenz in Millisekundne zurück
* @return long - Differenz
*/
public long getDifferenz()
@@ -151,7 +151,7 @@ public class LogObjectOld
}
/**
- * gibt das Datum zur�ck
+ * gibt das Datum zurück
* @return String - Datum
*/
public String getDate()
@@ -160,7 +160,7 @@ public class LogObjectOld
}
/**
- * gibt die Startuhrzeit zur�ck
+ * gibt die Startuhrzeit zurück
* @return String - Startuhrzeit
*/
public String getStartUhrzeit()
@@ -169,7 +169,7 @@ public class LogObjectOld
}
/**
- * gibt die Enduhrzeit zur�ck
+ * gibt die Enduhrzeit zurück
* @return String - Enduhrzeit
*/
public String getEndUhrzeit()
@@ -178,7 +178,7 @@ public class LogObjectOld
}
/**
- * gibt die Differenz zur�ck
+ * gibt die Differenz zurück
* @return String - Differenz
*/
public String getTime()
@@ -196,7 +196,7 @@ public class LogObjectOld
}
/**
- * gibt die Startuhrzeit zur�ck
+ * gibt die Startuhrzeit zurück
* @return String - Startuhrzeit
*/
public long getStarttime()
@@ -205,7 +205,7 @@ public class LogObjectOld
}
/**
- * gibt die Enduhrzeit zur�ck
+ * gibt die Enduhrzeit zurück
* @return String - Enduhrzeit
*/
public long getEndtime()
@@ -214,7 +214,7 @@ public class LogObjectOld
}
/**
- * setzt den Wert f�r die Differenz in Stunden, Minuten und Sekunden
+ * setzt den Wert für die Differenz in Stunden, Minuten und Sekunden
* @param time String - Zeit in der Form "Stunden + Minuten + Sekunden"
*/
public void setTime(String time)
diff --git a/src/core/Utils.java b/src/core/Utils.java
new file mode 100644
index 0000000000000000000000000000000000000000..08da47c52988d64c7889a406e08647d8e541901a
--- /dev/null
+++ b/src/core/Utils.java
@@ -0,0 +1,18 @@
+package core;
+
+import java.util.Arrays;
+
+public class Utils
+{
+ private static final String[] AVAILABLE_MONTH_NAMES = {"Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"};
+
+ public static String getMonthName(int monthNumberOneIndexed)
+ {
+ return AVAILABLE_MONTH_NAMES[monthNumberOneIndexed - 1];
+ }
+
+ public static int getMonthNumber(String monthName)
+ {
+ return Arrays.asList(AVAILABLE_MONTH_NAMES).indexOf(monthName) + 1;
+ }
+}
\ No newline at end of file
diff --git a/src/userInterface/EditController.java b/src/userInterface/EditController.java
index 29796a201fe051b59a90ff62f19cc5e69e76758b..620b5a6778803944bd54a2ebef1bc933b3066e3f 100644
--- a/src/userInterface/EditController.java
+++ b/src/userInterface/EditController.java
@@ -29,9 +29,10 @@ public class EditController
private Image icon;
private LogObject object;
- public void init(UserInterfaceController controller, String savePath, Image icon, LogObject object)
+ public void init(UserInterfaceController controller, Stage stage, String savePath, Image icon, LogObject object)
{
this.controller = controller;
+ this.stage = stage;
this.icon = icon;
this.object = object;
@@ -74,13 +75,7 @@ public class EditController
});
dropdown.getSelectionModel().select(object.getProject());
- dropdownTasks.getSelectionModel().select(object.getTask());
-
- }
-
- public void setStage(Stage s)
- {
- stage = s;
+ dropdownTasks.getSelectionModel().select(object.getTask());
}
public void okButton(ActionEvent e)
@@ -94,7 +89,7 @@ public class EditController
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Die Felder d�rfen nicht leer sein.");
+ alert.setContentText("Die Felder dürfen nicht leer sein.");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -111,9 +106,9 @@ public class EditController
public void buttonDelete()
{
Alert alert = new Alert(AlertType.CONFIRMATION);
- alert.setTitle("L�schen");
+ alert.setTitle("Löschen");
alert.setHeaderText("");
- alert.setContentText("M�chten Sie den Eintrag wirklich unwiederruflich aus der Datenbank l�schen?");
+ alert.setContentText("Möchten Sie den Eintrag wirklich unwiederruflich aus der Datenbank löschen?");
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -125,7 +120,7 @@ public class EditController
}
}
- public void abbrechenButtond(ActionEvent e)
+ public void abbrechenButton(ActionEvent e)
{
stage.close();
}
diff --git a/src/userInterface/InsertTimeController.java b/src/userInterface/InsertTimeController.java
index f7125914da50364af1f311f9b1909f4e23c5990f..b7e92635b535fdfc3aedfc8220f70f8040d7fc94 100644
--- a/src/userInterface/InsertTimeController.java
+++ b/src/userInterface/InsertTimeController.java
@@ -238,7 +238,7 @@ public class InsertTimeController
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Die Felder f�r Projekt und Task d�rfen nicht leer sein!");
+ alert.setContentText("Die Felder für Projekt und Task dürfen nicht leer sein!");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
diff --git a/src/userInterface/Main.java b/src/userInterface/Main.java
index 8ed6bd784f2852e3efa846863f08b763832837fc..9c5eaf0ef09e48a52c8f86a29cf9871c138cfb83 100644
--- a/src/userInterface/Main.java
+++ b/src/userInterface/Main.java
@@ -28,28 +28,27 @@ public class Main extends Application
stage.setTitle("SmartTime");
stage.setScene(scene);
- UserInterfaceController controller = (UserInterfaceController)loader.getController();
- controller.setStage(stage);
- controller.init();
+ UserInterfaceController controller = (UserInterfaceController)loader.getController();
+ controller.init(stage);
stage.getIcons().add(new Image("/userInterface/icon.png"));
stage.show();
- // f�ngt die Aufforderung das Fenster zu schlie�en ab, um vorher
- // noch eine Pr�fung duchzuf�hren
+ // fängt die Aufforderung das Fenster zu schließen ab, um vorher
+ // noch eine Prüfung duchzuführen
stage.setOnCloseRequest(new EventHandler<WindowEvent>()
{
public void handle(WindowEvent we)
{
- if(controller.stoppUhrL�uftFlag == true)
+ if(controller.stoppUhrLäuftFlag == true)
{
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Stoppuhr l�uft noch!");
+ alert.setContentText("Stoppuhr läuft noch!");
alert.showAndWait();
- // "schluckt" die Aufforderung das Fenster zu schlie�en
+ // "schluckt" die Aufforderung das Fenster zu schließen
// (Fenster wird dadurch nicht geschlossen)
we.consume();
}
diff --git a/src/userInterface/ProjektFensterController.java b/src/userInterface/ProjektFensterController.java
index 9fab71f682970c1d9fee3400887bc17228c4c069..3d613b8387ed57e0c0934a9c2b56afe28793076c 100644
--- a/src/userInterface/ProjektFensterController.java
+++ b/src/userInterface/ProjektFensterController.java
@@ -7,7 +7,6 @@ import core.SQL;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
@@ -15,16 +14,15 @@ import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;
import javafx.scene.image.Image;
import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
/**
- * Controllerklasse f�r das Projektfenster
+ * Controllerklasse für das Projektfenster
*
* @author Robert
*
*/
-public class ProjektFensterController implements EventHandler<WindowEvent>
+public class ProjektFensterController
{
@FXML private Button abbrechenButton;
@FXML private ComboBox<String> dropdown;
@@ -33,9 +31,14 @@ public class ProjektFensterController implements EventHandler<WindowEvent>
private UserInterfaceController controller;
private Image icon;
- public void init(UserInterfaceController controller, String savePath, Image icon)
+ public void init(UserInterfaceController controller, Stage stage, String savePath, Image icon)
{
this.controller = controller;
+ this.stage = stage;
+ this.stage.setOnCloseRequest((handle)-> {
+ controller.projektExistiertFlag = false;
+ stage.close();
+ });
this.icon = icon;
ArrayList<String> objects = new ArrayList<String>();
@@ -85,19 +88,6 @@ public class ProjektFensterController implements EventHandler<WindowEvent>
});
}
- @Override
- public void handle(WindowEvent arg0)
- {
- controller.projektExistiertFlag = false;
- stage.close();
- }
-
- public void setStage(Stage s)
- {
- stage = s;
- stage.setOnCloseRequest(this);
- }
-
public void okButton(ActionEvent e)
{
String project = dropdown.getValue();
@@ -109,7 +99,7 @@ public class ProjektFensterController implements EventHandler<WindowEvent>
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Die Felder d�rfen nicht leer sein.");
+ alert.setContentText("Die Felder dürfen nicht leer sein.");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
diff --git a/src/userInterface/TimePickerController.java b/src/userInterface/TimePickerController.java
index da845aa884b9fe2981a8bed88ccbd6de7e78bdfa..ac46f5cc6cdd28aa0607e26b50b0a6c89511adfc 100644
--- a/src/userInterface/TimePickerController.java
+++ b/src/userInterface/TimePickerController.java
@@ -208,7 +208,7 @@ public class TimePickerController implements Initializable
vboxSeconds.getChildren().add(buttonSecondsDown);
vboxSeconds.setAlignment(Pos.CENTER);
- //Hinzuf�gen zur HBox
+ //Hinzufügen zur HBox
Label separator = new Label(" : ");
separator.setStyle("-fx-font-size: 18; -fx-font-weight: bold;");
Label separator2 = new Label(" : ");
diff --git a/src/userInterface/UserInterfaceController.java b/src/userInterface/UserInterfaceController.java
index 2f134cd840079aeb8aff3ed89fc1507e451b743a..4976d5775ef81e1d4d63b799fb42263c9ef61713 100644
--- a/src/userInterface/UserInterfaceController.java
+++ b/src/userInterface/UserInterfaceController.java
@@ -12,7 +12,12 @@ import java.util.Optional;
import java.util.ResourceBundle;
import java.util.regex.Pattern;
-import tools.PathUtils;
+import charts.ChartGUIController;
+import core.ConvertToTime;
+import core.Exporter;
+import core.Importer;
+import core.LogObject;
+import core.SQL;
import javafx.application.Platform;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
@@ -53,12 +58,7 @@ import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import javafx.util.Callback;
-import charts.ChartGUIController;
-import core.ConvertToTime;
-import core.Exporter;
-import core.Importer;
-import core.LogObject;
-import core.SQL;
+import tools.PathUtils;
public class UserInterfaceController
@@ -76,7 +76,7 @@ public class UserInterfaceController
private Stage stage;
private core.Counter stoppUhr;
- public boolean stoppUhrL�uftFlag;
+ public boolean stoppUhrLäuftFlag;
public boolean projektExistiertFlag;
private ArrayList<TreeItem<HBox>> aktuelleTasks;
private TreeItem<HBox> item;
@@ -91,18 +91,19 @@ public class UserInterfaceController
private Image icon;
private final ResourceBundle bundle = ResourceBundle.getBundle("userInterface/", Locale.GERMANY);
- public void init()
+ public void init(Stage stage)
{
+ this.stage = stage;
+
PathUtils.checkFolder(new File(new File(savePath).getParent()));
icon = new Image("/userInterface/icon.png");
accordion.setExpandedPane(gesamtesLog);
projektExistiertFlag = false;
- stoppUhrL�uftFlag = false;
+ stoppUhrLäuftFlag = false;
- labelTime.setText("0 h 0 min 0 sek");
- stoppUhrL�uftFlag = false;
+ labelTime.setText("0 h 0 min 0 sek");
loadAll();
@@ -113,7 +114,7 @@ public class UserInterfaceController
if(startButton.isSelected())
{
- stoppUhrL�uftFlag = true;
+ stoppUhrLäuftFlag = true;
labelTime.setText("");
core.Counter.ausgabe = 0;
@@ -129,7 +130,7 @@ public class UserInterfaceController
}
else
{
- stoppUhrL�uftFlag = false;
+ stoppUhrLäuftFlag = false;
startButton.setText("Start");
stoppUhr.interrupt();
@@ -143,7 +144,7 @@ public class UserInterfaceController
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Kein Projekt ausgew�hlt!");
+ alert.setContentText("Kein Projekt ausgewählt!");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -155,18 +156,18 @@ public class UserInterfaceController
}
/**
- * F�ngt die Aufforderung das Fenster zu schlie�en ab, um vorher noch eine
- * Pr�fung duchzuf�hren
+ * Fängt die Aufforderung das Fenster zu schließen ab, um vorher noch eine
+ * Prüfung duchzuführen
*/
public void closeRequest()
{
- // Pr�ft, ob die Stoppuhr noch l�uft
- if(stoppUhrL�uftFlag == true)
+ // Prüft, ob die Stoppuhr noch läuft
+ if(stoppUhrLäuftFlag == true)
{
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Stoppuhr l�uft noch!");
+ alert.setContentText("Stoppuhr läuft noch!");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -178,11 +179,6 @@ public class UserInterfaceController
}
}
- public void setStage(Stage s)
- {
- stage = s;
- }
-
public void setLabels(String project, String task)
{
aktuellesProjektAusgabe.setText(project);
@@ -191,25 +187,25 @@ public class UserInterfaceController
public void openProjectGUI(ActionEvent e)
{
- if( ! stoppUhrL�uftFlag)
+ if( ! stoppUhrLäuftFlag)
{
try
{
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("projektFenster.fxml"));
Parent root = (Parent)fxmlLoader.load();
- Stage stage = new Stage();
- stage.setScene(new Scene(root, 455, 300));
- stage.setTitle("Neues Projekt");
+ Stage newStage = new Stage();
+ newStage.setScene(new Scene(root, 455, 300));
+ newStage.setTitle("Neues Projekt");
+ newStage.initOwner(stage);
- stage.getIcons().add(icon);
+ newStage.getIcons().add(icon);
ProjektFensterController pfc = (ProjektFensterController)fxmlLoader.getController();
- pfc.setStage(stage);
- pfc.init(this, savePath, icon);
+ pfc.init(this, stage, savePath, icon);
- stage.setResizable(false);
- stage.initModality(Modality.APPLICATION_MODAL);
- stage.showAndWait();
+ newStage.setResizable(false);
+ newStage.initModality(Modality.APPLICATION_MODAL);
+ newStage.showAndWait();
}
catch(IOException d)
{
@@ -220,8 +216,8 @@ public class UserInterfaceController
{
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
- alert.setHeaderText("Stoppuhr l�uft noch!");
- alert.setContentText("Projekt und Task k�nnen nur ge�ndert werden,\nwenn die Stoppuhr nicht l�uft.");
+ alert.setHeaderText("Stoppuhr läuft noch!");
+ alert.setContentText("Projekt und Task können nur geändert werden,\nwenn die Stoppuhr nicht läuft.");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -279,12 +275,12 @@ public class UserInterfaceController
box2.getChildren().add(labelTask);
box2.getChildren().add(labelTaskTime);
- // und ein neus TreeItem erzeugt, was sp�ter Kind des
- // �bergeordneten Knoten mit dem Projektnamen sein wird
+ // und ein neus TreeItem erzeugt, was später Kind des
+ // übergeordneten Knoten mit dem Projektnamen sein wird
aktuelleTasks.add(new TreeItem<HBox>(box2));
}
- // f�gt alle TreeItems der Ansicht hinzu
+ // fügt alle TreeItems der Ansicht hinzu
item.getChildren().setAll(aktuelleTasks);
alleTasks.add(item);
}
@@ -469,18 +465,19 @@ public class UserInterfaceController
Parent root = (Parent)fxmlLoader.load();
Scene scene = new Scene(root, 800, 600);
scene.getStylesheets().add("charts/Chart.css");
- Stage stage = new Stage();
- stage.setScene(scene);
- stage.setTitle("Diagramme");
+ Stage newStage = new Stage();
+ newStage.setScene(scene);
+ newStage.setTitle("Diagramme");
ChartGUIController controller = (ChartGUIController)fxmlLoader.getController();
controller.init(savePath, stage, icon);
- stage.getIcons().add(icon);
-
- stage.setResizable(true);
- stage.setMinWidth(800);
- stage.setMinHeight(600);
- stage.initModality(Modality.APPLICATION_MODAL);
- stage.showAndWait();
+ newStage.getIcons().add(icon);
+ newStage.initOwner(stage);
+
+ newStage.setResizable(true);
+ newStage.setMinWidth(800);
+ newStage.setMinHeight(600);
+ newStage.initModality(Modality.APPLICATION_MODAL);
+ newStage.showAndWait();
}
catch(IOException e)
{
@@ -504,14 +501,14 @@ public class UserInterfaceController
private void startClock()
{
- stoppUhrL�uftFlag = true;
+ stoppUhrLäuftFlag = true;
log.createStartTime();
startTimestamp = System.currentTimeMillis();
}
private void endClock()
{
- stoppUhrL�uftFlag = false;
+ stoppUhrLäuftFlag = false;
log.createEndTime();
endTimestamp = System.currentTimeMillis();
log.setDuration(endTimestamp - startTimestamp);
@@ -555,17 +552,18 @@ public class UserInterfaceController
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/userInterface/InsertTimeGUI.fxml"));
Parent root = (Parent)fxmlLoader.load();
Scene scene = new Scene(root, 540, 400);
- Stage stage = new Stage();
- stage.setScene(scene);
- stage.setTitle("Zeit nachtr�glich einf�gen");
+ Stage newStage = new Stage();
+ newStage.setScene(scene);
+ newStage.setTitle("Zeit nachträglich einfügen");
InsertTimeController controller = (InsertTimeController)fxmlLoader.getController();
controller.init(stage, this, savePath, icon);
- stage.getIcons().add(icon);
+ newStage.getIcons().add(icon);
+ newStage.initOwner(stage);
- stage.setResizable(false);
- stage.initModality(Modality.APPLICATION_MODAL);
- stage.showAndWait();
+ newStage.setResizable(false);
+ newStage.initModality(Modality.APPLICATION_MODAL);
+ newStage.showAndWait();
}
catch(IOException e)
{
@@ -765,19 +763,18 @@ public class UserInterfaceController
{
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("editGUI.fxml"));
Parent root = (Parent)fxmlLoader.load();
- Stage stage = new Stage();
- stage.setScene(new Scene(root, 455, 280));
- stage.setTitle("Eintrag bearbeiten");
-
- stage.getIcons().add(icon);
-
- EditController pfc = (EditController)fxmlLoader.getController();
- pfc.setStage(stage);
- pfc.init(this, savePath, icon, object);
-
- stage.setResizable(false);
- stage.initModality(Modality.APPLICATION_MODAL);
- stage.showAndWait();
+ Stage newStage = new Stage();
+ newStage.setScene(new Scene(root, 455, 280));
+ newStage.setTitle("Eintrag bearbeiten");
+ newStage.getIcons().add(icon);
+ newStage.initOwner(stage);
+
+ EditController pfc = (EditController)fxmlLoader.getController();
+ pfc.init(this, stage, savePath, icon, object);
+
+ newStage.setResizable(false);
+ newStage.initModality(Modality.APPLICATION_MODAL);
+ newStage.showAndWait();
}
catch(IOException d)
{
@@ -818,7 +815,7 @@ public class UserInterfaceController
Alert alert = new Alert(AlertType.ERROR);
alert.setTitle("Fehler");
alert.setHeaderText("");
- alert.setContentText("Beim L�schen des Eintrags ist ein Fehler aufgetreten.");
+ alert.setContentText("Beim Löschen des Eintrags ist ein Fehler aufgetreten.");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -830,9 +827,9 @@ public class UserInterfaceController
public void deleteDB()
{
Alert alert = new Alert(AlertType.CONFIRMATION);
- alert.setTitle("L�schen");
+ alert.setTitle("Löschen");
alert.setHeaderText("");
- alert.setContentText("M�chten Sie die gesamte Datenbank wirklich unwiederruflich l�schen?");
+ alert.setContentText("Möchten Sie die gesamte Datenbank wirklich unwiederruflich löschen?");
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
@@ -850,7 +847,7 @@ public class UserInterfaceController
Alert alert2 = new Alert(AlertType.ERROR);
alert2.setTitle("Fehler");
alert2.setHeaderText("");
- alert2.setContentText("Beim L�schen der Datenbank ist ein Fehler aufgetreten.");
+ alert2.setContentText("Beim Löschen der Datenbank ist ein Fehler aufgetreten.");
alert2.initOwner(stage);
Stage dialogStage2 = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage2.getIcons().add(icon);
@@ -863,7 +860,7 @@ public class UserInterfaceController
public void about()
{
Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("�ber " + bundle.getString("app.name"));
+ alert.setTitle("Über " + bundle.getString("app.name"));
alert.setHeaderText(bundle.getString("app.name"));
alert.setContentText("Version: " + bundle.getString("version.name") + "\r\nDatum: " + bundle.getString("version.date") + "\r\nAutor: Robert Goldmann\r\n");
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
diff --git a/src/userInterface/editGUI.fxml b/src/userInterface/editGUI.fxml
index 414f412407a6c1e10b7e89f584786585bae36290..b771f3d001fbf7db74737e1dd2cb8ae22782a140 100644
--- a/src/userInterface/editGUI.fxml
+++ b/src/userInterface/editGUI.fxml
@@ -13,7 +13,7 @@
<Font size="14.0" />
</font>
</Button>
- <Button fx:id="abbrechenButton" layoutX="298.0" layoutY="221.0" mnemonicParsing="false" onAction="#abbrechenButtond" prefHeight="30.0" prefWidth="92.0" text="Abbrechen">
+ <Button fx:id="abbrechenButton" layoutX="298.0" layoutY="221.0" mnemonicParsing="false" onAction="#abbrechenButton" prefHeight="30.0" prefWidth="92.0" text="Abbrechen">
<font>
<Font size="14.0" />
</font>