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

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 16 years ago
parent dcdc6dc4b6
commit 1aab5577ae
11 changed files with 111 additions and 49 deletions
Show Stats Download Patch File Download Diff File

8
trunk/GestaoSHST/src/com/evolute/siprp/client/GestaoSHST.java
Unescape View File

@ -6,10 +6,10 @@ import com.evolute.siprp.client.panels.utils.PageNavigation;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.user.client.ui.RootPanel;
/**
* Entry point classes define <code>onModuleLoad()</code>.
*/
public class GestaoSHST implements EntryPoint {
public class GestaoSHST implements EntryPoint
{
public void onModuleLoad()
{

19
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.java
Unescape View File

@ -1,8 +1,9 @@
package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho;
import com.evolute.siprp.client.panels.apps.AnchorSair;
import com.evolute.siprp.client.panels.utils.AppConstants;
import com.evolute.siprp.client.panels.utils.NavigationConstants;
import com.evolute.siprp.client.panels.utils.PageNavigation;
import com.evolute.siprp.client.vo.Utilizador;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.uibinder.client.UiBinder;
@ -24,7 +25,7 @@ public class AnaliseAcidentesTrabalhoPanel extends Composite
@UiField protected Image imgSiprp;
@UiField protected Image imgAuchan;
@UiField protected Anchor lnkSair;
@UiField protected AnchorSair lnkSair;
@UiField protected Anchor lnkPlanosActuacao;
@UiField protected InlineLabel lblUsername;
@ -32,13 +33,14 @@ public class AnaliseAcidentesTrabalhoPanel extends Composite
@UiField protected Anchor lnkAlterarDados;
@UiField protected Anchor lnkAjuda;
private Utilizador userLogged;
public AnaliseAcidentesTrabalhoPanel()
{
initWidget( uiBinder.createAndBindUi( this ) );
userLogged = PageNavigation.getProvider().getUserLogged();
lblUsername.setText( "username" );
lnkSair.setText( "sair>>" );
lblUsername.setText( userLogged.getUsername() );
imgSiprp.setTitle( "SIPRP" );
imgSiprp.setUrl( AppConstants.IMAGES_FOLDER + "SIPRP_logo_small.jpg" );
@ -52,15 +54,10 @@ public class AnaliseAcidentesTrabalhoPanel extends Composite
lnkAjuda.setText( "ajuda" );
}
@UiHandler( {"lnkSair", "lnkPlanosActuacao", "lnkGerirUtilizadores", "lnkAlterarDados", "lnkAjuda" } )
@UiHandler( { "lnkPlanosActuacao", "lnkGerirUtilizadores", "lnkAlterarDados", "lnkAjuda" } )
protected void onClick( ClickEvent e )
{
if ( e.getSource().equals( lnkSair ) )
{
//TODO: logout stuff
PageNavigation.goPage( NavigationConstants.LOGIN_PANEL );
}
else if ( e.getSource().equals( lnkPlanosActuacao ) )
if ( e.getSource().equals( lnkPlanosActuacao ) )
{
Window.alert( "planos actuacao..." );
}

5
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.ui.xml
Unescape View File

@ -1,6 +1,7 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:myLogout="urn:import:com.evolute.siprp.client.panels.apps">
<ui:style>
.headerDiv {
@ -47,7 +48,7 @@
<g:Anchor ui:field="lnkGerirUtilizadores" />
| <g:Anchor ui:field="lnkAlterarDados" />
| <g:Anchor ui:field="lnkAjuda" />
| <g:Anchor ui:field="lnkSair" />
| <myLogout:AnchorSair ui:field="lnkSair" />
</td>
</tr>
</table>

27
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnchorSair.java
Unescape View File

@ -0,0 +1,27 @@
package com.evolute.siprp.client.panels.apps;
import com.evolute.siprp.client.panels.utils.NavigationConstants;
import com.evolute.siprp.client.panels.utils.PageNavigation;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.Anchor;
public class AnchorSair extends Anchor implements ClickHandler
{
public AnchorSair()
{
super();
this.setText( "sair>>" );
this.addClickHandler( this );
}
@Override
public void onClick( ClickEvent event )
{
PageNavigation.getProvider().setUserLogged( null );
PageNavigation.goPage( NavigationConstants.LOGIN_PANEL );
}
}

22
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/MainPanel.java
Unescape View File

@ -3,6 +3,7 @@ package com.evolute.siprp.client.panels.apps;
import com.evolute.siprp.client.panels.utils.AppConstants;
import com.evolute.siprp.client.panels.utils.NavigationConstants;
import com.evolute.siprp.client.panels.utils.PageNavigation;
import com.evolute.siprp.client.vo.Utilizador;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.uibinder.client.UiBinder;
@ -15,26 +16,29 @@ import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.Widget;
public class MainPanel extends Composite {
public class MainPanel extends Composite
{
private static MainPanelUiBinder uiBinder = GWT.create( MainPanelUiBinder.class );
interface MainPanelUiBinder extends UiBinder< Widget, MainPanel > { }
@UiField protected InlineLabel lblUsername;
@UiField protected InlineLabel lblName;
@UiField protected Anchor lnkSair;
@UiField protected AnchorSair lnkSair;
@UiField protected Anchor lnkAnaliseAcidentesTrabalho;
@UiField protected Anchor lnkPlanosActuacao;
@UiField protected Image imgSiprp;
@UiField protected Image imgAuchan;
private Utilizador userLogged;
public MainPanel()
{
initWidget( uiBinder.createAndBindUi( this ) );
lblUsername.setText( "username" );
lnkSair.setText( "sair>>" );
userLogged = PageNavigation.getProvider().getUserLogged();
lblUsername.setText( userLogged.getUsername() );
imgSiprp.setTitle( "SIPRP" );
imgSiprp.setUrl( AppConstants.IMAGES_FOLDER + "SIPRP_logo_small.jpg" );
@ -42,20 +46,16 @@ public class MainPanel extends Composite {
imgAuchan.setUrl( AppConstants.IMAGES_FOLDER + "logo_empresa32.jpg" );
imgAuchan.setHeight( "40" );
lblName.setText( "user name" );
lblName.setText( userLogged.getNome() );
lnkAnaliseAcidentesTrabalho.setText( "An\u00E1lise de Acidentes de Trabalho" );
lnkPlanosActuacao.setText( "Planos de Actua\u00E7\u00E3o" );
}
@UiHandler( {"lnkSair", "lnkAnaliseAcidentesTrabalho", "lnkPlanosActuacao"} )
@UiHandler( { "lnkAnaliseAcidentesTrabalho", "lnkPlanosActuacao" } )
protected void onClick( ClickEvent e )
{
if ( e.getSource().equals( lnkSair ) )
{
PageNavigation.goPage( NavigationConstants.LOGIN_PANEL );
}
else if ( e.getSource().equals( lnkAnaliseAcidentesTrabalho ) )
if ( e.getSource().equals( lnkAnaliseAcidentesTrabalho ) )
{
PageNavigation.goPage( NavigationConstants.ANALISE_ACIDENTES_TRABALHO_PANEL );
}

4
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/MainPanel.ui.xml
Unescape View File

@ -1,6 +1,7 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:myLogout="urn:import:com.evolute.siprp.client.panels.apps"
>
<ui:style>
@ -41,7 +42,7 @@
<div class="mainDiv">
<div class="{style.headerDiv}">
<g:InlineLabel ui:field="lblUsername" styleName="lblBold {style.lblUsername}" /> <g:Anchor ui:field="lnkSair" />
<g:InlineLabel ui:field="lblUsername" styleName="lblBold {style.lblUsername}" /> <myLogout:AnchorSair ui:field="lnkSair" />
</div>
<div class="{style.bodyDiv} alignCenterText">
@ -64,7 +65,6 @@
</div>
</div>
</g:HTMLPanel>

1
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/login/LoginPanel.java
Unescape View File

@ -95,6 +95,7 @@ public class LoginPanel extends Composite
}
else
{
PageNavigation.getProvider().setUserLogged( result );
PageNavigation.goPage( NavigationConstants.APP_MAIN_PANEL );
}
}

15
trunk/GestaoSHST/src/com/evolute/siprp/client/panels/utils/PageNavigation.java
Unescape View File

@ -7,6 +7,7 @@ import com.evolute.siprp.client.panels.apps.MainPanel;
import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoPanel;
import com.evolute.siprp.client.panels.index.login.LoginPanel;
import com.evolute.siprp.client.panels.index.recover_pwd.RecoverPwdPanel;
import com.evolute.siprp.client.vo.Utilizador;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.RootPanel;
@ -19,6 +20,9 @@ public class PageNavigation
private Map< Integer, Object > panelsCache;
private Utilizador userLogged = null;
private PageNavigation( String id )
{
this.containerID = id;
@ -110,4 +114,15 @@ public class PageNavigation
}
}
public Utilizador getUserLogged()
{
return this.userLogged;
}
public void setUserLogged( Utilizador user )
{
this.userLogged = user;
}
}

25
trunk/GestaoSHST/src/com/evolute/siprp/client/vo/Utilizador.java
Unescape View File

@ -8,6 +8,9 @@ public class Utilizador implements Serializable
private Integer userID;
private String username;
private String nome;
private String email;
public Utilizador()
{
@ -15,12 +18,6 @@ public class Utilizador implements Serializable
this.username = null;
}
public Utilizador( Integer id, String uName )
{
this.userID = id;
this.username = uName;
}
public Integer getUserID() {
return userID;
}
@ -37,4 +34,20 @@ public class Utilizador implements Serializable
this.username = username;
}
public String getNome() {
return nome;
}
public void setNome(String nome) {
this.nome = nome;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}

8
trunk/GestaoSHST/src/com/evolute/siprp/server/logic/login/LoginDataProvider.java
Unescape View File

@ -51,7 +51,11 @@ public class LoginDataProvider
UtilizadoresData usersData = JDO_PROVIDER.load( UtilizadoresData.class, userID );
if ( usersData != null )
{
user = new Utilizador( usersData.getId(), usersData.getLogin() );
user = new Utilizador();
user.setUserID( usersData.getId() );
user.setUsername( usersData.getLogin() );
user.setEmail( usersData.getEmail() );
user.setNome( usersData.getNome() );
}
return user;
@ -63,7 +67,7 @@ public class LoginDataProvider
new String[] { UtilizadoresData.TABLENAME },
new Integer[] {},
new Expression[] {},
new String[] { UtilizadoresData.ID_FULL, UtilizadoresData.LOGIN_FULL },
new String[] { UtilizadoresData.ID_FULL, UtilizadoresData.LOGIN_FULL, UtilizadoresData.EMAIL_FULL, UtilizadoresData.NOME_FULL },
new Field( UtilizadoresData.LOGIN_FULL ).isEqual( username ).and(
new Field( UtilizadoresData.PASSWORD_FULL ).isEqual( password )
),

6
trunk/GestaoSHST/src/com/evolute/siprp/server/logic/login/LoginLogic.java
Unescape View File

@ -30,7 +30,11 @@ public class LoginLogic
Virtual2DArray users = loginProvider.getUtilizador( username, password );
if ( users.columnLength() == 1 )
{
rUser = new Utilizador( ( Integer ) users.get( 0, 0 ), ( String ) users.get( 0, 1 ) );
rUser = new Utilizador();
rUser.setUserID( ( Integer ) users.get( 0, 0 ) );
rUser.setUsername( ( String ) users.get( 0, 1 ) );
rUser.setEmail( ( String ) users.get( 0, 2 ) );
rUser.setNome( ( String ) users.get( 0, 3 ) );
}
}
catch ( Exception e )

Write Preview
Loading…
Cancel
Save