UserfrontController

signalement/pom.xml

@@ -21,6 +21,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+                  <dependency>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-thymeleaf</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>nz.net.ultraq.thymeleaf</groupId>
+                    <artifactId>thymeleaf-layout-dialect</artifactId>
+                </dependency>
 <!--		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-mongodb</artifactId>
@@ -108,6 +116,12 @@
 	  <version>2.5.7</version>
 	  <type>jar</type>
 	 </dependency>
+	 <dependency>
+	  <groupId>javax.servlet</groupId>
+	  <artifactId>servlet-api</artifactId>
+	  <version>2.5</version>
+	  <type>jar</type>
+	 </dependency>
 	</dependencies>
 
 	<build>

signalement/src/main/java/org/signalement/entities/Admin.java

@@ -25,10 +25,7 @@
 @Table(name = "admin")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Admin.findAll", query = "SELECT a FROM Admin a")
-    , @NamedQuery(name = "Admin.findById", query = "SELECT a FROM Admin a WHERE a.id = :id")
-    , @NamedQuery(name = "Admin.findByUsername", query = "SELECT a FROM Admin a WHERE a.username = :username")
-    , @NamedQuery(name = "Admin.findByPassword", query = "SELECT a FROM Admin a WHERE a.password = :password")})
+    @NamedQuery(name = "Admin.findAll", query = "SELECT a FROM Admin a")})
 public class Admin implements Serializable {
 
     private static final long serialVersionUID = 1L;

signalement/src/main/java/org/signalement/entities/Photo.java

@@ -27,9 +27,7 @@
 @Table(name = "photo")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Photo.findAll", query = "SELECT p FROM Photo p")
-    , @NamedQuery(name = "Photo.findById", query = "SELECT p FROM Photo p WHERE p.id = :id")
-    , @NamedQuery(name = "Photo.findByPhoto", query = "SELECT p FROM Photo p WHERE p.photo = :photo")})
+    @NamedQuery(name = "Photo.findAll", query = "SELECT p FROM Photo p")})
 public class Photo implements Serializable {
 
     private static final long serialVersionUID = 1L;

signalement/src/main/java/org/signalement/entities/Province.java

@@ -0,0 +1,102 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.signalement.entities;
+
+import java.io.Serializable;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ *
+ * @author Mamitiana
+ */
+@Entity
+@Table(name = "province")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "Province.findAll", query = "SELECT p FROM Province p")})
+public class Province implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
+    @Column(name = "Id")
+    private Integer id;
+    @Column(name = "Nom")
+    private String nom;
+    @OneToMany(mappedBy = "province")
+    private List<Region> regionList;
+
+    public Province() {
+    }
+
+    public Province(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getNom() {
+        return nom;
+    }
+
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+
+    @XmlTransient
+    public List<Region> getRegionList() {
+        return regionList;
+    }
+
+    public void setRegionList(List<Region> regionList) {
+        this.regionList = regionList;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (id != null ? id.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof Province)) {
+            return false;
+        }
+        Province other = (Province) object;
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "org.signalement.entities.Province[ id=" + id + " ]";
+    }
+
+}

signalement/src/main/java/org/signalement/entities/Region.java

@@ -13,6 +13,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
@@ -28,9 +30,7 @@
 @Table(name = "region")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Region.findAll", query = "SELECT r FROM Region r")
-    , @NamedQuery(name = "Region.findById", query = "SELECT r FROM Region r WHERE r.id = :id")
-    , @NamedQuery(name = "Region.findByNom", query = "SELECT r FROM Region r WHERE r.nom = :nom")})
+    @NamedQuery(name = "Region.findAll", query = "SELECT r FROM Region r")})
 public class Region implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -45,6 +45,9 @@ public class Region implements Serializable {
     private List<Userfront> userfrontList;
     @OneToMany(mappedBy = "region")
     private List<Signalement> signalementList;
+    @JoinColumn(name = "Province", referencedColumnName = "Id")
+    @ManyToOne
+    private Province province;
 
     public Region() {
     }
@@ -87,6 +90,14 @@ public void setSignalementList(List<Signalement> signalementList) {
         this.signalementList = signalementList;
     }
 
+    public Province getProvince() {
+        return province;
+    }
+
+    public void setProvince(Province province) {
+        this.province = province;
+    }
+
     @Override
     public int hashCode() {
         int hash = 0;

signalement/src/main/java/org/signalement/entities/Signalement.java

@@ -5,7 +5,11 @@
  */
 package org.signalement.entities;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import javax.persistence.Basic;
@@ -33,12 +37,7 @@
 @Table(name = "signalement")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Signalement.findAll", query = "SELECT s FROM Signalement s")
-    , @NamedQuery(name = "Signalement.findById", query = "SELECT s FROM Signalement s WHERE s.id = :id")
-    , @NamedQuery(name = "Signalement.findByDescription", query = "SELECT s FROM Signalement s WHERE s.description = :description")
-    , @NamedQuery(name = "Signalement.findByDaty", query = "SELECT s FROM Signalement s WHERE s.daty = :daty")
-    , @NamedQuery(name = "Signalement.findByLatitude", query = "SELECT s FROM Signalement s WHERE s.latitude = :latitude")
-    , @NamedQuery(name = "Signalement.findByLongitude", query = "SELECT s FROM Signalement s WHERE s.longitude = :longitude")})
+    @NamedQuery(name = "Signalement.findAll", query = "SELECT s FROM Signalement s")})
 public class Signalement implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -52,10 +51,11 @@ public class Signalement implements Serializable {
     @Column(name = "daty")
     @Temporal(TemporalType.DATE)
     private Date daty;
+    // @Max(value=?)  @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation
     @Column(name = "Latitude")
-    private Long latitude;
+    private BigDecimal latitude;
     @Column(name = "Longitude")
-    private Long longitude;
+    private BigDecimal longitude;
     @JoinColumn(name = "Type", referencedColumnName = "Id")
     @ManyToOne
     private Type type;
@@ -65,9 +65,9 @@ public class Signalement implements Serializable {
     @JoinColumn(name = "Statut", referencedColumnName = "Id")
     @ManyToOne
     private Statut statut;
-    @JoinColumn(name = "SignalNew", referencedColumnName = "Id")
+    @JoinColumn(name = "Signalnew", referencedColumnName = "Id")
     @ManyToOne
-    private Signalnew signalNew;
+    private Signalnew signalnew;
     @OneToMany(mappedBy = "signalement")
     private List<Photo> photoList;
 
@@ -102,19 +102,19 @@ public void setDaty(Date daty) {
         this.daty = daty;
     }
 
-    public Long getLatitude() {
+    public BigDecimal getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(Long latitude) {
+    public void setLatitude(BigDecimal latitude) {
         this.latitude = latitude;
     }
 
-    public Long getLongitude() {
+    public BigDecimal getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(Long longitude) {
+    public void setLongitude(BigDecimal longitude) {
         this.longitude = longitude;
     }
 
@@ -142,12 +142,12 @@ public void setStatut(Statut statut) {
         this.statut = statut;
     }
 
-    public Signalnew getSignalNew() {
-        return signalNew;
+    public Signalnew getSignalnew() {
+        return signalnew;
     }
 
-    public void setSignalNew(Signalnew signalNew) {
-        this.signalNew = signalNew;
+    public void setSignalnew(Signalnew signalnew) {
+        this.signalnew = signalnew;
     }
 
     @XmlTransient
@@ -183,5 +183,18 @@ public boolean equals(Object object) {
     public String toString() {
         return "org.signalement.entities.Signalement[ id=" + id + " ]";
     }
+
+    public Signalement(Integer id, String description, Date daty, BigDecimal latitude, BigDecimal longitude, Type type, Statut statut, Signalnew signalnew) {
+        this.id = id;
+        this.description = description;
+        this.daty = daty;
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.type = type;
+        this.statut = statut;
+        this.signalnew = signalnew;
+    }
+
+
 
 }

signalement/src/main/java/org/signalement/entities/Signalnew.java

@@ -28,9 +28,7 @@
 @Table(name = "signalnew")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Signalnew.findAll", query = "SELECT s FROM Signalnew s")
-    , @NamedQuery(name = "Signalnew.findById", query = "SELECT s FROM Signalnew s WHERE s.id = :id")
-    , @NamedQuery(name = "Signalnew.findByTitre", query = "SELECT s FROM Signalnew s WHERE s.titre = :titre")})
+    @NamedQuery(name = "Signalnew.findAll", query = "SELECT s FROM Signalnew s")})
 public class Signalnew implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -41,7 +39,7 @@ public class Signalnew implements Serializable {
     private Integer id;
     @Column(name = "Titre")
     private String titre;
-    @OneToMany(mappedBy = "signalNew")
+    @OneToMany(mappedBy = "signalnew")
     private List<Signalement> signalementList;
 
     public Signalnew() {

signalement/src/main/java/org/signalement/entities/Statut.java

@@ -28,9 +28,7 @@
 @Table(name = "statut")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Statut.findAll", query = "SELECT s FROM Statut s")
-    , @NamedQuery(name = "Statut.findById", query = "SELECT s FROM Statut s WHERE s.id = :id")
-    , @NamedQuery(name = "Statut.findByEtat", query = "SELECT s FROM Statut s WHERE s.etat = :etat")})
+    @NamedQuery(name = "Statut.findAll", query = "SELECT s FROM Statut s")})
 public class Statut implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -40,7 +38,7 @@ public class Statut implements Serializable {
     @Column(name = "Id")
     private Integer id;
     @Column(name = "Etat")
-    private Boolean etat;
+    private String etat;
     @OneToMany(mappedBy = "statut")
     private List<Signalement> signalementList;
 
@@ -59,11 +57,11 @@ public void setId(Integer id) {
         this.id = id;
     }
 
-    public Boolean getEtat() {
+    public String getEtat() {
         return etat;
     }
 
-    public void setEtat(Boolean etat) {
+    public void setEtat(String etat) {
         this.etat = etat;
     }
 

signalement/src/main/java/org/signalement/entities/Type.java

@@ -28,9 +28,7 @@
 @Table(name = "type")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Type.findAll", query = "SELECT t FROM Type t")
-    , @NamedQuery(name = "Type.findById", query = "SELECT t FROM Type t WHERE t.id = :id")
-    , @NamedQuery(name = "Type.findByNom", query = "SELECT t FROM Type t WHERE t.nom = :nom")})
+    @NamedQuery(name = "Type.findAll", query = "SELECT t FROM Type t")})
 public class Type implements Serializable {
 
     private static final long serialVersionUID = 1L;

signalement/src/main/java/org/signalement/entities/Userfront.java

@@ -27,10 +27,7 @@
 @Table(name = "userfront")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Userfront.findAll", query = "SELECT u FROM Userfront u")
-    , @NamedQuery(name = "Userfront.findById", query = "SELECT u FROM Userfront u WHERE u.id = :id")
-    , @NamedQuery(name = "Userfront.findByUsername", query = "SELECT u FROM Userfront u WHERE u.username = :username")
-    , @NamedQuery(name = "Userfront.findByPassword", query = "SELECT u FROM Userfront u WHERE u.password = :password")})
+    @NamedQuery(name = "Userfront.findAll", query = "SELECT u FROM Userfront u")})
 public class Userfront implements Serializable {
 
     private static final long serialVersionUID = 1L;

signalement/src/main/java/org/signalement/entities/Utilisateur.java

@@ -25,10 +25,7 @@
 @Table(name = "utilisateur")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "Utilisateur.findAll", query = "SELECT u FROM Utilisateur u")
-    , @NamedQuery(name = "Utilisateur.findById", query = "SELECT u FROM Utilisateur u WHERE u.id = :id")
-    , @NamedQuery(name = "Utilisateur.findByUsername", query = "SELECT u FROM Utilisateur u WHERE u.username = :username")
-    , @NamedQuery(name = "Utilisateur.findByPassword", query = "SELECT u FROM Utilisateur u WHERE u.password = :password")})
+    @NamedQuery(name = "Utilisateur.findAll", query = "SELECT u FROM Utilisateur u")})
 public class Utilisateur implements Serializable {
 
     private static final long serialVersionUID = 1L;