Merge pull request #54 from wimdetr/laatsteloodjes

refresh
wimdetr · May 17, 2017 · c3d60b9 · c3d60b9
2 parents 070fca0 + c352d60
commit c3d60b9
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 19 deletions.
diff --git a/src/controllers/AnalyseCard.java b/src/controllers/AnalyseCard.java
@@ -37,6 +37,9 @@ public class AnalyseCard extends VBox {
     @FXML
     private Label jobcoachLabel;
 
+    @FXML
+    private Label locatieLabel;
+
     @FXML
     private Label datumLabel;
 
@@ -86,6 +89,8 @@ private void fillInCard() {
         kostenLabel.setText(NumberUtil.formatDouble(kosten));
         batenLabel.setText(NumberUtil.formatDouble(baten));
         resultaatLabel.setText(NumberUtil.formatDouble(resultaat));
+        jobcoachLabel.setText(analyse.getJobcoach().getVoornaam() + " " + analyse.getJobcoach().getNaam());
+        locatieLabel.setText(analyse.getDepartement().getGemeente());
         DateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY");
         datumLabel.setText(dateFormat.format(analyse.getLaatsteAanpasDatum()));
         if (resultaat >= 0) {

diff --git a/src/controllers/GebruikersBeherenScherm.java b/src/controllers/GebruikersBeherenScherm.java
@@ -87,7 +87,6 @@ public class GebruikersBeherenScherm extends BorderPane {
     private Schermbeheer schermBeheer;
 
     public GebruikersBeherenScherm(Schermbeheer schermbeheer) {
-        System.out.println("hi");
         this.schermBeheer = schermbeheer;
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/gui/GebruikersBeherenScherm.fxml"));
         loader.setRoot(this);
@@ -276,7 +275,7 @@ private void doExporteer(ActionEvent event) {
     @FXML
     void doMail(ActionEvent event) {
         ObservableList<JobCoach> coaches = gebruikersTableView.getItems().filtered(p -> p.isChecked().get() == true);
-        schermBeheer.plaatsPopUpScherm(new EmailVerzendenScherm(schermBeheer,coaches), "Mail Verzenden");
+        schermBeheer.plaatsPopUpScherm(new EmailVerzendenScherm(schermBeheer, coaches), "Mail Verzenden");
     }
 
     @FXML

diff --git a/src/domein/Analyse.java b/src/domein/Analyse.java
@@ -65,8 +65,7 @@ public void setJobcoach(JobCoach jobcoach) {
     @Column(name = "AnalyseId")
     private int id;
 
-    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @JoinColumn(name = "AnalyseId", referencedColumnName = "AnalyseId")
+    @OneToMany(mappedBy = "analyse",fetch = FetchType.EAGER)
     private List<KostOfBaat> kostenEnBaten;
 
     @Transient

diff --git a/src/domein/DomeinController.java b/src/domein/DomeinController.java
@@ -92,6 +92,7 @@ public void refreshData() {
         jobCoachRepo.getAll();
         departementRepo.getAll();
         analyseRepo.getAll();
+        resultaat.clear();
         berekenResultaten(); // onperformant
     }
 

diff --git a/src/domein/KOBRij.java b/src/domein/KOBRij.java
@@ -15,6 +15,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -32,8 +33,19 @@ protected KOBRij() {
     }
     private static final long serialVersionUID = 1L;
 
-    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @JoinColumn(name = "KOBRijid", referencedColumnName = "id")
+    @ManyToOne(fetch=FetchType.EAGER)
+    @JoinColumn(name = "KostOfBaatid")
+    private KostOfBaat kostOfBaat;
+
+    public KostOfBaat getKostOfBaat() {
+        return kostOfBaat;
+    }
+
+    public void setKostOfBaat(KostOfBaat kostOfBaat) {
+        this.kostOfBaat = kostOfBaat;
+    }
+
+    @OneToMany(mappedBy = "kobrij",fetch = FetchType.EAGER)
     private List<KOBVak> vakken;
 
     @Transient
@@ -113,8 +125,8 @@ public KOBVak geefKOBVakMetNummer(int i) {
         }
         return null;
     }
-    
-    public KOBRij(int vraag){
+
+    public KOBRij(int vraag) {
         this.kOBRijId = vraag;
     }
 }
diff --git a/src/domein/KOBVak.java b/src/domein/KOBVak.java
@@ -8,9 +8,12 @@
 import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 /**
@@ -26,6 +29,18 @@ public class KOBVak implements Serializable {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "KOBRijid")
+    public KOBRij kobrij;
+
+    public KOBRij getKobrij() {
+        return kobrij;
+    }
+
+    public void setKobrij(KOBRij kobrij) {
+        this.kobrij = kobrij;
+    }
+
     @Column(name = "KOBVakId")
     private int kobVakId;
 
@@ -81,8 +96,7 @@ public String toString() {
         return "persistence.KOBVak[ id=" + id + " ]";
     }
 
-    public double geefDataAlsDouble(){
+    public double geefDataAlsDouble() {
         return Double.parseDouble(dataVak.replace(",", "."));
     }
 }
-
diff --git a/src/domein/KostOfBaat.java b/src/domein/KostOfBaat.java
@@ -18,6 +18,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -35,6 +36,19 @@ public class KostOfBaat implements Serializable {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
+    @ManyToOne(fetch=FetchType.EAGER)
+    @JoinColumn(name = "AnalyseId")
+    private Analyse analyse;
+
+    public Analyse getAnalyse() {
+        return analyse;
+    }
+
+    public void setAnalyse(Analyse analyse) {
+        this.analyse = analyse;
+    }
+
+
     @Column(name = "VraagId")
     private int vraagId;
 
@@ -44,8 +58,7 @@ public class KostOfBaat implements Serializable {
     @Column(name = "Formule")
     private Formule formule;
 
-    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @JoinColumn(name = "KostOfBaatid", referencedColumnName = "id")
+    @OneToMany(mappedBy = "kostOfBaat",fetch = FetchType.EAGER)
     private List<KOBRij> rijen;
 
     @Transient

diff --git a/src/domein/Resultaat.java b/src/domein/Resultaat.java
@@ -37,6 +37,11 @@ public void geefParametersDoor(KostOfBaat kob, Analyse a) {
         analyse = a;
     }
 
+    public void clear() {
+        kostOfBaat = null;
+        analyse = null;
+    }
+
     public void berekenRij(KOBRij mijnRij) {
         int aantalWerkuren = analyse.getDepartement().getAantalWerkuren();
         switch (kostOfBaat.getFormule()) {

diff --git a/src/domein/repository/AnalyseRepository.java b/src/domein/repository/AnalyseRepository.java
@@ -35,13 +35,12 @@ public AnalyseRepository() {
         getAll();
     }
 
-
-    public void getAll(){
+    public void getAll() {
         lijst = analyseMapper.getAll();
     }
-    
-    public List<Analyse> getNthMostRecent(int n){
-        if(n >= lijst.size()){
+
+    public List<Analyse> getNthMostRecent(int n) {
+        if (n >= lijst.size()) {
             n = lijst.size();
         }
         return lijst.stream().sorted(Comparator.reverseOrder()).limit(n).collect(Collectors.toList());

diff --git a/src/gui/AnalyseCard.fxml b/src/gui/AnalyseCard.fxml
@@ -141,7 +141,7 @@
                                     <Font name="System Bold" size="15.0" />
                                  </font>
                               </Label>
-                              <Label alignment="CENTER" prefHeight="16.0" prefWidth="236.0" text="Aalst" />
+                              <Label fx:id="locatieLabel" alignment="CENTER" prefHeight="16.0" prefWidth="236.0" text="Aalst" />
                            </children>
                         </VBox>
                         <VBox prefHeight="52.0" prefWidth="149.0" spacing="5.0">

diff --git a/src/gui/HoofdScherm.fxml b/src/gui/HoofdScherm.fxml
@@ -12,6 +12,7 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
@@ -126,7 +127,18 @@
                   </ImageView>
                </graphic>
             </Button>
-            <Button mnemonicParsing="false" onAction="#updateData" text="Button" />
+            <Region prefHeight="80.0" prefWidth="105.0" VBox.vgrow="ALWAYS" />
+            <Button mnemonicParsing="false" onAction="#updateData" prefHeight="61.0" prefWidth="114.0" styleClass="sidebarbutton">
+               <graphic>
+                  <ImageView fitHeight="65.0" fitWidth="57.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../img/icons/hoofdscherm/refresh.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+               <VBox.margin>
+                  <Insets bottom="10.0" />
+               </VBox.margin></Button>
          </children>
          <BorderPane.margin>
             <Insets top="1.0" />

diff --git a/src/img/icons/hoofdscherm/refresh.png b/src/img/icons/hoofdscherm/refresh.png
diff --git a/src/persistentie/AnalyseMapper.java b/src/persistentie/AnalyseMapper.java
@@ -6,6 +6,7 @@
 package persistentie;
 
 import domein.Analyse;
+import domein.KostOfBaat;
 import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -30,4 +31,5 @@ public List<Analyse> getAll() {
         return results;
     }
 
+
 }