From: maroni <maroni@192.168.1.103>
Date: Wed, 14 Mar 2012 01:55:08 +0000 (-0300)
Subject: (no commit message)
X-Git-Url: http://200.18.67.61/gitweb/?a=commitdiff_plain;h=b7aa417b024d2d87f80844bdb534f6b8a27dcf62;p=simdecs2.git

---

diff --git a/src/java/org/ufcspa/simdecs/mb/DefaultManagedBean.java b/src/java/org/ufcspa/simdecs/mb/DefaultManagedBean.java
index 16218b3..f4f76a7 100644
--- a/src/java/org/ufcspa/simdecs/mb/DefaultManagedBean.java
+++ b/src/java/org/ufcspa/simdecs/mb/DefaultManagedBean.java
@@ -82,4 +82,15 @@ public class DefaultManagedBean {
     protected HttpSession getSession() {
         return (HttpSession) getFacesContext().getExternalContext().getSession(true);
     }
+    
+    protected void beginTransaction() {
+        if (!em.getTransaction().isActive())
+            em.getTransaction().begin();
+    }
+
+    protected void commitTransaction() {
+        em.getTransaction().commit();
+    }
+    
+    
 }
diff --git a/src/java/org/ufcspa/simdecs/mb/editarcasos/SelecioneCasoBean.java b/src/java/org/ufcspa/simdecs/mb/editarcasos/SelecioneCasoBean.java
index 31f3db0..ebbe599 100644
--- a/src/java/org/ufcspa/simdecs/mb/editarcasos/SelecioneCasoBean.java
+++ b/src/java/org/ufcspa/simdecs/mb/editarcasos/SelecioneCasoBean.java
@@ -51,7 +51,7 @@ public class SelecioneCasoBean extends DefaultManagedBean {
     }
     
     public String criarNovoCaso() {
-        em.getTransaction().begin();
+        beginTransaction();
         Usuario usuario = getUsuario();
         
         Caso caso = new Caso();
@@ -62,7 +62,7 @@ public class SelecioneCasoBean extends DefaultManagedBean {
         caso.setModelo(modelo);
         em.persist(caso);
         
-        em.getTransaction().commit();
+        commitTransaction();
         getSession().setAttribute("casoSelecionado", caso.getId());
         
         return "/editarcasos/editarCaso.jsf?faces-redirect=true&pIDCaso=";
@@ -73,7 +73,7 @@ public class SelecioneCasoBean extends DefaultManagedBean {
         Caso caso = em.find(Caso.class, idCaso);
 
         if (caso != null) {
-            em.getTransaction().begin();
+            beginTransaction();
 
             caso.setNome(nomeCaso);
             caso.setResumo(resumo);
@@ -81,7 +81,7 @@ public class SelecioneCasoBean extends DefaultManagedBean {
             caso.setModelo(modelo);
             em.persist(caso);
 
-            em.getTransaction().commit();
+            commitTransaction();
         }
         getSession().setAttribute("casoSelecionado", caso.getId());
         
@@ -113,7 +113,7 @@ public class SelecioneCasoBean extends DefaultManagedBean {
     public void excluirCasoClinico() {
         Long id = Long.valueOf(getTextParameter("pIDCaso"));
         
-        em.getTransaction().begin();
+        beginTransaction();
 
         em.createQuery("Delete From NodoPaciente Where paciente.id in (Select id from Paciente where caso.id=:pIDCaso)")
           .setParameter("pIDCaso", id)
@@ -127,7 +127,7 @@ public class SelecioneCasoBean extends DefaultManagedBean {
           .setParameter("pIDCaso", id)
           .executeUpdate();
 
-        em.getTransaction().commit();
+        commitTransaction();
         populateCasosClinicos();
         addInfoMessage("Excluido!", "Caso clínico excluido com sucesso!");
         
diff --git a/web/login.xhtml b/web/login.xhtml
index 424cb89..521d0f5 100644
--- a/web/login.xhtml
+++ b/web/login.xhtml
@@ -33,7 +33,7 @@
             </p:panel>
             <br/>
             <br/>
-            <h:outputText value="Versão 1.4" />
+            <h:outputText value="Versão 1.5" />
         </center>
     </h:body>
 </html>