Compare commits
No commits in common. "ede28ae4a7b0f4c9d8ad52dc89192f78e6c6993c" and "351bcd524db7309c7ad546dfc05efc9772fdd7a3" have entirely different histories.
ede28ae4a7
...
351bcd524d
@ -42,7 +42,6 @@ public class CreateEventController {
|
|||||||
public CreateEventController() {
|
public CreateEventController() {
|
||||||
}
|
}
|
||||||
|
|
||||||
//Marco Kühn//
|
|
||||||
@FXML
|
@FXML
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
|
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
|
||||||
@ -53,7 +52,7 @@ public class CreateEventController {
|
|||||||
timeEnd.setConverter(defaultConverter);
|
timeEnd.setConverter(defaultConverter);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Marc Beyer//
|
|
||||||
@FXML
|
@FXML
|
||||||
protected void createBtnClick(ActionEvent actionEvent) {
|
protected void createBtnClick(ActionEvent actionEvent) {
|
||||||
try {
|
try {
|
||||||
@ -85,13 +84,11 @@ public class CreateEventController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Marc Beyer//
|
|
||||||
protected void sendHttpRequest(Event event) throws HttpRequestException {
|
protected void sendHttpRequest(Event event) throws HttpRequestException {
|
||||||
DataController dataController = new DataController();
|
DataController dataController = new DataController();
|
||||||
dataController.createEvent(event);
|
dataController.createEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Marc Beyer//
|
|
||||||
@FXML
|
@FXML
|
||||||
protected void abortBtnClick(ActionEvent event) {
|
protected void abortBtnClick(ActionEvent event) {
|
||||||
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Marc Beyer//
|
|
||||||
package main;
|
package main;
|
||||||
|
|
||||||
import config.Config;
|
import config.Config;
|
||||||
@ -15,7 +14,6 @@ import java.io.IOException;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
|
||||||
public class MainApplication extends Application {
|
public class MainApplication extends Application {
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage stage) throws IOException {
|
public void start(Stage stage) throws IOException {
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/* Marco Kühn, Marc Beyer */
|
|
||||||
package main;
|
package main;
|
||||||
|
|
||||||
import config.Config;
|
import config.Config;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/* Marco Kühn */
|
|
||||||
package main;
|
package main;
|
||||||
|
|
||||||
import com.jfoenix.controls.*;
|
import com.jfoenix.controls.*;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Alex Rechtin//
|
|
||||||
package users;
|
package users;
|
||||||
|
|
||||||
import helper.HttpRequestException;
|
import helper.HttpRequestException;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/* Marc Beyer */
|
|
||||||
package users;
|
package users;
|
||||||
|
|
||||||
import container.DataController;
|
import container.DataController;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Alex Rechtin//
|
|
||||||
package users;
|
package users;
|
||||||
|
|
||||||
import com.jfoenix.controls.*;
|
import com.jfoenix.controls.*;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/*Marco Kühn*/
|
|
||||||
GridPane{
|
GridPane{
|
||||||
-fx-background-color: #3E415F;
|
-fx-background-color: #3E415F;
|
||||||
-fx-padding: 20px;
|
-fx-padding: 20px;
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!-- Marco Kühn -->
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!-- Marco Kühn -->
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/*Alex Rechtin, Marco Kühn*/
|
|
||||||
* {
|
* {
|
||||||
-fx-base-background-color: #2B2D42;
|
-fx-base-background-color: #2B2D42;
|
||||||
-fx-base1-background-color: #525E74;
|
-fx-base1-background-color: #525E74;
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!-- Alex Rechtin, Marco Kühn -->
|
|
||||||
|
|
||||||
<?import javafx.geometry.*?>
|
<?import javafx.geometry.*?>
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.image.*?>
|
<?import javafx.scene.image.*?>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/* Marco Kühn */
|
|
||||||
GridPane{
|
GridPane{
|
||||||
-fx-background-color: #3E415F;
|
-fx-background-color: #3E415F;
|
||||||
-fx-padding: 20px;
|
-fx-padding: 20px;
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!-- Marco Kühn -->
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/*Alex Rechtin*/
|
|
||||||
* {
|
* {
|
||||||
-fx-base-background-color: #2B2D42;
|
-fx-base-background-color: #2B2D42;
|
||||||
-fx-base1-background-color: #525E74;
|
-fx-base1-background-color: #525E74;
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!-- Alex Rechtin -->
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
<?import javafx.geometry.Insets?>
|
<?import javafx.geometry.Insets?>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
/* Marco Kühn*/
|
|
||||||
* {
|
* {
|
||||||
-fx-base-background-color: #2B2D42;
|
-fx-base-background-color: #2B2D42;
|
||||||
-fx-base1-background-color: #525E74;
|
-fx-base1-background-color: #525E74;
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!-- Marco Kühn -->
|
|
||||||
|
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
<?import com.jfoenix.controls.*?>
|
<?import com.jfoenix.controls.*?>
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Marc Beyer//
|
|
||||||
package config;
|
package config;
|
||||||
|
|
||||||
public class Config {
|
public class Config {
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Marc Beyer//
|
|
||||||
package config;
|
package config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Marc Beyer//
|
|
||||||
package helper;
|
package helper;
|
||||||
|
|
||||||
public class HttpRequestException extends Exception{
|
public class HttpRequestException extends Exception{
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
//Marc Beyer//
|
|
||||||
package helper;
|
package helper;
|
||||||
|
|
||||||
public class Tuple<X, Y> {
|
public class Tuple<X, Y> {
|
||||||
|
Loading…
Reference in New Issue
Block a user