From a9a7cc76778ec9d1eb538a80616eade5851291ee Mon Sep 17 00:00:00 2001
From: akasakaisami <16302016004@fudan.edu.cn>
Date: Tue, 29 May 2018 15:43:35 +0800
Subject: [PATCH] update Conference type new item builder fxml

---
 .../conference_type_layout.fxml               | 23 ++++++++++---------
 app/src/test/java/org/cutem/MainTest.java     |  4 ++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/resources/fxml/newitem_layouts/conference_type_layout.fxml b/app/src/main/resources/fxml/newitem_layouts/conference_type_layout.fxml
index 340a79c..a2b0246 100644
--- a/app/src/main/resources/fxml/newitem_layouts/conference_type_layout.fxml
+++ b/app/src/main/resources/fxml/newitem_layouts/conference_type_layout.fxml
@@ -8,6 +8,7 @@
          xmlns:fx="http://javafx.com/fxml"
          type="VBox"
 >
+
 <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="359.0" prefWidth="390.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" maxWidth="291.0" minWidth="10.0" prefWidth="77.0" />
@@ -26,16 +27,16 @@
       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
-      <Label text="议题" />
-      <Label text="开始时间" GridPane.rowIndex="1" />
-      <Label text="结束时间" GridPane.rowIndex="2" />
-      <Label text="地点" GridPane.rowIndex="3" />
-      <Label text="内容" GridPane.rowIndex="4" />
-      <Label text="紧急" GridPane.rowIndex="5" />
-      <Label text="重要" GridPane.rowIndex="6" />
-      <Label text="提醒方式" GridPane.rowIndex="7" />
-      <Label text="提醒开始时间" GridPane.rowIndex="8" />
-      <Label text="提醒间隔" GridPane.rowIndex="9" />
+      <Label text="议题" GridPane.halignment="CENTER" />
+      <Label text="开始时间" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+      <Label text="结束时间" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+      <Label text="地点" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+      <Label text="内容" GridPane.halignment="CENTER" GridPane.rowIndex="4" />
+      <Label text="紧急" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
+      <Label text="重要" GridPane.halignment="CENTER" GridPane.rowIndex="6" />
+      <Label text="提醒方式" GridPane.halignment="CENTER" GridPane.rowIndex="7" />
+      <Label text="提醒开始时间" GridPane.halignment="CENTER" GridPane.rowIndex="8" />
+      <Label text="提醒间隔" GridPane.halignment="CENTER" GridPane.rowIndex="9" />
       <TextField fx:id="titleText" promptText="not empty" GridPane.columnIndex="1" />
       <TextField fx:id="bgnTimeText" promptText="yyyy-mm-dd/hh:mm" GridPane.columnIndex="1" GridPane.rowIndex="1" />
       <TextField fx:id="endTimeText" promptText="yyyy-mm-dd/hh:mm" GridPane.columnIndex="1" GridPane.rowIndex="2" />
@@ -82,4 +83,4 @@
       </ChoiceBox>
    </children>
 </GridPane>
-</fx:root>
\ No newline at end of file
+</fx:root>
diff --git a/app/src/test/java/org/cutem/MainTest.java b/app/src/test/java/org/cutem/MainTest.java
index 36e1e44..83f5e61 100644
--- a/app/src/test/java/org/cutem/MainTest.java
+++ b/app/src/test/java/org/cutem/MainTest.java
@@ -9,6 +9,8 @@ import javafx.scene.Scene;
 import javafx.stage.Stage;
 import org.cutem.cutecalendar.model.TodoItem;
 import org.cutem.cutecalendar.presenter.*;
+import org.cutem.cutecalendar.presenter.newitems.ConferenceTypeNewItemBuilder;
+import org.cutem.cutecalendar.presenter.newitems.InterviewTypeNewItemBuilder;
 import org.cutem.cutecalendar.presenter.newitems.OtherTypeNewItemBuilder;
 import org.cutem.cutecalendar.presenter.newitems.TimelessTypeBuilder;
 import org.jetbrains.annotations.NotNull;
@@ -61,6 +63,8 @@ public class MainTest extends Application {
         // add IoC
         newItemStrategy.addFactory(new TimelessTypeBuilder.Factory());
         newItemStrategy.addFactory(new OtherTypeNewItemBuilder.Factory());
+        newItemStrategy.addFactory(new ConferenceTypeNewItemBuilder.Factory());
+        newItemStrategy.addFactory(new InterviewTypeNewItemBuilder.Factory());
 
         mPresenter.goWork();
     }