Merge pull request #51 from wimdetr/Feature22

Implementatie departementen. persistentie en tableview ontbreekt
wimdetr · May 11, 2017 · 94a0eac · 94a0eac
2 parents c56f7be + 4252d70
commit 94a0eac
Show file tree

Hide file tree

Showing 20 changed files with 350 additions and 289 deletions.
diff --git a/src/META-INF/persistence.xml b/src/META-INF/persistence.xml
@@ -11,6 +11,7 @@
     <class>domein.Werkgever</class>
     <class>domein.Admin</class>
     <class>domein.Doelgroep</class>
+    <class>domein.Departement</class>
     <properties>
       <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
       <property name="javax.persistence.schema-generation.database.action" value="create"/>

diff --git a/src/controllers/AnalyseCard.java b/src/controllers/AnalyseCard.java
@@ -79,13 +79,12 @@ private void fillInCard() {
         double kosten = analyse.getResultaatKosten();
         double baten = analyse.getResultaatBaten();
         double resultaat = analyse.getResultaat();
-        bedrijfLabel.setText(analyse.getWerkgever().getNaam());
-        bedrijfOnderdeelLabel.setText(analyse.getWerkgever().getNaamAfdeling());
+        bedrijfLabel.setText(analyse.getDepartement().getWerkgever().getNaam());
+        bedrijfOnderdeelLabel.setText(analyse.getDepartement().getNaam());
         kostenLabel.setText(NumberUtil.formatDouble(kosten));
         batenLabel.setText(NumberUtil.formatDouble(baten));
         resultaatLabel.setText(NumberUtil.formatDouble(resultaat));
-
-
+
         if (resultaat >= 0) {
             resultBox.getStyleClass().add("resultBoxPositive");
         } else {

diff --git a/src/controllers/ArchiefScherm.java b/src/controllers/ArchiefScherm.java
@@ -23,12 +23,18 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.css.CssMetaData;
+import javafx.css.SimpleStyleableStringProperty;
+import javafx.css.Styleable;
+import javafx.css.StyleableStringProperty;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Alert;
+import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
@@ -87,9 +93,34 @@ public ArchiefScherm(Schermbeheer beheer) {
         idColumn.setCellValueFactory(e -> new SimpleIntegerProperty(e.getValue().getId()));
         voornaamColumn.setCellValueFactory(e -> e.getValue().getJobcoach().voornaamProperty());
         naamColumn.setCellValueFactory(e -> e.getValue().getJobcoach().naamProperty());
-        bedrijfColumn.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getWerkgever().getNaam()));
-        departementColumn.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getWerkgever().getNaamAfdeling()));
-        resultaatColumn.setCellValueFactory(e -> new SimpleStringProperty(NumberUtil.formatDouble(e.getValue().getResultaat())));
+        bedrijfColumn.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getDepartement().getWerkgever().getNaam()));
+        departementColumn.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getDepartement().getNaam()));
+        resultaatColumn.setCellFactory(e -> {
+            TableCell<Analyse, String> cell = new TableCell<Analyse, String>() {
+                @Override
+                protected void updateItem(String item, boolean empty) {
+                    super.updateItem(item, empty);
+                    if (item == null || empty) {
+                        setText(null);
+                        setStyle("");
+                    } else {
+                        setText(item);
+                        if (NumberUtil.convertToDouble(item) >= 0) {
+                            setStyle("-fx-text-fill: green");
+                        } else {
+                            setStyle("-fx-text-fill: red");
+                        }
+                    }
+                }
+            };
+            return cell;
+        }
+        );
+        resultaatColumn.setCellValueFactory(e -> {
+            double res = e.getValue().getResultaat();
+            return new SimpleStringProperty(NumberUtil.formatDouble(res));
+        });
+
         datumColumn.setCellValueFactory(e
                 -> {
             SimpleStringProperty property = new SimpleStringProperty();

diff --git a/src/controllers/OverzichtAnalyseScherm.java b/src/controllers/OverzichtAnalyseScherm.java
@@ -65,16 +65,16 @@ private void fillData() {
         /*
         TODO: mss in een lijst zetten want dit is wel heel lelijk ma bon
          */
-        overzichtAnalyseTitel.setText(analyse.getWerkgever().getNaam() + " - " + analyse.getWerkgever().getNaamAfdeling()
+        overzichtAnalyseTitel.setText(analyse.getDepartement().getWerkgever().getNaam() + " - " + analyse.getDepartement().getNaam()
                 + " (" + analyse.getJobcoach().getVoornaam() + " " + analyse.getJobcoach().getNaam() + ")");
 
-        String bus = analyse.getWerkgever().getBus() == null ? "" : analyse.getWerkgever().getBus();
-        gemeenteLabel.setText(analyse.getWerkgever().getGemeente());
-        straatLabel.setText(analyse.getWerkgever().getStraat() + " "
-                + analyse.getWerkgever().getNummer()
+        String bus = analyse.getDepartement().getBus() == null ? "" : analyse.getDepartement().getBus();
+        gemeenteLabel.setText(analyse.getDepartement().getGemeente());
+        straatLabel.setText(analyse.getDepartement().getStraat() + " "
+                + analyse.getDepartement().getNummer()
                 + bus);
-        postcodeLabel.setText(Integer.toString(analyse.getWerkgever().getPostcode()));
-        emailLabel.setText(analyse.getWerkgever().getContactPersoonEmail());
+        postcodeLabel.setText(Integer.toString(analyse.getDepartement().getPostcode()));
+        emailLabel.setText(analyse.getDepartement().getContactPersoonEmail());
         List<Label> baten = Arrays.asList(baat1, baat2, baat3, baat4, baat5, baat6, baat7, baat8, baat9, baat10, baat11);
         List<Label> kosten = Arrays.asList(kost1, kost2, kost3, kost4, kost5, kost6, kost7, kost8);
         //baten

diff --git a/src/controllers/WerkgeverBeherenScherm.java b/src/controllers/WerkgeverBeherenScherm.java
@@ -94,13 +94,13 @@ public WerkgeverBeherenScherm(Schermbeheer beheer) {
         checkboxCol.setCellValueFactory(param -> param.getValue().isChecked());
         checkboxCol.setCellFactory(CheckBoxTableCell.forTableColumn(checkboxCol));
         bedrijfCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getNaam()));
-        afdelingCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getNaamAfdeling()));
-        contactpersoonCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getContactPersoonVoornaam()
-                + " " + e.getValue().getContactPersoonNaam()));
-        emailCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getContactPersoonEmail()));
-        gemeenteCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getGemeente()));
-        straatCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getStraat() + e.getValue().getNummer()));
-        postcodeCol.setCellValueFactory(e -> new SimpleStringProperty(Integer.toString(e.getValue().getPostcode())));
+//        afdelingCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getNaamAfdeling()));
+//        contactpersoonCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getContactPersoonVoornaam()
+//                + " " + e.getValue().getContactPersoonNaam()));
+//        emailCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getContactPersoonEmail()));
+//        gemeenteCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getGemeente()));
+//        straatCol.setCellValueFactory(e -> new SimpleStringProperty(e.getValue().getStraat() + e.getValue().getNummer()));
+//        postcodeCol.setCellValueFactory(e -> new SimpleStringProperty(Integer.toString(e.getValue().getPostcode())));
         data = FXCollections.observableList(beheer.getDc().getBedrijfRepo().getLijst());
         werkgeversTableView.setItems(data);
         BooleanBinding checkBinding = new BooleanBinding() {
@@ -165,20 +165,20 @@ void doExporteer(ActionEvent event) {
                         .append("Postcode;")
                         .append("\n");
                 werkgevers.forEach((werkgever) -> {
-                    csvBuilder.append(werkgever.getNaam())
-                            .append(";")
-                            .append(werkgever.getNaamAfdeling())
-                            .append(";")
-                            .append(werkgever.getGemeente())
-                            .append(";")
-                            .append(werkgever.getStraat())
-                            .append(";")
-                            .append(werkgever.getNummer())
-                            .append(werkgever.getBus() == null ? "" : werkgever.getBus())
-                            .append(";")
-                            .append(werkgever.getPostcode())
-                            .append(";")
-                            .append("\n");
+//                    csvBuilder.append(werkgever.getNaam())
+//                            .append(";")
+//                            .append(werkgever.getNaamAfdeling())
+//                            .append(";")
+//                            .append(werkgever.getGemeente())
+//                            .append(";")
+//                            .append(werkgever.getStraat())
+//                            .append(";")
+//                            .append(werkgever.getNummer())
+//                            .append(werkgever.getBus() == null ? "" : werkgever.getBus())
+//                            .append(";")
+//                            .append(werkgever.getPostcode())
+//                            .append(";")
+//                            .append("\n");
                 });
                 String csvString = csvBuilder.toString();
                 String location = chosenDir.toString() + "/" + naamBestand;

diff --git a/src/css/analysecard.css b/src/css/analysecard.css
@@ -45,7 +45,7 @@
 }
 
 .resultBoxNegative{
-    -fx-background-color: #337AB7;
+    -fx-background-color: #FF6666;
 }
 
 .resultBoxPositive{

diff --git a/src/css/archiefscherm.css b/src/css/archiefscherm.css
@@ -44,3 +44,11 @@
     -fx-background-insets: 0;
     -fx-text-fill: white;
 }
+
+.resultaatPositive{
+    -fx-text-fill: green;
+}
+
+.resultaatNegative{
+    -fx-text-fill: red;
+}
diff --git a/src/domein/Admin.java b/src/domein/Admin.java
@@ -121,14 +121,6 @@ public void setChecked(Boolean checked) {
         this.checked.set(checked);
     }
 
-    boolean controleerOfCoachMetEmailBestaat(String jobCoachMail) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    JobCoach geefCoachMetEmail(String jobCoachMail) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
     @Override
     public String toString() {
         return "persistence.Persoon[ email=" + email + " ]";

diff --git a/src/domein/Analyse.java b/src/domein/Analyse.java
@@ -28,7 +28,7 @@
 @Table(name = "analyse")
 @NamedQueries({
     @NamedQuery(name = "Analyse.findAll", query = "SELECT a FROM Analyse a")})
-public class Analyse implements Serializable,Comparable<Analyse> {
+public class Analyse implements Serializable, Comparable<Analyse> {
 
     protected Analyse() {
 
@@ -40,23 +40,23 @@ protected Analyse() {
     @JoinColumn(name = "JobCoachEmail")
     private JobCoach jobcoach;
 
-    public JobCoach getJobcoach() {
-        return jobcoach;
-    }
+    @OneToOne(mappedBy = "analyse")
+    private Departement departement;
 
-    public void setJobcoach(JobCoach jobcoach) {
-        this.jobcoach = jobcoach;
+    public Departement getDepartement() {
+        return departement;
     }
 
-    @OneToOne(mappedBy = "analyse")
-    private Werkgever werkgever;
+    public void setDepartement(Departement departement) {
+        this.departement = departement;
+    }
 
-    public void setWerkgever(Werkgever werkgever) {
-        this.werkgever = werkgever;
+    public JobCoach getJobcoach() {
+        return jobcoach;
     }
 
-    public Werkgever getWerkgever() {
-        return werkgever;
+    public void setJobcoach(JobCoach jobcoach) {
+        this.jobcoach = jobcoach;
     }
 
     @Id
@@ -142,10 +142,6 @@ public String toString() {
         return "persistence.Analyse[ id=" + id + " ]";
     }
 
-    public void slaWerkgeverOp(Werkgever werk2) {
-        setWerkgever(werk2);
-    }
-
     public boolean controleerOfVraagNummerAlIngevuldIs(KOBEnum e, int vraagnummer) {
         for (KostOfBaat kob : kostenEnBaten) {
             if (kob.getVraagId() == vraagnummer && kob.getKobEnum() == e) {
@@ -191,9 +187,9 @@ public void berekenVolledigResultaat() {
     private double round(double a) {
         return Math.round(a * 100.00) / 100.00;
     }
-    
+
     @Override
-    public int compareTo(Analyse a){
+    public int compareTo(Analyse a) {
         return getLaatsteAanpasDatum().compareTo(a.getLaatsteAanpasDatum());
     }