23 src/GUI/Model/ModelFacade.java
View file
@@ -13,6 +13,7 @@
import java.util.HashMap;
import java.util.List;
import javafx.animation.FadeTransition;
import javafx.collections.ObservableList;
import javafx.scene.Node;
import javafx.scene.chart.XYChart;
import javafx.scene.image.Image;
@@ -190,31 +191,36 @@ public void changeView(int GUINumb)
}

//Volunteer data model
public List<Day> getWorkedDays(User user)
public ObservableList<Day> getWorkedDays(User user)
{
return VOL_DATA_MOD.getWorkedDays(user);
}

public List<User> getAllSavedVolunteers()
public ObservableList<User> getAllSavedVolunteers()
{
return VOL_DATA_MOD.getAllSavedVolunteers();
}

public List<User> getAllSavedManagers()
public ObservableList<User> getAllSavedManagers()
{
return VOL_DATA_MOD.getAllSavedManagers();
}

public List<User> getAllSavedAdmins()
public ObservableList<User> getAllSavedAdmins()
{
return VOL_DATA_MOD.getAllSavedAdmins();
}

public List<Guild> getAllSavedGuilds()
public ObservableList<Guild> getAllSavedGuilds()
{
return VOL_DATA_MOD.getAllSavedGuilds();
}

public ObservableList<User> getAllSavedUsers()
{
return VOL_DATA_MOD.getAllSavedUsers();
}

public void setAllVolunteersIntoArray()
{
VOL_DATA_MOD.setAllVolunteersIntoArray();
@@ -225,11 +231,6 @@ public void setAllManagersIntoArray()
VOL_DATA_MOD.setAllManagersIntoArray();
}

public List<User> getAllSavedUsers()
{
return VOL_DATA_MOD.getAllSavedUsers();
}

public void setAllGuildsIntoArray()
{
VOL_DATA_MOD.setAllGuildsIntoArray();
@@ -286,7 +287,7 @@ public void deleteWorkedDay(User user, Day day)
VOL_DATA_MOD.deleteWorkedDay(user, day);
}

public List<XYChart.Series<String, Number>> graphSort(Guild guild, LocalDate periodOne,LocalDate periodTwo)
public List<XYChart.Series<String, Number>> graphSort(Guild guild, LocalDate periodOne, LocalDate periodTwo)
{
return GRAPH_MOD.sortGraph(guild, periodOne, periodTwo);
}
34 src/GUI/View/MainLayout.css
View file
@@ -11,7 +11,6 @@
-fx-content-display: top;
-fx-background-color: #00e2c7;
-fx-button-type: RAISED;
/*#00c4ad*/
}
.JFXButtonLogHours
{
@@ -22,7 +21,6 @@
{
-fx-graphic:url("../Images/info-white.png");

/*#00d8bf;*/
}
.popup{

@@ -44,7 +42,6 @@
-fx-border-color: Black;
-fx-border-radius:5 5 5 5;
-fx-background-radius:5 5 5 5;
/* top-left, top-right, bottom-right, and bottom-left corners, in that order. */
}
.jfx-snackbar-toast{
-fx-font: bold 20px/30px System;
@@ -123,6 +120,7 @@
-fx-background-color: #00c4ad;
-fx-text-fill: rgb(255, 255, 255);
-jfx-button-type: RAISED;
-fx-font: 15px System;
}
.chart-series-line {
-fx-stroke-width: 4px;
@@ -135,5 +133,35 @@
.default-color1.chart-line-symbol { -fx-background-color: #00e2c7, white; }
.default-color2.chart-line-symbol { -fx-background-color: #dda0dd, white; }

/*Tableview*/
.table-view{
-fx-border-color: white;
-fx-border-width: 0px;
}


.table-view .column-header-background{
-fx-background-color: #029e99;
}

.table-view .column-header-background .label{
-fx-background-color: #029e99;
-fx-text-fill: white;
-fx-font-size: 15px;
}

.table-view .column-header {
-fx-background-color: #029e99;
}

.table-view .table-cell{
-fx-alignment: center;
}


.table-row-cell:selected {
-fx-background-color: #00c4ad;
-fx-background-insets: 0;
-fx-background-radius: 1;
}

53 src/GUI/View/ManagerView.fxml
View file
@@ -7,16 +7,17 @@
<?import com.jfoenix.controls.JFXTabPane?>
<?import com.jfoenix.controls.JFXTextArea?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.scene.chart.CategoryAxis?>
<?import javafx.scene.chart.LineChart?>
<?import javafx.scene.chart.NumberAxis?>
<?import javafx.scene.chart.CategoryAxis?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
@@ -27,24 +28,23 @@
<JFXComboBox fx:id="cmbGuildChooser" focusColor="#00c4ad" labelFloat="true" layoutX="517.0" layoutY="17.0" prefHeight="31.0" prefWidth="169.0" promptText="Guild Chooser" />
<JFXTabPane fx:id="tabPane" layoutX="11.0" layoutY="58.0" prefHeight="431.0" prefWidth="678.0" styleClass="jfx-tab-pane">
<tabs>
<Tab fx:id="tabVolunInfo" onSelectionChanged="#loadGuildView" text="Volunteer Information">
<Tab fx:id="tabVolunInfo" onSelectionChanged="#loadGuildView" text="User Information">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="678.0">
<children>
<Label fx:id="lblNotes" layoutX="461.0" layoutY="20.0" text="Notes:">

<font>
<Font size="20.0" />
</font>
</Label>
<JFXTextField fx:id="txtSearch" focusColor="#00e2c7" layoutX="2.0" layoutY="15.0" prefHeight="29.0" prefWidth="171.0" promptText="Search user.." />
<JFXButton fx:id="btnAddUser" buttonType="RAISED" layoutX="14.0" layoutY="362.0" onAction="#onBtnAddUserClicked" prefHeight="31.0" prefWidth="119.0" style="-fx-background-color: #029E99;" text="Add User" textFill="WHITE">
<JFXTextField fx:id="txtSearch" focusColor="#00e2c7" layoutX="2.0" layoutY="15.0" prefHeight="29.0" prefWidth="171.0" promptText="Search" />
<JFXButton fx:id="btnAddUser" buttonType="RAISED" layoutX="14.0" layoutY="359.0" maxHeight="31.0" onAction="#onBtnAddUserClicked" prefHeight="31.0" prefWidth="150.0" style="-fx-background-color: #029E99;" text="Add User" textFill="WHITE">
<font>
<Font name="System Bold" size="15.0" />
</font>
</JFXButton>
<JFXButton fx:id="btnAddHours" buttonType="RAISED" disable="true" layoutX="149.0" layoutY="362.0" prefWidth="120.0" style="-fx-background-color: #00c4ad;" text="Add Hours" textFill="WHITE" />
<JFXButton fx:id="btnEditInfo" buttonType="RAISED" layoutX="284.0" layoutY="362.0" onAction="#onEditInfoPressed" prefHeight="31.0" prefWidth="147.0" style="-fx-background-color: #00c4ad;" text="Edit Information" textFill="WHITE">
<JFXButton fx:id="btnEditInfo" buttonType="RAISED" layoutX="180.0" layoutY="359.0" maxHeight="31.0" onAction="#onEditInfoPressed" prefHeight="31.0" prefWidth="150.0" style="-fx-background-color: #00c4ad;" text="Edit Information" textFill="WHITE">
<font>
<Font name="System Bold" size="15.0" />
</font></JFXButton>
@@ -72,7 +72,7 @@
</AnchorPane>
</content>
</Tab>
<Tab fx:id="tabGraphStats" onSelectionChanged="#loadGuildView" text="Graphs &amp; Statistics">
<Tab fx:id="tabGraphStats" onSelectionChanged="#loadGuildView" text="Graphs And Statistics">
<content>
<AnchorPane fx:id="rootGraph" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="678.0">
<children>
@@ -102,22 +102,31 @@
</VBox>
</children>
</StackPane>
<JFXDatePicker fx:id="datePickerPeriodOne" layoutX="17.0" layoutY="355.0" prefHeight="30.0" prefWidth="135.0" />
<JFXDatePicker fx:id="datePickerPeriodTwo" layoutX="179.0" layoutY="354.0" prefHeight="30.0" prefWidth="135.0" />
<Label layoutX="153.0" layoutY="341.0" prefHeight="59.0" prefWidth="17.0" text="-">
<font>
<Font size="41.0" />
</font>
</Label>
<JFXButton fx:id="btnRefresh" alignment="BOTTOM_CENTER" contentDisplay="CENTER" layoutX="332.0" layoutY="343.0" onAction="#refreshGraph" prefHeight="55.0" prefWidth="52.0" style="-fx-background-color: rgba(0,0,0,0); -fx-background-radius: 50%;" text=" ">
<JFXButton fx:id="btnRefresh" alignment="BOTTOM_CENTER" contentDisplay="CENTER" layoutX="367.0" layoutY="348.0" onAction="#refreshGraph" prefHeight="31.0" prefWidth="38.0" style="-fx-background-color: rgba(0,0,0,0); -fx-background-radius: 50%;" text=" ">
<graphic>
<ImageView fitHeight="40.0" fitWidth="42.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Resources/RefreshIcon.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
<HBox alignment="CENTER" layoutX="20.0" layoutY="347.0" prefHeight="42.0" prefWidth="354.0">
<children>
<Label text="From:">
<font>
<Font name="System Bold" size="15.0" />
</font>
</Label>
<JFXDatePicker fx:id="datePickerPeriodOne" prefHeight="30.0" prefWidth="135.0" />
<Label text="To:">
<font>
<Font name="System Bold" size="15.0" />
</font>
</Label>
<JFXDatePicker fx:id="datePickerPeriodTwo" prefHeight="30.0" prefWidth="135.0" />
</children>
</HBox>
</children>
</AnchorPane>
</content>
@@ -127,20 +136,20 @@
<AnchorPane fx:id="anchorPaneGuild" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
</content>
</Tab>
<Tab fx:id="tabLog" text="Log">
<Tab fx:id="tabLog" text="Log Events">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="678.0">
<children>
<TableView fx:id="tblLog" layoutX="6.0" layoutY="9.0" maxWidth="1.7976931348623157E308" prefHeight="349.0" prefWidth="672.0">
<TableView fx:id="tblLog" layoutX="3.0" layoutY="9.0" maxWidth="1.7976931348623157E308" prefHeight="330.0" prefWidth="672.0">
<columns>
<TableColumn fx:id="colLogEventId" prefWidth="23.0" text="ID" />
<TableColumn fx:id="colLogEventDate" prefWidth="119.0" text="Event date" />
<TableColumn fx:id="colLogEventDesc" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="529.0" text="Event description" />
</columns>
</TableView>
<JFXButton fx:id="btnRefreshLog" layoutX="573.0" layoutY="367.0" onAction="#updateLogTable" prefHeight="25.0" prefWidth="104.0" style="-fx-background-color: #00c4ad;" stylesheets="@MainLayout.css" text="Refresh log" textFill="WHITE">
<JFXButton fx:id="btnRefreshLog" buttonType="RAISED" layoutX="14.0" layoutY="355.0" onAction="#updateLogTable" prefHeight="31.0" prefWidth="114.0" style="-fx-background-color: #00c4ad;" stylesheets="@MainLayout.css" text="Refresh log" textFill="WHITE">
<font>
<Font name="System Bold" size="12.0" />
<Font name="System Bold" size="15.0" />
</font>
</JFXButton>
</children>
32 src/GUI/View/UserInfoView.fxml
View file
@@ -25,7 +25,7 @@
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>

<AnchorPane id="AnchorPane" fx:id="root" maxHeight="490.0" minHeight="490.0" prefHeight="490.0" prefWidth="710.0" stylesheets="@MainLayout.css" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GUI.Controller.UserInfoViewController">
<AnchorPane id="AnchorPane" fx:id="root" maxHeight="490.0" minHeight="490.0" prefHeight="490.0" prefWidth="710.0" stylesheets="@MainLayout.css" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GUI.Controller.UserInfoViewController">



@@ -127,7 +127,7 @@
<DropShadow />
</effect>
</Rectangle>
<ImageView fx:id="imgVwProfilePic" fitHeight="143.0" fitWidth="141.0" layoutX="527.0" layoutY="26.0" pickOnBounds="true" AnchorPane.rightAnchor="32.0">
<ImageView fx:id="imgVwProfilePic" fitHeight="143.0" fitWidth="141.0" layoutX="536.0" layoutY="26.0" pickOnBounds="true" AnchorPane.rightAnchor="33.0">

<image>
<Image url="@../Images/labeouf.jpg" />
@@ -136,7 +136,7 @@
<Reflection fraction="0.11" topOffset="-4.0" topOpacity="0.35" />
</effect>
</ImageView>
<JFXButton fx:id="btnUpdatePhoto" buttonType="RAISED" layoutX="528.0" layoutY="183.0" maxHeight="25.0" minHeight="25.0" onAction="#pressedChangeImage" prefHeight="25.0" prefWidth="141.0" style="-fx-background-color: #029e99;" text="Update Photo" textFill="WHITE" AnchorPane.rightAnchor="31.0">
<JFXButton fx:id="btnUpdatePhoto" buttonType="RAISED" layoutX="537.0" layoutY="183.0" maxHeight="25.0" minHeight="25.0" onAction="#pressedChangeImage" prefHeight="25.0" prefWidth="141.0" style="-fx-background-color: #029e99;" text="Update Photo" textFill="WHITE" AnchorPane.rightAnchor="32.0">

<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
@@ -146,8 +146,8 @@
</font>
</JFXButton>

<HBox fx:id="hBoxInvisBtn" layoutX="516.0" layoutY="431.0" prefHeight="45.0" prefWidth="190.0" />
<JFXButton fx:id="btnChangePassword" buttonType="RAISED" layoutX="528.0" layoutY="221.0" maxHeight="25.0" minHeight="25.0" onAction="#openPasswordChangerEvent" prefHeight="25.0" prefWidth="141.0" style="-fx-background-color: #029e99;" text="Change Password" textFill="WHITE" AnchorPane.rightAnchor="31.0">
<HBox fx:id="hBoxInvisBtn" layoutX="516.0" layoutY="432.0" prefHeight="45.0" prefWidth="183.0" />
<JFXButton fx:id="btnChangePassword" buttonType="RAISED" layoutX="537.0" layoutY="221.0" maxHeight="25.0" minHeight="25.0" onAction="#openPasswordChangerEvent" prefHeight="25.0" prefWidth="141.0" style="-fx-background-color: #029e99;" text="Change Password" textFill="WHITE" AnchorPane.rightAnchor="32.0">


<padding>
@@ -211,13 +211,13 @@
</HBox>
</children>
</Pane>
<JFXListView fx:id="listVwGuilds" layoutX="538.0" layoutY="277.0" maxWidth="141.0" prefHeight="162.0" prefWidth="141.0" style="-fx-border-width: 0px;" />
<Label fx:id="lblGuilds" layoutX="538.0" layoutY="258.0" style="-fx-background-color: #00c4ad;" text="Guilds:">
<JFXListView fx:id="listVwGuilds" layoutX="537.0" layoutY="277.0" maxWidth="141.0" prefHeight="162.0" prefWidth="141.0" style="-fx-border-width: 0px;" />
<Label fx:id="lblGuilds" layoutX="537.0" layoutY="258.0" style="-fx-background-color: #00c4ad;" text="Guilds:">
<font>
<Font name="System Bold" size="15.0" />
</font></Label>

<StackPane fx:id="stckPanePasswordChanger" layoutX="-25.0" prefHeight="510.0" prefWidth="710.0" style="-fx-background-color: rgba(0,0,0,0.5);" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<StackPane fx:id="stckPanePasswordChanger" layoutX="-25.0" prefHeight="510.0" prefWidth="710.0" style="-fx-background-color: rgba(0,0,0,0.5);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<VBox alignment="CENTER" maxHeight="200.0" maxWidth="450.0" prefHeight="200.0" prefWidth="463.0" spacing="10.0" styleClass="loginwindow" stylesheets="@MainLayout.css">
<children>
@@ -253,8 +253,8 @@
</HBox>
<HBox alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="400.0" spacing="20.0">
<children>
<JFXButton fx:id="btnChangePWConfirm" buttonType="RAISED" onAction="#changePasswordEvent" styleClass="loginbuttons" text="Change" />
<JFXButton fx:id="btnCancelPW" buttonType="RAISED" onAction="#hidePasswordChangerEvent" styleClass="loginbuttons" text="Cancel" />
<JFXButton fx:id="btnChangePWConfirm" buttonType="RAISED" onAction="#changePasswordEvent" text="Change" />
<JFXButton fx:id="btnCancelPW" buttonType="RAISED" onAction="#hidePasswordChangerEvent" text="Cancel" />
</children>
<padding>
<Insets bottom="1.0" top="8.0" />
@@ -348,26 +348,26 @@
</VBox>
</children>
</StackPane>
<StackPane fx:id="stackPdeleteHours" layoutX="10.0" layoutY="10.0" prefHeight="490.0" prefWidth="720.0" style="-fx-background-color: rgba(0,0,0,0.5);" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<StackPane fx:id="stackPdeleteHours" alignment="BOTTOM_CENTER" layoutX="10.0" layoutY="10.0" prefHeight="490.0" prefWidth="720.0" style="-fx-background-color: rgba(0,0,0,0.5);" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<VBox maxHeight="100.0" maxWidth="50.0" minWidth="50.0" prefHeight="209.0" prefWidth="50.0" spacing="20.0" StackPane.alignment="CENTER_LEFT">
<VBox maxHeight="246.0" maxWidth="118.0" minWidth="50.0" prefHeight="246.0" prefWidth="118.0" spacing="20.0" StackPane.alignment="BOTTOM_CENTER">
<children>
<ImageView fx:id="imgVwEdit" fitHeight="50.0" fitWidth="113.0" pickOnBounds="true" preserveRatio="true">
<ImageView fx:id="imgVwEdit" fitHeight="113.0" fitWidth="113.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../Images/edit-icon.png" />
</image>
</ImageView>
<ImageView fx:id="imgVwDel" fitHeight="50.0" fitWidth="113.0" pickOnBounds="true" preserveRatio="true">
<ImageView fx:id="imgVwDel" fitHeight="113.0" fitWidth="113.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../Images/trash.png" />
</image>
</ImageView>
</children>
<StackPane.margin>
<Insets bottom="41.0" left="290.0" top="260.0" />
<Insets bottom="50.0" />
</StackPane.margin>
</VBox>
</children>
</StackPane>
</children>
</AnchorPane>
</AnchorPane>
2 src/Resources/da.lang
View file
@@ -62,7 +62,7 @@ CHK_VOLUNTEERS = Volunteers
#Manager view labels
#Remember to leave a space after LBL_USERNAME
LBL_USERNAME = Logget ind som:
PROMPT_SEARCH_USER = Søg i brugere...
PROMPT_SEARCH_USER = Søg
PROMPT_CMB_GUILDCHOOSER = Vælg et Laug
LBL_NOTES = Noter:
COL_NAME = Navn
2 src/Resources/en.lang
View file
@@ -65,7 +65,7 @@ CHK_VOLUNTEERS = Volunteers
#Manager view labels
#Remember to leave a space after LBL_USERNAME
LBL_USERNAME = Logged in as:
PROMPT_SEARCH_USER = Search user...
PROMPT_SEARCH_USER = Search
PROMPT_CMB_GUILDCHOOSER = Guild Chooser
LBL_NOTES = Notes:
COL_NAME = Name