(no commit message)

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java b/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java
index 7b11522..14b72fd 100644 (file)
--- a/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java
+++ b/src/java/org/ufcspa/simdecs/comunicacao/MetodoIniciaCaso.java
@@ -59,7 +59,7 @@ public class MetodoIniciaCaso extends HttpServlet {
             // Cria sessao
             SessaoUsuario sessaoUsuario = new SessaoUsuario();
             sessaoUsuario.setData(new Date());            
-            sessaoUsuario.setUsuario(caso.getUsuario());
+            sessaoUsuario.setCaso(caso);
             em.persist(sessaoUsuario);
             
             // Logo inicio do caso

diff --git a/src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java b/src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java
index 8f02323..5edd227 100644 (file)
--- a/src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java
+++ b/src/java/org/ufcspa/simdecs/entities/SessaoUsuario.java
@@ -26,8 +26,8 @@ public class SessaoUsuario implements Serializable {
     private Date data;
 
     @ManyToOne
-    @JoinColumn(nullable=false, name="usu_id")
-    private Usuario usuario;
+    @JoinColumn(nullable=false, name="caso_id")
+    private Caso caso;
 
     public Date getData() {
         return data;
@@ -37,14 +37,6 @@ public class SessaoUsuario implements Serializable {
         this.data = data;
     }
 
-    public Usuario getUsuario() {
-        return usuario;
-    }
-
-    public void setUsuario(Usuario usuario) {
-        this.usuario = usuario;
-    }
-    
     public Long getId() {
         return id;
     }
@@ -77,5 +69,12 @@ public class SessaoUsuario implements Serializable {
     public String toString() {
         return "org.ufcspa.simdecs.entities.SessaoUsuario[ id=" + id + " ]";
     }
-    
+
+    public Caso getCaso() {
+        return caso;
+    }
+
+    public void setCaso(Caso caso) {
+        this.caso = caso;
+    }
 }

diff --git a/src/java/org/ufcspa/simdecs/entities/TipoEventoLog.java b/src/java/org/ufcspa/simdecs/entities/TipoEventoLog.java
index 6129264..bc3de0e 100644 (file)
--- a/src/java/org/ufcspa/simdecs/entities/TipoEventoLog.java
+++ b/src/java/org/ufcspa/simdecs/entities/TipoEventoLog.java
@@ -12,7 +12,7 @@ import javax.persistence.*;
  * @author pbarros\r
  */\r
 @Entity\r
-@Table(name="TipoEventoLog")\r
+@Table(name="TIPO_EVENTO_LOG")\r
 public class TipoEventoLog implements Serializable {\r
     private static final long serialVersionUID = 1L;\r
     \r

diff --git a/src/java/org/ufcspa/simdecs/util/PopulaDados.java b/src/java/org/ufcspa/simdecs/util/PopulaDados.java
new file mode 100644 (file)
index 0000000..cc2dccc
--- /dev/null
+++ b/src/java/org/ufcspa/simdecs/util/PopulaDados.java
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.ufcspa.simdecs.util;
+
+import javax.persistence.EntityManager;
+
+/**
+ *
+ * @author maroni
+ */
+public class PopulaDados {
+
+    private static EntityManager em;
+    
+    static {
+        em = DbUtil.getInstance().getEntityManager();
+    }
+
+    public static void insereDadosIniciais() {
+        em.getTransaction().begin();
+        
+        em.createNativeQuery("DELETE FROM USUARIO;").executeUpdate();
+        em.createNativeQuery("INSERT INTO USUARIO (id, login, nome, senha) VALUES (nextval('SQ_USUARIO'), 'simdecs', 'simdecs', 'simdecs');").executeUpdate();
+        em.createNativeQuery("DELETE FROM TIPO_EVENTO_LOG;").executeUpdate();
+        em.createNativeQuery("INSERT INTO TIPO_EVENTO_LOG (id, nome) VALUES ('INICIO_CASO', 'Início do Caso');").executeUpdate();
+        
+        em.getTransaction().commit();
+    }
+    
+}