From 750be47c99ecf61c0ce4f3915163bcc92c0ae7f4 Mon Sep 17 00:00:00 2001
From: Stefan Suhren <suhren.stefan@fh-swf.de>
Date: Mon, 23 Nov 2015 23:18:43 +0100
Subject: Show grades in table

---
 src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java |  5 ++
 .../in/inf/se/notepadMinusMinus/view/MainView.fxml | 22 ++++----
 .../notepadMinusMinus/view/MainViewController.java | 63 +++++++++++++++++++++-
 3 files changed, 77 insertions(+), 13 deletions(-)

(limited to 'src/de/fhswf/in/inf/se/notepadMinusMinus')

diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
index 55e550a..0c8c4eb 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
@@ -9,6 +9,7 @@ import javax.xml.bind.Unmarshaller;
 
 import de.fhswf.in.inf.se.notepadMinusMinus.model.Grade;
 import de.fhswf.in.inf.se.notepadMinusMinus.model.Grades;
+import de.fhswf.in.inf.se.notepadMinusMinus.view.MainViewController;
 import javafx.application.Application;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -39,6 +40,10 @@ public class Main extends Application
 
          Scene scene = new Scene(root);
          primaryStage.setScene(scene);
+
+         MainViewController controller = loader.getController();
+         controller.setMain(this);
+
          primaryStage.setMaximized(true);
          primaryStage.show();
       }
diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainView.fxml b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainView.fxml
index dcdf450..4ad372d 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainView.fxml
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainView.fxml
@@ -46,13 +46,13 @@
    <center>
       <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <children>
-            <TableView fx:id="noteTable" editable="true" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <TableView fx:id="gradeTable" editable="true" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
               <columns>
-                <TableColumn prefWidth="75.0" text="Semester" />
-                <TableColumn prefWidth="75.0" text="Modulname" />
-                  <TableColumn prefWidth="75.0" text="ECTS" />
-                  <TableColumn prefWidth="75.0" text="Note" />
-                  <TableColumn prefWidth="75.0" text="Versuch" />
+                <TableColumn fx:id="semesterColumn" prefWidth="75.0" text="Semester" />
+                <TableColumn fx:id="modulenameColumn" prefWidth="75.0" text="Modulname" />
+                  <TableColumn fx:id="ectsColumn" prefWidth="75.0" text="ECTS" />
+                  <TableColumn fx:id="gradeColumn" prefWidth="75.0" text="Note" />
+                  <TableColumn fx:id="attemptColumn" prefWidth="75.0" text="Versuch" />
               </columns>
                <columnResizePolicy>
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
@@ -77,14 +77,14 @@
         </rowConstraints>
          <children>
             <Label text="ECTS:" />
-            <Label text="0" GridPane.columnIndex="1" />
+            <Label fx:id="ectsSumLabel" text="0" GridPane.columnIndex="1" />
             <Label text="Note:" GridPane.columnIndex="2" />
-            <Label text="0,0" GridPane.columnIndex="3" />
-            <Button mnemonicParsing="false" text="Neu" GridPane.columnIndex="4" />
+            <Label fx:id="averageNoteLabel" text="0,0" GridPane.columnIndex="3" />
+            <Button mnemonicParsing="false" onAction="#handleNew" text="Neu" GridPane.columnIndex="4" />
             <Button disable="true" mnemonicParsing="false" text="Löschen" GridPane.columnIndex="5" />
             <Label text="Kolloquium" GridPane.rowIndex="1" />
-            <ComboBox disable="true" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" />
-            <ComboBox disable="true" prefWidth="150.0" GridPane.columnIndex="4" GridPane.columnSpan="2" GridPane.rowIndex="1" />
+            <ComboBox fx:id="colloquiumComboBox" disable="true" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" />
+            <ComboBox fx:id="thesisComboBox" disable="true" prefWidth="150.0" GridPane.columnIndex="4" GridPane.columnSpan="2" GridPane.rowIndex="1" />
             <Label text="Bachelor&#10;Arbeit" GridPane.columnIndex="3" GridPane.rowIndex="1">
                <GridPane.margin>
                   <Insets />
diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
index 3908116..ab911a5 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
@@ -1,12 +1,71 @@
 package de.fhswf.in.inf.se.notepadMinusMinus.view;
 
+import java.math.BigDecimal;
+
+import de.fhswf.in.inf.se.notepadMinusMinus.Main;
 import de.fhswf.in.inf.se.notepadMinusMinus.model.Grade;
 import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 
-public class mainViewController
+public class MainViewController
 {
    @FXML
-   private TableView<Grade> noteTable;
+   private TableView<Grade> gradeTable;
+
+   @FXML
+   private TableColumn<Grade, Integer> semesterColumn;
+
+   @FXML
+   private TableColumn<Grade, String> modulenameColumn;
+
+   @FXML
+   private TableColumn<Grade, Integer> ectsColumn;
+
+   @FXML
+   private TableColumn<Grade, BigDecimal> gradeColumn;
 
+   @FXML
+   private TableColumn<Grade, Integer> attemptColumn;
+
+   @FXML
+   private Label ectsSumLabel;
+
+   @FXML
+   private Label averageNoteLabel;
+
+   @FXML
+   private ComboBox<Double> colloquiumComboBox;
+
+   @FXML
+   private ComboBox<Double> thesisComboBox;
+
+   @FXML
+   private void initialize()
+   {
+      semesterColumn.setCellValueFactory(
+            cellData -> cellData.getValue().semesterProperty().asObject());
+      modulenameColumn.setCellValueFactory(
+            cellData -> cellData.getValue().modulenameProperty());
+      ectsColumn.setCellValueFactory(
+            cellData -> cellData.getValue().ectsProperty().asObject());
+      gradeColumn.setCellValueFactory(
+            cellData -> cellData.getValue().gradeProperty());
+      attemptColumn.setCellValueFactory(
+            cellData -> cellData.getValue().semesterProperty().asObject());
+   }
+
+   public void setMain(Main main)
+   {
+      gradeTable.setItems(main.getGradeList());
+   }
+
+   @FXML
+   private void handleNew()
+   {
+      Grade grade = new Grade();
+      gradeTable.getItems().add(grade);
+   }
 }
-- 
cgit v1.2.3-70-g09d2