17/01/2009

git-svn-id: https://svn.coded.pt/svn/SIPRP@913 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml

@@ -2,6 +2,6 @@
 <driver project-version="3.0" class="org.postgresql.Driver">
 	<!-- <url value="jdbc:postgresql://storage:5432/siprp_local"/> -->
 	<url value="jdbc:postgresql://localhost:5436/siprp_local_3"/>
-    <connectionPool min="1" max="1"/>
+    <!-- <connectionPool min="1" max="1"/> -->
 	<login userName="postgres" password=""/>
 </driver>

trunk/PlanosActuacao/src/java/db/entidades/Risco.java

@@ -21,6 +21,7 @@ public class Risco {
     //private Valor valor;
     private Integer valor;
     private String responsavel_execucao;
+    private String por;
     private String recursos_necessarios;
     private Date data_inicio;
     private Date data_fim;  
@@ -160,4 +161,18 @@ public class Risco {
         this.risco_id = risco_id;
     }
 
+    /**
+     * @return the por
+     */
+    public String getPor() {
+        return por;
+    }
+
+    /**
+     * @param por the por to set
+     */
+    public void setPor(String por) {
+        this.por = por;
+    }
+
 }

trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java

@@ -173,6 +173,11 @@ public class PlanosDataProvider extends GenericDataProvider{
         {
             r.setResponsavel_execucao("");
         }
+
+        if(r.getPor() == null)
+        {
+            r.setPor("");
+        }
         
         if(r.getRecursos_necessarios() == null)
         {
@@ -195,6 +200,7 @@ public class PlanosDataProvider extends GenericDataProvider{
         
         //To Do sql string here :
         sql = "UPDATE plano_riscos SET responsavel_execucao = '" + r.getResponsavel_execucao() + "', ";
+        sql += "por = '" + r.getPor() + "', ";
         sql += "recursos_necessarios = '" + r.getRecursos_necessarios() + "', ";
         if(r.getData_inicio() == null)
         {
@@ -538,7 +544,7 @@ public class PlanosDataProvider extends GenericDataProvider{
     private List<Area> getAreasByPlano(PlanoActuacao p) throws Exception
     {
         Statement st = createStatement();  
-        String sql = "SELECT * FROM plano_areas WHERE plano_id = " + p.getId() + " ORDER BY id";
+        String sql = "SELECT * FROM plano_areas WHERE plano_id = " + p.getId() + " ORDER BY descricao";
         ResultSet rs = st.executeQuery(sql);   
         
         List<Area> areas = new ArrayList();
@@ -563,7 +569,7 @@ public class PlanosDataProvider extends GenericDataProvider{
     {
         List<Risco> riscos = new ArrayList();
         Statement st = createStatement();  
-        String sql = "SELECT * FROM plano_riscos WHERE area_id = " + a.getId() + " ORDER BY id";
+        String sql = "SELECT * FROM plano_riscos WHERE area_id = " + a.getId() + " ORDER BY valor DESC";
         ResultSet rs = st.executeQuery(sql);   
         
         if(rs.isBeforeFirst())
@@ -593,6 +599,7 @@ public class PlanosDataProvider extends GenericDataProvider{
 
                 
                 r.setResponsavel_execucao(rs.getString("responsavel_execucao"));
+                r.setPor(rs.getString("por"));
                 r.setRecursos_necessarios(rs.getString("recursos_necessarios"));
                 java.sql.Date sqlDataInicio = rs.getDate("data_inicio");
                 if(sqlDataInicio != null)
@@ -826,6 +833,7 @@ public class PlanosDataProvider extends GenericDataProvider{
             r.setId( new Integer( rs.getInt("id") ) );
             r.setDescricao( rs.getString("descricao") );
             r.setResponsavel_execucao(rs.getString("responsavel_execucao"));
+            r.setPor(rs.getString("por"));
             r.setRecursos_necessarios(rs.getString("recursos_necessarios"));
             java.sql.Date sqlDataInicio = rs.getDate("data_inicio");
             if(sqlDataInicio != null)
@@ -841,7 +849,8 @@ public class PlanosDataProvider extends GenericDataProvider{
             r.setParecer_dl(rs.getString("parecer_dl"));
             r.setParecer_dns(rs.getString("parecer_dns"));                
             r.setVerificacao_siprp(rs.getString("verificacao_siprp"));                                             
-            r.setActivo( rs.getString("activo") );            
+            r.setActivo( rs.getString("activo") );  
+            r.setValor(new Integer(rs.getInt("valor")));
         }
         return r;
     }

trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java

@@ -94,6 +94,7 @@ public class EditarPlano extends AbstractPageBean {
     
     //page components
     TextField txtResponsavelExecucao;
+    TextField txtPor;
     TextArea txtRecursos;
     Calendar dtInicio;
     Calendar dtFim; 
@@ -1019,6 +1020,37 @@ public class EditarPlano extends AbstractPageBean {
             st.setText(r.getResponsavel_execucao());
             pg.getChildren().add(st);                        
         }
+
+        st = new StaticText();
+        st.setEscape(false);
+        st.setText(" ");
+        pg.getChildren().add(st);
+
+        st = new StaticText();
+        st.setEscape(false);
+        st.setStyleClass("label");
+        st.setText("POR:");
+        pg.getChildren().add(st);
+
+        if(u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA)
+        {
+            txtPor = new TextField();
+            txtPor.setId("txtPor");
+            txtPor.setColumns(20);
+            txtPor.setText(r.getPor());
+            pg.getChildren().add(txtPor);
+        }
+        else
+        {
+            st = new StaticText();
+            st.setEscape(false);
+            st.setText(r.getPor());
+            pg.getChildren().add(st);
+        }
+
+
+
+
         gridResponsavel.getChildren().add(pg);
         pg = new PanelGroup();
         st = new StaticText();
@@ -1704,6 +1736,15 @@ public class EditarPlano extends AbstractPageBean {
                 r.setResponsavel_execucao((String) txtResponsavel.getText());
             }
         }
+
+        TextField txtPor = (TextField) gridResponsavel.findComponent("form1:pgResponsavel:txtPor");
+        if(txtPor != null)
+        {
+            if(txtPor.getText() != null)
+            {
+                r.setPor((String) txtPor.getText());
+            }
+        }
         
         TextArea txtRecursos = (TextArea) gridResponsavel.findComponent("form1:txtRecursos");
         if(txtRecursos != null)
@@ -2043,6 +2084,17 @@ public class EditarPlano extends AbstractPageBean {
                 res = false;
                 break;                
             }
+
+            if(r.getPor() == null)
+            {
+                res = false;
+                break;
+            }
+            else if(r.getPor().trim().length() == 0)
+            {
+                res = false;
+                break;
+            }
             
             if(r.getRecursos_necessarios() == null)
             {

trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java

@@ -340,6 +340,7 @@ public class ViewPlano extends AbstractPageBean {
                 if(r.getResponsavel_execucao().trim().length() > 0)
                 {
                     pg = new PanelGroup();
+
                     st = new StaticText();
                     st.setEscape(false);
                     st.setStyleClass("label");            
@@ -349,6 +350,29 @@ public class ViewPlano extends AbstractPageBean {
                     st.setEscape(false);
                     st.setText(r.getResponsavel_execucao().toString());
                     pg.getChildren().add(st);
+
+
+                    if(r.getPor() != null)
+                    {
+                        if(r.getPor().trim().length() > 0)
+                        {
+                            st = new StaticText();
+                            st.setEscape(false);
+                            st.setText(" ");
+                            pg.getChildren().add(st);
+
+                            st = new StaticText();
+                            st.setEscape(false);
+                            st.setStyleClass("label");
+                            st.setText("POR:  ");
+                            pg.getChildren().add(st);
+                            st = new StaticText();
+                            st.setEscape(false);
+                            st.setText(r.getPor().toString());
+                            pg.getChildren().add(st);
+                        }
+                    }
+
                     gridParecer.getChildren().add(pg);                        
                 }
             }            

trunk/PlanosActuacao/web/EditarPlano.jsp

@@ -164,7 +164,6 @@
 
                         }
                     </script>
-
                 </webuijsf:head>
                 <webuijsf:body id="body1">
                     <webuijsf:form id="form1">
@@ -260,7 +259,7 @@
                                     <br/>
                                     <br/>
                                 </f:verbatim>
-                                <webuijsf:staticText escape="false" id="staticText3" text="&amp;nbsp;AAAAAAAA"/>
+                                <webuijsf:staticText escape="false" id="staticText3" text="&amp;nbsp;"/>
                             </h:panelGrid>
                         </h:panelGrid>
                     </webuijsf:form>