| Utilizador: | -|||||
| Palavra-chave: | -|||||
| Preencha os seguintes dados pessoais | +Preencha os seguintes dados pessoais | ||
| Utilizador: | diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/navigation/PageNavigation.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/navigation/PageNavigation.java index 5f298e89..27e18750 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/navigation/PageNavigation.java +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/navigation/PageNavigation.java @@ -62,10 +62,10 @@ public class PageNavigation { newCache.put( NavigationConstants.LOGIN_PANEL, panelsCache.get( NavigationConstants.LOGIN_PANEL ) ); } - if ( panelsCache.containsKey( NavigationConstants.RECOVER_PWD_PANEL ) ) - { - newCache.put( NavigationConstants.RECOVER_PWD_PANEL, panelsCache.get( NavigationConstants.RECOVER_PWD_PANEL ) ); - } +// if ( panelsCache.containsKey( NavigationConstants.RECOVER_PWD_PANEL ) ) +// { +// newCache.put( NavigationConstants.RECOVER_PWD_PANEL, panelsCache.get( NavigationConstants.RECOVER_PWD_PANEL ) ); +// } panelsCache = newCache; } diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/AccessConstants.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/AccessConstants.java index 91bcf4dc..b7f37ed2 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/AccessConstants.java +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/AccessConstants.java @@ -6,4 +6,7 @@ public interface AccessConstants public static final int VIEW_ACTUAL_PANEL = 1; public static final int VIEW_ACTUAL_PANEL_NOVA_ANALISE_BUTTON = 2; + public static final int VIEW_SEGUIMENTO_PANEL = 3; + + public static final int VIEW_CONCLUIDO_PANEL = 4; } diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/PermissionsController.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/PermissionsController.java index ae89e0f3..0a564494 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/PermissionsController.java +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/permissoes/PermissionsController.java @@ -5,19 +5,31 @@ import com.evolute.siprp.client.vo.Utilizador; public class PermissionsController { - + private static PermissionsController instance; + private Utilizador userLogged = null; private int userType; - public PermissionsController() + private PermissionsController() { - userLogged = PageNavigation.getProvider().getUserLogged(); - userType = userLogged.getTipo_utilizador().intValue(); + + } + + public static PermissionsController getController() + { + if ( instance == null ) + { + instance = new PermissionsController(); + } + return instance; } public boolean hasPermissionTo( Integer accessConstant ) { + userLogged = PageNavigation.getProvider().getUserLogged(); + userType = userLogged.getTipo_utilizador().intValue(); + Boolean canAccess = false; switch ( accessConstant.intValue() ) @@ -42,6 +54,16 @@ public class PermissionsController break; } + case AccessConstants.VIEW_SEGUIMENTO_PANEL: + { + canAccess = true; + break; + } + case AccessConstants.VIEW_CONCLUIDO_PANEL: + { + canAccess = true; + break; + } default: { break; diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/vo/ActualTableRow.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/vo/ActualTableRow.java new file mode 100644 index 00000000..25145195 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/vo/ActualTableRow.java @@ -0,0 +1,72 @@ +package com.evolute.siprp.client.vo; + +import java.io.Serializable; +import java.util.Date; + +public class ActualTableRow implements Serializable +{ + private static final long serialVersionUID = -6271564752485792179L; + + private Date dataAcidente; + private Date dataAbertura; + private String nrAcidente; + private String POR; + private String nomeAcidentado; + private String fase; + + + public ActualTableRow() + { + + } + + + public Date getDataAcidente() { + return dataAcidente; + } + + public void setDataAcidente(Date dataAcidente) { + this.dataAcidente = dataAcidente; + } + + public Date getDataAbertura() { + return dataAbertura; + } + + public void setDataAbertura(Date dataAbertura) { + this.dataAbertura = dataAbertura; + } + + public String getNrAcidente() { + return nrAcidente; + } + + public void setNrAcidente(String nrAcidente) { + this.nrAcidente = nrAcidente; + } + + public String getPOR() { + return POR; + } + + public void setPOR(String por) { + POR = por; + } + + public String getNomeAcidentado() { + return nomeAcidentado; + } + + public void setNomeAcidentado(String nomeAcidentado) { + this.nomeAcidentado = nomeAcidentado; + } + + public String getFase() { + return fase; + } + + public void setFase(String fase) { + this.fase = fase; + } + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/public/GestaoSHST.css b/trunk/GestaoSHST/src/com/evolute/siprp/public/GestaoSHST.css index 89314ca3..5838e564 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/public/GestaoSHST.css +++ b/trunk/GestaoSHST/src/com/evolute/siprp/public/GestaoSHST.css @@ -85,4 +85,5 @@ a:hover { width: 80%; margin-left: auto; margin-right: auto; -} \ No newline at end of file +} + diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java new file mode 100644 index 00000000..3a72f200 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java @@ -0,0 +1,23 @@ +package com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho; + +import java.util.Vector; + +import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual.ActualTableService; +import com.evolute.siprp.client.vo.ActualTableRow; +import com.evolute.siprp.client.vo.Utilizador; + +public class AnaliseAcidentesTrabalhoLogic implements ActualTableService +{ + + public AnaliseAcidentesTrabalhoLogic() + { + + } + + @Override + public Vector< ActualTableRow > getActualTableData( Utilizador userLogged ) + { + return null; + } + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java new file mode 100644 index 00000000..cfa97fdf --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java @@ -0,0 +1,29 @@ +package com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.actual; + +import java.util.Vector; + +import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual.ActualTableService; +import com.evolute.siprp.client.vo.ActualTableRow; +import com.evolute.siprp.client.vo.Utilizador; +import com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoLogic; +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + +public class ActualTableServiceImpl extends RemoteServiceServlet implements ActualTableService +{ + private static final long serialVersionUID = -2932430810080164417L; + + private AnaliseAcidentesTrabalhoLogic logic; + + @Override + public Vector< ActualTableRow > getActualTableData( Utilizador userLogged ) + { + if ( logic == null ) + { + logic = new AnaliseAcidentesTrabalhoLogic(); + } + + return logic.getActualTableData( userLogged ); + } + + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/login/LoginLogic.java b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/login/LoginLogic.java index c33a6002..9d4ab397 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/login/LoginLogic.java +++ b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/login/LoginLogic.java @@ -2,10 +2,11 @@ package com.evolute.siprp.server.logic.login; import java.util.Date; +import com.evolute.siprp.client.panels.index.login.LoginService; import com.evolute.siprp.client.vo.Utilizador; import com.evolute.utils.arrays.Virtual2DArray; -public class LoginLogic +public class LoginLogic implements LoginService { private LoginDataProvider loginProvider; @@ -23,6 +24,7 @@ public class LoginLogic } + @Override public Utilizador doLogin( String username, String password ) { Utilizador rUser = null; diff --git a/trunk/GestaoSHST/war/WEB-INF/web.xml b/trunk/GestaoSHST/war/WEB-INF/web.xml index acd7c72c..5feb6e1c 100644 --- a/trunk/GestaoSHST/war/WEB-INF/web.xml +++ b/trunk/GestaoSHST/war/WEB-INF/web.xml @@ -24,6 +24,15 @@|||