Merge pull request #53 from wimdetr/Feature10

laatste touches deel 1

src/controllers/AnalyseCard.java

@@ -7,6 +7,8 @@
 
 import domein.Analyse;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -84,7 +86,8 @@ private void fillInCard() {
         kostenLabel.setText(NumberUtil.formatDouble(kosten));
         batenLabel.setText(NumberUtil.formatDouble(baten));
         resultaatLabel.setText(NumberUtil.formatDouble(resultaat));
-
+        DateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY");
+        datumLabel.setText(dateFormat.format(analyse.getLaatsteAanpasDatum()));
         if (resultaat >= 0) {
             resultBox.getStyleClass().add("resultBoxPositive");
         } else {

src/controllers/EmailVerzendenScherm.java

@@ -48,8 +48,8 @@ public class EmailVerzendenScherm extends BorderPane {
 
     public EmailVerzendenScherm(Schermbeheer beheer, AdminMail mail) {
         this(beheer, Arrays.asList(mail.getAfzender()));
-        onderwerpVeld.setText("Re:"+mail.getOnderwerp());
-        inhoudVeld.setText(mail.getInhoud());
+        onderwerpVeld.setText("Re:" + mail.getOnderwerp());
+        inhoudVeld.setText("\n----------------\n" + mail.getInhoud());
     }
 
     public EmailVerzendenScherm(Schermbeheer beheer, List<JobCoach> coaches) {

src/controllers/GebruikersBeherenScherm.java

@@ -87,6 +87,7 @@ 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);

src/controllers/HoofdScherm.java

@@ -84,6 +84,7 @@ public void toonDoelgroepScherm(ActionEvent event) {
 
     @FXML
     public void toonAnalyseScherm(ActionEvent event) {
+
         ArchiefScherm scherm = new ArchiefScherm(schermBeheer);
         this.setCenter(scherm);
     }
@@ -102,8 +103,13 @@ void toonWerkgeverScherm(ActionEvent event) {
 
     @FXML
     void toonEmailScherm(ActionEvent event) {
+        dc.getAdminRepo().updateEmailsVoorAdmin(dc.getAdmin());
         AdminMailScherm scherm = new AdminMailScherm(schermBeheer);
         this.setCenter(scherm);
     }
 
+    @FXML
+    void updateData(ActionEvent event) {
+        dc.refreshData();
+    }
 }

src/domein/Admin.java

@@ -45,8 +45,7 @@ public class Admin implements Serializable {
     protected Admin() {
     }
 
-    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    @JoinColumn(name = "OntvangerMail", referencedColumnName = "Email")
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "ontvanger")
     public List<AdminMail> mails;
 
     public List<AdminMail> getMails() {

src/domein/AdminMail.java

@@ -16,6 +16,8 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 
 import javax.persistence.Table;
 import javax.persistence.Temporal;
@@ -27,6 +29,9 @@
  */
 @Entity
 @Table(name = "adminmail")
+@NamedQueries({
+    @NamedQuery(name = "AdminMail.findAll", query = "SELECT a FROM AdminMail a where a.ontvanger = :ontvanger")
+})
 public class AdminMail implements Serializable, Comparable<AdminMail> {
 
     private static final long serialVersionUID = 1L;
@@ -44,6 +49,18 @@ public class AdminMail implements Serializable, Comparable<AdminMail> {
     @Temporal(TemporalType.TIMESTAMP)
     private Date verzendDatum;
 
+    @ManyToOne
+    @JoinColumn(name = "OntvangerMail")
+    private Admin ontvanger;
+
+    public Admin getOntvanger() {
+        return ontvanger;
+    }
+
+    public void setOntvanger(Admin ontvanger) {
+        this.ontvanger = ontvanger;
+    }
+
     @ManyToOne
     @JoinColumn(name = "AfzenderMail")
     private JobCoach afzender;

src/domein/Analyse.java

@@ -1,6 +1,7 @@
 package domein;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Stream;
@@ -30,10 +31,6 @@
     @NamedQuery(name = "Analyse.findAll", query = "SELECT a FROM Analyse a")})
 public class Analyse implements Serializable, Comparable<Analyse> {
 
-    protected Analyse() {
-
-    }
-
     private static final long serialVersionUID = 1L;
 
     @ManyToOne(fetch = FetchType.EAGER)
@@ -43,7 +40,10 @@ protected Analyse() {
     @OneToOne(mappedBy = "analyse")
     private Departement departement;
 
-
+    //voor test
+    public Analyse() {
+        kostenEnBaten = new ArrayList<>();
+    }
 
     public Departement getDepartement() {
         return departement;
@@ -195,4 +195,9 @@ public int compareTo(Analyse a) {
         return getLaatsteAanpasDatum().compareTo(a.getLaatsteAanpasDatum());
     }
 
+    // voor testen :DDDDDDDDDDD
+    public void slaKostOfBaatOp(KostOfBaat e) {
+        kostenEnBaten.add(e);
+    }
+
 }

src/domein/DomeinController.java

@@ -88,6 +88,13 @@ public void logAdminIn(String username) {
         berekenResultaten();
     }
 
+    public void refreshData() {
+        jobCoachRepo.getAll();
+        departementRepo.getAll();
+        analyseRepo.getAll();
+        berekenResultaten(); // onperformant
+    }
+
     public void logAdminUit() {
         admin = null;
     }

src/domein/KOBRij.java

@@ -113,4 +113,8 @@ public KOBVak geefKOBVakMetNummer(int i) {
         }
         return null;
     }
+
+    public KOBRij(int vraag){
+        this.kOBRijId = vraag;
+    }
 }

src/domein/KostOfBaat.java

@@ -6,6 +6,7 @@
 package domein;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -29,10 +30,6 @@
 @Table(name = "kostofbaat")
 public class KostOfBaat implements Serializable {
 
-    protected KostOfBaat() {
-
-    }
-
     private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -54,6 +51,11 @@ protected KostOfBaat() {
     @Transient
     private double resultaat;
 
+    // voor testen
+    public KostOfBaat() {
+        rijen = new ArrayList<>();
+    }
+
     public int getVraagId() {
         return vraagId;
     }
@@ -156,4 +158,15 @@ public void berekenResultaat() {
         resultaat = sum;
     }
 
+    public KostOfBaat(int vraagId, double res, KOBEnum a) {
+        this.vraagId = vraagId;
+        this.resultaat = res;
+        this.kobEnum = a;
+    }
+
+    // voor test shizzle
+    public void addKOBRij(KOBRij rij) {
+        rijen.add(rij);
+    }
+
 }

src/domein/repository/AdminRepository.java

@@ -32,6 +32,9 @@ public AdminRepository() {
         lijst = new ArrayList<>();
         adminMapper = new AdminMapper();
     }
+    public void updateEmailsVoorAdmin(Admin a) {
+        adminMapper.updateEmailsVoorAdmin(a);
+    }
 
     public boolean controleerOfAdminKanInloggen(String username, String wachtwoord) {
         return adminMapper.controleerOfAdminKanInloggen(username, wachtwoord);

src/domein/repository/AnalyseRepository.java

@@ -10,6 +10,7 @@
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,6 +44,6 @@ public List<Analyse> getNthMostRecent(int n){
         if(n >= lijst.size()){
             n = lijst.size();
         }
-        return lijst.stream().sorted().limit(n).collect(Collectors.toList());
+        return lijst.stream().sorted(Comparator.reverseOrder()).limit(n).collect(Collectors.toList());
     }
 }

src/domein/repository/DepartementRepository.java

@@ -19,7 +19,12 @@ public class DepartementRepository {
     public DepartementRepository() {
         lijst = new ArrayList<>();
         mapper = new DepartementMapper();
+        getAll();
+    }
+
+    public void getAll() {
         lijst = mapper.getAll();
+
     }
 
     public List<Departement> getLijst() {

src/domein/repository/JobCoachRepository.java

@@ -29,6 +29,10 @@ public JobCoachMapper getJobCoachMapper() {
     public JobCoachRepository() {
         lijst = new ArrayList<>();
         jobCoachMapper = new JobCoachMapper();
+        getAll();
+    }
+
+    public void getAll() {
         lijst = jobCoachMapper.getAll();
     }
 

src/gui/AdminMailLeftComponent.fxml

@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onMouseClicked="#openMail" prefHeight="218.0" prefWidth="369.0" stylesheets="@../css/adminmailcomponent.css" type="VBox" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onMouseClicked="#openMail" prefHeight="159.0" prefWidth="369.0" stylesheets="@../css/adminmailcomponent.css" type="VBox" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <HBox fx:id="headerBox" prefHeight="62.0" prefWidth="295.0" styleClass="topBarRead">
          <children>

src/gui/AdminMailScherm.fxml

@@ -28,9 +28,9 @@
       <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
    </padding>
    <left>
-      <ScrollPane fx:id="emailScrollPane" fitToWidth="true" hbarPolicy="NEVER" prefHeight="482.0" prefWidth="372.0" styleClass="scrollPane" BorderPane.alignment="CENTER">
+      <ScrollPane fx:id="emailScrollPane" fitToWidth="true" hbarPolicy="NEVER" prefHeight="482.0" prefWidth="386.0" styleClass="scrollPane" vbarPolicy="ALWAYS" BorderPane.alignment="CENTER">
          <content>
-            <VBox fx:id="emailBox" prefHeight="481.0" prefWidth="388.0" />
+            <VBox fx:id="emailBox" prefHeight="481.0" prefWidth="359.0" />
          </content>
          <BorderPane.margin>
             <Insets bottom="5.0" left="5.0" />

src/gui/HoofdScherm.fxml

@@ -126,6 +126,7 @@
                   </ImageView>
                </graphic>
             </Button>
+            <Button mnemonicParsing="false" onAction="#updateData" text="Button" />
          </children>
          <BorderPane.margin>
             <Insets top="1.0" />

src/gui/WerkgeverBeherenScherm.fxml

@@ -54,7 +54,7 @@
                      <children>
                         <TextField fx:id="zoekTextField" prefHeight="26.0" prefWidth="296.0" promptText="Vul een zoekfilter in..." />
                         <ChoiceBox fx:id="zoekChoiceBox" prefWidth="150.0" styleClass="cb" />
-                        <Button alignment="TOP_LEFT" mnemonicParsing="false" onAction="#doZoek" prefHeight="27.0" prefWidth="76.0" styleClass="blueButton" text="Zoek">
+                        <Button alignment="TOP_LEFT" mnemonicParsing="false" onAction="#doZoek" prefHeight="27.0" prefWidth="88.0" styleClass="blueButton" text="Zoeken">
                            <graphic>
                               <ImageView fitHeight="57.0" fitWidth="19.0" pickOnBounds="true" preserveRatio="true">
                                  <image>

src/persistentie/AdminMapper.java

@@ -41,6 +41,17 @@ public boolean controleerOfAdminKanInloggen(String username, String wachtwoord)
         return true;
     }
 
+    public void updateEmailsVoorAdmin(Admin a) {
+        EntityManager em = JPAUtil.getEmf().createEntityManager();
+        em.getTransaction().begin();
+        TypedQuery<AdminMail> q = em.createNamedQuery("AdminMail.findAll", AdminMail.class);
+        q.setParameter("ontvanger", a);
+        List<AdminMail> mails = q.getResultList();
+        em.getTransaction().commit();
+        em.close();
+        a.setMails(mails);
+    }
+
     public Admin geefAdmin(String username) {
         EntityManager em = JPAUtil.getEmf().createEntityManager();
         TypedQuery<Admin> q = em.createNamedQuery("Admin.findAdmin", Admin.class);

src/persistentie/JobCoachMapper.java

@@ -32,6 +32,11 @@ public void modifyJobCoach(JobCoach j) {
         EntityManager em = JPAUtil.getEmf().createEntityManager();
         em.getTransaction().begin();
         em.merge(j);
+        Query q = (Query) em.createNativeQuery("UPDATE aspnetusers SET Naam = ?1, Voornaam = ?2 WHERE NormalizedUsername = ?3");
+        q.setParameter(1, j.getNaam());
+        q.setParameter(2, j.getVoornaam());
+        q.setParameter(3, j.getEmail());
+        q.executeUpdate();
         em.getTransaction().commit();
         em.close();
     }
@@ -40,8 +45,8 @@ public void delete(JobCoach j) {
         EntityManager em = JPAUtil.getEmf().createEntityManager();
         em.getTransaction().begin();
         em.remove(em.contains(j) ? j : em.merge(j));
-        Query q  = (Query) em.createNativeQuery("DELETE FROM aspnetusers WHERE username = ?1");
-        q.setParameter(1,j.getEmail());
+        Query q = (Query) em.createNativeQuery("DELETE FROM aspnetusers WHERE username = ?1");
+        q.setParameter(1, j.getEmail());
         q.executeUpdate();
         em.getTransaction().commit();
         em.close();