Skip to content
Snippets Groups Projects
Commit 3ca08186 authored by Dennis Toth's avatar Dennis Toth
Browse files

added delete buttons

parent 85f35e89
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 12
− 3
View file @ 3ca08186
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="added catch for NullPointerException"> <list default="true" id="ce56effb-683b-43e9-9335-7e3aa5d26c29" name="Changes" comment="added delete buttons">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/SwitchWindowHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/thdeg/grademanager/gui/SwitchWindowHelper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/courses-of-study-details.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/courses-of-study-details.fxml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/courses-of-study-details.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/courses-of-study-details.fxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-details.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-details.fxml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-details.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/de/thdeg/grademanager/gui/student-details.fxml" afterDir="false" />
</list> </list>
...@@ -199,7 +200,14 @@ ...@@ -199,7 +200,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1655972192797</updated> <updated>1655972192797</updated>
</task> </task>
<option name="localTasksCounter" value="17" /> <task id="LOCAL-00017" summary="added delete buttons">
<created>1655973033253</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1655973033253</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
...@@ -243,6 +251,7 @@ ...@@ -243,6 +251,7 @@
<MESSAGE value="grades can now be added for every course" /> <MESSAGE value="grades can now be added for every course" />
<MESSAGE value="bug fix null pointer exception in enrollment table view" /> <MESSAGE value="bug fix null pointer exception in enrollment table view" />
<MESSAGE value="added catch for NullPointerException" /> <MESSAGE value="added catch for NullPointerException" />
<option name="LAST_COMMIT_MESSAGE" value="added catch for NullPointerException" /> <MESSAGE value="added delete buttons" />
<option name="LAST_COMMIT_MESSAGE" value="added delete buttons" />
</component> </component>
</project> </project>
\ No newline at end of file
src/main/java/de/thdeg/grademanager/gui/Main.java
+ 1
− 1
View file @ 3ca08186
...@@ -17,7 +17,7 @@ public class Main extends Application { ...@@ -17,7 +17,7 @@ public class Main extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("main.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("main.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 960, 540); Scene scene = new Scene(fxmlLoader.load(), 1000, 600);
stage.setTitle("Main"); stage.setTitle("Main");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
......
src/main/java/de/thdeg/grademanager/gui/SwitchWindowHelper.java
+ 2
− 1
View file @ 3ca08186
...@@ -30,7 +30,8 @@ public class SwitchWindowHelper { ...@@ -30,7 +30,8 @@ public class SwitchWindowHelper {
public static void switchTo(String windowTitle, Event event) throws IOException { public static void switchTo(String windowTitle, Event event) throws IOException {
FXMLLoader root = new FXMLLoader(Main.class.getResource(getResourceName(windowTitle))); FXMLLoader root = new FXMLLoader(Main.class.getResource(getResourceName(windowTitle)));
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow(); Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
Scene scene = new Scene(root.load(), 960, 540); //Scene scene = new Scene(root.load(), 960, 540);
Scene scene = new Scene(root.load(), 1000, 600);
if (stage != null){ if (stage != null){
stage.setTitle(windowTitle); stage.setTitle(windowTitle);
stage.setScene(scene); stage.setScene(scene);
......
src/main/resources/de/thdeg/grademanager/gui/courses-of-study-details.fxml
+ 23
− 23
View file @ 3ca08186
...@@ -18,26 +18,13 @@ ...@@ -18,26 +18,13 @@
<top> <top>
<VBox fillWidth="false" prefHeight="42.0" prefWidth="600.0" BorderPane.alignment="CENTER"> <VBox fillWidth="false" prefHeight="42.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox prefHeight="42.0" prefWidth="594.0"> <ButtonBar buttonMinWidth="30.0" prefHeight="40.0" prefWidth="200.0">
<children> <buttons>
<ButtonBar buttonMinWidth="30.0" prefHeight="40.0" prefWidth="200.0"> <Button alignment="CENTER" minWidth="22.0" mnemonicParsing="false" onAction="#switchToMain" prefHeight="26.0" text="←" />
<buttons> <Button alignment="CENTER" disable="true" layoutX="31.0" layoutY="17.0" minWidth="22.0" mnemonicParsing="false" prefHeight="26.0" text="→" />
<Button alignment="CENTER" minWidth="22.0" mnemonicParsing="false" onAction="#switchToMain" prefHeight="26.0" text="←" /> <Region prefHeight="200.0" prefWidth="200.0" />
<Button alignment="CENTER" disable="true" layoutX="31.0" layoutY="17.0" minWidth="22.0" mnemonicParsing="false" prefHeight="26.0" text="→" /> </buttons>
<Region prefHeight="200.0" prefWidth="200.0" /> </ButtonBar>
</buttons>
</ButtonBar>
<Region prefHeight="42.0" prefWidth="290.0" />
<Button mnemonicParsing="false" prefHeight="26.0" prefWidth="90.0" style="-fx-background-color: CD5C5C;" text="Löschen" textAlignment="CENTER">
<opaqueInsets>
<Insets />
</opaqueInsets>
<HBox.margin>
<Insets top="7.0" />
</HBox.margin>
</Button>
</children>
</HBox>
</children> </children>
</VBox> </VBox>
</top> </top>
...@@ -117,17 +104,30 @@ ...@@ -117,17 +104,30 @@
<Button fx:id="saveButton" mnemonicParsing="false" onAction="#onSaveButtonClick" text="Speichern" /> <Button fx:id="saveButton" mnemonicParsing="false" onAction="#onSaveButtonClick" text="Speichern" />
</children> </children>
</HBox> </HBox>
<Region prefHeight="34.0" prefWidth="200.0" /> <Region prefHeight="6.0" prefWidth="200.0" />
<HBox alignment="CENTER" prefHeight="52.0" prefWidth="600.0"> <HBox alignment="CENTER" prefHeight="52.0" prefWidth="600.0">
<children> <children>
<Button mnemonicParsing="false" onAction="#switchToCourseModification" prefHeight="26.0" prefWidth="94.0" text="Kurs anlegen" /> <Button mnemonicParsing="false" onAction="#switchToCourseModification" prefHeight="26.0" prefWidth="94.0" text="Kurs anlegen" />
</children> </children>
</HBox> </HBox>
<HBox alignment="CENTER" prefHeight="133.0" prefWidth="600.0"> <HBox alignment="CENTER" prefHeight="120.0" prefWidth="600.0">
<children> <children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Angelegte Kurse:" /> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Angelegte Kurse:" />
<Region prefHeight="99.0" prefWidth="18.0" /> <Region prefHeight="99.0" prefWidth="18.0" />
<ListView fx:id="courseListView" editable="true" onMouseClicked="#onCourseClick" prefHeight="133.0" prefWidth="270.0" /> <ListView fx:id="courseListView" editable="true" onMouseClicked="#onCourseClick" prefHeight="94.0" prefWidth="270.0" />
</children>
</HBox>
<Region prefHeight="20.0" prefWidth="200.0" />
<HBox alignment="TOP_CENTER" prefHeight="42.0" prefWidth="594.0">
<children>
<Button mnemonicParsing="false" prefHeight="26.0" prefWidth="134.0" style="-fx-background-color: CD5C5C;" text="Studiengang löschen" textAlignment="CENTER">
<opaqueInsets>
<Insets />
</opaqueInsets>
<HBox.margin>
<Insets />
</HBox.margin>
</Button>
</children> </children>
</HBox> </HBox>
</children> </children>
......
src/main/resources/de/thdeg/grademanager/gui/student-details.fxml
+ 23
− 23
View file @ 3ca08186
...@@ -13,30 +13,17 @@ ...@@ -13,30 +13,17 @@
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.thdeg.grademanager.gui.StudentDetailsController"> <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="857.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.thdeg.grademanager.gui.StudentDetailsController">
<top> <top>
<VBox fillWidth="false" prefHeight="46.0" prefWidth="600.0" BorderPane.alignment="CENTER"> <VBox fillWidth="false" prefHeight="46.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox prefHeight="42.0" prefWidth="594.0"> <ButtonBar buttonMinWidth="30.0" prefHeight="40.0" prefWidth="200.0">
<children> <buttons>
<ButtonBar buttonMinWidth="30.0" prefHeight="40.0" prefWidth="200.0"> <Button alignment="CENTER" minWidth="22.0" mnemonicParsing="false" onAction="#switchToMain" prefHeight="26.0" text="←" />
<buttons> <Button alignment="CENTER" disable="true" layoutX="31.0" layoutY="17.0" minWidth="22.0" mnemonicParsing="false" prefHeight="26.0" text="→" />
<Button alignment="CENTER" minWidth="22.0" mnemonicParsing="false" onAction="#switchToMain" prefHeight="26.0" text="←" /> <Region prefHeight="200.0" prefWidth="200.0" />
<Button alignment="CENTER" disable="true" layoutX="31.0" layoutY="17.0" minWidth="22.0" mnemonicParsing="false" prefHeight="26.0" text="→" /> </buttons>
<Region prefHeight="200.0" prefWidth="200.0" /> </ButtonBar>
</buttons>
</ButtonBar>
<Region prefHeight="42.0" prefWidth="290.0" />
<Button mnemonicParsing="false" prefHeight="26.0" prefWidth="90.0" style="-fx-background-color: CD5C5C;" text="Löschen" textAlignment="CENTER">
<opaqueInsets>
<Insets />
</opaqueInsets>
<HBox.margin>
<Insets top="7.0" />
</HBox.margin>
</Button>
</children>
</HBox>
</children> </children>
</VBox> </VBox>
</top> </top>
...@@ -44,7 +31,7 @@ ...@@ -44,7 +31,7 @@
<Label fx:id="welcomeText" BorderPane.alignment="CENTER" /> <Label fx:id="welcomeText" BorderPane.alignment="CENTER" />
</left> </left>
<center> <center>
<VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER"> <VBox prefHeight="243.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox alignment="CENTER" prefHeight="51.0" prefWidth="600.0"> <HBox alignment="CENTER" prefHeight="51.0" prefWidth="600.0">
<children> <children>
...@@ -201,7 +188,7 @@ ...@@ -201,7 +188,7 @@
</VBox> </VBox>
</center> </center>
<bottom> <bottom>
<VBox prefHeight="66.0" prefWidth="600.0" BorderPane.alignment="CENTER"> <VBox prefHeight="105.0" prefWidth="858.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox alignment="CENTER" prefHeight="52.0" prefWidth="600.0"> <HBox alignment="CENTER" prefHeight="52.0" prefWidth="600.0">
<children> <children>
...@@ -212,6 +199,19 @@ ...@@ -212,6 +199,19 @@
<Button mnemonicParsing="false" onAction="#switchToStudentStats" prefHeight="26.0" prefWidth="127.0" text="Statistiken anzeigen" /> <Button mnemonicParsing="false" onAction="#switchToStudentStats" prefHeight="26.0" prefWidth="127.0" text="Statistiken anzeigen" />
</children> </children>
</HBox> </HBox>
<Region prefHeight="18.0" prefWidth="858.0" />
<HBox alignment="TOP_CENTER" prefHeight="42.0" prefWidth="594.0">
<children>
<Button mnemonicParsing="false" prefHeight="26.0" prefWidth="111.0" style="-fx-background-color: CD5C5C;" text="Student löschen" textAlignment="CENTER">
<opaqueInsets>
<Insets />
</opaqueInsets>
<HBox.margin>
<Insets bottom="7.0" />
</HBox.margin>
</Button>
</children>
</HBox>
</children> </children>
</VBox> </VBox>
</bottom> </bottom>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment