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

trunk/PlanosActuacao/src/java/pagination/Pagination.java

@@ -22,7 +22,7 @@ import planosactuacao.SessionBean1.PAGINATION_ENUM;
 public abstract class Pagination implements Serializable
 {
 //	private static final String COLOR_TRATADO = "#000000";
-//	private static final String COLOR_NAO_TRATADO = "#FF5858";
+	private static final String DEFAULT_COLOR_NAO_TRATADO = "#FF5858";
 
 	private static final Map< Integer, String > COLOR_NAO_TRATADO = new HashMap< Integer, String >();
 	static
@@ -162,8 +162,15 @@ public abstract class Pagination implements Serializable
 	{
 		String result = null;
 
-		boolean isRiscoTratado = RiscoLogic.getInstance().isRiscoTratado( risco, user );
+		boolean isRiscoTratado = RiscoLogic.getInstance().isRiscoTratado( risco, null );
-		result = isRiscoTratado ? null : COLOR_NAO_TRATADO.get( user.getTipo() );
+		if ( ! isRiscoTratado )
+		{
+			result = COLOR_NAO_TRATADO.get( user.getTipo() );
+			if ( result == null )
+			{
+				result = DEFAULT_COLOR_NAO_TRATADO;
+			}
+		}
 
 		return result;
 	}