lxbfYeaa
/
SIPRP
forked from Coded/SIPRP
0
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 15 years ago
parent 1e6867b32e
commit 143cea8170
11 changed files with 189 additions and 176 deletions
Show Stats Download Patch File Download Diff File

4
trunk/PlanosActuacao/nbproject/build-impl.xml
Unescape View File

@ -544,10 +544,11 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xercesImpl-2.7.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xml-apis-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-1.3.04.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-ext-1.3.04.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.serializer-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.serializer-2.7.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
<attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.activation.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.postgresql-8.2-506.jdbc4.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.SIPRP.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.shst.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} "/>
<attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.activation.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.postgresql-8.2-506.jdbc4.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.SIPRP.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.shst.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.serializer-2.7.0.jar} "/>
</manifest>
</target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@ -579,6 +580,7 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xml-apis-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.serializer-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">

6
trunk/PlanosActuacao/nbproject/genfiles.properties
Unescape View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=4c811ff2
build.xml.data.CRC32=7ab0589b
build.xml.script.CRC32=50b8b881
build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=4c811ff2
nbproject/build-impl.xml.script.CRC32=3b2cdd43
nbproject/build-impl.xml.data.CRC32=7ab0589b
nbproject/build-impl.xml.script.CRC32=a142f504
nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1

4
trunk/PlanosActuacao/nbproject/project.properties
Unescape View File

@ -38,6 +38,7 @@ file.reference.jdom.jar=lib/jdom.jar
file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar
file.reference.mail.jar-1=lib/mail.jar
file.reference.postgresql-8.2-506.jdbc4.jar=lib/postgresql-8.2-506.jdbc4.jar
file.reference.serializer-2.7.0.jar=lib/serializer-2.7.0.jar
file.reference.shst.jar=lib/shst.jar
file.reference.SIPRP.jar=lib/SIPRP.jar
file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar
@ -78,7 +79,8 @@ javac.classpath=\
${file.reference.xalan-2.7.0.jar}:\
${file.reference.xercesImpl-2.7.1.jar}:\
${file.reference.xml-apis-1.3.04.jar}:\
${file.reference.xml-apis-ext-1.3.04.jar}
${file.reference.xml-apis-ext-1.3.04.jar}:\
${file.reference.serializer-2.7.0.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true

4
trunk/PlanosActuacao/nbproject/project.xml
Unescape View File

@ -119,6 +119,10 @@
<file>${file.reference.xml-apis-ext-1.3.04.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.serializer-2.7.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
</web-module-libraries>
<web-module-additional-libraries>
<library>

3
trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java
Unescape View File

@ -398,7 +398,8 @@ public class RelatoriosDataProvider extends GenericDataProvider {
return nome;
}
public byte[] getLogoByEmpresa(Integer empresaId) throws Exception
public byte[] getLogoByEmpresa( Integer empresaId )
throws Exception
{
Statement st = dblocal.createStatement();
String sql = "select empresa_logo_id from empresas where id = " + empresaId;

7
trunk/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java
Unescape View File

@ -19,11 +19,13 @@ public class UtilizadoresDataProvider extends GenericDataProvider{
public Utilizador getUtilizador( Integer id ) throws Exception
{
Utilizador u = new Utilizador();
Utilizador u = null;
Statement st = createStatement();
String sql = "SELECT * FROM utilizadores WHERE id = " + id;
ResultSet rs = st.executeQuery( sql );
rs.first();
if ( rs.first() )
{
u = new Utilizador();
u.setId(new Integer(rs.getInt("id")));
u.setLogin(rs.getString("login"));
u.setPassword(rs.getString("password"));
@ -42,6 +44,7 @@ public class UtilizadoresDataProvider extends GenericDataProvider{
u.setResponsavel_loja(rs.getString("responsavel_loja"));
u.setGestor_geral(rs.getString("gestor_geral"));
u.setApagado(rs.getString("apagado"));
}
return u;
}

1
trunk/PlanosActuacao/src/java/global/Global.java
Unescape View File

@ -41,6 +41,7 @@ public class Global {
//public static final String ANALISE_ACIDENTES_URL = "http://localhost:8084/AnaliseAcidentesTrabalho/faces/"; //testes
//public static final String ANALISE_ACIDENTES_URL = "http://192.168.111.24:8084/AnaliseAcidentesTrabalho/faces/"; //testes portatil
public static final String ANALISE_ACIDENTES_URL = "https://www.siprp.pt/AnaliseAcidentesTrabalho/faces/"; //real
public static final String PLANOS_ACTUACAO_URL = "https://www.siprp.pt/PlanosActuacao/faces/";
public static final String LOGOS_FOLDER = "/resources/images";

51
trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java
Unescape View File

@ -67,7 +67,8 @@ public class MainPhaseListener implements PhaseListener{
}
}
public void beforePhase(PhaseEvent pe) {
public void beforePhase( PhaseEvent pe )
{
if ( pe.getPhaseId() == PhaseId.RENDER_RESPONSE )
{
FacesContext fc = pe.getFacesContext();
@ -84,19 +85,17 @@ public class MainPhaseListener implements PhaseListener{
String user = JSFUtils.getRequestParameter( fc, "user" );
System.out.println( "USER >" + user.toString() + "<" );
}
}
//Determin Session Time out
HttpServletRequest req = ( HttpServletRequest ) fc.getExternalContext().getRequest();
UIViewRoot view = fc.getViewRoot();
System.out.println( "SESSION VALID : " + req.isRequestedSessionIdValid() );
//if(!req.isRequestedSessionIdValid() && view.getViewId().indexOf("Login") == -1 ){
if(!req.isRequestedSessionIdValid() && referer.indexOf("AnaliseAcidentes") == -1 ){
if ( ! req.isRequestedSessionIdValid() && referer.indexOf( "AnaliseAcidentes" ) == -1 )
{
System.out.println( "VIEW ID :" + view.getViewId() );
//NavigationHandler nh = fc.getApplication().getNavigationHandler();
//nh.handleNavigation(fc, null, "login");
@ -104,8 +103,6 @@ public class MainPhaseListener implements PhaseListener{
{
//JSFUtils.logout(fc);
//JSFUtils.navigateTo(fc, "login");
try
{
//JSFUtils.redirect(fc, "http://localhost:8084/AnaliseAcidentesTrabalho/faces/Login.jsp");
JSFUtils.redirect(fc, Global.ANALISE_ACIDENTES_URL + "Login.jsp");
}
@ -113,13 +110,6 @@ public class MainPhaseListener implements PhaseListener{
{
ErrorLogger.logException( ex );
}
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
}
//Determin if user is logged in
@ -128,7 +118,8 @@ public class MainPhaseListener implements PhaseListener{
//SessionBean1 session = JSFUtils.getSessionBean(fc);
boolean loggedIn = session.isLoggedIn();
System.out.println("LOGGED IN : " + loggedIn);
if(!loggedIn && view.getViewId().indexOf("Login") == -1 ){
if ( ! loggedIn && view.getViewId().indexOf( "Login" ) == -1 )
{
NavigationHandler nh = fc.getApplication().getNavigationHandler();
nh.handleNavigation( fc, null, "login" );
}
@ -145,23 +136,25 @@ public class MainPhaseListener implements PhaseListener{
Utilizador u = null;
try
{
Integer userId = new Integer(Integer.parseInt(user_id));
try
{
Integer userId = Integer.parseInt( user_id );
// Integer userId = new Integer( Integer.parseInt( user_id ) );
UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
udp.checkConnection();
u = udp.getUtilizador( userId );
session.setCurrentUser( u );
}
catch(Exception ex1)
{
ErrorLogger.logException( ex1 );
}
}
catch ( Exception ex )
{
ErrorLogger.logException( ex );
session.setMsg( "Utilizador inv&aacute;lido." );
// try
// {
// JSFUtils.redirect( fc, Global.PLANOS_ACTUACAO_URL + "Erro.jsp" );
// }
// catch ( Exception ex1 )
// {
// ErrorLogger.logException( ex1 );
// }
// ErrorLogger.logException( ex );
}
/////////////
@ -174,7 +167,7 @@ public class MainPhaseListener implements PhaseListener{
if(sview.matches("/ViewPlano.jsp"))
{
if(u.getTipo().intValue() == Global.DIRECTOR_SIPRP)
if( u != null && u.getTipo().intValue() == Global.DIRECTOR_SIPRP )
{
//session.setDisableMenu(false);
session.setDisableMenuUtilizadores(false);
@ -201,7 +194,7 @@ public class MainPhaseListener implements PhaseListener{
session.setDisableMenu(false);
if(sview.matches("/ListaPlanos.jsp"))
{
if(u.getTipo().intValue() == Global.RH || u.getTipo().intValue() == Global.GESTOR)
if( u != null && ( u.getTipo().intValue() == Global.RH || u.getTipo().intValue() == Global.GESTOR ) )
{
session.setDisableMenuUtilizadores(true);
}
@ -211,8 +204,8 @@ public class MainPhaseListener implements PhaseListener{
//insert logos
Integer empresaId = u.getEmpresa_id();
System.out.println("LOGO EMPRESA ID B : " + empresaId.toString());
Integer empresaId = u != null ? u.getEmpresa_id() : null;
System.out.println("LOGO EMPRESA ID B : " + ( empresaId != null ? empresaId.toString() : null ) );
Logos logos = new Logos();
String logourl = logos.getLogo( fc, empresaId );
session.setLogoEmpresaUrl( logourl );

33
trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
Unescape View File

@ -401,19 +401,20 @@ public class ListaPlanos extends AbstractPageBean {
String user_id = JSFUtils.getRequestParameter(fc, "user");
String estab_gestor = JSFUtils.getRequestParameter(fc, "estab_gestor");
System.out.println("LISTA PLANOS - USER ID : " + user_id );
Utilizador u = null;
if ( user_id != null )
{
try
{
Integer userId = new Integer( Integer.parseInt( user_id ) );
try
{
UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
udp.checkConnection();
u = udp.getUtilizador( userId );
if ( u != null )
{
if ( u.getTipo().intValue() == Global.GESTOR )
{
try
@ -428,21 +429,8 @@ public class ListaPlanos extends AbstractPageBean {
}
}
getSessionBean1().setCurrentUser(u);
}
catch(Exception ex1)
{
ErrorLogger.logException( ex1 );
}
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
}
getSessionBean1().setCurrentUser( u );
u = getSessionBean1().getCurrentUser();
if(u.getTipo().intValue() == Global.DIRECTOR_SIPRP || u.getTipo().intValue() == Global.RH || u.getTipo().intValue() == Global.DIRECTOR_GERAL_RH || u.getTipo().intValue() == Global.GESTOR)
@ -472,6 +460,17 @@ public class ListaPlanos extends AbstractPageBean {
initialize();
}
else
{
getSessionBean1().setMsg( "Utilizador inv&aacute;lido." );
}
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
}
}

8
trunk/PlanosActuacao/src/java/utils/Logos.java
Unescape View File

@ -27,11 +27,14 @@ public class Logos {
public String getLogo( FacesContext fc, Integer empresaId )
{
String result = null;
try
{
//get image from db :
RelatoriosDataProvider rdp = new RelatoriosDataProvider();
byte[] logo = rdp.getLogoByEmpresa( empresaId );
if ( logo != null )
{
int len = logo.length;
ServletContext context = (ServletContext) fc.getExternalContext().getContext();
@ -43,14 +46,15 @@ public class Logos {
outImej.write(logo, 0, len);
System.out.println("LOGO PATH : " + logoFilename);
outImej.close();
return Global.LOGOS_FOLDER + "/logo_empresa" + empresaId.toString() + ".jpg";
result = Global.LOGOS_FOLDER + "/logo_empresa" + empresaId.toString() + ".jpg";
}
}
catch ( Exception ex )
{
ErrorLogger.logException( ex );
return null;
}
return result;
}
}

4
trunk/PlanosActuacao/web/WEB-INF/faces-config.xml
Unescape View File

@ -66,6 +66,10 @@
<navigation-case>
<from-outcome>ver_plano</from-outcome>
<to-view-id>/ViewPlano.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>erro</from-outcome>
<to-view-id>/Erro.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>

Write Preview
Loading…
Cancel
Save