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

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/EstatisticasProcesso.java

@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
+import javax.faces.event.ValueChangeEvent;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -328,6 +329,48 @@ public class EstatisticasProcesso extends AbstractPageBean
 		this.listEstatisticas = l;
 	}
 
+	private DropDown dropEmpresas = new DropDown();
+
+	private StaticText labelFilterEmpresa = new StaticText();
+
+	public void setLabelFilterEmpresa( StaticText labelFilterEmpresaActual )
+	{
+		this.labelFilterEmpresa = labelFilterEmpresaActual;
+	}
+
+	public StaticText getLabelFilterEmpresa()
+	{
+		return labelFilterEmpresa;
+	}
+
+	public void setDropEmpresas( DropDown dropEmpresasActuais )
+	{
+		this.dropEmpresas = dropEmpresasActuais;
+	}
+
+	public void dropEmpresas_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+			_old = event.getOldValue() != null &&
+				event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentos );
+				dropEstabelecimentos.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresas()
+	{
+		return dropEmpresas;
+	}
+
 	private boolean canAccess()
 	{
 		boolean canAccess = false;
@@ -362,6 +405,8 @@ public class EstatisticasProcesso extends AbstractPageBean
 			}
 		}
 
+		siprp = getSessionBean1().isSiprp();
+
 		formacaoSHST_none.setSelected( true );
 
 		participacaoSeguro_none.setSelected( true );
@@ -386,6 +431,18 @@ public class EstatisticasProcesso extends AbstractPageBean
 		getSessionBean1().setMsg( "" );
 	}
 
+	private Boolean siprp = Boolean.FALSE;
+
+	public Boolean getSiprp()
+	{
+		return siprp;
+	}
+
+	public void setSiprp( Boolean siprp )
+	{
+		this.siprp = siprp;
+	}
+
 	/**
 	 * <p>Callback method that is called just before rendering takes place.
 	 * This method will <strong>only</strong> be called for the page that
@@ -411,6 +468,7 @@ public class EstatisticasProcesso extends AbstractPageBean
 
 		try
 		{
+
 			EstatisticasDataProvider statsProvider = EstatisticasDataProvider.getInstance();
 			
 			Option[] causas = AnalisesDataProvider.getInstance().getCausasAcidente( true );
@@ -425,6 +483,9 @@ public class EstatisticasProcesso extends AbstractPageBean
 				dropSeccoes.setItems( seccoes );
 			}
 
+			Utils.fillEmpresas( dropEmpresas );
+			dropEmpresas.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+
 			Option[] estabelecimentos = null;
 			if (  getSessionBean1().isLoggedIn() &&  getSessionBean1().getCurrentUser() != null && 
 				 getSessionBean1().getCurrentUser().getTipo() != null )
@@ -435,8 +496,7 @@ public class EstatisticasProcesso extends AbstractPageBean
 					|| tipo == Global.TIPO_UTILIZADOR_GESTOR || tipo == Global.TIPO_UTILIZADOR_DIRECTOR_GERAL_RH
 					|| tipo == Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA )
 				{
-					estabelecimentos = statsProvider.getEstabelecimentos();
+					estabelecimentos = statsProvider.getEstabelecimentos( getSessionBean1().getCurrentUser().getEmpresa_id() );
-
 				}
 				else
 				{
@@ -591,6 +651,21 @@ public class EstatisticasProcesso extends AbstractPageBean
 			}
 		}
 
+		Integer selectedEmpresa;
+		if( dropEmpresas.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresas.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresas );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
 		Integer seccaoID = null;
 		if ( dropSeccoes.getSelected() != null )
 		{
@@ -666,6 +741,7 @@ public class EstatisticasProcesso extends AbstractPageBean
 		searchProperties.put( EstatisticasConstants.KEY_PARTICIPADO_SEGURO, participadoSeguro );
 		searchProperties.put( EstatisticasConstants.KEY_POSTO_ACIDENTADO, postoAcidentado );
 		searchProperties.put( EstatisticasConstants.KEY_OUTROS_ACIDENTADOS, outrosAcidentados );
+		searchProperties.put( EstatisticasConstants.KEY_EMPRESA, selectedEmpresa );
 
 		return searchProperties;
 	}

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormDirGerRh.java

@@ -1082,6 +1082,105 @@ public class FormDirGerRh extends AbstractPageBean
 	private static final DateFormat D_F = new SimpleDateFormat( "yyyy-MM-dd" );
 	// </editor-fold>
 
+	private DropDown dropEmpresaConc = new DropDown();
+	private DropDown dropEmpresaSeg = new DropDown();
+
+	private StaticText labelFilterEmpresaConc = new StaticText();
+	private StaticText labelFilterEmpresaSeg = new StaticText();
+
+	public void setLabelFilterEmpresaSeg( StaticText labelFilterEmpresaSeg )
+	{
+		this.labelFilterEmpresaSeg = labelFilterEmpresaSeg;
+	}
+
+	public StaticText getLabelFilterEmpresaSeg()
+	{
+		return labelFilterEmpresaSeg;
+	}
+
+	public void setDropEmpresaSeg( DropDown dropEmpresaSeg )
+	{
+		this.dropEmpresaSeg = dropEmpresaSeg;
+	}
+
+	public void dropEmpresasSeg_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old =
+				event.getOldValue() != null &&
+					event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosSeguimento );
+				dropEstabelecimentosSeguimento.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaSeg()
+	{
+		return dropEmpresaSeg;
+	}
+
+	public void setLabelFilterEmpresaConc( StaticText labelFilterEmpresaConc )
+	{
+		this.labelFilterEmpresaConc = labelFilterEmpresaConc;
+	}
+
+	public StaticText getLabelFilterEmpresaConc()
+	{
+		return labelFilterEmpresaConc;
+	}
+
+	public void setDropEmpresaConc( DropDown dropEmpresaConc )
+	{
+		this.dropEmpresaConc = dropEmpresaConc;
+	}
+
+	public void dropEmpresasConc_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old = event.getOldValue() != null &&
+				event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosConcluidos );
+				dropEstabelecimentosConcluidos.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaConc()
+	{
+		return dropEmpresaConc;
+	}
+
+	private Boolean siprp = Boolean.FALSE;
+
+	public Boolean getSiprp()
+	{
+		return siprp;
+	}
+
+	public void setSiprp( Boolean siprp )
+	{
+		this.siprp = siprp;
+	}
+
 	/**
 	 * <p>Construct a new Page bean instance.</p>
 	 */
@@ -1121,6 +1220,7 @@ public class FormDirGerRh extends AbstractPageBean
 			}
 		}
 
+		siprp = getSessionBean1().isSiprp();
 
 		// <editor-fold defaultstate="collapsed" desc="Managed Component Initialization">
 		// Initialize automatically managed components
@@ -1173,7 +1273,7 @@ public class FormDirGerRh extends AbstractPageBean
 		{
 			table2.setRendered( true );
 
-			ArrayList concluidasList = AnalisesDataProvider.getInstance().getAnalisesConcluidasList( null, fromYear );
+			ArrayList concluidasList = AnalisesDataProvider.getInstance().getAnalisesConcluidasList( null, null, fromYear );
 			getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList );
 		}
 		catch ( Exception ex )
@@ -1204,11 +1304,19 @@ public class FormDirGerRh extends AbstractPageBean
 			|| dropCurrentYear.getItems() == null )
 		{
 			fillCurrentYearDrop();
-			Utils.fillEstabelecimentos( dropEstabelecimentosSeguimento, dropEstabelecimentosConcluidos );
+
+			Utils.fillEmpresas( dropEmpresaConc, dropEmpresaSeg );
+			Utils.fillEstabelecimentos( getSessionBean1().getCurrentUser().getEmpresa_id(),
+				dropEstabelecimentosConcluidos, dropEstabelecimentosSeguimento );
+
+			dropEmpresaConc.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+			dropEmpresaSeg.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+
 			fillInitialForm();
 
 			fillAnoDropDown();
 		}
+
 	}
 
 	/**
@@ -1439,14 +1547,37 @@ public class FormDirGerRh extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		Integer selectedEmpresa;
+		if( dropEmpresaConc.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaConc.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaConc );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosConcluidos.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosConcluidos.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			//getSessionBean1().getAnalisesConcluidasDataProvider().setList(new ArrayList());
-			ArrayList concluidasList = adp.searchAnalisesConcluidasList(
+			ArrayList concluidasList = adp.searchAnalisesConcluidasList( selectedEmpresa,
 				null, ano, mes, dia, por, nome, estabelecimentoID, getSelectedYear() );
 
 			table2.setRendered( true );
@@ -1667,13 +1798,36 @@ public class FormDirGerRh extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		Integer selectedEmpresa;
+		if( dropEmpresaSeg.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaSeg.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaSeg );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosSeguimento.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosSeguimento.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
-			ArrayList seguimentoList = adp.searchAnalisesSeguimentoDirGerRh(
+			ArrayList seguimentoList = adp.searchAnalisesSeguimentoDirGerRh( selectedEmpresa,
 				nome, estabelecimentoID, visitaDateStr, POR, getSelectedYear() );
 
 			table1.setRendered( true );

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormDirSiprp.java

@@ -1170,6 +1170,7 @@ public class FormDirSiprp extends AbstractPageBean
 			log( "FormDirSiprp Initialization Failure", e );
 			throw e instanceof FacesException ? ( FacesException ) e : new FacesException( e );
 		}
+		siprp = getSessionBean1().isSiprp();
 	}
 
 	@Override
@@ -1202,7 +1203,7 @@ public class FormDirSiprp extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 			table3.setRendered( true );
 
-			ArrayList concluidasList = adp.getAnalisesConcluidasList( null, fromYear );
+			ArrayList concluidasList = adp.getAnalisesConcluidasList( null, null, fromYear );
 			getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList );
 		}
 		catch ( Exception ex )
@@ -1228,11 +1229,19 @@ public class FormDirSiprp extends AbstractPageBean
 			|| dropCurrentYear.getItems() == null )
 		{
 			fillCurrentYearDrop();
-			Utils.fillEstabelecimentos( dropEstabelecimentosSeguimento, dropEstabelecimentosConcluidos );
+
+			Utils.fillEmpresas( dropEmpresaConc, dropEmpresaSeg );
+			Utils.fillEstabelecimentos( getSessionBean1().getCurrentUser().getEmpresa_id(),
+				dropEstabelecimentosConcluidos, dropEstabelecimentosSeguimento );
+
+			dropEmpresaConc.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+			dropEmpresaSeg.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+
 			fillInitialForm();
 
 			fillAnoDropDown();
 		}
+
 		//Column para desactivar plano - mostra se o utilizador for DIRECTOR SIPRP
 		int uType = currentUser == null ? -1 : currentUser.getTipo().intValue();
 		boolean renderOrNot = uType == Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP;
@@ -1478,13 +1487,36 @@ public class FormDirSiprp extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		Integer selectedEmpresa;
+		if( dropEmpresaConc.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaConc.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaConc );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosConcluidos.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosConcluidos.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
-			ArrayList concluidasList = adp.searchAnalisesConcluidasList(
+			ArrayList concluidasList = adp.searchAnalisesConcluidasList( selectedEmpresa,
 				null, ano, mes, dia, por, nome, estabelecimentoID, getSelectedYear() );
 
 			table3.setRendered( true );
@@ -1711,13 +1743,36 @@ public class FormDirSiprp extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		Integer selectedEmpresa;
+		if( dropEmpresaSeg.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaSeg.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaSeg );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosSeguimento.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosSeguimento.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
-			ArrayList seguimentoList = adp.searchAnalisesSeguimentoDirSiprp(
+			ArrayList seguimentoList = adp.searchAnalisesSeguimentoDirSiprp( selectedEmpresa,
 				nome, estabelecimentoID, visitaDateStr, POR, getSelectedYear() );
 
 			table2.setRendered( true );
@@ -1791,5 +1846,106 @@ public class FormDirSiprp extends AbstractPageBean
 
 		dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() );
 	}
+
+
+	private DropDown dropEmpresaConc = new DropDown();
+	private DropDown dropEmpresaSeg = new DropDown();
+
+	private StaticText labelFilterEmpresaConc = new StaticText();
+	private StaticText labelFilterEmpresaSeg = new StaticText();
+
+	public void setLabelFilterEmpresaSeg( StaticText labelFilterEmpresaSeg )
+	{
+		this.labelFilterEmpresaSeg = labelFilterEmpresaSeg;
+	}
+
+	public StaticText getLabelFilterEmpresaSeg()
+	{
+		return labelFilterEmpresaSeg;
+	}
+
+	public void setDropEmpresaSeg( DropDown dropEmpresaSeg )
+	{
+		this.dropEmpresaSeg = dropEmpresaSeg;
+	}
+
+	public void dropEmpresasSeg_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old =
+				event.getOldValue() != null &&
+					event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosSeguimento );
+				dropEstabelecimentosSeguimento.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaSeg()
+	{
+		return dropEmpresaSeg;
+	}
+
+	public void setLabelFilterEmpresaConc( StaticText labelFilterEmpresaConc )
+	{
+		this.labelFilterEmpresaConc = labelFilterEmpresaConc;
+	}
+
+	public StaticText getLabelFilterEmpresaConc()
+	{
+		return labelFilterEmpresaConc;
+	}
+
+	public void setDropEmpresaConc( DropDown dropEmpresaConc )
+	{
+		this.dropEmpresaConc = dropEmpresaConc;
+	}
+
+	public void dropEmpresasConc_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old = event.getOldValue() != null &&
+				event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosConcluidos );
+				dropEstabelecimentosConcluidos.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaConc()
+	{
+		return dropEmpresaConc;
+	}
+
+	private Boolean siprp = Boolean.FALSE;
+
+	public Boolean getSiprp()
+	{
+		return siprp;
+	}
+
+	public void setSiprp( Boolean siprp )
+	{
+		this.siprp = siprp;
+	}
+
 }
 

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormGestor.java

@@ -1117,6 +1117,8 @@ public class FormGestor extends AbstractPageBean
 			}
 		}
 
+		siprp = getSessionBean1().isSiprp();
+
 
 		// <editor-fold defaultstate="collapsed" desc="Managed Component Initialization">
 		// Initialize automatically managed components
@@ -1166,20 +1168,23 @@ public class FormGestor extends AbstractPageBean
 				estabelecimento_id = curUser.getEstabelecimento_gestor();
 				if ( estabelecimento_id == null || estabelecimento_id.intValue() == 0 )
 				{
-					seguimentoList = adp.getAnalisesSeguimentoGestorList( null, fromYear );
+					seguimentoList = adp.getAnalisesSeguimentoGestorList( null, null, fromYear );
 				}
 				else
 				{
-					seguimentoList = adp.getAnalisesSeguimentoGestorList( curUser.getEstabelecimento_id(), fromYear );
+					seguimentoList = adp.getAnalisesSeguimentoGestorList(
+						getSessionBean1().getCurrentUser().getEmpresa_id(),
+						curUser.getEstabelecimento_id(), fromYear );
 				}
 			}
 			else if ( curUser.getGestor_geral().matches( "y" ) || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA )
 			{
-				seguimentoList = adp.getAnalisesSeguimentoGestorList( null, fromYear );
+				seguimentoList = adp.getAnalisesSeguimentoGestorList( null, null, fromYear );
 			}
 			else if ( curUser.getGestor_geral().matches( "n" ) || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_LOJA )
 			{
-				seguimentoList = adp.getAnalisesSeguimentoGestorList( curUser.getEstabelecimento_id(), fromYear );
+				seguimentoList = adp.getAnalisesSeguimentoGestorList(
+					getSessionBean1().getCurrentUser().getEmpresa_id(), curUser.getEstabelecimento_id(), fromYear );
 			}
 			getSessionBean1().getAnalisesSeguimentoDataProvider().setList( seguimentoList );
 		}
@@ -1201,11 +1206,13 @@ public class FormGestor extends AbstractPageBean
 				|| ( curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_GESTOR && ( estabelecimento_gestor_id == null || estabelecimento_gestor_id.intValue() == 0 ) )
 				/*|| curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_LOJA*/ )
 			{
-				concluidasList = adp.getAnalisesConcluidasList( null, fromYear );
+				concluidasList = adp.getAnalisesConcluidasList( getSessionBean1().getCurrentUser().getEmpresa_id(), null, fromYear );
 			}
 			else
 			{
-				concluidasList = adp.getAnalisesConcluidasList( estabelecimento_id, fromYear );
+				concluidasList = adp.getAnalisesConcluidasList(
+					getSessionBean1().getCurrentUser().getEmpresa_id(),
+					estabelecimento_id, fromYear );
 			}
 			getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList );
 		}
@@ -1250,7 +1257,14 @@ public class FormGestor extends AbstractPageBean
 			|| dropCurrentYear.getItems() == null  )
 		{
 			fillCurrentYearDrop();
-			Utils.fillEstabelecimentos( dropEstabelecimentosSeguimento, dropEstabelecimentosConcluidos );
+
+			Utils.fillEmpresas( dropEmpresaConc, dropEmpresaSeg );
+			Utils.fillEstabelecimentos( getSessionBean1().getCurrentUser().getEmpresa_id(),
+				dropEstabelecimentosConcluidos, dropEstabelecimentosSeguimento );
+
+			dropEmpresaConc.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+			dropEmpresaSeg.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+
 			fillInitialForm();
 			fillAnoDropDown();
 		}
@@ -1505,7 +1519,30 @@ public class FormGestor extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		Integer selectedEmpresa;
+		if( dropEmpresaConc.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaConc.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaConc );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosConcluidos.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosConcluidos.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		}
 
 		try
 		{
@@ -1516,12 +1553,13 @@ public class FormGestor extends AbstractPageBean
 			ArrayList concluidasList = null;
 			if ( getSessionBean1().getCurrentUser().getGestor_geral().matches( "y" ) )
 			{
-				concluidasList = adp.searchAnalisesConcluidasList(
+				concluidasList = adp.searchAnalisesConcluidasList( selectedEmpresa,
 					null, ano, mes, dia, por, nome, estabelecimentoID, fromYear );
 			}
 			else
 			{
 				concluidasList = adp.searchAnalisesConcluidasList(
+					selectedEmpresa,
 					getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 					ano, mes, dia, por, nome, null, fromYear );
 			}
@@ -1722,7 +1760,30 @@ public class FormGestor extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		Integer selectedEmpresa;
+		if( dropEmpresaSeg.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaSeg.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaSeg );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosSeguimento.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosSeguimento.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		}
 
 		try
 		{
@@ -1738,20 +1799,27 @@ public class FormGestor extends AbstractPageBean
 				estabelecimento_id = curUser.getEstabelecimento_gestor();
 				if ( estabelecimento_id.intValue() == 0 )
 				{
-					seguimentoList = adp.searchAnalisesSeguimentoGestor( null, nome, estabelecimentoID, visitaDateStr, POR, fromYear );
+					seguimentoList = adp.searchAnalisesSeguimentoGestor(
+						selectedEmpresa,
+						null, nome, estabelecimentoID, visitaDateStr, POR, fromYear );
 				}
 				else
 				{
-					seguimentoList = adp.searchAnalisesSeguimentoGestor( curUser.getEstabelecimento_id(), nome, estabelecimentoID, visitaDateStr, POR, fromYear );
+					seguimentoList = adp.searchAnalisesSeguimentoGestor(
+						selectedEmpresa,
+						curUser.getEstabelecimento_id(), nome, estabelecimentoID, visitaDateStr, POR, fromYear );
 				}
 			}
 			else if ( curUser.getGestor_geral().matches( "y" ) || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA )
 			{
-				seguimentoList = adp.searchAnalisesSeguimentoGestor( null, nome, estabelecimentoID, visitaDateStr, POR, fromYear );
+				seguimentoList = adp.searchAnalisesSeguimentoGestor(
+					null, null, nome, estabelecimentoID, visitaDateStr, POR, fromYear );
 			}
 			else if ( curUser.getGestor_geral().matches( "n" ) || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_LOJA )
 			{
-				seguimentoList = adp.searchAnalisesSeguimentoGestor( curUser.getEstabelecimento_id(), nome, estabelecimentoID, visitaDateStr, POR, fromYear );
+				seguimentoList = adp.searchAnalisesSeguimentoGestor(
+					getSessionBean1().getCurrentUser().getEmpresa_id(),
+					curUser.getEstabelecimento_id(), nome, estabelecimentoID, visitaDateStr, POR, fromYear );
 			}
 
 			table1.setRendered( true );
@@ -1809,5 +1877,105 @@ public class FormGestor extends AbstractPageBean
 
 		dropCurrentYear.setSelected( selectedYear != null ? selectedYear : Utils.getDefaultSelectedYear() );
 	}
+
+	private DropDown dropEmpresaConc = new DropDown();
+	private DropDown dropEmpresaSeg = new DropDown();
+
+	private StaticText labelFilterEmpresaConc = new StaticText();
+	private StaticText labelFilterEmpresaSeg = new StaticText();
+
+	public void setLabelFilterEmpresaSeg( StaticText labelFilterEmpresaSeg )
+	{
+		this.labelFilterEmpresaSeg = labelFilterEmpresaSeg;
+	}
+
+	public StaticText getLabelFilterEmpresaSeg()
+	{
+		return labelFilterEmpresaSeg;
+	}
+
+	public void setDropEmpresaSeg( DropDown dropEmpresaSeg )
+	{
+		this.dropEmpresaSeg = dropEmpresaSeg;
+	}
+
+	public void dropEmpresasSeg_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old =
+				event.getOldValue() != null &&
+					event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosSeguimento );
+				dropEstabelecimentosSeguimento.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaSeg()
+	{
+		return dropEmpresaSeg;
+	}
+
+	public void setLabelFilterEmpresaConc( StaticText labelFilterEmpresaConc )
+	{
+		this.labelFilterEmpresaConc = labelFilterEmpresaConc;
+	}
+
+	public StaticText getLabelFilterEmpresaConc()
+	{
+		return labelFilterEmpresaConc;
+	}
+
+	public void setDropEmpresaConc( DropDown dropEmpresaConc )
+	{
+		this.dropEmpresaConc = dropEmpresaConc;
+	}
+
+	public void dropEmpresasConc_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old = event.getOldValue() != null &&
+				event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosConcluidos );
+				dropEstabelecimentosConcluidos.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaConc()
+	{
+		return dropEmpresaConc;
+	}
+
+	private Boolean siprp = Boolean.FALSE;
+
+	public Boolean getSiprp()
+	{
+		return siprp;
+	}
+
+	public void setSiprp( Boolean siprp )
+	{
+		this.siprp = siprp;
+	}
+
 }
 

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormHS.java

@@ -54,10 +54,16 @@ import utils.Utils;
  */
 public class FormHS extends AbstractPageBean
 {
-	// <editor-fold defaultstate="collapsed" desc="Managed Component Definition">
-
 	private int __placeholder;
 
+	private DropDown dropEmpresaConc = new DropDown();
+	private DropDown dropEmpresaSeg = new DropDown();
+	private DropDown dropEmpresasActuais = new DropDown();
+
+	private StaticText labelFilterEmpresaActual = new StaticText();
+	private StaticText labelFilterEmpresaConc = new StaticText();
+	private StaticText labelFilterEmpresaSeg = new StaticText();
+
 	/**
 	 * <p>Automatically managed component initialization.  <strong>WARNING:</strong>
 	 * This method is automatically generated, so any user-specified code inserted
@@ -1428,6 +1434,8 @@ public class FormHS extends AbstractPageBean
 				// . . .  handle exception . . .
 			}
 		}
+
+		siprp = getSessionBean1().isSiprp();
 	}
 
 	/**
@@ -1450,6 +1458,7 @@ public class FormHS extends AbstractPageBean
 		{
 			getSessionBean1().getAnalisesActualDataProvider().setList( null );
 			ArrayList actuaisList = AnalisesDataProvider.getInstance().getAnalisesActuaisHsList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear );
 			getSessionBean1().getAnalisesActualDataProvider().setList( actuaisList );
 			table1.setRendered( true );
@@ -1464,6 +1473,7 @@ public class FormHS extends AbstractPageBean
 		{
 			getSessionBean1().getAnalisesSeguimentoDataProvider().setList( null );
 			ArrayList seguimentoList = AnalisesDataProvider.getInstance().getAnalisesSeguimentoHsList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear );
 			getSessionBean1().getAnalisesSeguimentoDataProvider().setList( seguimentoList );
 			table2.setRendered( true );
@@ -1486,6 +1496,7 @@ public class FormHS extends AbstractPageBean
 			table3.setRendered( false );
 			ErrorLogger.logException( ex );
 		}
+
 	}
 
 	/**
@@ -1506,13 +1517,21 @@ public class FormHS extends AbstractPageBean
 		String referer = request.getRequestURI();
 		String pageFrom = Utils.getPageFrom( referer );
 		System.out.println( "PAGE FROM : " + pageFrom );
+
 		if ( ! pageFrom.matches( "FormHS.jsp" ) || getSessionBean1().isFromAnaliseDeletion()
 			|| dropCurrentYear.getItems() == null  )
 		{
 			fillCurrentYearDrop();
-			Utils.fillEstabelecimentos( dropEstabelecimentosActuais, dropEstabelecimentosSeguimento, dropEstabelecimentosConcluidos );
-			fillInitialForm();
 
+			Utils.fillEmpresas( dropEmpresaConc, dropEmpresasActuais, dropEmpresaSeg );
+			Utils.fillEstabelecimentos( getSessionBean1().getCurrentUser().getEmpresa_id(),
+				dropEstabelecimentosConcluidos, dropEstabelecimentosActuais, dropEstabelecimentosSeguimento );
+
+			dropEmpresaConc.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+			dropEmpresasActuais.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+			dropEmpresaSeg.setSelected( getSessionBean1().getCurrentUser().getEmpresa_id() );
+
+			fillInitialForm();
 			fillAnoDropDown();
 		}
 
@@ -1725,14 +1744,37 @@ public class FormHS extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		Integer selectedEmpresa;
+		if( dropEmpresaConc.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaConc.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaConc );
+		}
 
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosConcluidos.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosConcluidos.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosConcluidos );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList concluidasList = adp.searchAnalisesConcluidasList(
+				selectedEmpresa,
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				ano, mes, dia, por, nome, estabelecimentoID, getSelectedYear() );
 
@@ -1970,14 +2012,37 @@ public class FormHS extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosActuais );
+		Integer selectedEmpresa;
+		if( dropEmpresasActuais.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresasActuais.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresasActuais );
+		}
 
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosActuais.getSelected() instanceof Integer )
+		{
+			estabelecimentoID = ( Integer ) dropEstabelecimentosActuais.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosActuais );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList actualList = adp.searchAnalisesActuaisHS(
+				selectedEmpresa,
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, estabelecimentoID, visitaDateStr, POR, getSelectedYear() );
 
@@ -2036,13 +2101,37 @@ public class FormHS extends AbstractPageBean
 //				estabelecimento = null;
 //			}
 //		}
-		Integer estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		Integer selectedEmpresa;
+		if( dropEmpresaSeg.getSelected() instanceof Integer )
+		{
+			selectedEmpresa = ( Integer ) dropEmpresaSeg.getSelected();
+		}
+		else
+		{
+			selectedEmpresa = Utils.getSelectedID( dropEmpresaSeg );
+		}
+
+		if( selectedEmpresa == null )
+		{
+			selectedEmpresa = getSessionBean1().getCurrentUser().getEmpresa_id();
+		}
+
+		Integer estabelecimentoID;
+		if( dropEstabelecimentosSeguimento.getSelected() instanceof Integer )
+		{
+				estabelecimentoID = ( Integer ) dropEstabelecimentosSeguimento.getSelected();
+		}
+		else
+		{
+			estabelecimentoID = Utils.getSelectedID( dropEstabelecimentosSeguimento );
+		}
 
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList seguimentoList = adp.searchAnalisesSeguimentoHS(
+				selectedEmpresa,
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, estabelecimentoID, visitaDateStr, POR, getSelectedYear() );
 
@@ -2100,5 +2189,136 @@ public class FormHS extends AbstractPageBean
 			}
 		}
 	}
+
+	public void setLabelFilterEmpresaActual( StaticText labelFilterEmpresaActual )
+	{
+		this.labelFilterEmpresaActual = labelFilterEmpresaActual;
+	}
+
+	public StaticText getLabelFilterEmpresaActual()
+	{
+		return labelFilterEmpresaActual;
+	}
+
+	public void setDropEmpresasActuais( DropDown dropEmpresasActuais )
+	{
+		this.dropEmpresasActuais = dropEmpresasActuais;
+	}
+
+	public void dropEmpresasActuais_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+			_old = event.getOldValue() != null &&
+				event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosActuais );
+				dropEstabelecimentosActuais.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresasActuais()
+	{
+		return dropEmpresasActuais;
+	}
+
+	public void setLabelFilterEmpresaSeg( StaticText labelFilterEmpresaSeg )
+	{
+		this.labelFilterEmpresaSeg = labelFilterEmpresaSeg;
+	}
+
+	public StaticText getLabelFilterEmpresaSeg()
+	{
+		return labelFilterEmpresaSeg;
+	}
+
+	public void setDropEmpresaSeg( DropDown dropEmpresaSeg )
+	{
+		this.dropEmpresaSeg = dropEmpresaSeg;
+	}
+
+	public void dropEmpresasSeg_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old =
+				event.getOldValue() != null &&
+					event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosSeguimento );
+				dropEstabelecimentosSeguimento.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaSeg()
+	{
+		return dropEmpresaSeg;
+	}
+
+	public void setLabelFilterEmpresaConc( StaticText labelFilterEmpresaConc )
+	{
+		this.labelFilterEmpresaConc = labelFilterEmpresaConc;
+	}
+
+	public StaticText getLabelFilterEmpresaConc()
+	{
+		return labelFilterEmpresaConc;
+	}
+
+	public void setDropEmpresaConc( DropDown dropEmpresaConc )
+	{
+		this.dropEmpresaConc = dropEmpresaConc;
+	}
+
+	public void dropEmpresasConc_valueChangeListener( ValueChangeEvent event )
+	{
+		Integer _old;
+		Integer _new;
+
+		if( event.getNewValue() != null && event.getNewValue() instanceof Integer )
+		{
+			_new = ( Integer ) event.getNewValue();
+
+			_old = event.getOldValue() != null &&
+					event.getOldValue() instanceof Integer ? ( Integer ) event.getOldValue() : null;
+
+			if( _old == null || !_new.equals( _old ) )
+			{
+				Utils.fillEstabelecimentos( _new, dropEstabelecimentosConcluidos );
+				dropEstabelecimentosConcluidos.setSelected( null );
+			}
+		}
+	}
+
+	public DropDown getDropEmpresaConc()
+	{
+		return dropEmpresaConc;
+	}
+
+	private Boolean siprp = Boolean.FALSE;
+
+	public Boolean getSiprp()
+	{
+		return siprp;
+	}
+
+	public void setSiprp( Boolean siprp )
+	{
+		this.siprp = siprp;
+	}
 }
 

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormMedico.java

@@ -1438,6 +1438,7 @@ public class FormMedico extends AbstractPageBean
 			table2.setRendered( true );
 
 			ArrayList seguimentoList = adp.getAnalisesSeguimentoMedList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear );
 			getSessionBean1().getAnalisesSeguimentoDataProvider().setList( seguimentoList );
 		}
@@ -1453,6 +1454,7 @@ public class FormMedico extends AbstractPageBean
 			table3.setRendered( true );
 
 			ArrayList concluidasList = adp.getAnalisesConcluidasList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear );
 			getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList );
 		}
@@ -1715,6 +1717,7 @@ public class FormMedico extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList concluidasList = adp.searchAnalisesConcluidasList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				ano, mes, dia, por, nome, null, getSelectedYear() );
 
@@ -1966,6 +1969,7 @@ public class FormMedico extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList seguimentoList = adp.searchAnalisesSeguimentoMedico(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, visitaDateStr, POR, getSelectedYear() );
 

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormRH.java

@@ -1469,6 +1469,7 @@ public class FormRH extends AbstractPageBean
 			table1.setRendered( true );
 
 			ArrayList actuaisList = adp.getAnalisesActuaisRhList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), responsavel_loja, fromYear );
 			getSessionBean1().getAnalisesActualDataProvider().setList( actuaisList );
 		}
@@ -1484,6 +1485,7 @@ public class FormRH extends AbstractPageBean
 			table2.setRendered( true );
 
 			ArrayList seguimentoList = adp.getAnalisesSeguimentoRhList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), responsavel_loja, fromYear );
 			getSessionBean1().getAnalisesSeguimentoDataProvider().setList( seguimentoList );
 		}
@@ -1499,6 +1501,7 @@ public class FormRH extends AbstractPageBean
 			table3.setRendered( true );
 
 			ArrayList concluidasList = adp.getAnalisesConcluidasList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear );
 			getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList );
 		}
@@ -1786,6 +1789,7 @@ public class FormRH extends AbstractPageBean
 
 			//getSessionBean1().getAnalisesConcluidasDataProvider().setList(new ArrayList());
 			ArrayList concluidasList = adp.searchAnalisesConcluidasList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				ano, mes, dia, por, nome, null, getSelectedYear() );
 
@@ -2107,6 +2111,7 @@ public class FormRH extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList actualList = adp.searchAnalisesActualRH(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, visitaDateStr, POR,
 				getSessionBean1().getCurrentUser().getResponsavel_loja(), getSelectedYear() );
@@ -2161,6 +2166,7 @@ public class FormRH extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList seguimentoList = adp.searchAnalisesSeguimentoRH(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, visitaDateStr, POR,
 				getSessionBean1().getCurrentUser().getResponsavel_loja(), getSelectedYear() );

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/FormSeguranca.java

@@ -1506,6 +1506,7 @@ public class FormSeguranca extends AbstractPageBean
 			table1.setRendered( true );
 
 			ArrayList actuaisList = adp.getAnalisesActuaisSegList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), responsavel_loja, fromYear );
 			getSessionBean1().getAnalisesActualDataProvider().setList( actuaisList );
 		}
@@ -1521,6 +1522,7 @@ public class FormSeguranca extends AbstractPageBean
 			table2.setRendered( true );
 
 			ArrayList seguimentoList = adp.getAnalisesSeguimentoSegList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), responsavel_loja, fromYear );
 			getSessionBean1().getAnalisesSeguimentoDataProvider().setList( seguimentoList );
 		}
@@ -1536,6 +1538,7 @@ public class FormSeguranca extends AbstractPageBean
 			table3.setRendered( true );
 
 			ArrayList concluidasList = adp.getAnalisesConcluidasList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear );
 			getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList );
 		}
@@ -1834,6 +1837,7 @@ public class FormSeguranca extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList actualList = adp.searchAnalisesActualSeg(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, visitaDateStr, POR,
 				getSessionBean1().getCurrentUser().getResponsavel_loja(), getSelectedYear() );
@@ -1888,6 +1892,7 @@ public class FormSeguranca extends AbstractPageBean
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 
 			ArrayList seguimentoList = adp.searchAnalisesSeguimentoSeg(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				nome, visitaDateStr, POR,
 				getSessionBean1().getCurrentUser().getResponsavel_loja(), getSelectedYear() );
@@ -1967,6 +1972,7 @@ public class FormSeguranca extends AbstractPageBean
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 			ArrayList concluidasList = adp.searchAnalisesConcluidasList(
+				getSessionBean1().getCurrentUser().getEmpresa_id(),
 				getSessionBean1().getCurrentUser().getEstabelecimento_id(),
 				ano, mes, dia, por, nome, null, getSelectedYear() );
 

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/Login.java

@@ -23,11 +23,13 @@ import com.sun.rave.web.ui.component.TextField;
 import com.sun.rave.web.ui.model.Option;
 import db.providers.AnalisesDataProvider;
 import db.providers.UtilizadoresDataProvider;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+
 import utils.Utils;
 
 /**
@@ -47,206 +49,246 @@ public class Login extends AbstractPageBean
 	 * This method is automatically generated, so any user-specified code inserted
 	 * here is subject to being replaced.</p>
 	 */
-    private void _init() throws Exception {
+	private void _init() throws Exception
+	{
 	}
 
 	private Page page1 = new Page();
 
-    public Page getPage1() {
+	public Page getPage1()
+	{
 		return page1;
 	}
 
-    public void setPage1(Page p) {
+	public void setPage1( Page p )
+	{
 		this.page1 = p;
 	}
 
 	private Html html1 = new Html();
 
-    public Html getHtml1() {
+	public Html getHtml1()
+	{
 		return html1;
 	}
 
-    public void setHtml1(Html h) {
+	public void setHtml1( Html h )
+	{
 		this.html1 = h;
 	}
 
 	private Head head1 = new Head();
 
-    public Head getHead1() {
+	public Head getHead1()
+	{
 		return head1;
 	}
 
-    public void setHead1(Head h) {
+	public void setHead1( Head h )
+	{
 		this.head1 = h;
 	}
 
 	private Link link1 = new Link();
 
-    public Link getLink1() {
+	public Link getLink1()
+	{
 		return link1;
 	}
 
-    public void setLink1(Link l) {
+	public void setLink1( Link l )
+	{
 		this.link1 = l;
 	}
 
 	private Body body1 = new Body();
 
-    public Body getBody1() {
+	public Body getBody1()
+	{
 		return body1;
 	}
 
-    public void setBody1(Body b) {
+	public void setBody1( Body b )
+	{
 		this.body1 = b;
 	}
 
 	private Form form1 = new Form();
 
-    public Form getForm1() {
+	public Form getForm1()
+	{
 		return form1;
 	}
 
-    public void setForm1(Form f) {
+	public void setForm1( Form f )
+	{
 		this.form1 = f;
 	}
 
 	private HtmlPanelGrid gridPanel6 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel6() {
+	public HtmlPanelGrid getGridPanel6()
+	{
 		return gridPanel6;
 	}
 
-    public void setGridPanel6(HtmlPanelGrid hpg) {
+	public void setGridPanel6( HtmlPanelGrid hpg )
+	{
 		this.gridPanel6 = hpg;
 	}
 
 	private HtmlPanelGrid gridPanel1 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel1() {
+	public HtmlPanelGrid getGridPanel1()
+	{
 		return gridPanel1;
 	}
 
-    public void setGridPanel1(HtmlPanelGrid hpg) {
+	public void setGridPanel1( HtmlPanelGrid hpg )
+	{
 		this.gridPanel1 = hpg;
 	}
 
 	private HtmlPanelGrid gridPanel2 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel2() {
+	public HtmlPanelGrid getGridPanel2()
+	{
 		return gridPanel2;
 	}
 
-    public void setGridPanel2(HtmlPanelGrid hpg) {
+	public void setGridPanel2( HtmlPanelGrid hpg )
+	{
 		this.gridPanel2 = hpg;
 	}
 
 	private HtmlPanelGrid gridPanel3 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel3() {
+	public HtmlPanelGrid getGridPanel3()
+	{
 		return gridPanel3;
 	}
 
-    public void setGridPanel3(HtmlPanelGrid hpg) {
+	public void setGridPanel3( HtmlPanelGrid hpg )
+	{
 		this.gridPanel3 = hpg;
 	}
 
 	private HtmlPanelGrid gridPanel4 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel4() {
+	public HtmlPanelGrid getGridPanel4()
+	{
 		return gridPanel4;
 	}
 
-    public void setGridPanel4(HtmlPanelGrid hpg) {
+	public void setGridPanel4( HtmlPanelGrid hpg )
+	{
 		this.gridPanel4 = hpg;
 	}
 
 	private StaticText staticText1 = new StaticText();
 
-    public StaticText getStaticText1() {
+	public StaticText getStaticText1()
+	{
 		return staticText1;
 	}
 
-    public void setStaticText1(StaticText st) {
+	public void setStaticText1( StaticText st )
+	{
 		this.staticText1 = st;
 	}
 
 	private TextField txtUtilizador = new TextField();
 
-    public TextField getTxtUtilizador() {
+	public TextField getTxtUtilizador()
+	{
 		return txtUtilizador;
 	}
 
-    public void setTxtUtilizador(TextField tf) {
+	public void setTxtUtilizador( TextField tf )
+	{
 		this.txtUtilizador = tf;
 	}
 
 	private StaticText staticText2 = new StaticText();
 
-    public StaticText getStaticText2() {
+	public StaticText getStaticText2()
+	{
 		return staticText2;
 	}
 
-    public void setStaticText2(StaticText st) {
+	public void setStaticText2( StaticText st )
+	{
 		this.staticText2 = st;
 	}
 
 	private PasswordField txtPassword = new PasswordField();
 
-    public PasswordField getTxtPassword() {
+	public PasswordField getTxtPassword()
+	{
 		return txtPassword;
 	}
 
-    public void setTxtPassword(PasswordField pf) {
+	public void setTxtPassword( PasswordField pf )
+	{
 		this.txtPassword = pf;
 	}
 
 	private HtmlPanelGrid gridPanel5 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel5() {
+	public HtmlPanelGrid getGridPanel5()
+	{
 		return gridPanel5;
 	}
 
-    public void setGridPanel5(HtmlPanelGrid hpg) {
+	public void setGridPanel5( HtmlPanelGrid hpg )
+	{
 		this.gridPanel5 = hpg;
 	}
 
 	private Hyperlink lnkPassRecovery = new Hyperlink();
 
-    public Hyperlink getLnkPassRecovery() {
+	public Hyperlink getLnkPassRecovery()
+	{
 		return lnkPassRecovery;
 	}
 
-    public void setLnkPassRecovery(Hyperlink h) {
+	public void setLnkPassRecovery( Hyperlink h )
+	{
 		this.lnkPassRecovery = h;
 	}
 
 	private Button butLogin = new Button();
 
-    public Button getButLogin() {
+	public Button getButLogin()
+	{
 		return butLogin;
 	}
 
-    public void setButLogin(Button b) {
+	public void setButLogin( Button b )
+	{
 		this.butLogin = b;
 	}
 
 	private StaticText txtMsg = new StaticText();
 
-    public StaticText getTxtMsg() {
+	public StaticText getTxtMsg()
+	{
 		return txtMsg;
 	}
 
-    public void setTxtMsg(StaticText st) {
+	public void setTxtMsg( StaticText st )
+	{
 		this.txtMsg = st;
 	}
 
 	// </editor-fold>
+
 	/**
 	 * <p>Construct a new Page bean instance.</p>
 	 */
 	public Login()
 	{
-//        connect();
+		//        connect();
 	}
 
 	/**
@@ -255,7 +297,7 @@ public class Login extends AbstractPageBean
 	 * Customize this method to acquire resources that will be needed
 	 * for event handlers and lifecycle methods, whether or not this
 	 * page is performing post back processing.</p>
-     *
+	 * <p/>
 	 * <p>Note that, if the current request is a postback, the property
 	 * values of the components do <strong>not</strong> represent any
 	 * values submitted with this request.  Instead, they represent the
@@ -273,11 +315,14 @@ public class Login extends AbstractPageBean
 		// <editor-fold defaultstate="collapsed" desc="Managed Component Initialization">
 		// Initialize automatically managed components
 		// *Note* - this logic should NOT be modified
-        try {
+		try
+		{
 			_init();
-        } catch (Exception e) {
+		}
-            log("Page1 Initialization Failure", e);
+		catch( Exception e )
-            throw e instanceof FacesException ? (FacesException) e: new FacesException(e);
+		{
+			log( "Page1 Initialization Failure", e );
+			throw e instanceof FacesException ? ( FacesException ) e : new FacesException( e );
 		}
 
 		// </editor-fold>
@@ -310,8 +355,8 @@ public class Login extends AbstractPageBean
 	@Override
 	public void prerender()
 	{
-        txtMsg.setText(getSessionBean1().getMsg());
+		txtMsg.setText( getSessionBean1().getMsg() );
-        getSessionBean1().setMsg("");
+		getSessionBean1().setMsg( "" );
 	}
 
 	/**
@@ -331,15 +376,17 @@ public class Login extends AbstractPageBean
 	/**
 	 * <p>Return a reference to the scoped data bean.</p>
 	 */
-    protected SessionBean1 getSessionBean1() {
+	protected SessionBean1 getSessionBean1()
-        return (SessionBean1)getBean("SessionBean1");
+	{
+		return ( SessionBean1 ) getBean( "SessionBean1" );
 	}
 
 	/**
 	 * <p>Return a reference to the scoped data bean.</p>
 	 */
-    protected RequestBean1 getRequestBean1() {
+	protected RequestBean1 getRequestBean1()
-        return (RequestBean1)getBean("RequestBean1");
+	{
+		return ( RequestBean1 ) getBean( "RequestBean1" );
 	}
 
 	/**
@@ -347,21 +394,21 @@ public class Login extends AbstractPageBean
 	 */
 	protected ApplicationBean1 getApplicationBean1()
 	{
-        return (ApplicationBean1)getBean("ApplicationBean1");
+		return ( ApplicationBean1 ) getBean( "ApplicationBean1" );
 	}
 
 	public String butLogin_action()
 	{
 		String sRet = null;
 
-        if(txtUtilizador.getText() != null)
+		if( txtUtilizador.getText() != null )
 		{
-            String utilizador = (String) txtUtilizador.getText();
+			String utilizador = ( String ) txtUtilizador.getText();
-            if(utilizador.trim().length() > 0)
+			if( utilizador.trim().length() > 0 )
 			{
-                if(txtPassword.getText() != null)
+				if( txtPassword.getText() != null )
 				{
-                    String password = (String) txtPassword.getText();
+					String password = ( String ) txtPassword.getText();
 					if( password.trim().length() > 0 )
 					{
 						try
@@ -371,7 +418,7 @@ public class Login extends AbstractPageBean
 							Utilizador u = udp.getUtilizador( utilizador );
 							if( u != null && "y".equals( u.getActivo() ) )
 							{
-                                if ( ! password.equals( u.getPassword() ) )
+								if( !password.equals( u.getPassword() ) )
 								{
 									getSessionBean1().setMsg( "Palavra-chave inv&aacute;lida !" );
 								}
@@ -382,27 +429,30 @@ public class Login extends AbstractPageBean
 									Utils.doLogin( getExternalContext(), u );
 
 									//Login Ok !
-//                                    if(u.getPrimeiro_login().matches("y") || mustChangePassword(u))
+									//if(u.getPrimeiro_login().matches("y") || mustChangePassword(u))
-                                    if(u.getPrimeiro_login().matches("y") )                                    
+									if( u.getPrimeiro_login().matches( "y" ) )
 									{
-                                        getSessionBean1().setMudarPassword(true);
+										getSessionBean1().setMudarPassword( true );
 										getSessionBean1().setCurrentUser( u );
-                                        getSessionBean1().setNavFrom("Login");
+										getSessionBean1().setNavFrom( "Login" );
-                                        getSessionBean1().setModoEdicaoUtilizador("edit");
+										getSessionBean1().setModoEdicaoUtilizador( "edit" );
-                                        getSessionBean1().setLoggedIn(true);    
+										getSessionBean1().setLoggedIn( true );
 										initializeClock();
 										initializeDropDownOptions();
 										return "user";
 									}
+
+									getSessionBean1().setSiprp( udp.isSiprp( u ) );
+
 									try
 									{
 										Integer permissao = udp.getPermissionCode( u.getId() );
 										sRet = "form_seguranca";
-										if ( permissao != null )
+										if( permissao != null )
 										{
-											if(permissao.intValue() == 1)   //seguranca
+											if( permissao.intValue() == 1 )   //seguranca
 											{
-												if(u.getResponsavel_loja().matches("y"))
+												if( u.getResponsavel_loja().matches( "y" ) )
 												{
 													sRet = "acesso";
 												}
@@ -411,9 +461,9 @@ public class Login extends AbstractPageBean
 													sRet = "form_seguranca";
 												}
 											}
-											else if(permissao.intValue() == 2)  // rh
+											else if( permissao.intValue() == 2 )  // rh
 											{
-												if(u.getResponsavel_loja().matches("y"))
+												if( u.getResponsavel_loja().matches( "y" ) )
 												{
 													sRet = "acesso";
 												}
@@ -423,36 +473,36 @@ public class Login extends AbstractPageBean
 												}
 												//sRet = "form_rh";
 											}
-											else if(permissao.intValue() == 3)  // hs
+											else if( permissao.intValue() == 3 )  // hs
 											{
 												//sRet = "form_hs";
 												sRet = "acesso";
 											}
-											else if(permissao.intValue() == 5)  // medico
+											else if( permissao.intValue() == 5 )  // medico
 											{
 												sRet = "form_medico";
 											}
-											else if(permissao.intValue() == 6)  // gestor
+											else if( permissao.intValue() == 6 )  // gestor
 											{
 												//sRet = "form_gestor";
 												sRet = "acesso";
 											}
-											else if(permissao.intValue() == 7)  // director geral rh
+											else if( permissao.intValue() == 7 )  // director geral rh
 											{
 												//sRet = "form_rh";
 												//sRet = "form_dir_ger_rh";
 												sRet = "acesso";
 											}
-											else if(permissao.intValue() == 8)  // director siprp
+											else if( permissao.intValue() == 8 )  // director siprp
 											{
 												//sRet = "form_dir_siprp";
 												sRet = "acesso";
 											}
-											else if(permissao.intValue() == 9)  // director loja
+											else if( permissao.intValue() == 9 )  // director loja
 											{
 												sRet = "acesso";
 											}
-											else if(permissao.intValue() == 10)  // director nacional de seguranca
+											else if( permissao.intValue() == 10 )  // director nacional de seguranca
 											{
 												sRet = "acesso";
 											}
@@ -468,43 +518,44 @@ public class Login extends AbstractPageBean
 										///getSessionBean1().setModoEdicaoUtilizador("new");
 										///sRet = "create_user";
 									}
-                                    catch ( Exception e1 )
+									catch( Exception e1 )
 									{
 										ErrorLogger.logException( e1 );
-                                        getSessionBean1().setMsg("N&atilde;o tem permiss&atilde;o para entrar na aplica&ccedil;&atilde;o !");
+										getSessionBean1()
+											.setMsg( "N&atilde;o tem permiss&atilde;o para entrar na aplica&ccedil;&atilde;o !" );
 									}
 								}
 
 							}
 							else
 							{
-                                getSessionBean1().setMsg("Utilizador inv&aacute;lido ! ");						    								                                    
+								getSessionBean1().setMsg( "Utilizador inv&aacute;lido ! " );
 							}
 						}
-                        catch(Exception ex)
+						catch( Exception ex )
 						{
 							ErrorLogger.logException( ex );
-                            getSessionBean1().setMsg("Utilizador inv&aacute;lido ! ");						    								    
+							getSessionBean1().setMsg( "Utilizador inv&aacute;lido ! " );
 						}
 					}
 					else
 					{
-                        getSessionBean1().setMsg("Falta palavra-chave !");						    				
+						getSessionBean1().setMsg( "Falta palavra-chave !" );
 					}
 				}
 				else
 				{
-                    getSessionBean1().setMsg("Falta palavra-chave !");						    
+					getSessionBean1().setMsg( "Falta palavra-chave !" );
 				}
 			}
 			else
 			{
-                getSessionBean1().setMsg("Falta utilizador !");			
+				getSessionBean1().setMsg( "Falta utilizador !" );
 			}
 		}
 		else
 		{
-            getSessionBean1().setMsg("Falta utilizador !");
+			getSessionBean1().setMsg( "Falta utilizador !" );
 		}
 		return sRet;
 	}
@@ -514,99 +565,99 @@ public class Login extends AbstractPageBean
 		return "recuperar_password";
 	}
 
-//    private void connect()
+	//    private void connect()
-//    {
+	//    {
-//		db.Db db = new db.Db();
+	//		db.Db db = new db.Db();
-//		try
+	//		try
-//		{
+	//		{
-//			Connection connection = db.connect();
+	//			Connection connection = db.connect();
-//		}
+	//		}
-//		catch(Exception ex)
+	//		catch(Exception ex)
-//		{
+	//		{
-//			getSessionBean1().setMsg("Erro na liga&ccedil;&atilde;o &agrave; Base de Dados");
+	//			getSessionBean1().setMsg("Erro na liga&ccedil;&atilde;o &agrave; Base de Dados");
-//			//***** terminate session
+	//			//***** terminate session
-//			try
+	//			try
-//			{
+	//			{
-//				getExternalContext().redirect("faces/Erro.jsp");
+	//				getExternalContext().redirect("faces/Erro.jsp");
-//			}
+	//			}
-//			catch ( Exception e )
+	//			catch ( Exception e )
-//			{
+	//			{
-//				ErrorLogger.logException( e );
+	//				ErrorLogger.logException( e );
-//			}
+	//			}
-//			ErrorLogger.logException( ex );
+	//			ErrorLogger.logException( ex );
-//		}
+	//		}
-//    }
+	//    }
 
 	private void initializeClock()
 	{
 		com.sun.rave.web.ui.model.Option[] horasOptions = new com.sun.rave.web.ui.model.Option[25];
-        horasOptions[0] = new Option(new Integer(-1), "-"); 
+		horasOptions[0] = new Option( new Integer( -1 ), "-" );
 		int j = 0;
 		String str_j = "";
-        for(int i=1; i < 25; i++)
+		for( int i = 1; i < 25; i++ )
 		{
-            if(j < 10)
+			if( j < 10 )
 			{
-                str_j = "0" + new Integer(j).toString();
+				str_j = "0" + new Integer( j ).toString();
 			}
 			else
 			{
-                str_j = new Integer(j).toString();
+				str_j = new Integer( j ).toString();
 			}
-            horasOptions[i] = new Option(new Integer(j), str_j);
+			horasOptions[i] = new Option( new Integer( j ), str_j );
 			j++;
 		}
-        getSessionBean1().setHorasOptions(horasOptions);
+		getSessionBean1().setHorasOptions( horasOptions );
 
 		com.sun.rave.web.ui.model.Option[] minutosOptions = new com.sun.rave.web.ui.model.Option[13];
-        minutosOptions[0] = new Option(new Integer(-1), "-");        
+		minutosOptions[0] = new Option( new Integer( -1 ), "-" );
 		j = 0;
-        for(int i=1; i < 13; i++)
+		for( int i = 1; i < 13; i++ )
 		{
-            if(j < 10)
+			if( j < 10 )
 			{
-                str_j = "0" + new Integer(j).toString();
+				str_j = "0" + new Integer( j ).toString();
 			}
 			else
 			{
-                str_j = new Integer(j).toString();
+				str_j = new Integer( j ).toString();
 			}
-            minutosOptions[i] = new Option(new Integer(j), str_j);
+			minutosOptions[i] = new Option( new Integer( j ), str_j );
 			j += 5;
 		}
-        getSessionBean1().setMinutosOptions(minutosOptions);        
+		getSessionBean1().setMinutosOptions( minutosOptions );
 	}
 
 	private void initializeDropDownOptions()
 	{
-//           UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
+		//           UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
-//           try
+		//           try
-//           {
+		//           {
-//                getSessionBean1().setTecnicosOptions(udp.getTecnicosSaudeList());    
+		//                getSessionBean1().setTecnicosOptions(udp.getTecnicosSaudeList());
-//                //drpTipo.setSelected(new Integer(0));
+		//                //drpTipo.setSelected(new Integer(0));
-//           }
+		//           }
-//           catch(Exception ex)
+		//           catch(Exception ex)
-//           {
+		//           {
-//               ErrorLogger.logException( ex );
+		//               ErrorLogger.logException( ex );
-//           }            
+		//           }
-           
+
-//           try
+		//           try
-//           {
+		//           {
-//                getSessionBean1().setMedicosOptions(udp.getMedicosList());    
+		//                getSessionBean1().setMedicosOptions(udp.getMedicosList());
-//                //drpTipo.setSelected(new Integer(0));
+		//                //drpTipo.setSelected(new Integer(0));
-//           }
+		//           }
-//           catch(Exception ex)
+		//           catch(Exception ex)
-//           {
+		//           {
-//               ErrorLogger.logException( ex );
+		//               ErrorLogger.logException( ex );
-//           }     
+		//           }
-           
+
-//           AnalisesDataProvider adp = new AnalisesDataProvider();
+		//           AnalisesDataProvider adp = new AnalisesDataProvider();
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
 			getSessionBean1().setCausasOptions( adp.getCausasAcidente( false ) );
 		}
-           catch(Exception ex)
+		catch( Exception ex )
 		{
 			ErrorLogger.logException( ex );
 		}
@@ -614,48 +665,48 @@ public class Login extends AbstractPageBean
 		try
 		{
 			AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
-                getSessionBean1().setDepartamentoOptions(adp.getDepartamentosList());
+			getSessionBean1().setDepartamentoOptions( adp.getDepartamentosList() );
 		}
-           catch(Exception ex)
+		catch( Exception ex )
 		{
 			ErrorLogger.logException( ex );
 		}
 
 	}
 
-    private boolean mustChangePassword(Utilizador u)
+	private boolean mustChangePassword( Utilizador u )
 	{
 		java.util.Date now = new java.util.Date();
 		Calendar cal = new GregorianCalendar();
-        cal.setTime(now);        
+		cal.setTime( now );
-        int ano = cal.get(Calendar.YEAR);
+		int ano = cal.get( Calendar.YEAR );
-        int mes = cal.get(Calendar.MONTH);
+		int mes = cal.get( Calendar.MONTH );
-        int dia = cal.get(Calendar.DAY_OF_MONTH);
+		int dia = cal.get( Calendar.DAY_OF_MONTH );
 
-        Calendar today = new GregorianCalendar(ano, mes, dia);
+		Calendar today = new GregorianCalendar( ano, mes, dia );
-        Calendar firstJan = new GregorianCalendar(ano, Calendar.JANUARY, 1);
+		Calendar firstJan = new GregorianCalendar( ano, Calendar.JANUARY, 1 );
-//        Calendar firstJan = new GregorianCalendar(ano, Calendar.DECEMBER, 27);        
+		//        Calendar firstJan = new GregorianCalendar(ano, Calendar.DECEMBER, 27);
-        Calendar firstJul = new GregorianCalendar(ano, Calendar.JULY, 1);        
+		Calendar firstJul = new GregorianCalendar( ano, Calendar.JULY, 1 );
 
-        if(today.compareTo(firstJan) == 0 || today.compareTo(firstJul) == 0)
+		if( today.compareTo( firstJan ) == 0 || today.compareTo( firstJul ) == 0 )
 		{
 			return true;
 		}
 
-        if(u.getData_password() == null)
+		if( u.getData_password() == null )
 		{
 			return true;
 		}
 		else
 		{
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd" );
 			try
 			{
-                java.util.Date dt_password = sdf.parse(u.getData_password().toString());                
+				java.util.Date dt_password = sdf.parse( u.getData_password().toString() );
 				Calendar cal_dt_password = new GregorianCalendar();
-                cal_dt_password.setTime(dt_password);
+				cal_dt_password.setTime( dt_password );
-                cal_dt_password.add(GregorianCalendar.MONTH, 6);                 
+				cal_dt_password.add( GregorianCalendar.MONTH, 6 );
-                if(cal.compareTo(cal_dt_password) > 0)
+				if( cal.compareTo( cal_dt_password ) > 0 )
 				{
 					return true;
 				}
@@ -665,7 +716,7 @@ public class Login extends AbstractPageBean
 				}
 
 			}
-            catch(Exception ex)
+			catch( Exception ex )
 			{
 				ErrorLogger.logException( ex );
 			}

trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/SessionBean1.java

@@ -571,7 +571,17 @@ public class SessionBean1 extends AbstractSessionBean
         this.estabelecimentosGestorOptions = estabelecimentosGestorOptions;
     }
 
+    private Boolean siprp;
 
+		public Boolean isSiprp()
+		{
+			return siprp;
+		}
+
+		public void setSiprp( Boolean siprp )
+		{
+			this.siprp = siprp;
+		}
 
 	//
     private Integer estabelecimentoOutroChoice;

trunk/AnaliseAcidentesTrabalho/src/beans/Utilizador.java

@@ -63,25 +63,25 @@ public class Utilizador implements Serializable
 
 	public Utilizador( UtilizadoresData utilizadoresData )
 	{
-		this.withId( utilizadoresData.getId() )
+		this.withId( utilizadoresData.getId() );
-		  .withLogin( utilizadoresData.getLogin() )
+		this.withLogin( utilizadoresData.getLogin() );
-		  .withPassword( utilizadoresData.getPassword() )
+		this.withPassword( utilizadoresData.getPassword() );
-		  .withData_password( new Date( utilizadoresData.getData_password().getTime() ) )
+		this.withData_password( new Date( utilizadoresData.getData_password().getTime() ) );
-		  .withEmail( utilizadoresData.getEmail() )
+		this.withEmail( utilizadoresData.getEmail() );
-		  .withEmpresa_id( utilizadoresData.getEmpresa_id() )
+		this.withEmpresa_id( utilizadoresData.getEmpresa_id() );
-		  .withEstabelecimento_id( utilizadoresData.getEstabelecimento_id() )
+		this.withEstabelecimento_id( utilizadoresData.getEstabelecimento_id() );
-		  .withAdministrador( utilizadoresData.getAdministrador() )
+		this.withAdministrador( utilizadoresData.getAdministrador() );
-		  .withTipo( utilizadoresData.getTipo() )
+		this.withTipo( utilizadoresData.getTipo() );
-		  .withNumero_cedula( utilizadoresData.getNumero_cedula() )
+		this.withNumero_cedula( utilizadoresData.getNumero_cedula() );
-		  .withCap( utilizadoresData.getCap() )
+		this.withCap( utilizadoresData.getCap() );
-		  .withNome( utilizadoresData.getNome() )
+		this.withNome( utilizadoresData.getNome() );
-		  .withMedico_id( utilizadoresData.getMedico_id() )
+		this.withMedico_id( utilizadoresData.getMedico_id() );
-		  .withFuncionario_hst_id( utilizadoresData.getFuncionario_hst_id() )
+		this.withFuncionario_hst_id( utilizadoresData.getFuncionario_hst_id() );
-		  .withActivo( utilizadoresData.getActivo() )
+		this.withActivo( utilizadoresData.getActivo() );
-		  .withResponsavel_loja( utilizadoresData.getResponsavel_loja() )
+		this.withResponsavel_loja( utilizadoresData.getResponsavel_loja() );
-		  .withGestor_geral( utilizadoresData.getGestor_geral() )
+		this.withGestor_geral( utilizadoresData.getGestor_geral() );
-		  .withPrimeiro_login( utilizadoresData.getPrimeiro_login() )
+		this.withPrimeiro_login( utilizadoresData.getPrimeiro_login() );
-		  .withApagado( utilizadoresData.getApagado() );
+		this.withApagado( utilizadoresData.getApagado() );
 	}
 
 	public Utilizador withId( final Integer id )

trunk/AnaliseAcidentesTrabalho/src/db/providers/EstatisticasDataProvider.java

@@ -18,6 +18,8 @@ import db.data.siprp.outer.AcidentadosData;
 import db.data.siprp.outer.AnalisesAcidentesData;
 import db.data.siprp.outer.CausasData;
 import db.data.siprp.outer.SeccoesData;
+import db.data.siprp_local.outer.EmpresasData;
+import db.data.siprp_local.outer.EstabelecimentosData;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -66,6 +68,7 @@ public class EstatisticasDataProvider extends GenericDataProvider
 		String turno = ( String ) searchProperties.get( EstatisticasConstants.KEY_TURNO_TRABALHO );
 		Boolean formacao_shst = ( Boolean ) searchProperties.get( EstatisticasConstants.KEY_FORMACAO_SHST );
 		Boolean participado_seguro = ( Boolean ) searchProperties.get( EstatisticasConstants.KEY_PARTICIPADO_SEGURO );
+		Integer empresaID = (Integer) searchProperties.get( EstatisticasConstants.KEY_EMPRESA );
 
 		String[] tables;
 		Expression[] joins;
@@ -162,6 +165,11 @@ public class EstatisticasDataProvider extends GenericDataProvider
 			where = where.and( new Field( EstatisticasConstants.KEY_PARTICIPADO_SEGURO ).isEqual( participado_seguro ? "y" : "n" ) );
 		}
 
+		if( empresaID != null )
+		{
+			where = where.and( new Field( EstatisticasConstants.KEY_EMPRESA ).isEqual( empresaID ) );
+		}
+
 		Select select = new Select2( tables, joinTypes, joins,
 			new String[]{ AnalisesAcidentesData.ESTADO_FULL, "COUNT( analises_acidentes.* ) AS count" },
 		    where, new String[]{ AnalisesAcidentesData.ESTADO_FULL }, new String[]{ AnalisesAcidentesData.ESTADO_FULL }, null, null );
@@ -254,12 +262,17 @@ public class EstatisticasDataProvider extends GenericDataProvider
 		return causa;
 	}
 
-	public Option[] getEstabelecimentos( ) throws Exception
+	public Option[] getEstabelecimentos( Integer selectedEmpresa ) throws Exception
 	{
 		Option[] options = null;
 
 		Expression where = new Field( db.data.siprp_local.outer.EstabelecimentosData.INACTIVO_FULL ).isDifferent( "y" );
 
+		if( selectedEmpresa != null )
+		{
+			where = where.and( new Field( EstabelecimentosData.EMPRESA_ID_FULL ).isEqual( selectedEmpresa ) );
+		}
+
 		Select2 query = new Select2(
 			new String[] { db.data.siprp_local.outer.EstabelecimentosData.TABLENAME },
 			new Integer[] { },
@@ -296,5 +309,36 @@ public class EstatisticasDataProvider extends GenericDataProvider
 		return estabelecimento;
 	}
 
+	public Option[] getEmpresas( ) throws Exception
+	{
+		Option[] options = null;
+
+		Expression where = new Field( db.data.siprp_local.outer.EmpresasData.INACTIVO_FULL ).isDifferent( "y" )
+			.and( new Field( EmpresasData.ID_FULL ).in( new Integer[] { 142, 85, 219, 32 } ) );
+
+		Select2 query = new Select2(
+			new String[] { db.data.siprp_local.outer.EmpresasData.TABLENAME },
+			new Integer[] { },
+			new Expression[] {},
+			new String[] {
+				db.data.siprp_local.outer.EmpresasData.ID_FULL, EmpresasData.DESIGNACAO_SOCIAL_FULL
+			},
+			where,
+			new String[] { EmpresasData.DESIGNACAO_SOCIAL_FULL },
+			null, null, null );
+		Virtual2DArray array = getLocalExecuter().executeQuery( query );
+		if ( array != null )
+		{
+			options = new Option[ array.rowCount() + 1 ];
+			options[ 0 ] = new Option( "", "" );
+			for ( int i = 0; i < array.rowCount(); i++ )
+			{
+				Integer empresaID = array.get( i, 0 );
+				String empresaNome = array.get( i, 1 );
+				options[ ( i + 1 ) ] = new Option( empresaID, empresaNome );
+			}
+		}
+		return options;
+	}
 }
 

trunk/AnaliseAcidentesTrabalho/src/db/providers/UtilizadoresDataProvider.java

@@ -26,6 +26,8 @@ import db.data.siprp.outer.PermissoesData;
 import db.data.siprp.outer.TiposUtilizadoresData;
 import db.data.siprp.outer.UtilizadoresData;
 import global.Global;
+
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
@@ -330,10 +332,15 @@ public class UtilizadoresDataProvider extends GenericDataProvider
 		Select select = new Select2( EmpresasData.TABLENAME, new Field( EmpresasData.DESIGNACAO_SOCIAL_FULL ).isILike( "siprp%" )
 		  .and( new Field( EmpresasData.ID_FULL ).isEqual( utilizador.getEmpresa_id() ) ), "1" );
 
-		Select outer = new Select(  "select exists( " + select.toString() + " )" );
+		Select outer = new Select( MessageFormat.format( "select exists( {0} )", select.toString() ) );
 
 		Virtual2DArray array = getExecuter().executeQuery( outer );
 
-		return array.rowCount() > 0 ? ( Boolean ) array.get( 0, 1 ) : Boolean.FALSE;
+		Boolean result = Boolean.FALSE;
+		if( array.rowCount() > 0 )
+		{
+			result = array.get( 0, 0 );
+		}
+		return result;
 	}
 }

trunk/AnaliseAcidentesTrabalho/src/utils/Utils.java

@@ -569,7 +569,7 @@ public class Utils {
 	{
 		try
 		{
-			Option[] estabelecimentos = EstatisticasDataProvider.getInstance().getEstabelecimentos();
+			Option[] estabelecimentos = EstatisticasDataProvider.getInstance().getEstabelecimentos( null );
 			if ( estabelecimentos != null )
 			{
 				for ( DropDown drop : drops )
@@ -584,18 +584,79 @@ public class Utils {
 		}
 	}
 
+	public static void fillEstabelecimentos( Integer empresaId, DropDown ... drops )
+	{
+		try
+		{
+			Option[] estabelecimentos = EstatisticasDataProvider.getInstance().getEstabelecimentos( empresaId );
+			if ( estabelecimentos != null )
+			{
+				Integer selected = null;
+				for ( DropDown drop : drops )
+				{
+					if( drop.getSelected() != null )
+					{
+						if( drop.getSelected() instanceof Integer )
+						{
+							selected = ( Integer ) drop.getSelected();
+						}
+						else
+						{
+							selected = getSelectedID( drop );
+						}
+					}
+					drop.setItems( estabelecimentos );
+					drop.setSelected( selected );
+				}
+			}
+		}
+		catch ( Exception e )
+		{
+			ErrorLogger.logException( e );
+		}
+	}
+
 	public static Integer getSelectedID( DropDown drop )
 	{
 		Integer selectedID = null;
 		if ( drop.getSelected() != null )
 		{
 			String value = ( String ) drop.getSelected();
-			if ( value != null )
-			{
 			try { selectedID = Integer.parseInt( value ); }
-				catch ( Exception e ) { }
+			catch ( Exception ignored ) { }
-			}
 		}
 		return selectedID;
 	}
+
+	public static void fillEmpresas( DropDown ... drops )
+	{
+		try
+		{
+			Option[] empresas = EstatisticasDataProvider.getInstance().getEmpresas();
+			if ( empresas != null )
+			{
+				Integer selected = null;
+				for ( DropDown drop : drops )
+				{
+					if( drop.getSelected() != null )
+					{
+						if( drop.getSelected() instanceof Integer )
+						{
+							selected = ( Integer ) drop.getSelected();
+						}
+						else
+						{
+							selected = getSelectedID( drop );
+						}
+					}
+					drop.setItems( empresas );
+					drop.setSelected( selected );
+				}
+			}
+		}
+		catch ( Exception e )
+		{
+			ErrorLogger.logException( e );
+		}
+	}
 }

trunk/AnaliseAcidentesTrabalho/web/EstatisticasProcesso.jsp

@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core"
-<jsp:root version="1.2"
-	xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
           xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:ui="http://www.sun.com/web/ui"
-	xmlns:t="http://myfaces.apache.org/tomahawk">
+          xmlns:t="http://myfaces.apache.org/tomahawk"
-
+          xmlns:c="http://java.sun.com/jsp/jstl/core">
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-
   <f:view>
     <ui:page id="page">
-
       <ui:html id="html">
-
         <ui:head id="head">
-                    <ui:link id="link_css" url="/resources/stylesheet.css"/>
+          <ui:link id="link_css" url="/resources/stylesheet.css" />
-
           <script type="text/javascript">
             function showPdf()
             {
@@ -29,94 +23,81 @@
               wOpen.resizeTo( screen.availWidth, screen.availHeight );
             }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
         </ui:head>
-
         <ui:body id="body" style="-rave-layout: grid" onLoad="showTables( 'tableEstatisticas' );">
-
           <h:panelGrid columns="1" id="gridBase" style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-
             <h:panelGrid columns="1" id="gridLayout" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <!-- header -->
               <ui:form id="form0">
                 <h:panelGrid columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel8" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup id="groupPanel5" style="height: 24px; width: 216px">
-                                        <ui:image id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel6">
-                                            <ui:hyperlink action="#{EstatisticasProcesso.lnkPlanosActuacao_action}" binding="#{EstatisticasProcesso.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                      <ui:hyperlink action="#{EstatisticasProcesso.lnkPlanosActuacao_action}" binding="#{EstatisticasProcesso.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-											<ui:staticText escape="false" id="webAppLinkSeparator" text=" | "/>
+                      <ui:staticText escape="false" id="webAppLinkSeparator" text=" | " />
-                                            <ui:hyperlink action="#{EstatisticasProcesso.lnkAnalisesAcidente_action}" binding="#{EstatisticasProcesso.lnkAnaliseAcidentes}" id="lnkAnalisesAcidenteHeader" text="análise de acidentes de trabalho&gt;&gt;"/>
+                      <ui:hyperlink action="#{EstatisticasProcesso.lnkAnalisesAcidente_action}" binding="#{EstatisticasProcesso.lnkAnaliseAcidentes}" id="lnkAnalisesAcidenteHeader" text="análise de acidentes de trabalho&gt;&gt;" />
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px">
-                                            <ui:staticText binding="#{EstatisticasProcesso.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
+                      <ui:staticText binding="#{EstatisticasProcesso.lblUser}" escape="false" id="lblUser" styleClass="labelBold" />
-                                            <ui:staticText escape="false" id="staticText9" text="   "/>
+                      <ui:staticText escape="false" id="staticText9" text="   " />
-                                            <ui:hyperlink action="#{EstatisticasProcesso.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{EstatisticasProcesso.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="staticText12" text=" | "/>
+                      <ui:staticText escape="false" id="staticText12" text=" | " />
-                                            <ui:hyperlink action="#{EstatisticasProcesso.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{EstatisticasProcesso.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText13" text=" | "/>
+                      <ui:staticText escape="false" id="staticText13" text=" | " />
-                                            <ui:hyperlink id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText15" style="width: 0px" text="|"/>
+                      <ui:staticText id="staticText15" style="width: 0px" text="|" />
-                                            <ui:hyperlink action="#{EstatisticasProcesso.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{EstatisticasProcesso.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel10" style="height: 24px; width: 100%" width="504">
-								<ui:staticText binding="#{EstatisticasProcesso.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                <ui:staticText binding="#{EstatisticasProcesso.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px" />
               </h:panelGrid>
-
               <!-- body -->
-							<h:panelGrid columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
+              <h:panelGrid columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1" id="gridLayoutTop" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-								id="gridLayoutTop" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-
                 <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridEstatisticas" style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
                   <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel1" style="height: 24px; width: 100%">
-										<ui:staticText id="staticText1" text="Estatisticas" style="font-size: 18px; font-weight: bold; height: 24px;"/>
+                    <ui:staticText id="staticText1" text="Estatisticas" style="font-size: 18px; font-weight: bold; height: 24px;" />
                   </h:panelGrid>
-
                   <h:form id="formEstatistica">
                     <h:panelGrid id="panelGrid1" columns="2">
                       <ui:staticText id="labelPOR" escape="false" text="POR:" styleClass="labelBold" />
                       <ui:textField id="textPOR" binding="#{EstatisticasProcesso.textPOR}" />
-
                       <ui:staticText id="labelNome" escape="false" text="Nome:" styleClass="labelBold" />
                       <ui:textField id="textNome" binding="#{EstatisticasProcesso.textNome}" />
-
                       <ui:staticText id="labelAnoOcorrencia" escape="false" text="Ano de ocorrência:" styleClass="labelBold" />
                       <ui:textField id="textAnoOcorrencia" binding="#{EstatisticasProcesso.textAnoOcorrencia}" />
-
                       <ui:staticText id="labelDataOcorrencia" escape="false" text="Data de ocorrência:" styleClass="labelBold" />
                       <t:inputDate id="calDataOcorrencia" value="#{EstatisticasProcesso.calDataOcorrencia}" />
-
                       <ui:staticText id="labelHoraOcorrencia" escape="false" text="Hora de ocorrência:" styleClass="labelBold" />
                       <ui:textField id="textHoraOcorrencia" binding="#{EstatisticasProcesso.textHoraOcorrencia}" />
-
                       <ui:staticText id="labelHorasTrabalhadas" escape="false" text="Nº horas trabalhadas por turno:" styleClass="labelBold" />
                       <ui:textField id="textHorasTrabalhadas" binding="#{EstatisticasProcesso.textHorasTrabalhadas}" />
-
                       <!--
 											<ui:staticText id="labelDepartamento" escape="false" text="Departamento:" styleClass="labelBold" />
 											<ui:textField id="textDepartamento" binding="#{EstatisticasProcesso.textDepartamento}" />
 											-->
-
+                      <ui:staticText rendered="#{EstatisticasProcesso.siprp}" binding="#{EstatisticasProcesso.labelFilterEmpresa}"
+                        id="labelFilterEmpresa" styleClass="labelBold" text="Empresa:" />
+                      <ui:dropDown rendered="#{EstatisticasProcesso.siprp}"
+                                   binding="#{EstatisticasProcesso.dropEmpresas}" id="dropEmpresas"
+                        valueChangeListener="#{EstatisticasProcesso.dropEmpresas_valueChangeListener}"
+                        onChange="common_timeoutSubmitForm(this.form,
+                          'gridBase:gridLayout:gridLayoutTop:gridEstatisticas:formEstatistica:panelGrid1:dropEmpresa');"
+                        style="height: 18px; width: 240px" />
                       <ui:staticText id="labelEstabelecimento" escape="false" text="Estabelecimento:" styleClass="labelBold" />
-											<ui:dropDown binding="#{EstatisticasProcesso.dropEstabelecimentos}" id="dropEstabelecimentos" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{EstatisticasProcesso.dropEstabelecimentos}" id="dropEstabelecimentos" style="height: 18px; width: 240px" />
-
                       <ui:staticText id="labelSeccao" escape="false" text="Mercado:" styleClass="labelBold" />
-											<ui:dropDown binding="#{EstatisticasProcesso.dropSeccoes}" id="dropSeccoes" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{EstatisticasProcesso.dropSeccoes}" id="dropSeccoes" style="height: 18px; width: 240px" />
-
                       <ui:staticText id="labelCausas" escape="false" text="Causas do acidente:" styleClass="labelBold" />
-											<ui:dropDown binding="#{EstatisticasProcesso.dropCausas}" id="dropCausas" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{EstatisticasProcesso.dropCausas}" id="dropCausas" style="height: 18px; width: 240px" />
-
                       <ui:staticText id="labelTurno" escape="false" text="Turno de trabalho:" styleClass="labelBold" />
-											<ui:dropDown binding="#{EstatisticasProcesso.dropTurno}" id="dropTurno" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{EstatisticasProcesso.dropTurno}" id="dropTurno" style="height: 18px; width: 240px" />
-
                       <ui:staticText id="labelFormacaoSHST" escape="false" text="Formação em SHST" styleClass="labelBold" />
                       <ui:panelGroup>
                         <ui:radioButton binding="#{EstatisticasProcesso.formacaoSHST_true}" id="formacaoSHST_true" name="formacaoSHST" />
@@ -150,15 +131,12 @@
 												<ui:staticText id="labeloutrosColaboradores_NAO" escape="false" text="Não" />
 											</ui:panelGroup>
 											-->
-
                       <ui:button id="buttonEstatistica" action="#{EstatisticasProcesso.buttonEstatistica_action}" text="Pesquisar" />
                     </h:panelGrid>
                   </h:form>
-
                   <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%; margin-top: 50px;">
                     <ui:staticText id="staticText2" text="Resultados" style="font-size: 18px; font-weight: bold; height: 24px;" />
                   </h:panelGrid>
-
                   <ui:table id="tableEstatisticas" binding="#{EstatisticasProcesso.tableEstatisticas}" augmentTitle="false" style="width: 50%; margin-top: 20px;" styleClass="centerBlock">
                     <ui:tableRowGroup id="tableEstatisticasRow" rows="10" sourceData="#{EstatisticasProcesso.listEstatisticas}" sourceVar="row">
                       <ui:tableColumn id="tableEstatisticasColumn_Estado" headerText="Estado" style="width: 33%;">
@@ -172,28 +150,23 @@
                       </ui:tableColumn>
                     </ui:tableRowGroup>
                   </ui:table>
-
                   <h:form>
                     <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 100%; margin-top: 20px; margin-bottom: 20px;">
                       <ui:button id="buttonExport" binding="#{EstatisticasProcesso.buttonExport}" action="#{EstatisticasProcesso.buttonExport_action}" text="Exportar" rendered="false" />
                     </h:panelGrid>
                   </h:form>
-
                 </h:panelGrid>
               </h:panelGrid>
-
               <!-- footer -->
               <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                 <ui:panelGroup id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-									<ui:staticText id="staticText6" text="Software desenvolvido por "/>
+                  <ui:staticText id="staticText6" text="Software desenvolvido por " />
-									<ui:image height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-									<ui:staticText escape="false" id="staticText7" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText escape="false" id="staticText7" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
-
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- google analytics -->
           <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
@@ -206,13 +179,8 @@
             }
             catch( err ) {}
           </script>
-
         </ui:body>
-
       </ui:html>
-
     </ui:page>
-
   </f:view>
-
 </jsp:root>

trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2"
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
           xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:ui="http://www.sun.com/web/ui"
           xmlns:t="http://myfaces.apache.org/tomahawk">
-
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
   <f:view>
     <ui:page binding="#{FormDirGerRh.page1}" id="page1">
       <ui:html binding="#{FormDirGerRh.html1}" id="html1">
         <ui:head binding="#{FormDirGerRh.head1}" id="head1">
-                    <ui:link binding="#{FormDirGerRh.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormDirGerRh.link1}" id="link1" url="/resources/stylesheet.css" />
           <script type="text/javascript">
             function showPdf()
             {
@@ -24,135 +22,107 @@
               wOpen.resizeTo( screen.availWidth, screen.availHeight );
             }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
-
         </ui:head>
         <ui:body binding="#{FormDirGerRh.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form2:table1', 'form3:table2' );">
-
+          <h:panelGrid binding="#{FormDirGerRh.gridBase1}" columns="1" id="gridBase1" style="height: 24px; left: 0px; top: 120px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-					<!-- ui:form binding=FormDirGerRh.form1 id="form1" -->
-
-                        <h:panelGrid binding="#{FormDirGerRh.gridBase1}" columns="1" id="gridBase1"
-                            style="height: 24px; left: 0px; top: 120px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormDirGerRh.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <ui:form binding="#{FormDirGerRh.form1}" id="form1">
-                                <h:panelGrid binding="#{FormDirGerRh.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                <h:panelGrid binding="#{FormDirGerRh.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormDirGerRh.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormDirGerRh.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormDirGerRh.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormDirGerRh.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image binding="#{FormDirGerRh.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel8" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel2">
                       <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" text="Estatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" />
                       <ui:staticText escape="false" id="sepUpper" text=" | " rendered="#{SessionBean1.canAccessEstatisticas}" />
-                                            <ui:hyperlink action="#{FormDirGerRh.lnkPlanosActuacao_action}" binding="#{FormDirGerRh.lnkPlanosActuacao}"
+                      <ui:hyperlink action="#{FormDirGerRh.lnkPlanosActuacao_action}" binding="#{FormDirGerRh.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%; width: 100%">
-                                            <ui:staticText binding="#{FormDirGerRh.lblUser}" escape="false" id="lblUser" styleClass="labelBold    "/>
+                      <ui:staticText binding="#{FormDirGerRh.lblUser}" escape="false" id="lblUser" styleClass="labelBold    " />
-                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                      <ui:staticText escape="false" id="stSep1" text="   " />
-                                            <ui:hyperlink action="#{FormDirGerRh.lnkGerirUtilizadores_action}" id="lnkGerirUtilizadores1" style="" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{FormDirGerRh.lnkGerirUtilizadores_action}" id="lnkGerirUtilizadores1" style="" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                      <ui:staticText escape="false" id="stSep4" text=" | " />
-                                            <ui:hyperlink action="#{FormDirGerRh.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{FormDirGerRh.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                      <ui:staticText escape="false" id="staticText1" text=" | " />
-                                            <ui:hyperlink action="#{FormDirGerRh.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink action="#{FormDirGerRh.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText9" style="width: 0px" text="|"/>
+                      <ui:staticText id="staticText9" style="width: 0px" text="|" />
-                                            <ui:hyperlink action="#{FormDirGerRh.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{FormDirGerRh.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid columnClasses="gridColCenter" columns="2" id="gridPanel2" style="height: 24px; width: 100%" width="504">
                 <ui:staticText escape="false" id="txtMsg1" text="" />
-
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-											<ui:dropDown binding="#{FormDirGerRh.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormDirGerRh.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormDirGerRh.dropCurrentYear_valueChangeListener}" />
-												onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormDirGerRh.dropCurrentYear_valueChangeListener}"/>
                   </ui:form>
                 </h:panelGroup>
               </h:panelGrid>
-
               <ui:form id="form2">
-                                <h:panelGrid binding="#{FormDirGerRh.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
+                <h:panelGrid binding="#{FormDirGerRh.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2" id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-                                    id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
+                  <h:panelGrid binding="#{FormDirGerRh.gridSeguimento1}" columns="1" id="gridSeguimento1" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                    <h:panelGrid binding="#{FormDirGerRh.gridSeguimento1}" columns="1" id="gridSeguimento1"
+                    <h:panelGrid binding="#{FormDirGerRh.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%" width="264">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                      <ui:staticText binding="#{FormDirGerRh.staticText2}" id="staticText2" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                        <h:panelGrid binding="#{FormDirGerRh.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormDirGerRh.staticText2}" id="staticText2"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
-                                        <h:panelGrid binding="#{FormDirGerRh.gridPanel3}" id="gridPanel3"
+                    <h:panelGrid binding="#{FormDirGerRh.gridPanel3}" id="gridPanel3" style="background-color: #f6f4e8; height: 24px" styleClass="centerBlock">
-                                            style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormDirGerRh.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
-
                           <t:inputDate id="calFilterDateSeg" value="#{FormDirGerRh.calFilterDateSeguimento}" />
-
                         </ui:panelGroup>
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />
-													<ui:textField binding="#{FormDirGerRh.textFilterPORSeg}" id="textFilterPORSeg" />
+                          <ui:textField binding="#{FormDirGerRh.textFilterPORSeg}" id="textFilterPORSeg" style="width: 160px" />
                         </ui:panelGroup>
                         <ui:panelGroup binding="#{FormDirGerRh.groupPanelFilterSeg}" id="groupPanelFilterSeg">
                           <ui:staticText binding="#{FormDirGerRh.labelFilterNameSeg}" id="labelFilterNameSeg" styleClass="labelBold" text="Nome:" />
                           <ui:textField binding="#{FormDirGerRh.textFilterNameSeg}" id="textFilterNameSeg" />
                         </ui:panelGroup>
+                        <ui:panelGroup id="groupPanel12" rendered="#{FormDirGerRh.siprp}">
+                          <ui:staticText binding="#{FormDirGerRh.labelFilterEmpresaSeg}"
+                                         id="labelFilterEmpresaSeg" styleClass="labelBold" text="Empresa:" />
+                          <ui:dropDown binding="#{FormDirGerRh.dropEmpresaSeg}" id="dropEmpresaSeg"
+                                       valueChangeListener="#{FormDirGerRh.dropEmpresasSeg_valueChangeListener}"
+                                       onChange="common_timeoutSubmitForm(this.form,
+                                       'gridBase1:gridLayout1:gridSeguimento1:gridPanel5:gridPanelFilterSeg:groupPanel12:dropEmpresaSeg');"
+                                       style="height: 18px; width: 200px" />
+                        </ui:panelGroup>
                         <ui:panelGroup>
                           <ui:staticText binding="#{FormDirGerRh.labelFilterEstabelecimentoSeg}" id="labelFilterEstabelecimentoSeg" styleClass="labelBold" text="Estabelecimento:" />
-													<ui:dropDown binding="#{FormDirGerRh.dropEstabelecimentosSeguimento}" id="dropEstabelecimentosSeguimento" style="height: 18px; width: 240px"/>
+                          <ui:dropDown binding="#{FormDirGerRh.dropEstabelecimentosSeguimento}"
-													<!-- <ui:textField binding="#{FormDirGerRh.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg" />-->
+                                       id="dropEstabelecimentosSeguimento" style="height: 18px; width: 200px" />
                         </ui:panelGroup>
                         <ui:button binding="#{FormDirGerRh.buttonFilterSeg}" id="buttonFilterSeg" action="#{FormDirGerRh.buttonFilterSeg_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormDirGerRh.table1}" id="table1" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormDirGerRh.tableRowGroup1}" id="tableRowGroup1"
+                        <ui:tableRowGroup binding="#{FormDirGerRh.tableRowGroup1}" id="tableRowGroup1" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn1}" headerText="Data do acidente" id="tableColumn1" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
+                            <ui:hyperlink action="#{FormDirGerRh.lnkDataAcidenteSeg_action}" binding="#{FormDirGerRh.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkDataAcidenteSeg_action}"
-                                                            binding="#{FormDirGerRh.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn11}" headerText="Data da abertura" id="tableColumn11"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn11}" headerText="Data da abertura" id="tableColumn11" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormDirGerRh.lnkDataAberturaSeg_action}" binding="#{FormDirGerRh.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkDataAberturaSeg_action}"
-                                                            binding="#{FormDirGerRh.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormDirGerRh.lnkNrSeg_action}" binding="#{FormDirGerRh.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkNrSeg_action}" binding="#{FormDirGerRh.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn3}" headerText="POR" id="tableColumn3" width="10%"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn3}" headerText="POR" id="tableColumn3" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormDirGerRh.lnkPorSeg_action}" binding="#{FormDirGerRh.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkPorSeg_action}" binding="#{FormDirGerRh.lnkPorSeg}"
-                                                            id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn4}" headerText="Nome do acidentado" id="tableColumn4"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn4}" headerText="Nome do acidentado" id="tableColumn4" sort="nome_acidentado" style="width: 50%" width="50%">
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                            <ui:hyperlink action="#{FormDirGerRh.lnkNomeAcidentadoSeg_action}" binding="#{FormDirGerRh.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkNomeAcidentadoSeg_action}"
-                                                            binding="#{FormDirGerRh.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormDirGerRh.lnkFaseSeg_action}" binding="#{FormDirGerRh.lnkFaseSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkFaseSeg_action}" binding="#{FormDirGerRh.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="20%"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="20%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormDirGerRh.lnkEstabelecimentoSeg_action}" binding="#{FormDirGerRh.lnkEstabelecimentoSeg}" id="lnkEstabelecimentoSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormDirGerRh.lnkEstabelecimentoSeg_action}" binding="#{FormDirGerRh.lnkEstabelecimentoSeg}"
-                                                            id="lnkEstabelecimentoSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormDirGerRh.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormDirGerRh.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
@@ -160,119 +130,95 @@
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <ui:form id="form3">
-                                <h:panelGrid binding="#{FormDirGerRh.gridConcluidos1}" columns="1" id="gridConcluidos1"
+                <h:panelGrid binding="#{FormDirGerRh.gridConcluidos1}" columns="1" id="gridConcluidos1" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormDirGerRh.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormDirGerRh.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                    <ui:staticText binding="#{FormDirGerRh.staticText3}" escape="false" id="staticText3" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
-                                        <ui:staticText binding="#{FormDirGerRh.staticText3}" escape="false" id="staticText3"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormDirGerRh.gridPanel5}" columns="7" id="gridPanel5" style="height: 24px" width="576">
+                  <h:panelGrid binding="#{FormDirGerRh.gridPanel5}" columns="7" id="gridPanel5" style="height: 24px"
-                                        <ui:panelGroup binding="#{FormDirGerRh.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                               styleClass="centerBlock">
-                                            <ui:staticText binding="#{FormDirGerRh.staticText4}" id="staticText4" style="height: 24px; width: 22px"
+                    <ui:panelGroup binding="#{FormDirGerRh.groupPanel3}" id="groupPanel3">
-                                                styleClass="labelBold" text="Ano:"/>
+                      <ui:staticText binding="#{FormDirGerRh.staticText4}" id="staticText4" styleClass="labelBold" text="Ano:" />
                       <ui:dropDown binding="#{FormDirGerRh.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
                                    onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel3:drpAno');"
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormDirGerRh.drpAno_processValueChange}"/>
+                                   selected="#{SessionBean1.anoChoice}" style="width: 70px"
+                                   valueChangeListener="#{FormDirGerRh.drpAno_processValueChange}" />
+                    </ui:panelGroup>
+                    <ui:panelGroup binding="#{FormDirGerRh.groupPanel4}" id="groupPanel4" visible="false">
+                      <ui:staticText binding="#{FormDirGerRh.lblMes}" escape="false" id="lblMes" text="Mês:" visible="false" />
+                      <ui:dropDown binding="#{FormDirGerRh.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel4:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormDirGerRh.drpMes_processValueChange}" visible="false" />
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirGerRh.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormDirGerRh.groupPanel5}" id="groupPanel5" visible="false">
-                                            <ui:staticText binding="#{FormDirGerRh.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px"
+                      <ui:staticText binding="#{FormDirGerRh.lblDia}" id="lblDia" text="Dia:" visible="false" />
-                                                text="Mês:" visible="false"/>
+                      <ui:dropDown binding="#{FormDirGerRh.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormDirGerRh.drpDia_processValueChange}" visible="false" />
-                                            <ui:dropDown binding="#{FormDirGerRh.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel4:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormDirGerRh.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirGerRh.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormDirGerRh.groupPanel6}" id="groupPanel6">
-                                            <ui:staticText binding="#{FormDirGerRh.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormDirGerRh.staticText5}" escape="false" id="staticText5" styleClass="labelBold" text="POR:&amp;nbsp;" />
-                                            <ui:dropDown binding="#{FormDirGerRh.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:textField binding="#{FormDirGerRh.txtPor}" id="txtPor" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormDirGerRh.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirGerRh.groupPanel6}" id="groupPanel6" style="height: 24px; width: 142px">
+                    <ui:panelGroup binding="#{FormDirGerRh.groupPanel7}" id="groupPanel7">
-                                            <ui:staticText binding="#{FormDirGerRh.staticText5}" escape="false" id="staticText5"
+                      <ui:staticText binding="#{FormDirGerRh.staticText6}" id="staticText6" styleClass="labelBold" text="Nome:" />
-                                                style="height: 24px; width: 96px" styleClass="labelBold" text="POR:&amp;nbsp;"/>
+                      <ui:textField binding="#{FormDirGerRh.txtNome}" id="txtNome" />
-                                            <ui:textField binding="#{FormDirGerRh.txtPor}" id="txtPor" style=""/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirGerRh.groupPanel7}" id="groupPanel7" style="height: 24px; width: 262px">
+                    <ui:panelGroup id="groupPanel8" rendered="#{FormDirGerRh.siprp}">
-                                            <ui:staticText binding="#{FormDirGerRh.staticText6}" id="staticText6" style="height: 24px; width: 46px"
+                      <ui:staticText binding="#{FormDirGerRh.labelFilterEmpresaConc}"
-                                                styleClass="labelBold" text="Nome:"/>
+                                     id="labelFilterEmpresaConc" styleClass="labelBold" text="Empresa:" />
-                                            <ui:textField binding="#{FormDirGerRh.txtNome}" id="txtNome"/>
+                      <ui:dropDown binding="#{FormDirGerRh.dropEmpresaConc}" id="dropEmpresaConc"
+                                   valueChangeListener="#{FormDirGerRh.dropEmpresasConc_valueChangeListener}"
+                                   onChange="common_timeoutSubmitForm(this.form,
+                                   'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel8:dropEmpresaConc');"
+                                   style="height: 18px; width: 200px" />
                     </ui:panelGroup>
                     <ui:panelGroup>
                       <ui:staticText id="labelFilterEstabelecimentoConc" styleClass="labelBold" text="Estabelecimento:" />
-											<ui:dropDown binding="#{FormDirGerRh.dropEstabelecimentosConcluidos}" id="dropEstabelecimentosConcluidos" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{FormDirGerRh.dropEstabelecimentosConcluidos}"
-											<!-- <ui:textField binding="#{FormDirGerRh.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc" /> -->
+                                   id="dropEstabelecimentosConcluidos" style="height: 18px; width: 200px" />
                     </ui:panelGroup>
-                                        <ui:button action="#{FormDirGerRh.butPesquisar_action}" binding="#{FormDirGerRh.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormDirGerRh.butPesquisar_action}" binding="#{FormDirGerRh.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormDirGerRh.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                  <h:panelGrid binding="#{FormDirGerRh.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                     <ui:table augmentTitle="false" binding="#{FormDirGerRh.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:tableRowGroup binding="#{FormDirGerRh.tableRowGroup2}" id="tableRowGroup2"
+                      <ui:tableRowGroup binding="#{FormDirGerRh.tableRowGroup2}" id="tableRowGroup2" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumn6}" headerText="Data do acidente" id="tableColumn6" sort="data_acidente" style="width: 10%" width="10%">
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn6}" headerText="Data do acidente" id="tableColumn6"
+                          <ui:hyperlink action="#{FormDirGerRh.lnkDataConcluida_action}" binding="#{FormDirGerRh.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                    sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:hyperlink action="#{FormDirGerRh.lnkDataConcluida_action}" binding="#{FormDirGerRh.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn12}" headerText="Data da abertura" id="tableColumn12"
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumn12}" headerText="Data da abertura" id="tableColumn12" sort="data_inicio_processo" width="10%">
-                                                    sort="data_inicio_processo" width="10%">
+                          <ui:hyperlink action="#{FormDirGerRh.lnkDataAberturaConcluida_action}" binding="#{FormDirGerRh.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                    <ui:hyperlink action="#{FormDirGerRh.lnkDataAberturaConcluida_action}"
-                                                        binding="#{FormDirGerRh.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn7}" headerText="Nº acidente" id="tableColumn7"
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumn7}" headerText="Nº acidente" id="tableColumn7" sort="analise_nr" style="width: 10%" width="7%">
-                                                    sort="analise_nr" style="width: 10%" width="7%">
+                          <ui:hyperlink action="#{FormDirGerRh.lnkNrConcluida_action}" binding="#{FormDirGerRh.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                    <ui:hyperlink action="#{FormDirGerRh.lnkNrConcluida_action}" binding="#{FormDirGerRh.lnkNrConcluida}"
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn8}" headerText="POR" id="tableColumn8" width="8%"
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumn8}" headerText="POR" id="tableColumn8" width="8%" sort="numero_mecanografico">
-													sort="numero_mecanografico">
+                          <ui:hyperlink action="#{FormDirGerRh.lnkPorConcluida_action}" binding="#{FormDirGerRh.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormDirGerRh.lnkPorConcluida_action}" binding="#{FormDirGerRh.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 80%" width="60%">
-                                                    sort="nome_acidentado" style="width: 80%" width="60%">
+                          <ui:hyperlink action="#{FormDirGerRh.lnkNomeConcluida_action}" binding="#{FormDirGerRh.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormDirGerRh.lnkNomeConcluida_action}" binding="#{FormDirGerRh.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%"
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%" sort="nome_estabelecimento">
-													sort="nome_estabelecimento">
+                          <ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}" binding="#{FormDirGerRh.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}" binding="#{FormDirGerRh.lnkEstabConcluida}"
-                                                        id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn headerText="Desactivação"
+                        <ui:tableColumn headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-													<ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormDirGerRh.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                        <ui:tableColumn binding="#{FormDirGerRh.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-														sort="participado">
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormDirGerRh.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormDirGerRh.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
-								
               <h:panelGrid binding="#{FormDirGerRh.gridPanel7}" columnClasses="gridColCenter" columns="1" id="gridPanel7" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormDirGerRh.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                        <ui:staticText binding="#{FormDirGerRh.staticText7}" id="staticText7" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormDirGerRh.staticText7}" id="staticText7" text="Software desenvolvido por " />
-                                        <ui:image binding="#{FormDirGerRh.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormDirGerRh.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                        <ui:staticText binding="#{FormDirGerRh.staticText8}" escape="false" id="staticText8" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormDirGerRh.staticText8}" escape="false" id="staticText8" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- EOF form1 -->
-
           <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
             document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2" 
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
           xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:ui="http://www.sun.com/web/ui"
           xmlns:t="http://myfaces.apache.org/tomahawk">
-	
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
   <f:view>
     <ui:page binding="#{FormDirSiprp.page1}" id="page1">
       <ui:html binding="#{FormDirSiprp.html1}" id="html1">
         <ui:head binding="#{FormDirSiprp.head1}" id="head1">
-                    <ui:link binding="#{FormDirSiprp.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormDirSiprp.link1}" id="link1" url="/resources/stylesheet.css" />
           <script type="text/javascript">
             function showPdf()
             {
@@ -24,76 +22,54 @@
               wOpen.resizeTo( screen.availWidth, screen.availHeight );
             }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
-
         </ui:head>
         <ui:body binding="#{FormDirSiprp.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form1:table2', 'form2:table3' );">
-
           <!-- ui:form binding="#{FormDirSiprp.form1}" id="form1" -->
-                    
+          <h:panelGrid binding="#{FormDirSiprp.gridBase1}" columns="1" id="gridBase1" style="height: 24px; left: 0px; top: 72px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-                        <h:panelGrid binding="#{FormDirSiprp.gridBase1}" columns="1" id="gridBase1"
-                            style="height: 24px; left: 0px; top: 72px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormDirSiprp.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <ui:form id="form0">
-                                <h:panelGrid binding="#{FormDirSiprp.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                <h:panelGrid binding="#{FormDirSiprp.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormDirSiprp.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormDirSiprp.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormDirSiprp.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormDirSiprp.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image binding="#{FormDirSiprp.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel3" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel2">
-
                       <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" text="Estatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" />
                       <ui:staticText escape="false" id="sepUpper" text=" | " rendered="#{SessionBean1.canAccessEstatisticas}" />
-											
+                      <ui:hyperlink action="#{FormDirSiprp.lnkPlanosActuacao_action}" binding="#{FormDirSiprp.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-                                            <ui:hyperlink action="#{FormDirSiprp.lnkPlanosActuacao_action}" binding="#{FormDirSiprp.lnkPlanosActuacao}"
-                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%; width: 100%">
-                                            <ui:staticText binding="#{FormDirSiprp.lblUser}" escape="false" id="lblUser" styleClass="labelBold   "/>
+                      <ui:staticText binding="#{FormDirSiprp.lblUser}" escape="false" id="lblUser" styleClass="labelBold   " />
-                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                      <ui:staticText escape="false" id="stSep1" text="   " />
-                                            <ui:hyperlink action="#{FormDirSiprp.lnkNewUser_action}" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{FormDirSiprp.lnkNewUser_action}" id="lnkNewUser1" style="" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                      <ui:staticText escape="false" id="stSep4" text=" | " />
-                                            <ui:hyperlink action="#{FormDirSiprp.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{FormDirSiprp.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                      <ui:staticText escape="false" id="staticText1" text=" | " />
-                                            <ui:hyperlink action="#{FormDirSiprp.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink action="#{FormDirSiprp.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText2" style="width: 0px" text="|"/>
+                      <ui:staticText id="staticText2" style="width: 0px" text="|" />
-                                            <ui:hyperlink action="#{FormDirSiprp.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{FormDirSiprp.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-								
+              <h:panelGrid binding="#{FormDirSiprp.gridPanel2}" columnClasses="gridColCenter" columns="2" id="gridPanel2" style="height: 24px; width: 100%" width="504">
-                                <h:panelGrid binding="#{FormDirSiprp.gridPanel2}" columnClasses="gridColCenter" columns="2" id="gridPanel2"
+                <ui:staticText binding="#{FormDirSiprp.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px" />
-                                    style="height: 24px; width: 100%" width="504">
-                                    <ui:staticText binding="#{FormDirSiprp.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
-
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-											<ui:dropDown binding="#{FormDirSiprp.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormDirSiprp.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormDirSiprp.dropCurrentYear_valueChangeListener}" />
-												onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormDirSiprp.dropCurrentYear_valueChangeListener}"/>
                   </ui:form>
                 </h:panelGroup>
               </h:panelGrid>
-
-
               <ui:form binding="#{FormDirSiprp.form1}" id="form1">
-                                <h:panelGrid binding="#{FormDirSiprp.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
+                <h:panelGrid binding="#{FormDirSiprp.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2" id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-                                    id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
+                  <h:panelGrid binding="#{FormDirSiprp.gridSeguimento1}" columns="1" id="gridSeguimento1" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                    <h:panelGrid binding="#{FormDirSiprp.gridSeguimento1}" columns="1" id="gridSeguimento1"
+                    <h:panelGrid binding="#{FormDirSiprp.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%" width="264">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                      <ui:staticText binding="#{FormDirSiprp.staticText4}" id="staticText4" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                        <h:panelGrid binding="#{FormDirSiprp.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormDirSiprp.staticText4}" id="staticText4"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
-                                        <h:panelGrid binding="#{FormDirSiprp.gridPanel5}" id="gridPanel5"
+                    <h:panelGrid binding="#{FormDirSiprp.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                            style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormDirSiprp.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
@@ -101,64 +77,57 @@
                         </ui:panelGroup>
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />
-													<ui:textField binding="#{FormDirSiprp.textFilterPORSeg}" id="textFilterPORSeg" />
+                          <ui:textField binding="#{FormDirSiprp.textFilterPORSeg}" id="textFilterPORSeg"
+                                        style="width: 160px" />
                         </ui:panelGroup>
                         <ui:panelGroup binding="#{FormDirSiprp.groupPanelFilterSeg}" id="groupPanelFilterSeg">
                           <ui:staticText binding="#{FormDirSiprp.labelFilterNameSeg}" id="labelFilterNameSeg" styleClass="labelBold" text="Nome:" />
                           <ui:textField binding="#{FormDirSiprp.textFilterNameSeg}" id="textFilterNameSeg" />
                         </ui:panelGroup>
+                        <ui:panelGroup id="groupPanel12" rendered="#{FormDirSiprp.siprp}">
+                          <ui:staticText binding="#{FormDirSiprp.labelFilterEmpresaSeg}"
+                                         id="labelFilterEmpresaSeg" styleClass="labelBold" text="Empresa:" />
+                          <ui:dropDown binding="#{FormDirSiprp.dropEmpresaSeg}" id="dropEmpresaSeg"
+                                       valueChangeListener="#{FormDirSiprp.dropEmpresasSeg_valueChangeListener}"
+                                       onChange="common_timeoutSubmitForm(this.form,
+                                       'gridBase1:gridLayout1:gridSeguimento1:gridPanel5:gridPanelFilterSeg:groupPanel12:dropEmpresaSeg');"
+                                       style="height: 18px; width: 200px" />
+                        </ui:panelGroup>
                         <ui:panelGroup>
                           <ui:staticText binding="#{FormDirSiprp.labelFilterEstabelecimentoSeg}" id="labelFilterEstabelecimentoSeg" styleClass="labelBold" text="Estabelecimento:" />
-													<ui:dropDown binding="#{FormDirSiprp.dropEstabelecimentosSeguimento}" id="dropEstabelecimentosSeguimento" style="height: 18px; width: 240px"/>
+                          <ui:dropDown binding="#{FormDirSiprp.dropEstabelecimentosSeguimento}"
-													<!-- <ui:textField binding="#{FormDirSiprp.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg" /> -->
+                                       id="dropEstabelecimentosSeguimento" style="height: 18px; width: 200px" />
                         </ui:panelGroup>
                         <ui:button binding="#{FormDirSiprp.buttonFilterSeg}" id="buttonFilterSeg" action="#{FormDirSiprp.buttonFilterSeg_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormDirSiprp.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormDirSiprp.tableRowGroup2}" id="tableRowGroup2"
+                        <ui:tableRowGroup binding="#{FormDirSiprp.tableRowGroup2}" id="tableRowGroup2" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn6}" headerText="Data do acidente" id="tableColumn6" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn6}" headerText="Data do acidente" id="tableColumn6"
+                            <ui:hyperlink action="#{FormDirSiprp.lnkDataAcidenteSeg_action}" binding="#{FormDirSiprp.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkDataAcidenteSeg_action}"
-                                                            binding="#{FormDirSiprp.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn1}" headerText="Data da abertura" id="tableColumn1"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn1}" headerText="Data da abertura" id="tableColumn1" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormDirSiprp.lnkDataAberturaSeg_action}" binding="#{FormDirSiprp.lnkDataAberturaSeg1}" id="lnkDataAberturaSeg1" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkDataAberturaSeg_action}"
-                                                            binding="#{FormDirSiprp.lnkDataAberturaSeg1}" id="lnkDataAberturaSeg1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn7}" headerText="Nº acidente" id="tableColumn7"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn7}" headerText="Nº acidente" id="tableColumn7" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormDirSiprp.lnkNrSeg_action}" binding="#{FormDirSiprp.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkNrSeg_action}" binding="#{FormDirSiprp.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn8}" headerText="POR" id="tableColumn8" width="10%"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn8}" headerText="POR" id="tableColumn8" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormDirSiprp.lnkPorSeg_action}" binding="#{FormDirSiprp.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkPorSeg_action}" binding="#{FormDirSiprp.lnkPorSeg}"
-                                                            id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 50%" width="50%">
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                            <ui:hyperlink action="#{FormDirSiprp.lnkNomeAcidentadoSeg_action}" binding="#{FormDirSiprp.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkNomeAcidentadoSeg_action}"
-                                                            binding="#{FormDirSiprp.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormDirSiprp.lnkFaseSeg_action}" binding="#{FormDirSiprp.lnkFaseSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkFaseSeg_action}" binding="#{FormDirSiprp.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn3}" headerText="Estabelecimento" id="tableColumn3" width="15%"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumn3}" headerText="Estabelecimento" id="tableColumn3" width="15%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormDirSiprp.lnkEstabelecimentoSeg_action}" binding="#{FormDirSiprp.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormDirSiprp.lnkEstabelecimentoSeg_action}"
-                                                            binding="#{FormDirSiprp.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormDirSiprp.tableColumnDesactivarAnalise}" headerText="" id="tableColumnDesactivarAnalise" >
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumnDesactivarAnalise}" headerText="" id="tableColumnDesactivarAnalise">
-														<ui:button binding="#{FormDirSiprp.buttonDesactivarAnalise}" id="buttonDesactivarAnalsie"
+                            <ui:button binding="#{FormDirSiprp.buttonDesactivarAnalise}" id="buttonDesactivarAnalsie" action="#{FormDirSiprp.buttonDesactivarAnalise_action}" text="Desactivar" />
-															action="#{FormDirSiprp.buttonDesactivarAnalise_action}" text="Desactivar" />
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormDirSiprp.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormDirSiprp.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
@@ -166,120 +135,92 @@
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <ui:form id="form2">
-                                <h:panelGrid binding="#{FormDirSiprp.gridConcluidos1}" columns="1" id="gridConcluidos1"
+                <h:panelGrid binding="#{FormDirSiprp.gridConcluidos1}" columns="1" id="gridConcluidos1" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormDirSiprp.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormDirSiprp.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                    <ui:staticText binding="#{FormDirSiprp.staticText5}" escape="false" id="staticText5" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
-                                        <ui:staticText binding="#{FormDirSiprp.staticText5}" escape="false" id="staticText5"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormDirSiprp.gridPanel7}" columns="7" id="gridPanel7" style="height: 24px" width="576">
+                  <h:panelGrid binding="#{FormDirSiprp.gridPanel7}" columns="7" id="gridPanel7"
-                                        <ui:panelGroup binding="#{FormDirSiprp.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                               style="height: 24px" styleClass="centerBlock">
-                                            <ui:staticText binding="#{FormDirSiprp.staticText6}" id="staticText6" style="height: 24px; width: 22px"
+                    <ui:panelGroup binding="#{FormDirSiprp.groupPanel3}" id="groupPanel3">
-                                                styleClass="labelBold" text="Ano:"/>
+                      <ui:staticText binding="#{FormDirSiprp.staticText6}" id="staticText6" styleClass="labelBold" text="Ano:" />
-                                            <ui:dropDown binding="#{FormDirSiprp.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
+                      <ui:dropDown binding="#{FormDirSiprp.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel3:drpAno');" selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormDirSiprp.drpAno_processValueChange}" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel3:drpAno');"
+                    </ui:panelGroup>
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormDirSiprp.drpAno_processValueChange}"/>
+                    <ui:panelGroup binding="#{FormDirSiprp.groupPanel4}" id="groupPanel4" visible="false">
+                      <ui:staticText binding="#{FormDirSiprp.lblMes}" escape="false" id="lblMes" text="Mês:" visible="false" />
+                      <ui:dropDown binding="#{FormDirSiprp.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel4:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormDirSiprp.drpMes_processValueChange}" visible="false" />
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirSiprp.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormDirSiprp.groupPanel5}" id="groupPanel5" visible="false">
-                                            <ui:staticText binding="#{FormDirSiprp.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px"
+                      <ui:staticText binding="#{FormDirSiprp.lblDia}" id="lblDia" text="Dia:" visible="false" />
-                                                text="Mês:" visible="false"/>
+                      <ui:dropDown binding="#{FormDirSiprp.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormDirSiprp.drpDia_processValueChange}" visible="false" />
-                                            <ui:dropDown binding="#{FormDirSiprp.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel4:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormDirSiprp.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirSiprp.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormDirSiprp.groupPanel6}" id="groupPanel6">
-                                            <ui:staticText binding="#{FormDirSiprp.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormDirSiprp.staticText7}" escape="false" id="staticText7" styleClass="labelBold" text="POR:&amp;nbsp;" />
-                                            <ui:dropDown binding="#{FormDirSiprp.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:textField binding="#{FormDirSiprp.txtPor}" id="txtPor" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormDirSiprp.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirSiprp.groupPanel6}" id="groupPanel6" style="height: 24px; width: 142px">
+                    <ui:panelGroup binding="#{FormDirSiprp.groupPanel7}" id="groupPanel7">
-                                            <ui:staticText binding="#{FormDirSiprp.staticText7}" escape="false" id="staticText7"
+                      <ui:staticText binding="#{FormDirSiprp.staticText8}" id="staticText8" styleClass="labelBold" text="Nome:" />
-                                                style="height: 24px; width: 96px" styleClass="labelBold" text="POR:&amp;nbsp;"/>
+                      <ui:textField binding="#{FormDirSiprp.txtNome}" id="txtNome" />
-                                            <ui:textField binding="#{FormDirSiprp.txtPor}" id="txtPor" style=""/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormDirSiprp.groupPanel7}" id="groupPanel7" style="height: 24px; width: 262px">
+                    <ui:panelGroup id="groupPanel8" rendered="#{FormDirSiprp.siprp}">
-                                            <ui:staticText binding="#{FormDirSiprp.staticText8}" id="staticText8" style="height: 24px; width: 46px"
+                      <ui:staticText binding="#{FormDirSiprp.labelFilterEmpresaConc}"
-                                                styleClass="labelBold" text="Nome:"/>
+                                     id="labelFilterEmpresaConc" styleClass="labelBold" text="Empresa:" />
-                                            <ui:textField binding="#{FormDirSiprp.txtNome}" id="txtNome"/>
+                      <ui:dropDown binding="#{FormDirSiprp.dropEmpresaConc}" id="dropEmpresaConc"
+                                   valueChangeListener="#{FormDirSiprp.dropEmpresasConc_valueChangeListener}"
+                                   onChange="common_timeoutSubmitForm(this.form,
+                                   'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel8:dropEmpresaConc');"
+                                   style="height: 18px; width: 200px" />
                     </ui:panelGroup>
                     <ui:panelGroup>
                       <ui:staticText id="labelFilterEstabelecimentoConc" styleClass="labelBold" text="Estabelecimento:" />
-											<ui:dropDown binding="#{FormDirSiprp.dropEstabelecimentosConcluidos}" id="dropEstabelecimentosConcluidos" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{FormDirSiprp.dropEstabelecimentosConcluidos}"
-											<!-- <ui:textField binding="#{FormDirSiprp.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc" /> -->
+                                   id="dropEstabelecimentosConcluidos" style="height: 18px; width: 200px" />
                     </ui:panelGroup>
-                                        <ui:button action="#{FormDirSiprp.butPesquisar_action}" binding="#{FormDirSiprp.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormDirSiprp.butPesquisar_action}" binding="#{FormDirSiprp.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormDirSiprp.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8"
+                  <h:panelGrid binding="#{FormDirSiprp.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                     <ui:table augmentTitle="false" binding="#{FormDirSiprp.table3}" id="table3" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:tableRowGroup binding="#{FormDirSiprp.tableRowGroup3}" id="tableRowGroup3"
+                      <ui:tableRowGroup binding="#{FormDirSiprp.tableRowGroup3}" id="tableRowGroup3" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumn11}" headerText="Data do acidente" id="tableColumn11" sort="data_acidente" style="width: 10%" width="10%">
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn11}" headerText="Data do acidente" id="tableColumn11"
+                          <ui:hyperlink action="#{FormDirSiprp.lnkDataConcluida_action}" binding="#{FormDirSiprp.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                    sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:hyperlink action="#{FormDirSiprp.lnkDataConcluida_action}" binding="#{FormDirSiprp.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn2}" headerText="Data da abertura" id="tableColumn2"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumn2}" headerText="Data da abertura" id="tableColumn2" sort="data_inicio_processo" width="10%">
-                                                    sort="data_inicio_processo" width="10%">
+                          <ui:hyperlink action="#{FormDirSiprp.lnkDataAberturaConcluida_action}" binding="#{FormDirSiprp.lnkDataAberturaConcluida1}" id="lnkDataAberturaConcluida1" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                    <ui:hyperlink action="#{FormDirSiprp.lnkDataAberturaConcluida_action}"
-                                                        binding="#{FormDirSiprp.lnkDataAberturaConcluida1}" id="lnkDataAberturaConcluida1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn12}" headerText="Nº acidente" id="tableColumn12"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumn12}" headerText="Nº acidente" id="tableColumn12" sort="analise_nr" style="width: 10%" width="7%">
-                                                    sort="analise_nr" style="width: 10%" width="7%">
+                          <ui:hyperlink action="#{FormDirSiprp.lnkNrConcluida_action}" binding="#{FormDirSiprp.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                    <ui:hyperlink action="#{FormDirSiprp.lnkNrConcluida_action}" binding="#{FormDirSiprp.lnkNrConcluida}"
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn13}" headerText="POR" id="tableColumn13" width="8%"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumn13}" headerText="POR" id="tableColumn13" width="8%" sort="numero_mecanografico">
-													sort="numero_mecanografico">
+                          <ui:hyperlink action="#{FormDirSiprp.lnkPorConcluida_action}" binding="#{FormDirSiprp.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormDirSiprp.lnkPorConcluida_action}" binding="#{FormDirSiprp.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn14}" headerText="Nome do acidentado" id="tableColumn14"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumn14}" headerText="Nome do acidentado" id="tableColumn14" sort="nome_acidentado" style="width: 80%" width="60%">
-                                                    sort="nome_acidentado" style="width: 80%" width="60%">
+                          <ui:hyperlink action="#{FormDirSiprp.lnkNomeConcluida_action}" binding="#{FormDirSiprp.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormDirSiprp.lnkNomeConcluida_action}" binding="#{FormDirSiprp.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%" sort="nome_estabelecimento">
-													sort="nome_estabelecimento">
+                          <ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}" binding="#{FormDirSiprp.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}" binding="#{FormDirSiprp.lnkEstabConcluida}"
-                                                        id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormDirSiprp.tableColumnDesactivarAnaliseConcluidos}" headerText="Desactivação"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumnDesactivarAnaliseConcluidos}" headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:button binding="#{FormDirSiprp.buttonDesactivarAnaliseConcluidos}" id="buttonDesactivarAnaliseConcluidos" action="#{FormDirSiprp.buttonDesactivarAnaliseConcluidos_action}" text="Desactivar" rendered="#{! currentRow.value['concluido_por_desactivacao']}" />
-													<ui:button binding="#{FormDirSiprp.buttonDesactivarAnaliseConcluidos}" id="buttonDesactivarAnaliseConcluidos"
+                          <ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-														action="#{FormDirSiprp.buttonDesactivarAnaliseConcluidos_action}" text="Desactivar" 
-														rendered="#{! currentRow.value['concluido_por_desactivacao']}" />
-
-													<ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormDirSiprp.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                        <ui:tableColumn binding="#{FormDirSiprp.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-														sort="participado">
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormDirSiprp.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormDirSiprp.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid binding="#{FormDirSiprp.gridPanel9}" columnClasses="gridColCenter" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormDirSiprp.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                        <ui:staticText binding="#{FormDirSiprp.staticText9}" id="staticText9" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormDirSiprp.staticText9}" id="staticText9" text="Software desenvolvido por " />
-                                        <ui:image binding="#{FormDirSiprp.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormDirSiprp.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                        <ui:staticText binding="#{FormDirSiprp.staticText10}" escape="false" id="staticText10" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormDirSiprp.staticText10}" escape="false" id="staticText10" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- /ui:form -->
           <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2" 
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
           xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:ui="http://www.sun.com/web/ui"
-	xmlns:t="http://myfaces.apache.org/tomahawk">
+          xmlns:t="http://myfaces.apache.org/tomahawk"
-	
+          xmlns:c="http://java.sun.com/jsp/jstl/core">
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
   <f:view>
     <ui:page binding="#{FormGestor.page1}" id="page1">
       <ui:html binding="#{FormGestor.html1}" id="html1">
         <ui:head binding="#{FormGestor.head1}" id="head1">
-                    <ui:link binding="#{FormGestor.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormGestor.link1}" id="link1" url="/resources/stylesheet.css" />
           <script type="text/javascript">
             function showPdf()
             {
@@ -24,134 +23,109 @@
               wOpen.resizeTo( screen.availWidth, screen.availHeight );
             }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
         </ui:head>
         <ui:body binding="#{FormGestor.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form1:table1', 'form2:table2' );">
-
           <!-- ui:form binding="#{FormGestor.form1}" id="form1" -->
-                    
+          <h:panelGrid binding="#{FormGestor.gridBase1}" columns="1" id="gridBase1" style="height: 24px; left: 24px; top: 120px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-                        <h:panelGrid binding="#{FormGestor.gridBase1}" columns="1" id="gridBase1"
-                            style="height: 24px; left: 24px; top: 120px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormGestor.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <ui:form id="form0">
-                                <h:panelGrid binding="#{FormGestor.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                <h:panelGrid binding="#{FormGestor.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormGestor.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormGestor.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormGestor.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormGestor.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image binding="#{FormGestor.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel8" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel2">
                       <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" text="Estatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" />
                       <ui:staticText escape="false" id="sepUpper" text=" | " rendered="#{SessionBean1.canAccessEstatisticas}" />
-                                            <ui:hyperlink action="#{FormGestor.lnkPlanosActuacao_action}" binding="#{FormGestor.lnkPlanosActuacao}"
+                      <ui:hyperlink action="#{FormGestor.lnkPlanosActuacao_action}" binding="#{FormGestor.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%; width: 100%">
-                                            <ui:staticText binding="#{FormGestor.lblUser}" escape="false" id="lblUser" styleClass="labelBold             "/>
+                      <ui:staticText binding="#{FormGestor.lblUser}" escape="false" id="lblUser" styleClass="labelBold             " />
-                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                      <ui:staticText escape="false" id="stSep1" text="   " />
-                                            <ui:hyperlink action="#{FormGestor.lnkGerirUtilizadores_action}" disabled="true" id="lnkGerirUtilizadores1" style="" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{FormGestor.lnkGerirUtilizadores_action}" disabled="true" id="lnkGerirUtilizadores1" style="" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                      <ui:staticText escape="false" id="stSep4" text=" | " />
-                                            <ui:hyperlink action="#{FormGestor.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{FormGestor.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                      <ui:staticText escape="false" id="staticText1" text=" | " />
-                                            <ui:hyperlink action="#{FormGestor.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink action="#{FormGestor.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText9" style="height: 22px; width: 0px" text="|"/>
+                      <ui:staticText id="staticText9" style="height: 22px; width: 0px" text="|" />
-                                            <ui:hyperlink action="#{FormGestor.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{FormGestor.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid columnClasses="gridColCenter" columns="2" id="gridPanel2" style="height: 24px; width: 100%" width="504">
                 <ui:staticText escape="false" id="txtMsg1" text="" />
-
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-											<ui:dropDown binding="#{FormGestor.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormGestor.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormGestor.dropCurrentYear_valueChangeListener}" />
-												onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormGestor.dropCurrentYear_valueChangeListener}"/>
                   </ui:form>
                 </h:panelGroup>
               </h:panelGrid>
-
               <ui:form binding="#{FormGestor.form1}" id="form1">
-                                <h:panelGrid binding="#{FormGestor.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
+                <h:panelGrid binding="#{FormGestor.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2" id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-                                    id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
+                  <h:panelGrid binding="#{FormGestor.gridSeguimento1}" columns="1" id="gridSeguimento1" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                    <h:panelGrid binding="#{FormGestor.gridSeguimento1}" columns="1" id="gridSeguimento1"
+                    <h:panelGrid binding="#{FormGestor.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%" width="264">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                      <ui:staticText binding="#{FormGestor.staticText2}" id="staticText2" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                        <h:panelGrid binding="#{FormGestor.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormGestor.staticText2}" id="staticText2"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
                     <h:panelGrid binding="#{FormGestor.gridPanel3}" id="gridPanel3"
-                                            style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
+                                 style="background-color: #f6f4e8; height: 24px" styleClass="centerBlock">
-
                       <h:panelGrid binding="#{FormGestor.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
-
                           <t:inputDate id="calFilterDateSeg" value="#{FormGestor.calFilterDateSeguimento}" />
                         </ui:panelGroup>
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />
-													<ui:textField binding="#{FormGestor.textFilterPORSeg}" id="textFilterPORSeg" />
+                          <ui:textField binding="#{FormGestor.textFilterPORSeg}" id="textFilterPORSeg" style="width: 160px" />
                         </ui:panelGroup>
                         <ui:panelGroup binding="#{FormGestor.groupPanelFilterSeg}" id="groupPanelFilterSeg">
                           <ui:staticText binding="#{FormGestor.labelFilterNameSeg}" id="labelFilterNameSeg" styleClass="labelBold" text="Nome:" />
                           <ui:textField binding="#{FormGestor.textFilterNameSeg}" id="textFilterNameSeg" />
                         </ui:panelGroup>
+                        <ui:panelGroup id="groupPanel12" rendered="#{FormGestor.siprp}">
+                          <ui:staticText binding="#{FormGestor.labelFilterEmpresaSeg}"
+                                         id="labelFilterEmpresaSeg" styleClass="labelBold" text="Empresa:" />
+                          <ui:dropDown binding="#{FormGestor.dropEmpresaSeg}" id="dropEmpresaSeg"
+                                       valueChangeListener="#{FormGestor.dropEmpresasSeg_valueChangeListener}"
+                                       onChange="common_timeoutSubmitForm(this.form,
+                                       'gridBase1:gridLayout1:gridSeguimento1:gridPanel5:gridPanelFilterSeg:groupPanel12:dropEmpresaSeg');"
+                                       style="height: 18px; width: 200px" />
+                        </ui:panelGroup>
                         <ui:panelGroup>
                           <ui:staticText binding="#{FormGestor.labelFilterEstabelecimentoSeg}" id="labelFilterEstabelecimentoSeg" styleClass="labelBold" text="Estabelecimento:" />
-													<ui:dropDown binding="#{FormGestor.dropEstabelecimentosSeguimento}" id="dropEstabelecimentosSeguimento" style="height: 18px; width: 240px"/>
+                          <ui:dropDown binding="#{FormGestor.dropEstabelecimentosSeguimento}"
-													<!-- <ui:textField binding="#{FormGestor.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg" /> -->
+                                       id="dropEstabelecimentosSeguimento" style="height: 18px; width: 200px" />
                         </ui:panelGroup>
                         <ui:button binding="#{FormGestor.buttonFilterSeg}" id="buttonFilterSeg" action="#{FormGestor.buttonFilterSeg_action}" text="Pesquisar" />
                       </h:panelGrid>
-
+                      <ui:table augmentTitle="false" binding="#{FormGestor.table1}" id="table1" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:table augmentTitle="false" binding="#{FormGestor.table1}" id="table1" style="width: 100%; height: 48px"
+                        <ui:tableRowGroup binding="#{FormGestor.tableRowGroup1}" id="tableRowGroup1" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                styleClass="centerBlock">
+                          <ui:tableColumn binding="#{FormGestor.tableColumn1}" headerText="Data do acidente" id="tableColumn1" sort="data_acidente" style="width: 10%" width="477">
-                                                <ui:tableRowGroup binding="#{FormGestor.tableRowGroup1}" id="tableRowGroup1"
+                            <ui:hyperlink action="#{FormGestor.lnkDataAcidenteSeg_action}" binding="#{FormGestor.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
-                                                        sort="data_acidente" style="width: 10%" width="477">
-                                                        <ui:hyperlink action="#{FormGestor.lnkDataAcidenteSeg_action}"
-                                                            binding="#{FormGestor.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn11}" headerText="Data da abertura" id="tableColumn11"
+                          <ui:tableColumn binding="#{FormGestor.tableColumn11}" headerText="Data da abertura" id="tableColumn11" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormGestor.lnkDataAberturaSeg_action}" binding="#{FormGestor.lnkDataAberturaSeg1}" id="lnkDataAberturaSeg1" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormGestor.lnkDataAberturaSeg_action}"
-                                                            binding="#{FormGestor.lnkDataAberturaSeg1}" id="lnkDataAberturaSeg1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
+                          <ui:tableColumn binding="#{FormGestor.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormGestor.lnkNrSeg_action}" binding="#{FormGestor.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormGestor.lnkNrSeg_action}" binding="#{FormGestor.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn3}" headerText="POR" id="tableColumn3" width="10%"
+                          <ui:tableColumn binding="#{FormGestor.tableColumn3}" headerText="POR" id="tableColumn3" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormGestor.lnkPorSeg_action}" binding="#{FormGestor.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormGestor.lnkPorSeg_action}" binding="#{FormGestor.lnkPorSeg}" id="lnkPorSeg"
-                                                            style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn4}" headerText="Nome do acidentado" id="tableColumn4"
+                          <ui:tableColumn binding="#{FormGestor.tableColumn4}" headerText="Nome do acidentado" id="tableColumn4" sort="nome_acidentado" style="width: 50%" width="50%">
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                            <ui:hyperlink action="#{FormGestor.lnkNomeAcidentadoSeg_action}" binding="#{FormGestor.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormGestor.lnkNomeAcidentadoSeg_action}"
-                                                            binding="#{FormGestor.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%"
+                          <ui:tableColumn binding="#{FormGestor.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormGestor.lnkFaseSeg_action}" binding="#{FormGestor.lnkFaseSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormGestor.lnkFaseSeg_action}" binding="#{FormGestor.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="15%"
+                          <ui:tableColumn binding="#{FormGestor.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="15%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormGestor.lnkEstabelecimentoSeg_action}" binding="#{FormGestor.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormGestor.lnkEstabelecimentoSeg_action}"
-                                                            binding="#{FormGestor.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormGestor.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormGestor.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
@@ -159,117 +133,91 @@
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <ui:form id="form2">
-                                <h:panelGrid binding="#{FormGestor.gridConcluidos1}" columns="1" id="gridConcluidos1"
+                <h:panelGrid binding="#{FormGestor.gridConcluidos1}" columns="1" id="gridConcluidos1" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormGestor.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormGestor.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                    <ui:staticText binding="#{FormGestor.staticText3}" escape="false" id="staticText3" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
-                                        <ui:staticText binding="#{FormGestor.staticText3}" escape="false" id="staticText3"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormGestor.gridPanel5}" columns="7" id="gridPanel5" style="height: 24px" width="576">
+                  <h:panelGrid binding="#{FormGestor.gridPanel5}" columns="7" id="gridPanel5" style="height: 24px"
-                                        <ui:panelGroup binding="#{FormGestor.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                               styleClass="centerBlock">
-                                            <ui:staticText binding="#{FormGestor.staticText4}" id="staticText4" style="height: 24px; width: 22px"
+                    <ui:panelGroup binding="#{FormGestor.groupPanel3}" id="groupPanel3">
-                                                styleClass="labelBold" text="Ano:"/>
+                      <ui:staticText binding="#{FormGestor.staticText4}" id="staticText4" styleClass="labelBold" text="Ano:" />
-                                            <ui:dropDown binding="#{FormGestor.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
+                      <ui:dropDown binding="#{FormGestor.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel3:drpAno');" selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormGestor.drpAno_processValueChange}" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel3:drpAno');"
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormGestor.drpAno_processValueChange}"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormGestor.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormGestor.groupPanel4}" id="groupPanel4" visible="false">
-                                            <ui:staticText binding="#{FormGestor.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px"
+                      <ui:staticText binding="#{FormGestor.lblMes}" escape="false" id="lblMes" text="Mês:" visible="false" />
-                                                text="Mês:" visible="false"/>
+                      <ui:dropDown binding="#{FormGestor.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel4:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormGestor.drpMes_processValueChange}" visible="false" />
-                                            <ui:dropDown binding="#{FormGestor.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel5:groupPanel4:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormGestor.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormGestor.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormGestor.groupPanel5}" id="groupPanel5" visible="false">
-                                            <ui:staticText binding="#{FormGestor.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormGestor.lblDia}" id="lblDia" text="Dia:" visible="false" />
-                                            <ui:dropDown binding="#{FormGestor.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:dropDown binding="#{FormGestor.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormGestor.drpDia_processValueChange}" visible="false" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormGestor.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormGestor.groupPanel6}" id="groupPanel6" style="height: 24px; width: 142px">
+                    <ui:panelGroup binding="#{FormGestor.groupPanel6}" id="groupPanel6">
-                                            <ui:staticText binding="#{FormGestor.staticText5}" escape="false" id="staticText5" style="height: 24px; width: 96px"
+                      <ui:staticText binding="#{FormGestor.staticText5}" escape="false" id="staticText5" styleClass="labelBold" text="POR:&amp;nbsp;" />
-                                                styleClass="labelBold" text="POR:&amp;nbsp;"/>
+                      <ui:textField binding="#{FormGestor.txtPor}" id="txtPor" />
-                                            <ui:textField binding="#{FormGestor.txtPor}" id="txtPor" style=""/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormGestor.groupPanel7}" id="groupPanel7" style="height: 24px; width: 262px">
+                    <ui:panelGroup binding="#{FormGestor.groupPanel7}" id="groupPanel7">
-                                            <ui:staticText binding="#{FormGestor.staticText6}" id="staticText6" style="height: 24px; width: 46px"
+                      <ui:staticText binding="#{FormGestor.staticText6}" id="staticText6" styleClass="labelBold" text="Nome:" />
-                                                styleClass="labelBold" text="Nome:"/>
+                      <ui:textField binding="#{FormGestor.txtNome}" id="txtNome" />
-                                            <ui:textField binding="#{FormGestor.txtNome}" id="txtNome"/>
+                    </ui:panelGroup>
+                    <ui:panelGroup id="groupPanel8" rendered="#{FormGestor.siprp}">
+                      <ui:staticText binding="#{FormGestor.labelFilterEmpresaConc}"
+                                     id="labelFilterEmpresaConc" styleClass="labelBold" text="Empresa:" />
+                      <ui:dropDown binding="#{FormGestor.dropEmpresaConc}" id="dropEmpresaConc"
+                                   valueChangeListener="#{FormGestor.dropEmpresasConc_valueChangeListener}"
+                                   onChange="common_timeoutSubmitForm(this.form,
+                                   'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel8:dropEmpresaConc');"
+                                   style="height: 18px; width: 200px" />
                     </ui:panelGroup>
                     <ui:panelGroup>
                       <ui:staticText id="labelFilterEstabelecimentoConc" styleClass="labelBold" text="Estabelecimento:" />
-											<ui:dropDown binding="#{FormGestor.dropEstabelecimentosConcluidos}" id="dropEstabelecimentosConcluidos" style="height: 18px; width: 240px"/>
+                      <ui:dropDown binding="#{FormGestor.dropEstabelecimentosConcluidos}"
-											<!-- <ui:textField binding="#{FormGestor.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc" /> -->
+                                   id="dropEstabelecimentosConcluidos" style="height: 18px; width: 200px" />
                     </ui:panelGroup>
-                                        <ui:button action="#{FormGestor.butPesquisar_action}" binding="#{FormGestor.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormGestor.butPesquisar_action}" binding="#{FormGestor.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormGestor.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                  <h:panelGrid binding="#{FormGestor.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
+                    <ui:table augmentTitle="false" binding="#{FormGestor.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                        <ui:table augmentTitle="false" binding="#{FormGestor.table2}" id="table2" style="width: 100%; height: 48px"
+                      <ui:tableRowGroup binding="#{FormGestor.tableRowGroup2}" id="tableRowGroup2" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                            styleClass="centerBlock">
+                        <ui:tableColumn binding="#{FormGestor.tableColumn6}" headerText="Data do acidente" id="tableColumn6" sort="data_acidente" style="width: 10%" width="10%">
-                                            <ui:tableRowGroup binding="#{FormGestor.tableRowGroup2}" id="tableRowGroup2"
+                          <ui:hyperlink action="#{FormGestor.lnkDataConcluida_action}" binding="#{FormGestor.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn6}" headerText="Data do acidente" id="tableColumn6"
-                                                    sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:hyperlink action="#{FormGestor.lnkDataConcluida_action}" binding="#{FormGestor.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn12}" headerText="Data da abertura" id="tableColumn12"
+                        <ui:tableColumn binding="#{FormGestor.tableColumn12}" headerText="Data da abertura" id="tableColumn12" sort="data_inicio_processo" width="10%">
-                                                    sort="data_inicio_processo" width="10%">
+                          <ui:hyperlink action="#{FormGestor.lnkDataAberturaConcluida_action}" binding="#{FormGestor.lnkDataAberturaConcluida1}" id="lnkDataAberturaConcluida1" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                    <ui:hyperlink action="#{FormGestor.lnkDataAberturaConcluida_action}"
-                                                        binding="#{FormGestor.lnkDataAberturaConcluida1}" id="lnkDataAberturaConcluida1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn7}" headerText="Nº acidente" id="tableColumn7"
+                        <ui:tableColumn binding="#{FormGestor.tableColumn7}" headerText="Nº acidente" id="tableColumn7" sort="analise_nr" style="width: 10%" width="7%">
-                                                    sort="analise_nr" style="width: 10%" width="7%">
+                          <ui:hyperlink action="#{FormGestor.lnkNrConcluida_action}" binding="#{FormGestor.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                    <ui:hyperlink action="#{FormGestor.lnkNrConcluida_action}" binding="#{FormGestor.lnkNrConcluida}"
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn8}" headerText="POR" id="tableColumn8" width="8%"
+                        <ui:tableColumn binding="#{FormGestor.tableColumn8}" headerText="POR" id="tableColumn8" width="8%" sort="numero_mecanografico">
-													sort="numero_mecanografico">
+                          <ui:hyperlink action="#{FormGestor.lnkPorConcluida_action}" binding="#{FormGestor.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormGestor.lnkPorConcluida_action}" binding="#{FormGestor.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                        <ui:tableColumn binding="#{FormGestor.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 80%" width="60%">
-                                                    sort="nome_acidentado" style="width: 80%" width="60%">
+                          <ui:hyperlink action="#{FormGestor.lnkNomeConcluida_action}" binding="#{FormGestor.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormGestor.lnkNomeConcluida_action}" binding="#{FormGestor.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormGestor.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%"
+                        <ui:tableColumn binding="#{FormGestor.tableColumn10}" headerText="Estabelecimento" id="tableColumn10" width="15%" sort="nome_estabelecimento">
-													sort="nome_estabelecimento">
+                          <ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}" binding="#{FormGestor.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}" binding="#{FormGestor.lnkEstabConcluida}"
-                                                        id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn headerText="Desactivação"
+                        <ui:tableColumn headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-													<ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormGestor.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                        <ui:tableColumn binding="#{FormGestor.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-													sort="participado">
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                       <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormGestor.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormGestor.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid binding="#{FormGestor.gridPanel7}" columnClasses="gridColCenter" columns="1" id="gridPanel7" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormGestor.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                        <ui:staticText binding="#{FormGestor.staticText7}" id="staticText7" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormGestor.staticText7}" id="staticText7" text="Software desenvolvido por " />
-                                        <ui:image binding="#{FormGestor.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormGestor.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                        <ui:staticText binding="#{FormGestor.staticText8}" escape="false" id="staticText8" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormGestor.staticText8}" escape="false" id="staticText8" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- /ui:form -->
           <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp

@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2" 
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:t="http://myfaces.apache.org/tomahawk"
-	xmlns:ui="http://www.sun.com/web/ui"
+          xmlns:ui="http://www.sun.com/web/ui" version="1.2">
-	xmlns:t="http://myfaces.apache.org/tomahawk">
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-	
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
   <f:view>
     <ui:page binding="#{FormHS.page1}" id="page1">
       <ui:html binding="#{FormHS.html1}" id="html1">
         <ui:head binding="#{FormHS.head1}" id="head1">
-                    <ui:link binding="#{FormHS.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormHS.link1}" id="link1" url="/resources/stylesheet.css" />
-					
           <script type="text/javascript">
           function showPdf()
           {
@@ -25,97 +22,84 @@
             wOpen.resizeTo( screen.availWidth, screen.availHeight );
           }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
-
         </ui:head>
         <ui:body binding="#{FormHS.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form1:table1', 'form2:table2', 'form3:table3' );">
           <!-- ui:form binding="#{FormHS.form1}" id="form1" -->
-                    <h:panelGrid binding="#{FormHS.gridBase1}" columns="1" id="gridBase1"
+          <h:panelGrid binding="#{FormHS.gridBase1}" columns="1" id="gridBase1" style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-                        style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormHS.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
               <ui:form id="form0">
-                                <h:panelGrid binding="#{FormHS.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                <h:panelGrid binding="#{FormHS.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormHS.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormHS.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormHS.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormHS.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image binding="#{FormHS.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel2">
-                                            <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" text="Estatisticas"/>
+                      <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" text="Estatisticas" />
-                                            <ui:staticText escape="false" id="sepUpper" rendered="#{SessionBean1.canAccessEstatisticas}" text=" | "/>
+                      <ui:staticText escape="false" id="sepUpper" rendered="#{SessionBean1.canAccessEstatisticas}" text=" | " />
-                                            <ui:hyperlink action="#{FormHS.lnkPlanosActuacao_action}" binding="#{FormHS.lnkPlanosActuacao}"
+                      <ui:hyperlink action="#{FormHS.lnkPlanosActuacao_action}" binding="#{FormHS.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%">
-                                            <ui:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
+                      <ui:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser" styleClass="labelBold  " />
-                                            <ui:staticText escape="false" id="staticText1" text="   "/>
+                      <ui:staticText escape="false" id="staticText1" text="   " />
-                                            <ui:hyperlink action="#{FormHS.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{FormHS.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="staticText13" text=" | "/>
+                      <ui:staticText escape="false" id="staticText13" text=" | " />
-                                            <ui:hyperlink action="#{FormHS.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{FormHS.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText14" text=" | "/>
+                      <ui:staticText escape="false" id="staticText14" text=" | " />
-                                            <ui:hyperlink action="#{FormHS.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink action="#{FormHS.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText15" style="width: 0px" text="|"/>
+                      <ui:staticText id="staticText15" style="width: 0px" text="|" />
-                                            <ui:hyperlink action="#{FormHS.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{FormHS.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid columnClasses="gridColCenter" columns="2" id="gridPanel10" style="height: 24px; width: 100%;">
-                                <ui:staticText binding="#{FormHS.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                <ui:staticText binding="#{FormHS.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px" />
-
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-										<ui:dropDown binding="#{FormHS.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormHS.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormHS.dropCurrentYear_valueChangeListener}" />
-											onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormHS.dropCurrentYear_valueChangeListener}" />
                   </ui:form>
                 </h:panelGroup>
               </h:panelGrid>
-
               <h:panelGrid binding="#{FormHS.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1" id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-
                 <ui:form binding="#{FormHS.form1}" id="form1">
-
+                  <h:panelGrid binding="#{FormHS.gridActual1}" columnClasses="gridColCenter" columns="1" id="gridActual1" style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
-									<h:panelGrid binding="#{FormHS.gridActual1}" columnClasses="gridColCenter" columns="1" id="gridActual1"
+                    <h:panelGrid binding="#{FormHS.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%" width="264">
-                                        style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
+                      <ui:staticText binding="#{FormHS.staticText4}" id="staticText4" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual" />
-
-										<h:panelGrid binding="#{FormHS.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormHS.staticText4}" id="staticText4"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual"/>
                     </h:panelGrid>
-
+                    <ui:staticText binding="#{FormHS.staticText5}" id="staticText5" styleClass="labelBold" text="Processos com dados pendentes" />
-                                        <ui:staticText binding="#{FormHS.staticText5}" id="staticText5" styleClass="labelBold" text="Processos com dados pendentes"/>
-
                     <h:panelGrid binding="#{FormHS.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%" styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormHS.gridPanelFilterActual}" columns="5" id="gridPanelFilterActual" styleClass="centerBlock">
                         <ui:panelGroup>
-                                                    <ui:staticText escape="false" id="labelFilterDateActual" styleClass="labelBold" text="Data do acidente:"/>
+                          <ui:staticText escape="false" id="labelFilterDateActual" styleClass="labelBold" text="Data do acidente:" />
-                                                    
                           <t:inputDate id="calFilterDateActual" value="#{FormHS.calFilterDateActual}" />
                         </ui:panelGroup>
                         <ui:panelGroup>
-                                                    <ui:staticText escape="false" id="labelFilterPORActual" styleClass="labelBold" text="POR:"/>
+                          <ui:staticText escape="false" id="labelFilterPORActual" styleClass="labelBold" text="POR:" />
-                                                    <ui:textField binding="#{FormHS.textFilterPORActual}" id="textFilterPORActual"/>
+                          <ui:textField binding="#{FormHS.textFilterPORActual}" id="textFilterPORActual" style="width: 160px" />
                         </ui:panelGroup>
                         <ui:panelGroup binding="#{FormHS.groupPanelFilterActual}" id="groupPanelFilterActual">
-                                                    <ui:staticText binding="#{FormHS.labelFilterNameActual}" id="labelFilterNameActual" styleClass="labelBold" text="Nome:"/>
+                          <ui:staticText binding="#{FormHS.labelFilterNameActual}" id="labelFilterNameActual" styleClass="labelBold" text="Nome:" />
-                                                    <ui:textField binding="#{FormHS.textFilterNameActual}" id="textFilterNameActual"/>
+                          <ui:textField binding="#{FormHS.textFilterNameActual}" id="textFilterNameActual" />
+                        </ui:panelGroup>
+                        <ui:panelGroup id="groupPanel15" rendered="#{FormHS.siprp}">
+                          <ui:staticText binding="#{FormHS.labelFilterEmpresaActual}"
+                                         id="labelFilterEmpresaActual" styleClass="labelBold" text="Empresa:" />
+                          <ui:dropDown binding="#{FormHS.dropEmpresasActuais}" id="dropEmpresasActuais"
+                                       valueChangeListener="#{FormHS.dropEmpresasActuais_valueChangeListener}"
+                                       onChange="common_timeoutSubmitForm(this.form,
+                                       'gridBase1:gridLayout1:gridActual1:gridPanel3:gridPanelFilterActual:groupPanel15:dropEmpresaActuais');"
+                                       style="height: 18px; width: 200px" />
                         </ui:panelGroup>
                         <ui:panelGroup>
-                                                    <ui:staticText binding="#{FormHS.labelFilterEstabelecimentoActual}" id="labelFilterEstabelecimentoActual"
+                          <ui:staticText binding="#{FormHS.labelFilterEstabelecimentoActual}" id="labelFilterEstabelecimentoActual" styleClass="labelBold" text="Estabelecimento:" />
-                                                        styleClass="labelBold" text="Estabelecimento:"/>
+                          <ui:dropDown binding="#{FormHS.dropEstabelecimentosActuais}"
-													<ui:dropDown binding="#{FormHS.dropEstabelecimentosActuais}" id="dropEstabelecimentosActuais" style="height: 18px; width: 240px"/>
+                                       id="dropEstabelecimentosActuais" style="height: 18px; width: 200px" />
-                                                    <!-- <ui:textField binding="#{FormHS.textFilterEstabelecimentoActual}" id="textFilterEstabelecimentoActual"/> -->
                         </ui:panelGroup>
-                                                <ui:button action="#{FormHS.buttonFilterActual_action}" binding="#{FormHS.buttonFilterActual}"
+                        <ui:button action="#{FormHS.buttonFilterActual_action}" binding="#{FormHS.buttonFilterActual}" id="buttonFilterActual" text="Pesquisar" />
-                                                    id="buttonFilterActual" text="Pesquisar"/>
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormHS.table1}" id="table1" style="height: 48px; width: 100%" styleClass="centerBlock">
                         <ui:tableRowGroup binding="#{FormHS.tableRowGroup1}" id="tableRowGroup1" sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
                           <ui:tableColumn headerText="Data do acidente" sort="data_acidente" style="width: 10%">
@@ -139,86 +123,74 @@
                           <ui:tableColumn headerText="Estabelecimento" sort="nome_estabelecimento" width="15%">
                             <ui:hyperlink action="#{FormHS.lnkEstabelecimento_action}" binding="#{FormHS.lnkEstabelecimento}" id="lnkEstabelecimento" text="#{currentRow.value['nome_estabelecimento']}" />
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormHS.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormHS.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
-
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
                 <ui:form id="form2">
-                                    <h:panelGrid binding="#{FormHS.gridSeguimento1}" columns="1" id="gridSeguimento1"
+                  <h:panelGrid binding="#{FormHS.gridSeguimento1}" columns="1" id="gridSeguimento1" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormHS.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormHS.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                      <ui:staticText binding="#{FormHS.staticText6}" id="staticText6" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormHS.staticText6}" id="staticText6"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
-                                        <h:panelGrid binding="#{FormHS.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%"
+                    <h:panelGrid binding="#{FormHS.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                            styleClass="centerBlock" width="456">
                       <h:panelGrid binding="#{FormHS.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
-                                                    <ui:staticText escape="false" id="labelFilterDateSeg" styleClass="labelBold" text="Data do acidente:"/>
+                          <ui:staticText escape="false" id="labelFilterDateSeg" styleClass="labelBold" text="Data do acidente:" />
                           <t:inputDate id="calFilterDateSeg" value="#{FormHS.calFilterDateSeguimento}" />
                         </ui:panelGroup>
                         <ui:panelGroup>
-                                                    <ui:staticText escape="false" id="labelFilterPORSeg" styleClass="labelBold" text="POR:"/>
+                          <ui:staticText escape="false" id="labelFilterPORSeg" styleClass="labelBold" text="POR:" />
-                                                    <ui:textField binding="#{FormHS.textFilterPORSeg}" id="textFilterPORSeg"/>
+                          <ui:textField binding="#{FormHS.textFilterPORSeg}" id="textFilterPORSeg" style="width: 160px" />
                         </ui:panelGroup>
                         <ui:panelGroup binding="#{FormHS.groupPanelFilterSeg}" id="groupPanelFilterSeg">
-                                                    <ui:staticText binding="#{FormHS.labelFilterNameSeg}" id="labelFilterNameSeg" styleClass="labelBold" text="Nome:"/>
+                          <ui:staticText binding="#{FormHS.labelFilterNameSeg}" id="labelFilterNameSeg" styleClass="labelBold" text="Nome:" />
-                                                    <ui:textField binding="#{FormHS.textFilterNameSeg}" id="textFilterNameSeg"/>
+                          <ui:textField binding="#{FormHS.textFilterNameSeg}" id="textFilterNameSeg" />
+                        </ui:panelGroup>
+                        <ui:panelGroup id="groupPanel12" rendered="#{FormHS.siprp}">
+                          <ui:staticText binding="#{FormHS.labelFilterEmpresaSeg}"
+                                         id="labelFilterEmpresaSeg" styleClass="labelBold" text="Empresa:" />
+                          <ui:dropDown binding="#{FormHS.dropEmpresaSeg}" id="dropEmpresaSeg"
+                                       valueChangeListener="#{FormHS.dropEmpresasSeg_valueChangeListener}"
+                                       onChange="common_timeoutSubmitForm(this.form,
+                                       'gridBase1:gridLayout1:gridSeguimento1:gridPanel5:gridPanelFilterSeg:groupPanel12:dropEmpresaSeg');"
+                                       style="height: 18px; width: 200px" />
                         </ui:panelGroup>
                         <ui:panelGroup>
-                                                    <ui:staticText binding="#{FormHS.labelFilterEstabelecimentoSeg}" id="labelFilterEstabelecimentoSeg"
+                          <ui:staticText binding="#{FormHS.labelFilterEstabelecimentoSeg}" id="labelFilterEstabelecimentoSeg" styleClass="labelBold" text="Estabelecimento:" />
-                                                        styleClass="labelBold" text="Estabelecimento:"/>
+                          <ui:dropDown binding="#{FormHS.dropEstabelecimentosSeguimento}"
-													<ui:dropDown binding="#{FormHS.dropEstabelecimentosSeguimento}" id="dropEstabelecimentosSeguimento" style="height: 18px; width: 240px"/>
+                                       id="dropEstabelecimentosSeguimento" style="height: 18px; width: 200px" />
-                                                    <!-- <ui:textField binding="#{FormHS.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg"/> -->
                         </ui:panelGroup>
-                                                <ui:button action="#{FormHS.buttonFilterSeg_action}" binding="#{FormHS.buttonFilterSeg}" id="buttonFilterSeg" text="Pesquisar"/>
+                        <ui:button action="#{FormHS.buttonFilterSeg_action}" binding="#{FormHS.buttonFilterSeg}" id="buttonFilterSeg" text="Pesquisar" />
                       </h:panelGrid>
                       <ui:table augmentTitle="false" binding="#{FormHS.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormHS.tableRowGroup2}" id="tableRowGroup2"
+                        <ui:tableRowGroup binding="#{FormHS.tableRowGroup2}" id="tableRowGroup2" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormHS.tableColumn4}" headerText="Data do acidente" id="tableColumn4" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
+                            <ui:hyperlink action="#{FormHS.lnkDataAcidenteSeg_action}" binding="#{FormHS.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormHS.lnkDataAcidenteSeg_action}" binding="#{FormHS.lnkDataAcidenteSeg}"
-                                                            id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn17}" headerText="Data da abertura" id="tableColumn17"
+                          <ui:tableColumn binding="#{FormHS.tableColumn17}" headerText="Data da abertura" id="tableColumn17" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormHS.lnkDataAberturaSeg_action}" binding="#{FormHS.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormHS.lnkDataAberturaSeg_action}" binding="#{FormHS.lnkDataAberturaSeg}"
-                                                            id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
+                          <ui:tableColumn binding="#{FormHS.tableColumn5}" headerText="Nº acidente" id="tableColumn5" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormHS.lnkNrSeg_action}" binding="#{FormHS.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormHS.lnkNrSeg_action}" binding="#{FormHS.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn13}" headerText="POR" id="tableColumn13"
+                          <ui:tableColumn binding="#{FormHS.tableColumn13}" headerText="POR" id="tableColumn13" sort="numero_mecanografico" width="10%">
-                                                        sort="numero_mecanografico" width="10%">
+                            <ui:hyperlink action="#{FormHS.lnkPorSeg_action}" binding="#{FormHS.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormHS.lnkPorSeg_action}" binding="#{FormHS.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
+                          <ui:tableColumn binding="#{FormHS.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6" sort="nome_acidentado" style="width: 50%" width="50%">
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                            <ui:hyperlink action="#{FormHS.lnkNomeAcidentadoSeg_action}" binding="#{FormHS.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormHS.lnkNomeAcidentadoSeg_action}" binding="#{FormHS.lnkNomeAcidentadoSeg}"
-                                                            id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
                           <ui:tableColumn binding="#{FormHS.tableColumn11}" headerText="Fase" id="tableColumn11" sort="fase" width="20%">
-                                                        <ui:hyperlink action="#{FormHS.lnkFaseSeg_action}" binding="#{FormHS.lnkFaseSeg}" id="lnkFaseSeg"
+                            <ui:hyperlink action="#{FormHS.lnkFaseSeg_action}" binding="#{FormHS.lnkFaseSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormHS.tableColumn20}" headerText="Estabelecimento" id="tableColumn20"
+                          <ui:tableColumn binding="#{FormHS.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" sort="nome_estabelecimento" width="15%">
-                                                        sort="nome_estabelecimento" width="15%">
+                            <ui:hyperlink action="#{FormHS.lnkEstabelecimentoSeg_action}" binding="#{FormHS.lnkEstabelecimentoSeg}" id="lnkEstabelecimentoSeg" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormHS.lnkEstabelecimentoSeg_action}" binding="#{FormHS.lnkEstabelecimentoSeg}"
-                                                            id="lnkEstabelecimentoSeg" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormHS.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormHS.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
@@ -227,117 +199,100 @@
                 </ui:form>
               </h:panelGrid>
               <ui:form id="form3">
-                                <h:panelGrid binding="#{FormHS.gridConcluidos1}" columns="1" id="gridConcluidos1"
+                <h:panelGrid binding="#{FormHS.gridConcluidos1}" columns="1" id="gridConcluidos1" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormHS.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormHS.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                    <ui:staticText binding="#{FormHS.staticText7}" escape="false" id="staticText7" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
-                                        <ui:staticText binding="#{FormHS.staticText7}" escape="false" id="staticText7"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormHS.gridPanel7}" columns="7" id="gridPanel7" style="height: 24px" width="576">
+                  <h:panelGrid binding="#{FormHS.gridPanel7}" columns="7" id="gridPanel7" style="height: 24px"
-                                        <ui:panelGroup binding="#{FormHS.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                               styleClass="centerBlock">
-                                            <ui:staticText binding="#{FormHS.staticText8}" id="staticText8" style="height: 24px; width: 22px" text="Ano:"/>
+                    <ui:panelGroup binding="#{FormHS.groupPanel3}" id="groupPanel3">
-                                            <ui:dropDown binding="#{FormHS.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
+                      <ui:staticText binding="#{FormHS.staticText8}" id="staticText8" text="Ano:" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel3:drpAno');"
+                      <ui:dropDown binding="#{FormHS.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel3:drpAno');" selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormHS.drpAno_processValueChange}" />
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormHS.drpAno_processValueChange}"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormHS.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormHS.groupPanel4}" id="groupPanel4" visible="false">
-                                            <ui:staticText binding="#{FormHS.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px" text="Mês:" visible="false"/>
+                      <ui:staticText binding="#{FormHS.lblMes}" escape="false" id="lblMes" text="Mês:" visible="false" />
-                                            <ui:dropDown binding="#{FormHS.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
+                      <ui:dropDown binding="#{FormHS.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel4:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormHS.drpMes_processValueChange}" visible="false" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel4:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormHS.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormHS.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormHS.groupPanel5}" id="groupPanel5" visible="false">
-                                            <ui:staticText binding="#{FormHS.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormHS.lblDia}" id="lblDia" text="Dia:" visible="false" />
-                                            <ui:dropDown binding="#{FormHS.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:dropDown binding="#{FormHS.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormHS.drpDia_processValueChange}" visible="false" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormHS.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormHS.groupPanel7}" id="groupPanel7" style="height: 24px; width: 142px">
+                    <ui:panelGroup binding="#{FormHS.groupPanel7}" id="groupPanel7">
-                                            <ui:staticText binding="#{FormHS.staticText3}" escape="false" id="staticText3" style="height: 24px; width: 96px" text="POR:&amp;nbsp;"/>
+                      <ui:staticText binding="#{FormHS.staticText3}" escape="false" id="staticText3" text="POR:&amp;nbsp;" />
-                                            <ui:textField binding="#{FormHS.txtPor}" id="txtPor" style="width: 96px"/>
+                      <ui:textField binding="#{FormHS.txtPor}" id="txtPor" style="width: 96px" />
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormHS.groupPanel6}" id="groupPanel6" style="height: 24px; width: 262px">
+                    <ui:panelGroup binding="#{FormHS.groupPanel6}" id="groupPanel6">
-                                            <ui:staticText binding="#{FormHS.staticText9}" id="staticText9" style="height: 24px; width: 46px" text="Nome:"/>
+                      <ui:staticText binding="#{FormHS.staticText9}" id="staticText9" text="Nome:" />
-                                            <ui:textField binding="#{FormHS.txtNome}" id="txtNome"/>
+                      <ui:textField binding="#{FormHS.txtNome}" id="txtNome" />
+                    </ui:panelGroup>
+                    <ui:panelGroup id="groupPanel8" rendered="#{FormHS.siprp}">
+                      <ui:staticText binding="#{FormHS.labelFilterEmpresaConc}"
+                                     id="labelFilterEmpresaConc" styleClass="labelBold" text="Empresa:" />
+                      <ui:dropDown binding="#{FormHS.dropEmpresaConc}" id="dropEmpresaConc"
+                                   valueChangeListener="#{FormHS.dropEmpresasConc_valueChangeListener}"
+                                   onChange="common_timeoutSubmitForm(this.form,
+                                   'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel8:dropEmpresaConc');"
+                                   style="height: 18px; width: 200px" />
                     </ui:panelGroup>
                     <ui:panelGroup>
-                                            <ui:staticText id="labelFilterEstabelecimentoConc" text="Estabelecimento:"/>
+                      <ui:staticText id="labelFilterEstabelecimentoConc" text="Estabelecimento:" />
-                                            <!--  <ui:textField binding="#{FormHS.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc"/> -->
+                      <ui:dropDown binding="#{FormHS.dropEstabelecimentosConcluidos}"
-											<ui:dropDown binding="#{FormHS.dropEstabelecimentosConcluidos}" id="dropEstabelecimentosConcluidos" style="height: 18px; width: 240px"/>
+                                   id="dropEstabelecimentosConcluidos" style="height: 18px; width: 200px" />
                     </ui:panelGroup>
-                                        <ui:button action="#{FormHS.butPesquisar_action}" binding="#{FormHS.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormHS.butPesquisar_action}" binding="#{FormHS.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormHS.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8"
+                  <h:panelGrid binding="#{FormHS.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                     <ui:table augmentTitle="false" binding="#{FormHS.table3}" id="table3" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:tableRowGroup binding="#{FormHS.tableRowGroup3}" id="tableRowGroup3"
+                      <ui:tableRowGroup binding="#{FormHS.tableRowGroup3}" id="tableRowGroup3" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                        <ui:tableColumn binding="#{FormHS.tableColumn7}" headerText="Data do acidente" id="tableColumn7" sort="data_acidente" style="width: 10%">
-                                                <ui:tableColumn binding="#{FormHS.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
+                          <ui:hyperlink action="#{FormHS.lnkDataConcluida_action}" binding="#{FormHS.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                    sort="data_acidente" style="width: 10%">
-                                                    <ui:hyperlink action="#{FormHS.lnkDataConcluida_action}" binding="#{FormHS.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormHS.tableColumn18}" headerText="Data da abertura" id="tableColumn18"
+                        <ui:tableColumn binding="#{FormHS.tableColumn18}" headerText="Data da abertura" id="tableColumn18" sort="data_inicio_processo" width="10%">
-                                                    sort="data_inicio_processo" width="10%">
+                          <ui:hyperlink action="#{FormHS.lnkDataAberturaConcluida_action}" binding="#{FormHS.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                    <ui:hyperlink action="#{FormHS.lnkDataAberturaConcluida_action}"
-                                                        binding="#{FormHS.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                         </ui:tableColumn>
                         <ui:tableColumn binding="#{FormHS.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr" style="width: 10%">
-                                                    <ui:hyperlink action="#{FormHS.lnkNrConcluida_action}" binding="#{FormHS.lnkNrConcluida}"
+                          <ui:hyperlink action="#{FormHS.lnkNrConcluida_action}" binding="#{FormHS.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormHS.tableColumn14}" headerText="POR" id="tableColumn14"
+                        <ui:tableColumn binding="#{FormHS.tableColumn14}" headerText="POR" id="tableColumn14" sort="numero_mecanografico" width="200">
-                                                    sort="numero_mecanografico" width="200">
+                          <ui:hyperlink action="#{FormHS.lnkPorConcluida_action}" binding="#{FormHS.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormHS.lnkPorConcluida_action}" binding="#{FormHS.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormHS.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                        <ui:tableColumn binding="#{FormHS.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 80%">
-                                                    sort="nome_acidentado" style="width: 80%">
+                          <ui:hyperlink action="#{FormHS.lnkNomeConcluida_action}" binding="#{FormHS.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormHS.lnkNomeConcluida_action}" binding="#{FormHS.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormHS.tableColumn15}" headerText="Estabelecimento" id="tableColumn15"
+                        <ui:tableColumn binding="#{FormHS.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" sort="nome_estabelecimento" width="200">
-                                                    sort="nome_estabelecimento" width="200">
+                          <ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}" binding="#{FormHS.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}" binding="#{FormHS.lnkEstabConcluida}"
-                                                        id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn headerText="Desactivação"
+                        <ui:tableColumn headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-													<ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormHS.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                        <ui:tableColumn binding="#{FormHS.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-														sort="participado">
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormHS.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormHS.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
               <h:panelGrid binding="#{FormHS.gridPanel9}" columnClasses="gridColCenter" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormHS.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                    <ui:staticText binding="#{FormHS.staticText10}" id="staticText10" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormHS.staticText10}" id="staticText10" text="Software desenvolvido por " />
-                                    <ui:image binding="#{FormHS.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormHS.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                    <ui:staticText binding="#{FormHS.staticText11}" escape="false" id="staticText11" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormHS.staticText11}" escape="false" id="staticText11" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
           <!-- /ui:form -->
+          <script type="text/javascript">var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+          document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));</script>
           <script type="text/javascript">
-                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+          try
-                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+          {
-                    </script>
-                    <script type="text/javascript">
-                    try {
             var pageTracker = _gat._getTracker("UA-6942416-1");
             pageTracker._trackPageview();
-                    } catch(err) {}</script>
+          }
+          catch(err) {}</script>
         </ui:body>
       </ui:html>
     </ui:page>

trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp

@@ -1,76 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2" 
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:ui="http://www.sun.com/web/ui" xmlns:t="http://myfaces.apache.org/tomahawk">
-	xmlns:f="http://java.sun.com/jsf/core"
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:jsp="http://java.sun.com/JSP/Page"
-	xmlns:ui="http://www.sun.com/web/ui"
-	xmlns:t="http://myfaces.apache.org/tomahawk">
-	
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
   <f:view>
     <ui:page binding="#{FormMedico.page1}" id="page1">
       <ui:html binding="#{FormMedico.html1}" id="html1">
         <ui:head binding="#{FormMedico.head1}" id="head1">
-                    <ui:link binding="#{FormMedico.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormMedico.link1}" id="link1" url="/resources/stylesheet.css" />
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
         </ui:head>
         <ui:body binding="#{FormMedico.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form1:table1', 'form2:table2', 'form3:table3' );">
-
           <!-- ui:form binding="#{FormMedico.form1}" id="form1" -->
-
+          <h:panelGrid binding="#{FormMedico.gridBase1}" columns="1" id="gridBase1" style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-                        <h:panelGrid binding="#{FormMedico.gridBase1}" columns="1" id="gridBase1"
-                            style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormMedico.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <ui:form id="form0">
-                                <h:panelGrid binding="#{FormMedico.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                <h:panelGrid binding="#{FormMedico.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormMedico.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormMedico.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormMedico.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormMedico.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                    <ui:image binding="#{FormMedico.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg" />
                   </ui:panelGroup>
                   <ui:panelGroup id="groupPanel2">
                     <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" text="Estatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" />
                     <ui:staticText escape="false" id="sepUpper" text=" | " rendered="#{SessionBean1.canAccessEstatisticas}" />
                   </ui:panelGroup>
                   <ui:panelGroup binding="#{FormMedico.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
-                                        <ui:staticText binding="#{FormMedico.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
+                    <ui:staticText binding="#{FormMedico.lblUser}" escape="false" id="lblUser" styleClass="labelBold" />
-                                        <ui:staticText binding="#{FormMedico.staticText1}" escape="false" id="staticText1" text="   "/>
+                    <ui:staticText binding="#{FormMedico.staticText1}" escape="false" id="staticText1" text="   " />
-                                        <ui:hyperlink action="#{FormMedico.lnkEditUser_action}" binding="#{FormMedico.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
+                    <ui:hyperlink action="#{FormMedico.lnkEditUser_action}" binding="#{FormMedico.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador" />
-                                        <ui:staticText binding="#{FormMedico.staticText2}" escape="false" id="staticText2" text=" | "/>
+                    <ui:staticText binding="#{FormMedico.staticText2}" escape="false" id="staticText2" text=" | " />
-                                        <ui:hyperlink action="#{FormMedico.lnkLogout_action}" binding="#{FormMedico.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
+                    <ui:hyperlink action="#{FormMedico.lnkLogout_action}" binding="#{FormMedico.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;" />
                   </ui:panelGroup>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid columnClasses="gridColCenter" columns="2" id="gridPanel2" style="height: 24px; width: 100%" width="504">
                 <ui:staticText escape="false" id="txtMsg1" text="" />
-
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-											<ui:dropDown binding="#{FormMedico.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormMedico.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormMedico.dropCurrentYear_valueChangeListener}" />
-												onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormMedico.dropCurrentYear_valueChangeListener}"/>
                   </ui:form>
                 </h:panelGroup>
               </h:panelGrid>
-								
+              <h:panelGrid binding="#{FormMedico.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1" id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-                                <h:panelGrid binding="#{FormMedico.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
-                                    id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-
                 <ui:form binding="#{FormMedico.form1}" id="form1">
-                                    <h:panelGrid binding="#{FormMedico.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual"
+                  <h:panelGrid binding="#{FormMedico.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual" style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormMedico.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormMedico.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
+                      <ui:staticText binding="#{FormMedico.staticText4}" id="staticText4" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormMedico.staticText4}" id="staticText4"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual"/>
                     </h:panelGrid>
-                                        <ui:staticText binding="#{FormMedico.staticText5}" id="staticText5" text="Processos com dados pendentes"/>
+                    <ui:staticText binding="#{FormMedico.staticText5}" id="staticText5" text="Processos com dados pendentes" />
-                                        <h:panelGrid binding="#{FormMedico.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%"
+                    <h:panelGrid binding="#{FormMedico.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                            styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormMedico.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" />
@@ -86,59 +63,40 @@
                         </ui:panelGroup>
                         <ui:button binding="#{FormMedico.buttonFilterActual}" id="buttonFilterActual" action="#{FormMedico.buttonFilterActual_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormMedico.table1}" id="table1" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormMedico.tableRowGroup1}" id="tableRowGroup1"
+                        <ui:tableRowGroup binding="#{FormMedico.tableRowGroup1}" id="tableRowGroup1" sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormMedico.tableColumn1}" headerText="Data do acidente" id="tableColumn1" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
+                            <ui:hyperlink action="#{FormMedico.lnkDataAcidente_action}" binding="#{FormMedico.lnkDataAcidente}" id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormMedico.lnkDataAcidente_action}" binding="#{FormMedico.lnkDataAcidente}"
-                                                            id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr" style="width: 10%" width="10%">
-                                                        style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormMedico.lnkNr_action}" binding="#{FormMedico.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkNr_action}" binding="#{FormMedico.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn12}" headerText="POR" id="tableColumn12" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormMedico.lnkPor_action}" binding="#{FormMedico.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkPor_action}" binding="#{FormMedico.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3" sort="nome_acidentado" style="width: 80%" width="60%">
-                                                        sort="nome_acidentado" style="width: 80%" width="60%">
+                            <ui:hyperlink action="#{FormMedico.lnkNomeAcidentado_action}" binding="#{FormMedico.lnkNomeAcidentado}" id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkNomeAcidentado_action}" binding="#{FormMedico.lnkNomeAcidentado}"
-                                                            id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn10}" headerText="Fase" id="tableColumn10" width="10%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn10}" headerText="Fase" id="tableColumn10" width="10%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormMedico.lnkFase_action}" binding="#{FormMedico.lnkFase}" id="lnkFase" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkFase_action}" binding="#{FormMedico.lnkFase}" id="lnkFase"
-                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn16}" headerText="Estabelecimento" id="tableColumn16" width="10%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn16}" headerText="Estabelecimento" id="tableColumn16" width="10%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormMedico.lnkEstabelecimento_action}" binding="#{FormMedico.lnkEstabelecimento}" id="lnkEstabelecimento" style="width: 96px; height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkEstabelecimento_action}" binding="#{FormMedico.lnkEstabelecimento}" id="lnkEstabelecimento"
-                                                            style="width: 96px; height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
                 <ui:form id="form2">
-                                    <h:panelGrid binding="#{FormMedico.gridSeguimento}" columns="1" id="gridSeguimento"
+                  <h:panelGrid binding="#{FormMedico.gridSeguimento}" columns="1" id="gridSeguimento" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormMedico.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormMedico.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                      <ui:staticText binding="#{FormMedico.staticText6}" id="staticText6" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormMedico.staticText6}" id="staticText6"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
-                                        <h:panelGrid binding="#{FormMedico.gridPanel5}" id="gridPanel5"
+                    <h:panelGrid binding="#{FormMedico.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                            style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormMedico.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
@@ -154,148 +112,103 @@
                         </ui:panelGroup>
                         <ui:button binding="#{FormMedico.buttonFilterSeg}" id="buttonFilterSeg" action="#{FormMedico.buttonFilterSeg_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormMedico.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormMedico.tableRowGroup2}" id="tableRowGroup2"
+                        <ui:tableRowGroup binding="#{FormMedico.tableRowGroup2}" id="tableRowGroup2" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormMedico.tableColumn4}" headerText="Data do acidente" id="tableColumn4" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
+                            <ui:hyperlink action="#{FormMedico.lnkDataAcidenteSeg_action}" binding="#{FormMedico.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormMedico.lnkDataAcidenteSeg_action}"
-                                                            binding="#{FormMedico.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn5}" headerText="Nº acidente" id="tableColumn5" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormMedico.lnkNrSeg_action}" binding="#{FormMedico.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkNrSeg_action}" binding="#{FormMedico.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn13}" headerText="POR" id="tableColumn13" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormMedico.lnkPorSeg_action}" binding="#{FormMedico.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkPorSeg_action}" binding="#{FormMedico.lnkPorSeg}" id="lnkPorSeg"
-                                                            style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6" sort="nome_acidentado" style="width: 80%" width="60%">
-                                                        sort="nome_acidentado" style="width: 80%" width="60%">
+                            <ui:hyperlink action="#{FormMedico.lnkNomeAcidentadoSeg_action}" binding="#{FormMedico.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkNomeAcidentadoSeg_action}"
-                                                            binding="#{FormMedico.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn11}" headerText="Fase" id="tableColumn11" width="10%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn11}" headerText="Fase" id="tableColumn11" width="10%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormMedico.lnkFaseSeg_action}" binding="#{FormMedico.lnkFaseSeg}" id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkFaseSeg_action}" binding="#{FormMedico.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumn17}" headerText="Estabelecimento" id="tableColumn17" width="10%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumn17}" headerText="Estabelecimento" id="tableColumn17" width="10%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormMedico.lnkEstabelecimentoSeg_action}" binding="#{FormMedico.lnkEstabelecimentoSeg}" id="lnkEstabelecimentoSeg" style="width: 96px; height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormMedico.lnkEstabelecimentoSeg_action}" binding="#{FormMedico.lnkEstabelecimentoSeg}"
-                                                            id="lnkEstabelecimentoSeg" style="width: 96px; height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormMedico.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormMedico.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
               </h:panelGrid>
-
               <ui:form id="form3">
-                                <h:panelGrid binding="#{FormMedico.gridConcluidos}" columns="1" id="gridConcluidos"
+                <h:panelGrid binding="#{FormMedico.gridConcluidos}" columns="1" id="gridConcluidos" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormMedico.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormMedico.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                    <ui:staticText binding="#{FormMedico.staticText7}" escape="false" id="staticText7" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
-                                        <ui:staticText binding="#{FormMedico.staticText7}" escape="false" id="staticText7"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
                   </h:panelGrid>
                   <h:panelGrid binding="#{FormMedico.gridPanel7}" columns="6" id="gridPanel7" style="height: 24px" width="576">
                     <ui:panelGroup binding="#{FormMedico.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
-                                            <ui:staticText binding="#{FormMedico.staticText8}" id="staticText8" style="height: 24px; width: 22px" text="Ano:"/>
+                      <ui:staticText binding="#{FormMedico.staticText8}" id="staticText8" style="height: 24px; width: 22px" text="Ano:" />
-                                            <ui:dropDown binding="#{FormMedico.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
+                      <ui:dropDown binding="#{FormMedico.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos:gridPanel7:groupPanel3:drpAno');" selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormMedico.drpAno_processValueChange}" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos:gridPanel7:groupPanel3:drpAno');"
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormMedico.drpAno_processValueChange}"/>
                     </ui:panelGroup>
                     <ui:panelGroup binding="#{FormMedico.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
-                                            <ui:staticText binding="#{FormMedico.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px"
+                      <ui:staticText binding="#{FormMedico.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px" text="Mês:" visible="false" />
-                                                text="Mês:" visible="false"/>
+                      <ui:dropDown binding="#{FormMedico.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos:gridPanel7:groupPanel4:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormMedico.drpMes_processValueChange}" visible="false" />
-                                            <ui:dropDown binding="#{FormMedico.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos:gridPanel7:groupPanel4:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormMedico.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
                     <ui:panelGroup binding="#{FormMedico.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
-                                            <ui:staticText binding="#{FormMedico.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormMedico.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false" />
-                                            <ui:dropDown binding="#{FormMedico.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:dropDown binding="#{FormMedico.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormMedico.drpDia_processValueChange}" visible="false" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormMedico.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
                     <ui:panelGroup binding="#{FormMedico.groupPanel7}" id="groupPanel7" style="height: 24px; width: 142px">
-                                            <ui:staticText binding="#{FormMedico.staticText3}" escape="false" id="staticText3" style="height: 24px; width: 96px" text="POR:&amp;nbsp;"/>
+                      <ui:staticText binding="#{FormMedico.staticText3}" escape="false" id="staticText3" style="height: 24px; width: 96px" text="POR:&amp;nbsp;" />
-                                            <ui:textField binding="#{FormMedico.txtPor}" id="txtPor" style="height: 24px; width: 96px"/>
+                      <ui:textField binding="#{FormMedico.txtPor}" id="txtPor" style="height: 24px; width: 96px" />
                     </ui:panelGroup>
                     <ui:panelGroup binding="#{FormMedico.groupPanel6}" id="groupPanel6" style="height: 24px; width: 262px">
-                                            <ui:staticText binding="#{FormMedico.staticText9}" id="staticText9" style="height: 24px; width: 46px" text="Nome:"/>
+                      <ui:staticText binding="#{FormMedico.staticText9}" id="staticText9" style="height: 24px; width: 46px" text="Nome:" />
-                                            <ui:textField binding="#{FormMedico.txtNome}" id="txtNome"/>
+                      <ui:textField binding="#{FormMedico.txtNome}" id="txtNome" />
                     </ui:panelGroup>
-                                        <ui:button action="#{FormMedico.butPesquisar_action}" binding="#{FormMedico.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormMedico.butPesquisar_action}" binding="#{FormMedico.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormMedico.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8"
+                  <h:panelGrid binding="#{FormMedico.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                     <ui:table augmentTitle="false" binding="#{FormMedico.table3}" id="table3" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:tableRowGroup binding="#{FormMedico.tableRowGroup3}" id="tableRowGroup3"
+                      <ui:tableRowGroup binding="#{FormMedico.tableRowGroup3}" id="tableRowGroup3" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                        <ui:tableColumn binding="#{FormMedico.tableColumn7}" headerText="Data do acidente" id="tableColumn7" sort="data_acidente" style="width: 10%">
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
+                          <ui:hyperlink action="#{FormMedico.lnkDataConcluida_action}" binding="#{FormMedico.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                    sort="data_acidente" style="width: 10%">
-                                                    <ui:hyperlink action="#{FormMedico.lnkDataConcluida_action}" binding="#{FormMedico.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
                         <ui:tableColumn binding="#{FormMedico.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr" style="width: 10%">
-                                                    <ui:hyperlink action="#{FormMedico.lnkNrConcluida_action}" binding="#{FormMedico.lnkNrConcluida}"
+                          <ui:hyperlink action="#{FormMedico.lnkNrConcluida_action}" binding="#{FormMedico.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn14}" headerText="POR" id="tableColumn14" width="200"
+                        <ui:tableColumn binding="#{FormMedico.tableColumn14}" headerText="POR" id="tableColumn14" width="200" sort="numero_mecanografico">
-													sort="numero_mecanografico">
+                          <ui:hyperlink action="#{FormMedico.lnkPorConcluida_action}" binding="#{FormMedico.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormMedico.lnkPorConcluida_action}" binding="#{FormMedico.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                        <ui:tableColumn binding="#{FormMedico.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 80%">
-                                                    sort="nome_acidentado" style="width: 80%">
+                          <ui:hyperlink action="#{FormMedico.lnkNomeConcluida_action}" binding="#{FormMedico.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormMedico.lnkNomeConcluida_action}" binding="#{FormMedico.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormMedico.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="200"
+                        <ui:tableColumn binding="#{FormMedico.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="200" sort="nome_estabelecimento">
-													sort="nome_estabelecimento">
+                          <ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}" binding="#{FormMedico.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}" binding="#{FormMedico.lnkEstabConcluida}"
-                                                        id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn headerText="Desactivação"
+                        <ui:tableColumn headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-													<ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormMedico.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                        <ui:tableColumn binding="#{FormMedico.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-													sort="participado">
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                       <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormMedico.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormMedico.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid binding="#{FormMedico.gridPanel9}" columnClasses="gridColCenter" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormMedico.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                        <ui:staticText binding="#{FormMedico.staticText10}" id="staticText10" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormMedico.staticText10}" id="staticText10" text="Software desenvolvido por " />
-                                        <ui:image binding="#{FormMedico.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormMedico.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                        <ui:staticText binding="#{FormMedico.staticText11}" escape="false" id="staticText11" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormMedico.staticText11}" escape="false" id="staticText11" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- /ui:form -->
-					
         </ui:body>
       </ui:html>
     </ui:page>

trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp

@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2" 
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:ui="http://www.sun.com/web/ui" xmlns:t="http://myfaces.apache.org/tomahawk">
-	xmlns:f="http://java.sun.com/jsf/core"
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:jsp="http://java.sun.com/JSP/Page"
-	xmlns:ui="http://www.sun.com/web/ui"
-	xmlns:t="http://myfaces.apache.org/tomahawk">
-	
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
   <f:view>
     <ui:page binding="#{FormRH.page1}" id="page1">
       <ui:html binding="#{FormRH.html1}" id="html1">
         <ui:head binding="#{FormRH.head1}" id="head1">
-                    <ui:link binding="#{FormRH.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormRH.link1}" id="link1" url="/resources/stylesheet.css" />
           <script type="text/javascript">
             function showPdf()
             {
@@ -24,72 +18,55 @@
               wOpen.resizeTo( screen.availWidth, screen.availHeight );
             }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
         </ui:head>
         <ui:body binding="#{FormRH.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form1:table1', 'form2:table2', 'form3:table3' );">
-
           <!-- ui:form binding="#{FormRH.form1}" id="form1" -->
-
+          <h:panelGrid binding="#{FormRH.gridBase1}" columns="1" id="gridBase1" style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-                        <h:panelGrid binding="#{FormRH.gridBase1}" columns="1" id="gridBase1"
-                            style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormRH.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <ui:form id="form0">
-                                <h:panelGrid binding="#{FormRH.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                <h:panelGrid binding="#{FormRH.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormRH.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormRH.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormRH.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormRH.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image binding="#{FormRH.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel2">
                       <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" text="Estatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" />
                       <ui:staticText escape="false" id="sepUpper" text=" | " rendered="#{SessionBean1.canAccessEstatisticas}" />
-                                            <ui:hyperlink action="#{FormRH.lnkPlanosActuacao_action}" binding="#{FormRH.lnkPlanosActuacao}"
+                      <ui:hyperlink action="#{FormRH.lnkPlanosActuacao_action}" binding="#{FormRH.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%">
-                                            <ui:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
+                      <ui:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser" styleClass="labelBold  " />
-                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                      <ui:staticText escape="false" id="stSep1" text="   " />
-                                            <ui:hyperlink action="#{FormRH.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{FormRH.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="staticText11" text=" | "/>
+                      <ui:staticText escape="false" id="staticText11" text=" | " />
-                                            <ui:hyperlink action="#{FormRH.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{FormRH.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText12" text=" | "/>
+                      <ui:staticText escape="false" id="staticText12" text=" | " />
-                                            <ui:hyperlink action="#{FormRH.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink action="#{FormRH.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText13" style="width: 0px" text="|"/>
+                      <ui:staticText id="staticText13" style="width: 0px" text="|" />
-                                            <ui:hyperlink action="#{FormRH.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{FormRH.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-								
+              <h:panelGrid binding="#{FormRH.gridPanel10}" columnClasses="gridColCenter" columns="2" id="gridPanel10" style="height: 24px; width: 100%" width="504">
-                                <h:panelGrid binding="#{FormRH.gridPanel10}" columnClasses="gridColCenter" columns="2" id="gridPanel10"
+                <ui:staticText binding="#{FormRH.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px" />
-                                    style="height: 24px; width: 100%" width="504">
-                                    <ui:staticText binding="#{FormRH.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
-
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-											<ui:dropDown binding="#{FormRH.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormRH.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormRH.dropCurrentYear_valueChangeListener}" />
-												onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormRH.dropCurrentYear_valueChangeListener}"/>
                   </ui:form>
                 </h:panelGroup>
               </h:panelGrid>
-                                <h:panelGrid binding="#{FormRH.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
+              <h:panelGrid binding="#{FormRH.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1" id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-                                    id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-
                 <ui:form binding="#{FormRH.form1}" id="form1">
-                                    <h:panelGrid binding="#{FormRH.gridActual1}" columnClasses="gridColCenter" columns="1" id="gridActual1"
+                  <h:panelGrid binding="#{FormRH.gridActual1}" columnClasses="gridColCenter" columns="1" id="gridActual1" style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormRH.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormRH.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
+                      <ui:staticText binding="#{FormRH.staticText4}" id="staticText4" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormRH.staticText4}" id="staticText4"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual"/>
                     </h:panelGrid>
-                                        <ui:staticText binding="#{FormRH.staticText5}" id="staticText5" styleClass="labelBold" text="Processos com dados pendentes"/>
+                    <ui:staticText binding="#{FormRH.staticText5}" id="staticText5" styleClass="labelBold" text="Processos com dados pendentes" />
                     <h:panelGrid binding="#{FormRH.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%" styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormRH.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" />
@@ -105,64 +82,43 @@
                         </ui:panelGroup>
                         <ui:button binding="#{FormRH.buttonFilterActual}" id="buttonFilterActual" action="#{FormRH.buttonFilterActual_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormRH.table1}" id="table1" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormRH.tableRowGroup1}" id="tableRowGroup1"
+                        <ui:tableRowGroup binding="#{FormRH.tableRowGroup1}" id="tableRowGroup1" sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormRH.tableColumn1}" headerText="Data do acidente" id="tableColumn1" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
+                            <ui:hyperlink action="#{FormRH.lnkDataAcidente_action}" binding="#{FormRH.lnkDataAcidente}" id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormRH.lnkDataAcidente_action}" binding="#{FormRH.lnkDataAcidente}"
-                                                            id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn16}" headerText="Data da abertura" id="tableColumn16"
+                          <ui:tableColumn binding="#{FormRH.tableColumn16}" headerText="Data da abertura" id="tableColumn16" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormRH.lnkDataAbertura_action}" binding="#{FormRH.lnkDataAbertura}" id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkDataAbertura_action}" binding="#{FormRH.lnkDataAbertura}"
-                                                            id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
+                          <ui:tableColumn binding="#{FormRH.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormRH.lnkNr_action}" binding="#{FormRH.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkNr_action}" binding="#{FormRH.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+                          <ui:tableColumn binding="#{FormRH.tableColumn12}" headerText="POR" id="tableColumn12" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormRH.lnkPor_action}" binding="#{FormRH.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkPor_action}" binding="#{FormRH.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
+                          <ui:tableColumn binding="#{FormRH.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3" sort="nome_acidentado" style="width: 50%" width="50%">
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                            <ui:hyperlink action="#{FormRH.lnkNomeAcidentado_action}" binding="#{FormRH.lnkNomeAcidentado}" id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkNomeAcidentado_action}" binding="#{FormRH.lnkNomeAcidentado}"
-                                                            id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+                          <ui:tableColumn binding="#{FormRH.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormRH.lnkFase_action}" binding="#{FormRH.lnkFase}" id="lnkFase" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkFase_action}" binding="#{FormRH.lnkFase}" id="lnkFase"
-                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%"
+                          <ui:tableColumn binding="#{FormRH.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormRH.lnkEstabelecimento_action}" binding="#{FormRH.lnkEstabelecimento}" id="lnkEstabelecimento" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkEstabelecimento_action}" binding="#{FormRH.lnkEstabelecimento}" id="lnkEstabelecimento"
-                                                            style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormRH.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormRH.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
                 <ui:form id="form2">
-                                    <h:panelGrid binding="#{FormRH.gridSeguimento1}" columns="1" id="gridSeguimento1"
+                  <h:panelGrid binding="#{FormRH.gridSeguimento1}" columns="1" id="gridSeguimento1" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormRH.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormRH.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                      <ui:staticText binding="#{FormRH.staticText6}" id="staticText6" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormRH.staticText6}" id="staticText6"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
-                                        <h:panelGrid binding="#{FormRH.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%"
+                    <h:panelGrid binding="#{FormRH.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                            styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormRH.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
@@ -178,158 +134,109 @@
                         </ui:panelGroup>
                         <ui:button binding="#{FormRH.buttonFilterSeg}" id="buttonFilterSeg" action="#{FormRH.buttonFilterSeg_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormRH.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormRH.tableRowGroup2}" id="tableRowGroup2"
+                        <ui:tableRowGroup binding="#{FormRH.tableRowGroup2}" id="tableRowGroup2" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormRH.tableColumn4}" headerText="Data do acidente" id="tableColumn4" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
+                            <ui:hyperlink action="#{FormRH.lnkDataAcidenteSeg_action}" binding="#{FormRH.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormRH.lnkDataAcidenteSeg_action}" binding="#{FormRH.lnkDataAcidenteSeg}"
-                                                            id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn17}" headerText="Data da abertura" id="tableColumn17"
+                          <ui:tableColumn binding="#{FormRH.tableColumn17}" headerText="Data da abertura" id="tableColumn17" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormRH.lnkDataAberturaSeg_action}" binding="#{FormRH.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkDataAberturaSeg_action}" binding="#{FormRH.lnkDataAberturaSeg}"
-                                                            id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
+                          <ui:tableColumn binding="#{FormRH.tableColumn5}" headerText="Nº acidente" id="tableColumn5" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormRH.lnkNrSeg_action}" binding="#{FormRH.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkNrSeg_action}" binding="#{FormRH.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+                          <ui:tableColumn binding="#{FormRH.tableColumn13}" headerText="POR" id="tableColumn13" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormRH.lnkPorSeg_action}" binding="#{FormRH.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkPorSeg_action}" binding="#{FormRH.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
+                          <ui:tableColumn binding="#{FormRH.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6" sort="nome_acidentado" style="width: 50%" width="50%">
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                            <ui:hyperlink action="#{FormRH.lnkNomeAcidentadoSeg_action}" binding="#{FormRH.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkNomeAcidentadoSeg_action}" binding="#{FormRH.lnkNomeAcidentadoSeg}"
-                                                            id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%"
+                          <ui:tableColumn binding="#{FormRH.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormRH.lnkFaseSeg_action}" binding="#{FormRH.lnkFaseSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkFaseSeg_action}" binding="#{FormRH.lnkFaseSeg}" id="lnkFaseSeg"
-                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="20%"
+                          <ui:tableColumn binding="#{FormRH.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="20%" sort="nome_estabelecimento">
-														sort="nome_estabelecimento">
+                            <ui:hyperlink action="#{FormRH.lnkEstabelecimentoSeg_action}" binding="#{FormRH.lnkEstabelecimentoSeg}" id="lnkEstabelecimentoSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                        <ui:hyperlink action="#{FormRH.lnkEstabelecimentoSeg_action}" binding="#{FormRH.lnkEstabelecimentoSeg}" id="lnkEstabelecimentoSeg"
-                                                            style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-													<ui:tableColumn binding="#{FormRH.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                          <ui:tableColumn binding="#{FormRH.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-														sort="participado">
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
               </h:panelGrid>
-
               <ui:form id="form3">
-                                <h:panelGrid binding="#{FormRH.gridConcluidos1}" columns="1" id="gridConcluidos1"
+                <h:panelGrid binding="#{FormRH.gridConcluidos1}" columns="1" id="gridConcluidos1" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormRH.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormRH.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                    <ui:staticText binding="#{FormRH.staticText7}" escape="false" id="staticText7" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
+                  </h:panelGrid>
-                                        <ui:staticText binding="#{FormRH.staticText7}" escape="false" id="staticText7"
+                  <h:panelGrid binding="#{FormRH.gridPanel7}" columns="6" id="gridPanel7" style="height: 24px"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
+                               styleClass="centerBlock">
-                                    </h:panelGrid>
+                    <ui:panelGroup binding="#{FormRH.groupPanel3}" id="groupPanel3">
-                                    <h:panelGrid binding="#{FormRH.gridPanel7}" columns="6" id="gridPanel7" style="height: 24px" width="576">
+                      <ui:staticText binding="#{FormRH.staticText8}" id="staticText8" styleClass="labelBold" text="Ano:" />
-                                        <ui:panelGroup binding="#{FormRH.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                      <ui:dropDown binding="#{FormRH.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel3:drpAno');" selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormRH.drpAno_processValueChange}" />
-                                            <ui:staticText binding="#{FormRH.staticText8}" id="staticText8" style="height: 24px; width: 22px"
-                                                styleClass="labelBold" text="Ano:"/>
-                                            <ui:dropDown binding="#{FormRH.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel3:drpAno');"
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormRH.drpAno_processValueChange}"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormRH.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormRH.groupPanel4}" id="groupPanel4" visible="false">
-                                            <ui:staticText binding="#{FormRH.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px" text="Mês:" visible="false"/>
+                      <ui:staticText binding="#{FormRH.lblMes}" escape="false" id="lblMes" text="Mês:" visible="false" />
-                                            <ui:dropDown binding="#{FormRH.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
+                      <ui:dropDown binding="#{FormRH.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel4:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormRH.drpMes_processValueChange}" visible="false" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos1:gridPanel7:groupPanel4:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormRH.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormRH.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormRH.groupPanel5}" id="groupPanel5" visible="false">
-                                            <ui:staticText binding="#{FormRH.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormRH.lblDia}" id="lblDia" text="Dia:" visible="false" />
-                                            <ui:dropDown binding="#{FormRH.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:dropDown binding="#{FormRH.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormRH.drpDia_processValueChange}" visible="false" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormRH.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormRH.groupPanel7}" id="groupPanel7" style="height: 24px; width: 142px">
+                    <ui:panelGroup binding="#{FormRH.groupPanel7}" id="groupPanel7">
-                                            <ui:staticText binding="#{FormRH.staticText3}" escape="false" id="staticText3" style="height: 24px; width: 96px"
+                      <ui:staticText binding="#{FormRH.staticText3}" escape="false" id="staticText3" styleClass="labelBold" text="POR:&amp;nbsp;" />
-                                                styleClass="labelBold" text="POR:&amp;nbsp;"/>
+                      <ui:textField binding="#{FormRH.txtPor}" id="txtPor" />
-                                            <ui:textField binding="#{FormRH.txtPor}" id="txtPor" style=""/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormRH.groupPanel6}" id="groupPanel6" style="height: 24px; width: 262px">
+                    <ui:panelGroup binding="#{FormRH.groupPanel6}" id="groupPanel6">
-                                            <ui:staticText binding="#{FormRH.staticText9}" id="staticText9" style="height: 24px; width: 46px"
+                      <ui:staticText binding="#{FormRH.staticText9}" id="staticText9" styleClass="labelBold" text="Nome:" />
-                                                styleClass="labelBold" text="Nome:"/>
+                      <ui:textField binding="#{FormRH.txtNome}" id="txtNome" />
-                                            <ui:textField binding="#{FormRH.txtNome}" id="txtNome"/>
                     </ui:panelGroup>
-                                        <ui:button action="#{FormRH.butPesquisar_action}" binding="#{FormRH.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormRH.butPesquisar_action}" binding="#{FormRH.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormRH.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8"
+                  <h:panelGrid binding="#{FormRH.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                     <ui:table augmentTitle="false" binding="#{FormRH.table3}" id="table3" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:tableRowGroup binding="#{FormRH.tableRowGroup3}" id="tableRowGroup3"
+                      <ui:tableRowGroup binding="#{FormRH.tableRowGroup3}" id="tableRowGroup3" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                        <ui:tableColumn binding="#{FormRH.tableColumn7}" headerText="Data do acidente" id="tableColumn7" sort="data_acidente" style="width: 10%" width="10%">
-                                                <ui:tableColumn binding="#{FormRH.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
+                          <ui:hyperlink action="#{FormRH.lnkDataConcluida_action}" binding="#{FormRH.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                    sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:hyperlink action="#{FormRH.lnkDataConcluida_action}" binding="#{FormRH.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn18}" headerText="Data da abertura" id="tableColumn18"
+                        <ui:tableColumn binding="#{FormRH.tableColumn18}" headerText="Data da abertura" id="tableColumn18" sort="data_inicio_processo" width="10%">
-                                                    sort="data_inicio_processo" width="10%">
+                          <ui:hyperlink action="#{FormRH.lnkDataAberturaConcluida_action}" binding="#{FormRH.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                    <ui:hyperlink action="#{FormRH.lnkDataAberturaConcluida_action}"
-                                                        binding="#{FormRH.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr"
+                        <ui:tableColumn binding="#{FormRH.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr" style="width: 10%" width="7%">
-                                                    style="width: 10%" width="7%">
+                          <ui:hyperlink action="#{FormRH.lnkNrConcluida_action}" binding="#{FormRH.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                    <ui:hyperlink action="#{FormRH.lnkNrConcluida_action}" binding="#{FormRH.lnkNrConcluida}"
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn14}" headerText="POR" id="tableColumn14" width="8%"
+                        <ui:tableColumn binding="#{FormRH.tableColumn14}" headerText="POR" id="tableColumn14" width="8%" sort="numero_mecanografico">
-													sort="numero_mecanografico">
+                          <ui:hyperlink action="#{FormRH.lnkPorConcluida_action}" binding="#{FormRH.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormRH.lnkPorConcluida_action}" binding="#{FormRH.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                        <ui:tableColumn binding="#{FormRH.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 80%" width="60%">
-                                                    sort="nome_acidentado" style="width: 80%" width="60%">
+                          <ui:hyperlink action="#{FormRH.lnkNomeConcluida_action}" binding="#{FormRH.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormRH.lnkNomeConcluida_action}" binding="#{FormRH.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormRH.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%"
+                        <ui:tableColumn binding="#{FormRH.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%" sort="nome_estabelecimento">
-													sort="nome_estabelecimento">
+                          <ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}" binding="#{FormRH.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}" binding="#{FormRH.lnkEstabConcluida}"
-                                                        id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn headerText="Desactivação"
+                        <ui:tableColumn headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-													<ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												<ui:tableColumn binding="#{FormRH.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                        <ui:tableColumn binding="#{FormRH.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-														sort="participado">
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormRH.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormRH.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid binding="#{FormRH.gridPanel9}" columnClasses="gridColCenter" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormRH.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                        <ui:staticText binding="#{FormRH.staticText1}" id="staticText1" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormRH.staticText1}" id="staticText1" text="Software desenvolvido por " />
-                                        <ui:image binding="#{FormRH.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormRH.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                        <ui:staticText binding="#{FormRH.staticText10}" escape="false" id="staticText10" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormRH.staticText10}" escape="false" id="staticText10" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- /ui:form -->
           <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp

@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jsp:root version="1.2" 
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:ui="http://www.sun.com/web/ui" xmlns:t="http://myfaces.apache.org/tomahawk">
-	xmlns:f="http://java.sun.com/jsf/core"
+  <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" />
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:jsp="http://java.sun.com/JSP/Page"
-	xmlns:ui="http://www.sun.com/web/ui"
-	xmlns:t="http://myfaces.apache.org/tomahawk">
-	
-    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
   <f:view>
     <ui:page binding="#{FormSeguranca.page1}" id="page1">
       <ui:html binding="#{FormSeguranca.html1}" id="html1">
         <ui:head binding="#{FormSeguranca.head1}" id="head1">
-                    <ui:link binding="#{FormSeguranca.link1}" id="link1" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormSeguranca.link1}" id="link1" url="/resources/stylesheet.css" />
-                    <ui:link binding="#{FormSeguranca.link2}" id="link2" url="/resources/stylesheet.css"/>
+          <ui:link binding="#{FormSeguranca.link2}" id="link2" url="/resources/stylesheet.css" />
           <script type="text/javascript">
             function showPdf()
             {
@@ -25,78 +19,57 @@
               wOpen.resizeTo( screen.availWidth, screen.availHeight );
             }
           </script>
-
           <ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
         </ui:head>
         <ui:body binding="#{FormSeguranca.body1}" id="body1" style="-rave-layout: grid" onLoad="showTables( 'form1:table1', 'form2:table2', 'form3:table3' );">
-
           <!-- ui:form binding="#{FormSeguranca.form1}" id="form1" -->
-
+          <h:panelGrid binding="#{FormSeguranca.gridBase}" columns="1" id="gridBase" style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
-                        <h:panelGrid binding="#{FormSeguranca.gridBase}" columns="1" id="gridBase"
-                            style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
             <h:panelGrid binding="#{FormSeguranca.gridLayout}" columns="1" id="gridLayout" style="height: 15px; width: 80%" styleClass="centerBlock">
-
               <ui:form id="form0">
-                                <h:panelGrid binding="#{FormSeguranca.gridPanel8}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel8"
+                <h:panelGrid binding="#{FormSeguranca.gridPanel8}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel8" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
-                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                   <ui:panelGroup binding="#{FormSeguranca.groupPanel5}" id="groupPanel5" style="height: 24px; width: 216px">
-                                        <ui:image binding="#{FormSeguranca.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                    <ui:image binding="#{FormSeguranca.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg" />
-                                        <ui:image binding="#{FormSeguranca.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
+                    <ui:image binding="#{FormSeguranca.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150" />
                   </ui:panelGroup>
                   <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                     <ui:panelGroup id="groupPanel6">
                       <ui:hyperlink action="estatisticasProcesso" id="linkEstatisticas" text="Estatisticas" rendered="#{SessionBean1.canAccessEstatisticas}" />
                       <ui:staticText escape="false" id="sepUpper" text=" | " rendered="#{SessionBean1.canAccessEstatisticas}" />
-                                            <ui:hyperlink action="#{FormSeguranca.lnkPlanosActuacao_action}" binding="#{FormSeguranca.lnkPlanosActuacao}"
+                      <ui:hyperlink action="#{FormSeguranca.lnkPlanosActuacao_action}" binding="#{FormSeguranca.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;" />
-                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
                     </ui:panelGroup>
                     <ui:panelGroup id="groupPanel9" style="height: 24px">
-                                            <ui:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser" styleClass="labelBold     "/>
+                      <ui:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser" styleClass="labelBold     " />
-                                            <ui:staticText escape="false" id="staticText9" text="   "/>
+                      <ui:staticText escape="false" id="staticText9" text="   " />
-                                            <ui:hyperlink action="#{FormSeguranca.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                      <ui:hyperlink action="#{FormSeguranca.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores" />
-                                            <ui:staticText escape="false" id="staticText12" text=" | "/>
+                      <ui:staticText escape="false" id="staticText12" text=" | " />
-                                            <ui:hyperlink action="#{FormSeguranca.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                      <ui:hyperlink action="#{FormSeguranca.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador" />
-                                            <ui:staticText escape="false" id="staticText13" text=" | "/>
+                      <ui:staticText escape="false" id="staticText13" text=" | " />
-                                            <ui:hyperlink action="#{FormSeguranca.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                      <ui:hyperlink action="#{FormSeguranca.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda " />
-                                            <ui:staticText id="staticText15" style="width: 0px" text="|"/>
+                      <ui:staticText id="staticText15" style="width: 0px" text="|" />
-                                            <ui:hyperlink action="#{FormSeguranca.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                      <ui:hyperlink action="#{FormSeguranca.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;" />
                     </ui:panelGroup>
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-								
+              <h:panelGrid binding="#{FormSeguranca.gridPanel10}" columnClasses="gridColCenter" columns="2" id="gridPanel10" style="height: 24px; width: 100%" width="504">
-                                <h:panelGrid binding="#{FormSeguranca.gridPanel10}" columnClasses="gridColCenter" columns="2" id="gridPanel10"
+                <ui:staticText binding="#{FormSeguranca.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px" />
-                                    style="height: 24px; width: 100%" width="504">
-                                    <ui:staticText binding="#{FormSeguranca.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
-
-									
                 <h:panelGroup id="panelGroupCurrentYear" style="text-align: right;">
                   <ui:form id="formYear">
                     <ui:staticText escape="false" id="textCurrentYear" text="Visualizar análises do ano: " />
-											<ui:dropDown binding="#{FormSeguranca.dropCurrentYear}" id="dropCurrentYear"
+                    <ui:dropDown binding="#{FormSeguranca.dropCurrentYear}" id="dropCurrentYear" onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormSeguranca.dropCurrentYear_valueChangeListener}" />
-												onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormSeguranca.dropCurrentYear_valueChangeListener}"/>
                   </ui:form>
                 </h:panelGroup>
-									
               </h:panelGrid>
-                                <h:panelGrid binding="#{FormSeguranca.gridLayoutTop}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
+              <h:panelGrid binding="#{FormSeguranca.gridLayoutTop}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1" id="gridLayoutTop" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-                                    id="gridLayoutTop" style="height: 15px; position: relative; vertical-align: top; width: 100%">
-
                 <ui:form binding="#{FormSeguranca.form1}" id="form1">
-                                    <h:panelGrid binding="#{FormSeguranca.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual"
+                  <h:panelGrid binding="#{FormSeguranca.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual" style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormSeguranca.gridPanel1}" columnClasses="gridColCenter" columns="1" id="gridPanel1" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormSeguranca.gridPanel1}" columnClasses="gridColCenter" columns="1" id="gridPanel1"
+                      <ui:staticText binding="#{FormSeguranca.staticText1}" id="staticText1" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormSeguranca.staticText1}" id="staticText1"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual"/>
                     </h:panelGrid>
-                                        <ui:button action="#{FormSeguranca.butNovaAnalise_action}" binding="#{FormSeguranca.butNovaAnalise}" id="butNovaAnalise"
+                    <ui:button action="#{FormSeguranca.butNovaAnalise_action}" binding="#{FormSeguranca.butNovaAnalise}" id="butNovaAnalise" style="background-color: orange; font-weight: bold; height: 30px; width: 80%" text="Criar nova análise de acidentes de trabalho" />
-                                            style="background-color: orange; font-weight: bold; height: 30px; width: 80%" text="Criar nova análise de acidentes de trabalho"/>
+                    <ui:staticText binding="#{FormSeguranca.staticText8}" escape="false" id="staticText8" style="height: 12px; width: 24px" text="&amp;nbsp;" />
-                                        <ui:staticText binding="#{FormSeguranca.staticText8}" escape="false" id="staticText8" style="height: 12px; width: 24px" text="&amp;nbsp;"/>
+                    <ui:staticText binding="#{FormSeguranca.staticText4}" id="staticText4" style="font-size: 12px" styleClass="labelBold" text="Processos com dados pendentes" />
-                                        <ui:staticText binding="#{FormSeguranca.staticText4}" id="staticText4" style="font-size: 12px" styleClass="labelBold" text="Processos com dados pendentes"/>
+                    <h:panelGrid binding="#{FormSeguranca.gridPanel4}" id="gridPanel4" style="height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                        <h:panelGrid binding="#{FormSeguranca.gridPanel4}" id="gridPanel4" style="height: 24px; width: 100%"
-                                            styleClass="centerBlock" width="456">											
-											
                       <h:panelGrid binding="#{FormSeguranca.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" />
@@ -112,67 +85,43 @@
                         </ui:panelGroup>
                         <ui:button binding="#{FormSeguranca.buttonFilterActual}" id="buttonFilterActual" action="#{FormSeguranca.buttonFilterActual_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormSeguranca.table1}" id="table1" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup1}" id="tableRowGroup1" rows="10"
+                        <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup1}" id="tableRowGroup1" rows="10" sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn1}" headerText="Data do acidente" id="tableColumn1" sort="data_acidente" style="width: 10%" width="811">
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
+                            <ui:hyperlink action="#{FormSeguranca.lnkDataAcidente_action}" binding="#{FormSeguranca.lnkDataAcidente}" id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="811">
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkDataAcidente_action}"
-                                                            binding="#{FormSeguranca.lnkDataAcidente}" id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn16}" headerText="Data da abertura" id="tableColumn16"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn16}" headerText="Data da abertura" id="tableColumn16" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkDataAbertura_action}" binding="#{FormSeguranca.lnkDataAbertura}" id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkDataAbertura_action}"
-                                                            binding="#{FormSeguranca.lnkDataAbertura}" id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn2}" headerText="Nº acidente" id="tableColumn2" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkNr_action}" binding="#{FormSeguranca.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkNr_action}" binding="#{FormSeguranca.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn12}" headerText="POR" id="tableColumn12" width="10%"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn12}" headerText="POR" id="tableColumn12" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormSeguranca.lnkPor_action}" binding="#{FormSeguranca.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkPor_action}" binding="#{FormSeguranca.lnkPor}" id="lnkPor"
-                                                            style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3" sort="nome_acidentado" style="width=40%">
-                                                        sort="nome_acidentado" style="width=40%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentado_action}" binding="#{FormSeguranca.lnkNomeAcidentado}" id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentado_action}"
-                                                            binding="#{FormSeguranca.lnkNomeAcidentado}" id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%" sort="fase">
-														sort="fase">
+                            <ui:hyperlink action="#{FormSeguranca.lnkFase_action}" binding="#{FormSeguranca.lnkFase}" id="lnkFase" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkFase_action}" binding="#{FormSeguranca.lnkFase}" id="lnkFase"
-                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%" sort="nome_estabelecimento">
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="20%"
+                            <ui:hyperlink action="#{FormSeguranca.lnkEstabelecimento_action}" binding="#{FormSeguranca.lnkEstabelecimento}" id="lnkEstabelecimento" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-														sort="nome_estabelecimento">
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkEstabelecimento_action}" binding="#{FormSeguranca.lnkEstabelecimento}" id="lnkEstabelecimento"
-                                                            style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-													
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%" sort="participado">
-													<ui:tableColumn binding="#{FormSeguranca.tableColumnActualParticipado}" headerText="Seguro" id="tableColumnActualParticipado" width="20%"
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-														sort="participado">
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
                 <ui:form id="form2">
-                                    <h:panelGrid binding="#{FormSeguranca.gridSeguimento}" columns="1" id="gridSeguimento"
+                  <h:panelGrid binding="#{FormSeguranca.gridSeguimento}" columns="1" id="gridSeguimento" style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
-                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                    <h:panelGrid binding="#{FormSeguranca.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; width: 100%" width="264">
-                                        <h:panelGrid binding="#{FormSeguranca.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
+                      <ui:staticText binding="#{FormSeguranca.staticText2}" id="staticText2" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento" />
-                                            style="height: 24px; width: 100%" width="264">
-                                            <ui:staticText binding="#{FormSeguranca.staticText2}" id="staticText2"
-                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
                     </h:panelGrid>
-                                        <h:panelGrid binding="#{FormSeguranca.gridPanel5}" id="gridPanel5"
+                    <h:panelGrid binding="#{FormSeguranca.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-                                            style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
-
                       <h:panelGrid binding="#{FormSeguranca.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock">
                         <ui:panelGroup>
                           <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
@@ -188,164 +137,109 @@
                         </ui:panelGroup>
                         <ui:button binding="#{FormSeguranca.buttonFilterSeg}" id="buttonFilterSeg" action="#{FormSeguranca.buttonFilterSeg_action}" text="Pesquisar" />
                       </h:panelGrid>
-
                       <ui:table augmentTitle="false" binding="#{FormSeguranca.table2}" id="table2" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                                <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup2}" id="tableRowGroup2" rows="10"
+                        <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup2}" id="tableRowGroup2" rows="10" sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
-                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn4}" headerText="Data do acidente" id="tableColumn4" sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
+                            <ui:hyperlink action="#{FormSeguranca.lnkDataAcidenteSeg_action}" binding="#{FormSeguranca.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}" />
-                                                        sort="data_acidente" style="width: 10%" width="10%">
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkDataAcidenteSeg_action}"
-                                                            binding="#{FormSeguranca.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn17}" headerText="Data da abertura" id="tableColumn17"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn17}" headerText="Data da abertura" id="tableColumn17" sort="data_inicio_processo" width="10%">
-                                                        sort="data_inicio_processo" width="10%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkDataAberturaSeg_action}" binding="#{FormSeguranca.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkDataAberturaSeg_action}"
-                                                            binding="#{FormSeguranca.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn5}" headerText="Nº acidente" id="tableColumn5" sort="analise_nr" style="width: 10%" width="10%">
-                                                        sort="analise_nr" style="width: 10%" width="10%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkNrSeg_action}" binding="#{FormSeguranca.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkNrSeg_action}" binding="#{FormSeguranca.lnkNrSeg}"
-                                                            id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn13}" headerText="POR" id="tableColumn13" width="10%"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn13}" headerText="POR" id="tableColumn13" width="10%" sort="numero_mecanografico">
-														sort="numero_mecanografico">
+                            <ui:hyperlink action="#{FormSeguranca.lnkPorSeg_action}" binding="#{FormSeguranca.lnkPorSeg}" id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkPorSeg_action}" binding="#{FormSeguranca.lnkPorSeg}"
-                                                            id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6" sort="nome_acidentado" style="width: 40%" width="40%">
-                                                        sort="nome_acidentado" style="width: 40%" width="40%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentadoSeg_action}" binding="#{FormSeguranca.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentadoSeg_action}"
-                                                            binding="#{FormSeguranca.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                           </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn11}" headerText="Fase" id="tableColumn11"
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn11}" headerText="Fase" id="tableColumn11" sort="fase" style="width: 20%" width="20%">
-                                                        sort="fase" style="width: 20%" width="20%">
+                            <ui:hyperlink action="#{FormSeguranca.lnkFaseSeg_action}" binding="#{FormSeguranca.lnkFaseSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}" />
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkFaseSeg_action}" binding="#{FormSeguranca.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                           </ui:tableColumn>
-
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" style="width: 20%" width="20%" sort="nome_estabelecimento">
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" style="width: 20%" width="20%"
+                            <ui:hyperlink action="#{FormSeguranca.lnkEstabelecimentoSeg_action}" binding="#{FormSeguranca.lnkEstabelecimentoSeg}" id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}" />
-														sort="nome_estabelecimento">
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkEstabelecimentoSeg_action}" binding="#{FormSeguranca.lnkEstabelecimentoSeg}"
-                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['nome_estabelecimento']}"/>
                           </ui:tableColumn>
-                                                    
+                          <ui:tableColumn binding="#{FormSeguranca.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%" sort="participado">
-                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumnSeguimentoParticipado}" headerText="Seguro" id="tableColumnSeguimentoParticipado" width="20%"
+                            <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-														sort="participado">
-                                                        <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                           </ui:tableColumn>
                         </ui:tableRowGroup>
                       </ui:table>
                     </h:panelGrid>
                   </h:panelGrid>
                 </ui:form>
-
               </h:panelGrid>
-
               <ui:form id="form3">
-                                <h:panelGrid binding="#{FormSeguranca.gridConcluidos}" columns="1" id="gridConcluidos"
+                <h:panelGrid binding="#{FormSeguranca.gridConcluidos}" columns="1" id="gridConcluidos" style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
-                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                  <h:panelGrid binding="#{FormSeguranca.gridPanel3}" columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 100%" width="264">
-                                    <h:panelGrid binding="#{FormSeguranca.gridPanel3}" columnClasses="gridColCenter" columns="1" id="gridPanel3"
+                    <ui:staticText binding="#{FormSeguranca.staticText3}" escape="false" id="staticText3" style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos" />
-                                        style="height: 24px; width: 100%" width="264">
-                                        <ui:staticText binding="#{FormSeguranca.staticText3}" escape="false" id="staticText3"
-                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormSeguranca.gridPanel6}" columns="6" id="gridPanel6" style="height: 24px" width="576">
+                  <h:panelGrid binding="#{FormSeguranca.gridPanel6}" columns="6" id="gridPanel6" style="height: 24px"
-                                        <ui:panelGroup binding="#{FormSeguranca.groupPanel1}" id="groupPanel1" style="height: 24px; width: 94px">
+                               styleClass="centerBlock">
-                                            <ui:staticText binding="#{FormSeguranca.staticText11}" id="staticText11" style="height: 24px; width: 22px"
+                    <ui:panelGroup binding="#{FormSeguranca.groupPanel1}" id="groupPanel1">
-                                                styleClass="labelBold" text="Ano:"/>
+                      <ui:staticText binding="#{FormSeguranca.staticText11}" id="staticText11" styleClass="labelBold" text="Ano:" />
-                                            <ui:dropDown binding="#{FormSeguranca.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
+                      <ui:dropDown binding="#{FormSeguranca.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase:gridLayout:gridConcluidos:gridPanel6:groupPanel1:drpAno');" selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormSeguranca.drpAno_processValueChange}" />
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase:gridLayout:gridConcluidos:gridPanel6:groupPanel1:drpAno');"
-                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormSeguranca.drpAno_processValueChange}"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormSeguranca.groupPanel2}" id="groupPanel2" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormSeguranca.groupPanel2}" id="groupPanel2" visible="false">
-                                            <ui:staticText binding="#{FormSeguranca.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px"
+                      <ui:staticText binding="#{FormSeguranca.lblMes}" escape="false" id="lblMes" text="Mês:" visible="false" />
-                                                text="Mês:" visible="false"/>
+                      <ui:dropDown binding="#{FormSeguranca.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}" onChange="common_timeoutSubmitForm(this.form, 'gridBase:gridLayout:gridConcluidos:gridPanel6:groupPanel2:drpMes');" selected="#{SessionBean1.mesChoice}" style="width: 69px" valueChangeListener="#{FormSeguranca.drpMes_processValueChange}" visible="false" />
-                                            <ui:dropDown binding="#{FormSeguranca.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
-                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase:gridLayout:gridConcluidos:gridPanel6:groupPanel2:drpMes');"
-                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
-                                                valueChangeListener="#{FormSeguranca.drpMes_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormSeguranca.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                    <ui:panelGroup binding="#{FormSeguranca.groupPanel3}" id="groupPanel3" visible="false">
-                                            <ui:staticText binding="#{FormSeguranca.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                      <ui:staticText binding="#{FormSeguranca.lblDia}" id="lblDia" text="Dia:" visible="false" />
-                                            <ui:dropDown binding="#{FormSeguranca.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                      <ui:dropDown binding="#{FormSeguranca.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}" selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormSeguranca.drpDia_processValueChange}" visible="false" />
-                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormSeguranca.drpDia_processValueChange}" visible="false"/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormSeguranca.groupPanel7}" id="groupPanel7" style="height: 24px">
+                    <ui:panelGroup binding="#{FormSeguranca.groupPanel7}" id="groupPanel7">
-                                            <ui:staticText binding="#{FormSeguranca.staticText5}" escape="false" id="staticText5"
+                      <ui:staticText binding="#{FormSeguranca.staticText5}" escape="false" id="staticText5" styleClass="labelBold" text="POR:&amp;nbsp;" />
-                                                style="height: 24px; width: 96px" styleClass="labelBold" text="POR:&amp;nbsp;"/>
+                      <ui:textField binding="#{FormSeguranca.txtPor}" id="txtPor" />
-                                            <ui:textField binding="#{FormSeguranca.txtPor}" id="txtPor" style=""/>
                     </ui:panelGroup>
-                                        <ui:panelGroup binding="#{FormSeguranca.groupPanel4}" id="groupPanel4" style="height: 24px; width: 262px">
+                    <ui:panelGroup binding="#{FormSeguranca.groupPanel4}" id="groupPanel4">
-                                            <ui:staticText binding="#{FormSeguranca.staticText14}" id="staticText14" style="height: 24px; width: 46px"
+                      <ui:staticText binding="#{FormSeguranca.staticText14}" id="staticText14" styleClass="labelBold" text="Nome:" />
-                                                styleClass="labelBold" text="Nome:"/>
+                      <ui:textField binding="#{FormSeguranca.txtNome}" id="txtNome" />
-                                            <ui:textField binding="#{FormSeguranca.txtNome}" id="txtNome"/>
                     </ui:panelGroup>
-                                        <ui:button action="#{FormSeguranca.butPesquisar_action}" binding="#{FormSeguranca.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                    <ui:button action="#{FormSeguranca.butPesquisar_action}" binding="#{FormSeguranca.butPesquisar}" id="butPesquisar" text="Pesquisar" />
                   </h:panelGrid>
-                                    <h:panelGrid binding="#{FormSeguranca.gridPanel7}" columnClasses="gridColCenter" columns="1" id="gridPanel7"
+                  <h:panelGrid binding="#{FormSeguranca.gridPanel7}" columnClasses="gridColCenter" columns="1" id="gridPanel7" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
-                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                     <ui:table augmentTitle="false" binding="#{FormSeguranca.table3}" id="table3" style="width: 100%; height: 48px" styleClass="centerBlock">
-                                            <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup3}" id="tableRowGroup3" rows="10"
+                      <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup3}" id="tableRowGroup3" rows="10" sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
-                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumn7}" headerText="Data do acidente" id="tableColumn7" sort="data_acidente" style="width: 10%" width="10%">
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
+                          <ui:hyperlink action="#{FormSeguranca.lnkDataConcluida_action}" binding="#{FormSeguranca.lnkDataConcluida}" id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}" />
-                                                    sort="data_acidente" style="width: 10%" width="10%">
-                                                    <ui:hyperlink action="#{FormSeguranca.lnkDataConcluida_action}" binding="#{FormSeguranca.lnkDataConcluida}"
-                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn18}" headerText="Data da abertura" id="tableColumn18"
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumn18}" headerText="Data da abertura" id="tableColumn18" sort="data_inicio_processo" width="10%">
-                                                    sort="data_inicio_processo" width="10%">
+                          <ui:hyperlink action="#{FormSeguranca.lnkDataAberturaConcluida_action}" binding="#{FormSeguranca.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}" />
-                                                    <ui:hyperlink action="#{FormSeguranca.lnkDataAberturaConcluida_action}"
-                                                        binding="#{FormSeguranca.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn8}" headerText="Nº acidente" id="tableColumn8"
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr" style="width: 10%" width="7%">
-                                                    sort="analise_nr" style="width: 10%" width="7%">
+                          <ui:hyperlink action="#{FormSeguranca.lnkNrConcluida_action}" binding="#{FormSeguranca.lnkNrConcluida}" id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}" />
-                                                    <ui:hyperlink action="#{FormSeguranca.lnkNrConcluida_action}" binding="#{FormSeguranca.lnkNrConcluida}"
-                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn14}" headerText="POR" id="tableColumn14" width="8%"
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumn14}" headerText="POR" id="tableColumn14" width="8%" sort="numero_mecanografico">
-													sort="numero_mecanografico">
+                          <ui:hyperlink action="#{FormSeguranca.lnkPorConcluida_action}" binding="#{FormSeguranca.lnkPorConcluida}" id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}" />
-                                                    <ui:hyperlink action="#{FormSeguranca.lnkPorConcluida_action}" binding="#{FormSeguranca.lnkPorConcluida}"
-                                                        id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9" sort="nome_acidentado" style="width: 70%" width="50%">
-                                                    sort="nome_acidentado" style="width: 70%" width="50%">
+                          <ui:hyperlink action="#{FormSeguranca.lnkNomeConcluida_action}" binding="#{FormSeguranca.lnkNomeConcluida}" id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}" />
-                                                    <ui:hyperlink action="#{FormSeguranca.lnkNomeConcluida_action}" binding="#{FormSeguranca.lnkNomeConcluida}"
-                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                         </ui:tableColumn>
-                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%"
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumn15}" headerText="Estabelecimento" id="tableColumn15" width="15%" sort="nome_estabelecimento">
-													sort="nome_estabelecimento">
+                          <ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}" binding="#{FormSeguranca.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}" />
-                                                    <ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}"
-                                                        binding="#{FormSeguranca.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                         </ui:tableColumn>
-												<ui:tableColumn headerText="Desactivação"
+                        <ui:tableColumn headerText="Desactivação" id="tableColumnDesactivarAnaliseConcluidos">
-													id="tableColumnDesactivarAnaliseConcluidos" >
+                          <ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}" id="labelAnaliseDesactivada" text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );" rendered="#{currentRow.value['concluido_por_desactivacao']}" />
-													<ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}"
-														id="labelAnaliseDesactivada"
-														text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
-														rendered="#{currentRow.value['concluido_por_desactivacao']}" />
                         </ui:tableColumn>
-												
+                        <ui:tableColumn binding="#{FormSeguranca.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%" sort="participado">
-												<ui:tableColumn binding="#{FormSeguranca.tableColumnConcluidoParticipado}" headerText="Seguro" id="tableColumnConcluidoParticipado" width="20%"
+                          <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}" />
-													sort="participado">
-                                                       <ui:hyperlink style="height: 24px" text="#{currentRow.value['participado_str']}"/>
                         </ui:tableColumn>
                       </ui:tableRowGroup>
                     </ui:table>
-                                        <ui:staticText binding="#{FormSeguranca.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                    <ui:staticText binding="#{FormSeguranca.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px" />
                   </h:panelGrid>
                 </h:panelGrid>
               </ui:form>
-
               <h:panelGrid binding="#{FormSeguranca.gridPanel9}" columnClasses="gridColCenter" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                 <ui:panelGroup binding="#{FormSeguranca.groupPanel8}" id="groupPanel8" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
-                                        <ui:staticText binding="#{FormSeguranca.staticText6}" id="staticText6" text="Software desenvolvido por "/>
+                  <ui:staticText binding="#{FormSeguranca.staticText6}" id="staticText6" text="Software desenvolvido por " />
-                                        <ui:image binding="#{FormSeguranca.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                  <ui:image binding="#{FormSeguranca.image3}" height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100" />
-                                        <ui:staticText binding="#{FormSeguranca.staticText7}" escape="false" id="staticText7" text="&amp;nbsp;&amp;copy; 2008 "/>
+                  <ui:staticText binding="#{FormSeguranca.staticText7}" escape="false" id="staticText7" text="&amp;nbsp;&amp;copy; 2008 " />
                 </ui:panelGroup>
               </h:panelGrid>
             </h:panelGrid>
           </h:panelGrid>
-
           <!-- /ui:form -->
           <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");