@@ -3,16 +3,20 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/gui/ConfiguratieController.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/database/DatabaseConnector.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/klassen/Administration.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/klassen/LogManager.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/gui/Start.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/gui/InloggenController.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/chatserver/ServerThread.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/CommunicationClient/MessageSenderThread.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/CommunicationClient/ComManager.java</file>
<file>file:/C:/Users/Oomis/Documents/GitHub/Cims/Groep%203/PTS4/src/pts4/database/IDatabase.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/chatserver/ServerThread.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/klassen/Unit.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/chat/EmergencyUnit.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/chatserver/Server.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/klassen/Administration.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/gui/ConfiguratieController.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/googlemaps/Gmaps.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/googlemaps/Animation.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/chat/ChatMessage.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/gui/GUIController.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/klassen/Incident.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/database/DatabaseConnector.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/chatserver/Client.java</file>
<file>file:/C:/Users/Sander/Documents/NetBeansProjects/Cims/Groep%203/PTS4/src/pts4/gui/GUIFX.fxml</file>
</group>
</open-files>
</project-private>
@@ -42,7 +42,8 @@ javac.classpath=\
${file.reference.javax.json-1.0.jar}:\
${file.reference.jxmapviewer2-2.0.jar-1}:\
${file.reference.commons-logging-1.1.1.jar-1}:\
${file.reference.FXMessageBox.jar-1}
${file.reference.FXMessageBox.jar-1}:\
${javafx.classpath.extension}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -68,6 +69,10 @@ javadoc.version=false
javadoc.windowtitle=
javafx.application.implementation.version=1.0
javafx.binarycss=false
javafx.classpath.extension=\
${java.home}/lib/javaws.jar:\
${java.home}/lib/deploy.jar:\
${java.home}/lib/plugin.jar
javafx.deploy.allowoffline=true
# If true, application update mode is set to 'background', if false, update mode is set to 'eager'
javafx.deploy.backgroundupdate=false
@@ -104,7 +109,7 @@ manifest.custom.permissions=
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=JDK_1.8
platform.active=default_platform
run.classpath=\
${dist.jar}:\
${javac.classpath}:\
@@ -14,7 +14,6 @@
</buildExtensions>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>PTS4</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
@@ -39,6 +39,8 @@
import pts4.chatserver.*;
import pts4.googlemaps.Gmaps;
import pts4.klassen.*;
import static pts4.klassen.Administration.EndedIncidents;
import static pts4.klassen.Administration.incidents;
import pts4.rssfeed.EnumProvincies;
import se.mbaeumer.fxmessagebox.MessageBox;
import se.mbaeumer.fxmessagebox.MessageBoxType;
@@ -56,13 +58,13 @@ public class GUIController implements Initializable, MapChangeListener<String, C
@FXML
ListView lvEndedIncidents;
@FXML
TextField tfEndName;
TextArea tfEndName;
@FXML
TextField tfEndDescription;
TextArea tfEndDescription;
@FXML
TextField tfEndDetails;
TextArea tfEndDetails;
@FXML
TextField tfEndSolvedBy;
TextArea tfEndSolvedBy;
@FXML
Button btnEndIncident;
@FXML
@@ -180,6 +182,22 @@ public void goActiveIncident() {
tfEndName.setText(a.getName());
tfEndDescription.setText(a.getDescription());
tfEndDetails.setText("Explosion: " + a.getExplosion() + ", Fire: " + a.getFire() + ", Toxicity: " + a.getToxicity() + ", Urgent: " + a.getUrgent() + ", Violent: " + a.getViolent());
btnEndIncident.setDisable(false);
tfEndSolvedBy.setText(null);
}
}
}

public void goEndedIncident() {

for (Incident a : admin.getEndedIncidents()) {
if (a.equals(lvEndedIncidents.getSelectionModel().getSelectedItem())) {

tfEndName.setText(a.getName());
tfEndDescription.setText(a.getDescription());
tfEndDetails.setText("Explosion: " + a.getExplosion() + ", Fire: " + a.getFire() + ", Toxicity: " + a.getToxicity() + ", Urgent: " + a.getUrgent() + ", Violent: " + a.getViolent());
tfEndSolvedBy.setText(a.getSolvedBy());
btnEndIncident.setDisable(true);
}
}
}
@@ -191,6 +209,9 @@ public void endIncident() {
if (a.equals(lvActiveIncidents.getSelectionModel().getSelectedItem())) {

a.setSolvedBy(tfEndSolvedBy.getText());
EndedIncidents.add(a);
incidents.remove(a);
initComboboxes();
}
}
} else {
@@ -206,6 +227,8 @@ public void initComboboxes() {
cbincident.setItems(admin.getIncidents());
lvIncidents.setItems(admin.getIncidents());
lvIncidents2.setItems(admin.getIncidents());
lvActiveIncidents.setItems(admin.getIncidents());
lvEndedIncidents.setItems(admin.getEndedIncidents());
lvunits.setItems(admin.getUnits());
lvPendingIncidents.setItems(admin.getPendingIncidents());
lvAcceptedIncidents.setItems(admin.getIncidents());
@@ -169,18 +169,18 @@
<AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children>
<Label id="lbl" layoutX="393.0" layoutY="25.0" text="Name" />
<Button id="btnAcceptIncident" layoutX="395.0" layoutY="727.0" mnemonicParsing="false" onAction="#acceptIncident" prefWidth="420.0" text="Accept incident" />
<Button id="btnAcceptIncident" fx:id="btnEndIncident" layoutX="395.0" layoutY="727.0" mnemonicParsing="false" onAction="#endIncident" prefWidth="420.0" text="Accept incident" />
<Label id="lblBeschrijving" layoutX="397.0" layoutY="326.0" text="Details" />
<TextArea id="tfAddDescription" editable="true" layoutX="397.0" layoutY="509.0" prefHeight="199.0" prefWidth="416.0" wrapText="true" />
<TextArea id="tfAddDescription" fx:id="tfEndSolvedBy" editable="true" layoutX="397.0" layoutY="509.0" prefHeight="199.0" prefWidth="416.0" wrapText="true" />
<Label id="lblBeschrijving" layoutX="399.0" layoutY="484.0" text="Solved by" />
<TextArea id="tfAddDescription" editable="false" layoutX="395.0" layoutY="355.0" opacity="1.0" prefHeight="122.0" prefWidth="421.0" wrapText="true" />
<TextArea id="tfAddDescription" fx:id="tfEndDetails" editable="false" layoutX="395.0" layoutY="355.0" opacity="1.0" prefHeight="122.0" prefWidth="421.0" wrapText="true" />
<Label id="lblIncoming" layoutX="14.0" layoutY="17.0" text="Active incidents" />
<Label id="lblIncoming" layoutX="827.0" layoutY="22.0" text="Ended incidents" />
<ListView id="lvIncidenten" fx:id="lvEndedIncidents" layoutX="827.0" layoutY="48.0" onMouseClicked="#endIncident" prefHeight="700.0" prefWidth="369.0" />
<ListView id="lvIncidenten" fx:id="lvEndedIncidents" layoutX="827.0" layoutY="48.0" onMouseClicked="#goEndedIncident" prefHeight="700.0" prefWidth="369.0" />
<ListView id="lvIncidenten" fx:id="lvActiveIncidents" layoutX="14.0" layoutY="48.0" onMouseClicked="#goActiveIncident" prefHeight="700.0" prefWidth="369.0" />
<Label id="lblBeschrijving" layoutX="392.0" layoutY="106.0" text="Description" />
<TextArea id="tfAddDescription" layoutX="392.0" layoutY="129.0" prefHeight="188.0" prefWidth="421.0" wrapText="true" />
<TextArea id="tfAddDescription" layoutX="392.0" layoutY="48.0" prefHeight="47.0" prefWidth="420.0" wrapText="true" />
<TextArea id="tfAddDescription" fx:id="tfEndDescription" layoutX="392.0" layoutY="129.0" prefHeight="188.0" prefWidth="421.0" wrapText="true" />
<TextArea id="tfAddDescription" fx:id="tfEndName" layoutX="392.0" layoutY="48.0" prefHeight="47.0" prefWidth="420.0" wrapText="true" />
</children>
</AnchorPane>
</content>
@@ -30,11 +30,13 @@ public class Administration {
public static ArrayList<Incident> incidents;
public static ArrayList<Unit> EmergencyUnits;
public static ArrayList<Unit> ActiveUnits;
public static ArrayList<Incident> EndedIncidents;
public ArrayList<Incident> pendingIncidents;
private Server server;
private IDatabase databaseconn;

public Administration() throws MalformedURLException {
EndedIncidents = new ArrayList<>();
incidents = new ArrayList<>();
EmergencyUnits = new ArrayList<>();
ActiveUnits = new ArrayList<>();
@@ -126,6 +128,11 @@ public ObservableList<Unit> getUnits() {
return FXCollections.observableArrayList(EmergencyUnits);
}

public ObservableList<Incident> getEndedIncidents() {

return FXCollections.observableArrayList(EndedIncidents);
}

public ObservableList<Unit> getActiveUnits() {

return FXCollections.observableArrayList(ActiveUnits);
@@ -122,6 +122,11 @@ public void setSolvedBy(String solvedBy) {
this.solvedBy = solvedBy;
}

public String getSolvedBy()
{
return this.solvedBy;
}

@Override
public String toString() {
return this.name;