Add comment to Projekt view and allow less than 3 students

3 files changed, 72 insertions, 19 deletions

diff --git a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegen.fxml b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegen.fxml
index c065496..4e29d22 100644
--- a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegen.fxml
+++ b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegen.fxml
@@ -22,7 +22,8 @@
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints fillHeight="false" maxHeight="67.0" minHeight="0.0" prefHeight="43.0" vgrow="SOMETIMES" />
+            <RowConstraints fillHeight="false" maxHeight="67.0" minHeight="0.0" prefHeight="43.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
             <Label text="Projektthema">
@@ -129,16 +130,28 @@
                   <Insets left="10.0" right="10.0" top="5.0" />
                </GridPane.margin>
             </TextArea>
-            <Button fx:id="saveButton" disable="true" mnemonicParsing="false" onAction="#handleSave" prefHeight="25.0" prefWidth="500.0" text="Speichern" GridPane.rowIndex="8">
+            <Label text="Dozentenkommentar" GridPane.rowIndex="8">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
                <GridPane.margin>
-                  <Insets left="10.0" right="10.0" />
+                  <Insets left="10.0" />
                </GridPane.margin>
-            </Button>
-            <Button mnemonicParsing="false" onAction="#handleCancel" prefHeight="25.0" prefWidth="500.0" text="Abbrechen" GridPane.columnIndex="1" GridPane.rowIndex="8">
+            </Label>
+            <TextArea fx:id="dozentenkommentar" editable="false" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="8">
                <GridPane.margin>
-                  <Insets left="10.0" right="10.0" />
+                  <Insets left="10.0" right="10.0" top="5.0" />
                </GridPane.margin>
-            </Button>
+            </TextArea>
+            <ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="9">
+              <buttons>
+                  <Button fx:id="saveButton" defaultButton="true" disable="true" mnemonicParsing="false" onAction="#handleSave" prefHeight="25.0" prefWidth="500.0" text="Speichern" ButtonBar.buttonData="OK_DONE" />
+                  <Button cancelButton="true" mnemonicParsing="false" onAction="#handleCancel" prefHeight="25.0" prefWidth="500.0" text="Abbrechen" ButtonBar.buttonData="CANCEL_CLOSE" />
+              </buttons>
+               <padding>
+                  <Insets left="10.0" right="10.0" />
+               </padding>
+            </ButtonBar>
          </children>
       </GridPane>
    </center>
diff --git a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java
index f5a1491..583dd7b 100644
--- a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java
+++ b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java
@@ -38,6 +38,9 @@ public class ProjektHinzufuegenController
    private ComboBox<Student> student3ComboBox;
 
    @FXML
+   private TextArea dozentenkommentar;
+
+   @FXML
    private Button saveButton;
 
    private Projekt projekt;
@@ -60,6 +63,8 @@ public class ProjektHinzufuegenController
 
       if (projekt != null)
       {
+         main.getProjekthinzufuegenStage().setTitle("Projekt bearbeiten");
+
          ansprechpartnerComboBox.setDisable(true);
          student1ComboBox.setDisable(true);
          student2ComboBox.setDisable(true);
@@ -72,9 +77,25 @@ public class ProjektHinzufuegenController
          projektinhalteTextField.setText(projekt.getProjekteinhalte());
 
          ansprechpartnerComboBox.setValue(projekt.getAnsprechpartner());
-         student1ComboBox.setValue(projekt.getStudents().get(0));
-         student2ComboBox.setValue(projekt.getStudents().get(1));
-         student3ComboBox.setValue(projekt.getStudents().get(2));
+
+         if (projekt.getStudents().size() > 0)
+         {
+            student1ComboBox.setValue(projekt.getStudents().get(0));
+         }
+         if (projekt.getStudents().size() > 1)
+         {
+            student2ComboBox.setValue(projekt.getStudents().get(1));
+         }
+         if (projekt.getStudents().size() > 2)
+         {
+            student3ComboBox.setValue(projekt.getStudents().get(2));
+         }
+
+         dozentenkommentar.setText(projekt.getDozentenkommentar());
+      }
+      else
+      {
+         main.getProjekthinzufuegenStage().setTitle("Projekt anlegen");
       }
 
       // It's art
@@ -87,9 +108,9 @@ public class ProjektHinzufuegenController
                                     .isNull()
                                     .or(student1ComboBox.valueProperty()
                                           .isNull()
-                                          .or(student2ComboBox.valueProperty()
-                                                .isNull()
-                                                .or(student3ComboBox
+                                          .and(student2ComboBox
+                                                .valueProperty().isNull()
+                                                .and(student3ComboBox
                                                       .valueProperty()
                                                       .isNull()))))))));
    }
diff --git a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java
index de0c09f..d9c871e 100644
--- a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java
+++ b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java
@@ -5,6 +5,7 @@ import java.util.Optional;
 import de.fhswf.in.inf.se.projektthemenvergabe.Main;
 import de.fhswf.in.inf.se.projektthemenvergabe.model.Projekt;
 import javafx.application.Platform;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
@@ -61,12 +62,30 @@ public class ProjektthemenverwaltungsController
             (data) -> data.getValue().projektthemaProperty());
       ansprechpatnerTableColumn.setCellValueFactory((data) -> data.getValue()
             .getAnsprechpartner().nachnameProperty());
-      student1TableColumn.setCellValueFactory((data) -> data.getValue()
-            .getStudents().get(0).matrikelnummerProperty().asObject());
-      student2TableColumn.setCellValueFactory((data) -> data.getValue()
-            .getStudents().get(1).matrikelnummerProperty().asObject());
-      student3TableColumn.setCellValueFactory((data) -> data.getValue()
-            .getStudents().get(2).matrikelnummerProperty().asObject());
+      student1TableColumn.setCellValueFactory((data) -> {
+         if (data.getValue().getStudents().size() > 0)
+         {
+            return data.getValue().getStudents().get(0)
+                  .matrikelnummerProperty().asObject();
+         }
+         return new SimpleIntegerProperty(0).asObject();
+      });
+      student2TableColumn.setCellValueFactory((data) -> {
+         if (data.getValue().getStudents().size() > 1)
+         {
+            data.getValue().getStudents().get(1).matrikelnummerProperty()
+                  .asObject();
+         }
+         return new SimpleIntegerProperty(0).asObject();
+      });
+      student3TableColumn.setCellValueFactory((data) -> {
+         if (data.getValue().getStudents().size() > 2)
+         {
+            data.getValue().getStudents().get(2).matrikelnummerProperty()
+                  .asObject();
+         }
+         return new SimpleIntegerProperty(0).asObject();
+      });
       statusTableColumn
             .setCellValueFactory((data) -> data.getValue().statusProperty());
       statusTableColumn.setCellFactory(ComboBoxTableCell.forTableColumn(