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

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 17 years ago
parent aab5a94e10
commit 3e5d675939

@ -67,14 +67,15 @@ public class CreatePlanosDataProvider {
} }
} }
public List<Date> getPlanosOnline() throws Exception public List<Date> getPlanosOnline( Integer estabelecimentoID ) throws Exception
{ {
GregorianCalendar xmas = new GregorianCalendar(1990, 11, 25); ArrayList<Date> list = new ArrayList<Date>();
Date dummyDate = xmas.getTime();
ArrayList list = new ArrayList();
list.add(dummyDate);
Statement st = createStatement(); Statement st = createStatement();
String sql = "select data_visita from planos_actuacao"; String sql = "select data_visita from planos_actuacao ";
if( estabelecimentoID != null )
{
sql += "where estabelecimento_id = " + estabelecimentoID;
}
ResultSet rs = st.executeQuery(sql); ResultSet rs = st.executeQuery(sql);
if(rs.isBeforeFirst()) if(rs.isBeforeFirst())
@ -90,6 +91,23 @@ public class CreatePlanosDataProvider {
} }
return list; return list;
} }
public List<Integer> getEstabelecimentosWithPlanos()
{
List<Integer> result = new ArrayList<Integer>();
Statement st = createStatement();
String sql = "select estabelecimento_id from planos_actuacao where deleted_date is not null;";
ResultSet rs = st.executeQuery(sql);
if(rs.isBeforeFirst())
{
rs.first();
do
{
result.add( rs.getInt("estabelecimento_id") );
}while(rs.next());
}
return result;
}

@ -363,29 +363,29 @@ public class PlanosDataProvider extends GenericDataProvider{
st.execute(sql); st.execute(sql);
} }
public List<Date> getPlanosOnline() throws Exception // public List<Date> getPlanosOnline() throws Exception
{ // {
GregorianCalendar xmas = new GregorianCalendar(1990, 11, 25); // GregorianCalendar xmas = new GregorianCalendar(1990, 11, 25);
Date dummyDate = xmas.getTime(); // Date dummyDate = xmas.getTime();
ArrayList list = new ArrayList(); // ArrayList list = new ArrayList();
list.add(dummyDate); // list.add(dummyDate);
Statement st = createStatement(); // Statement st = createStatement();
String sql = "select data_visita from planos_actuacao"; // String sql = "select data_visita from planos_actuacao";
ResultSet rs = st.executeQuery(sql); // ResultSet rs = st.executeQuery(sql);
//
if(rs.isBeforeFirst()) // if(rs.isBeforeFirst())
{ // {
rs.first(); // rs.first();
do // do
{ // {
java.sql.Date sqlDate = rs.getDate("data_visita"); // java.sql.Date sqlDate = rs.getDate("data_visita");
java.util.Date data_visita = new java.util.Date(sqlDate.getTime()); // java.util.Date data_visita = new java.util.Date(sqlDate.getTime());
System.out.println("DATA PLANO : " + data_visita.toString()); // System.out.println("DATA PLANO : " + data_visita.toString());
list.add(data_visita); // list.add(data_visita);
}while(rs.next()); // }while(rs.next());
} // }
return list; // return list;
} // }
public ArrayList getPlanosActivos(Utilizador u) throws Exception public ArrayList getPlanosActivos(Utilizador u) throws Exception
{ {

@ -56,10 +56,10 @@ public class PlanosActuacao {
// { // {
// estabelecimentoId = u.getEstabelecimento_id(); // estabelecimentoId = u.getEstabelecimento_id();
// } // }
//
List<Date> planosOnlineList = getPlanosOnline(); // List<Date> planosOnlineList = getPlanosOnline(null);
System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size()); // System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size());
List<HsRelatorio> listRelatorios = getRelatorios(planosOnlineList, estabelecimentoId); List<HsRelatorio> listRelatorios = initRelatorios(null,null);
System.out.println("LIST RELATORIOS : " + listRelatorios.size()); System.out.println("LIST RELATORIOS : " + listRelatorios.size());
putPlanosOnline(listRelatorios); putPlanosOnline(listRelatorios);
} }
@ -78,11 +78,9 @@ public class PlanosActuacao {
{ {
estabelecimentoId = u.getEstabelecimento_id(); estabelecimentoId = u.getEstabelecimento_id();
} }
List<Date> planosOnlineList = getPlanosOnline(); List<Date> planosOnlineList = getPlanosOnline(estabelecimentoId);
System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size()); System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size());
List<HsRelatorio> listRelatorios = getRelatorios(planosOnlineList, estabelecimentoId); List<HsRelatorio> listRelatorios = initRelatorios(planosOnlineList, estabelecimentoId);
System.out.println("LIST RELATORIOS : " + listRelatorios.size());
putPlanosOnline(listRelatorios);
} }
catch(Exception ex) catch(Exception ex)
{ {
@ -90,13 +88,15 @@ public class PlanosActuacao {
} }
} }
private List<Date> getPlanosOnline() private List<Date> getPlanosOnline(Integer estabelecimentoId)
{ {
List<Date> list = null; List<Date> list = new ArrayList<Date>();
try try
{ {
list = cpdp.getPlanosOnline(); if( estabelecimentoId != null )
{
list = cpdp.getPlanosOnline(estabelecimentoId);
}
} }
catch(Exception ex) catch(Exception ex)
{ {
@ -105,10 +105,20 @@ public class PlanosActuacao {
return list; return list;
} }
private List<HsRelatorio> getRelatorios(List<Date> list, Integer estabelecimentoId) private void initRelatorios(List<Date> list, Integer estabelecimentoId)
{ {
List<HsRelatorio> listRelatorios = pa.getRelatoriosNotIn(list, estabelecimentoId); if( estabelecimentoId == null )
return listRelatorios; {
List<Integer> estabelecimentos = cpdp.getEstabelecimentosWithPlanos();
for( Integer estabelecimentoID : estabelecimentos )
{
putPlanosOnline(pa.getRelatoriosNotIn(cpdp.getPlanosOnline(estabelecimentoID), estabelecimentoID));
}
}
else
{
putPlanosOnline(pa.getRelatoriosNotIn(list, estabelecimentoId));
}
} }
private void putPlanosOnline(List<HsRelatorio> listRelatorios) private void putPlanosOnline(List<HsRelatorio> listRelatorios)

Loading…
Cancel
Save