Merge 5c0632f into 7eef614

CS2103-AY1819S1-W16-2 · Nov 5, 2018 · 2b538e4 · 2b538e4
2 parents 7eef614 + 5c0632f
commit 2b538e4
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 27 deletions.
diff --git a/src/main/java/seedu/address/ui/OverviewPanel.java b/src/main/java/seedu/address/ui/OverviewPanel.java
@@ -10,6 +10,7 @@
 import javafx.scene.layout.Region;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.commons.events.ui.OverviewPanelChangedEvent;
+import seedu.address.model.Overview;
 import seedu.address.model.event.Event;
 import seedu.address.model.record.Record;
 import seedu.address.model.volunteer.Volunteer;
@@ -31,19 +32,22 @@ public class OverviewPanel extends UiPart<Region> {
     private ObservableList<Volunteer> volunteerList;
     private ObservableList<Event> eventList;
     private ObservableList<Record> recordList;
-
+    private Overview overview;
 
     public OverviewPanel(ObservableList<Volunteer> volunteerList, ObservableList<Event> eventList,
                                                                     ObservableList<Record> recordList) {
         super(FXML);
         this.volunteerList = volunteerList;
         this.eventList = eventList;
         this.recordList = recordList;
+        this.overview = new Overview(volunteerList, eventList, recordList);
         registerAsAnEventHandler(this);
     }
 
     private void setLabelText() {
-        upcomingLabel.setText("Number of events: " + Integer.toString(eventList.size()));
+        upcomingLabel.setText(Integer.toString(overview.getNumOfUpcomingEvents()));
+        ongoingLabel.setText(Integer.toString(overview.getNumOfOngoingEvents()));
+        completedLabel.setText(Integer.toString(overview.getNumOfCompletedEvents()));
     }
 
     @Subscribe

diff --git a/src/main/resources/view/Custom.css b/src/main/resources/view/Custom.css
@@ -394,6 +394,40 @@
     -fx-text-fill: white;
 }
 
+.overview-category {
+    -fx-font-size: 18pt;
+    -fx-text-fill: -white-1-;
+    -fx-font-family: "Open Sans";
+    -fx-padding: 0 0 5 0;
+}
+
+
 #overviewPanel .overviewEvent {
-    -fx-background-color: white;
+    -fx-background-radius: 2;
+    -fx-padding: 15;
+}
+
+#overviewPanel .Upcoming {
+    -fx-background-color: -amber-1-;
+}
+
+#overviewPanel .Ongoing {
+    -fx-background-color: -green-1-;
+}
+
+#overviewPanel .Completed {
+    -fx-background-color: -red-1-;
+}
+
+.overview-event-type {
+    -fx-font-family: "Open Sans";
+    -fx-font-size: 15pt;
+    -fx-text-fill: white;
+}
+
+.overview-type-number {
+    -fx-font-family: "Open Sans";
+    -fx-font-size: 20pt;
+    -fx-font-weight: 700;
+    -fx-text-fill: white;
 }
diff --git a/src/main/resources/view/OverviewPanel.fxml b/src/main/resources/view/OverviewPanel.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
@@ -8,50 +9,50 @@
 
 <VBox fx:id="overviewPanel" styleClass="browser-panel" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1">
     <VBox alignment="CENTER_LEFT">
-        <Label fx:id="eventOverviewLabel" styleClass="event-name" text="Events"/>
+        <Label fx:id="eventOverviewLabel" styleClass="overview-category" text="Events"/>
     </VBox>
-    <GridPane>
+    <GridPane hgap="10">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
         </columnConstraints>
-        <HBox id="upcomingPane" fx:id="upcomingPane" styleClass="overviewEvent" GridPane.columnIndex="0" GridPane.rowIndex="0"  GridPane.columnSpan="1">
+        <HBox id="upcomingPane" fx:id="upcomingPane" styleClass="overviewEvent, Upcoming" GridPane.columnIndex="0" GridPane.rowIndex="0"  GridPane.columnSpan="1">
             <GridPane HBox.hgrow="NEVER">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
-                </columnConstraints>
-                <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
-                    <Label text="Upcoming" styleClass="cell_big_label" />
-                    <Label fx:id="upcomingLabel" styleClass="cell_small_label" text="-" />
+                <VBox alignment="TOP_LEFT" minHeight="70" GridPane.columnIndex="0">
+                    <Label text="Upcoming" styleClass="overview-event-type"/>
+                </VBox>
+                <VBox alignment="BOTTOM_LEFT" minHeight="70" GridPane.columnIndex="0">
+                    <Label fx:id="upcomingLabel" styleClass="overview-type-number" text="-" />
                 </VBox>
             </GridPane>
         </HBox>
-        <HBox id="ongoingPane" fx:id="ongoingPane" styleClass="overviewEvent" GridPane.columnIndex="1" GridPane.rowIndex="0"  GridPane.columnSpan="1">
+        <HBox id="ongoingPane" fx:id="ongoingPane" styleClass="overviewEvent, Ongoing" GridPane.columnIndex="1" GridPane.rowIndex="0"  GridPane.columnSpan="1">
             <GridPane HBox.hgrow="NEVER">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
-                </columnConstraints>
-                <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
-                    <Label text="Ongoing" styleClass="cell_big_label" />
-                    <Label fx:id="ongoingLabel" styleClass="cell_small_label" text="-" />
+                <VBox alignment="TOP_LEFT" minHeight="70" GridPane.columnIndex="0">
+                    <Label text="Ongoing" styleClass="overview-event-type" />
+                </VBox>
+                <VBox alignment="BOTTOM_LEFT" minHeight="70" GridPane.columnIndex="0">
+                    <Label fx:id="ongoingLabel" styleClass="overview-type-number" text="-" />
                 </VBox>
             </GridPane>
         </HBox>
-        <HBox id="ongoingPane" fx:id="completedPane" styleClass="overviewEvent" GridPane.columnIndex="2" GridPane.rowIndex="0"  GridPane.columnSpan="1">
+        <HBox id="completedPane" fx:id="completedPane" styleClass="overviewEvent, Completed" GridPane.columnIndex="2" GridPane.rowIndex="0"  GridPane.columnSpan="1">
             <GridPane HBox.hgrow="NEVER">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
-                </columnConstraints>
-                <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
-                    <Label text="Completed" styleClass="cell_big_label" />
-                    <Label fx:id="completedLabel" styleClass="cell_small_label" text="-" />
+                <VBox alignment="TOP_LEFT" minHeight="70" GridPane.columnIndex="0">
+                    <Label text="Completed" styleClass="overview-event-type" />
+                </VBox>
+                <VBox alignment="BOTTOM_LEFT" minHeight="70" GridPane.columnIndex="0">
+                    <Label fx:id="completedLabel" styleClass="overview-type-number" text="-" />
                 </VBox>
             </GridPane>
         </HBox>
     </GridPane>
     <VBox>
-        <Label fx:id="volunteerOverviewLabel" styleClass="event-name" text="Volunteers"/>
+        <padding>
+            <Insets top="25" />
+        </padding>
+        <Label fx:id="volunteerOverviewLabel" styleClass="overview-category" text="Volunteers"/>
         <HBox>
             <Label text="Play area"></Label>
         </HBox>