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

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

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent 5fbfd34bb3
commit 73c7fe5c3b
6 changed files with 650 additions and 656 deletions
Show Stats Download Patch File Download Diff File

25
branches/SIPRP/web/contents/user.html
Unescape View File

@ -190,27 +190,30 @@
</table>
#elseif( $query == "trabalhadores_pendentes" )
<div class="icons_info">
<span><img SRC="/siprpWeb/html/images/red.png"> - Pendente</span>
<span><img SRC="/siprpWeb/html/images/yellow.png"> - Marcado</span>
<span><img SRC="/siprpWeb/html/images/green.png"> - Tratado </span>
<span><img SRC="/siprpWeb/html/images/red.png"> - Por Agendar</span>
<span><img SRC="/siprpWeb/html/images/yellow.png"> - Por Realizar</span>
</div>
<div class="info">(*)ECD - Exames Complementares de Diagn&oacute;stico</div>
<table width='98%' cellspacing='0' cellpadding='0' border="0">
<tr class="tableheader">
<td width='75%'>Nome</td>
<td class='box6' width='12%'>ECD(*)</td>
<td class='box6' width='12%'>Consulta</td>
<td class='box6' width='12%'>Tipo de Consulta</td>
</tr>
#foreach( $element in $v1 )
#set ( $counter = $velocityCount - 1 )
#set ( $dados_trabalhador = $v2.get($counter) )
#foreach ( $trabalhador in $v1 )
<tr class="elements">
<td class='box5' ><a class='text' href="$v1.get($counter)">$dados_trabalhador.Nome</a></td>
<td class='box6'><img SRC="/siprpWeb/html/images/${dados_trabalhador.Exame}.png"></td>
<td class='box6' ><img SRC="/siprpWeb/html/images/${dados_trabalhador.Consulta}.png"></td>
<td class="box5"><a href="$trabalhador.link_trabalhador" class="text">$trabalhador.nome_trabalhador</a></td>
<td class="box6">
#if ( $trabalhador.estado_consulta )
<img src="/siprpWeb/html/images/${trabalhador.estado_consulta}.png">
#else
-
#end
</td>
<td class="box6">$trabalhador.motivo_consulta</td>
</tr>
#end
</table>
#else
#foreach( $element in $v1 )
#set ( $counter = $velocityCount - 1 )

25
branches/SIPRP/web/contents/user_print.html
Unescape View File

@ -62,9 +62,23 @@
</table>
#elseif( $query == "trabalhadores_pendentes" )
<!--<IMG SRC="/siprpWeb/html/images/red.gif"> - pendente &nbsp;&nbsp;
<IMG SRC="/siprpWeb/html/images/yellow.gif"> - marcado &nbsp;&nbsp;
<IMG SRC="/siprpWeb/html/images/green.gif"> - tratado <br>-->
<table width='100%' cellspacing='0' cellpadding='0' border="0">
<tr class="tableheader">
<td width='75%'>Nome</td>
<td class='box6' width='12%'>Consulta</td>
<td class='box6' width='12%'>Tipo de Consulta</td>
</tr>
#foreach ( $trabalhador in $v1 )
<tr class="elements">
<td class="box5" align="left"><a href="$trabalhador.link_trabalhador" class="text">$trabalhador.nome_trabalhador</a></td>
<td class="box6" align="center">$trabalhador.estado_consulta_print</td>
<td class="box6" align="center">$trabalhador.motivo_consulta_print</td>
</tr>
#end
</table>
#*
<div class="info">(*)ECD - Exames Complementares de Diagn&oacute;stico</div>
<table width='100%' >
<tr class="tableheader">
@ -76,15 +90,14 @@
#set ( $counter = $velocityCount - 1 )
#set ( $dados_trabalhador = $v2.get($counter) )
<tr class="elements">
<!--<td align='left' ><a class='text' href="$v1.get($counter)">&nbsp;&nbsp;$dados_trabalhador.Nome</a></td>
<td align='center' ><IMG SRC="/siprpWeb/html/images/${dados_trabalhador.Exame}.gif"></td>
<td align='center' ><IMG SRC="/siprpWeb/html/images/${dados_trabalhador.Consulta}.gif"></td>-->
<td align='left' ><a class='text' href="$v1.get($counter)">&nbsp;&nbsp;$dados_trabalhador.Nome</a></td>
<td align='center' >$dados_trabalhador.Exame_estado</td>
<td align='center' >$dados_trabalhador.Consulta_estado</td>
</tr>
#end
</table>
*#
#end
</div>
</body>

15
branches/SIPRP/web/src/siprp/pagina/GlobalConstants.java
Unescape View File

@ -6,6 +6,8 @@
package siprp.pagina;
import java.util.Map;
/**
*
* @author fpalma
@ -34,7 +36,14 @@ public interface GlobalConstants
public static final int TIPO_MARCACAO_EXAMES = 0;
public static final int TIPO_MARCACAO_CONSULTA = 1;
public static final Integer ESTADO_POR_REALIZAR = new Integer( 0 );
public static final Integer ESTADO_PARCIALMENTE_REALIZADO = new Integer( 1 );
public static final Integer ESTADO_REALIZADO = new Integer( 2 );
public static final int ESTADO_POR_REALIZAR = 0;
public static final int ESTADO_PARCIALMENTE_REALIZADO = 1;
public static final int ESTADO_REALIZADO = 2;
public static final int ESTADO_POR_AGENDAR = 7;
public static final int MOTIVO_ADMISSAO = 1;
public static final int MOTIVO_PERIODICO = 2;
public static final int MOTIVO_OCASIONAL = 3;
public static final int MOTIVO_PERIODICO_INICIAL = 5;
}

14
branches/SIPRP/web/src/siprp/pagina/doGetListaEmpresas.java
Unescape View File

@ -11,10 +11,10 @@ import javax.servlet.http.*;
import org.apache.velocity.*;
import org.apache.velocity.app.*;
public class doGetListaEmpresas extends siprpServlet{
public class doGetListaEmpresas extends siprpServlet
{
/** Creates a new instance of doGetListaEmpresas */
public doGetListaEmpresas(HttpServletRequest req, HttpServletResponse res) throws IOException
public doGetListaEmpresas( HttpServletRequest req, HttpServletResponse res ) throws IOException
{
ServletOutputStream out = res.getOutputStream();
Connection con = null ;
@ -42,7 +42,13 @@ empresa_nome = null;
Class.forName(super.bdDriver);
con = DriverManager.getConnection( bdLocalUrl, bdLocalUsername, bdLocalPassword );
dbQuery = new StringBuffer();
dbQuery.append( "SELECT id, designacao_social, designacao_social_plain FROM empresas WHERE inactivo <> 'y' ORDER BY designacao_social_plain" );
dbQuery.append(
"SELECT id, designacao_social, designacao_social_plain " +
"FROM empresas " +
"WHERE " +
"inactivo <> 'y' " +
"AND data_cancelamento IS NULL " +
"ORDER BY designacao_social_plain" );
stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );

2
branches/SIPRP/web/src/siprp/pagina/doGetListaTrabalhadores.java
Unescape View File

@ -24,7 +24,7 @@ public class doGetListaTrabalhadores extends siprpServlet
}
public doGetListaTrabalhadores(HttpServletRequest req, HttpServletResponse res, String query) throws IOException
public doGetListaTrabalhadores(HttpServletRequest req, HttpServletResponse res, String query) throws Exception
{
boolean print = false;
if( query != null )

1189
branches/SIPRP/web/src/siprp/pagina/doGetListaTrabalhadoresPendentes.java
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save