From f69e32e6a6ed98ab6feb2eea596dceb93b6d6926 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Mon, 14 Dec 2009 17:10:49 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1124 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../AnaliseAcidentesTrabalhoPanel.java | 36 +++++++- .../AnaliseAcidentesTrabalhoPanel.ui.xml | 27 ++---- .../{ => actual}/ActualPanel.java | 22 +++-- .../actual/ActualPanel.ui.xml | 48 +++++++++++ .../actual/ActualTable.java | 83 +++++++++++++++++++ .../actual/ActualTableService.java | 12 +++ .../actual/ActualTableServiceAsync.java | 12 +++ .../concluido/ConcluidoPanel.java | 38 +++++++++ .../ConcluidoPanel.ui.xml} | 14 ++-- .../seguimento/SeguimentoPanel.java | 42 ++++++++++ .../seguimento/SeguimentoPanel.ui.xml | 39 +++++++++ .../seguimento/SeguimentoTable.java | 8 ++ .../panels/index/login/LoginPanel.ui.xml | 10 ++- .../index/recover_pwd/RecoverPwdPanel.ui.xml | 4 +- .../utils/navigation/PageNavigation.java | 8 +- .../utils/permissoes/AccessConstants.java | 3 + .../permissoes/PermissionsController.java | 30 ++++++- .../siprp/client/vo/ActualTableRow.java | 72 ++++++++++++++++ .../com/evolute/siprp/public/GestaoSHST.css | 3 +- .../AnaliseAcidentesTrabalhoLogic.java | 23 +++++ .../actual/ActualTableServiceImpl.java | 29 +++++++ .../siprp/server/logic/login/LoginLogic.java | 4 +- trunk/GestaoSHST/war/WEB-INF/web.xml | 9 ++ .../4219B3A1733D0EC54B4663A77B9340DB.gwt.rpc | 15 ++++ .../66B58610AC8FE0AF961E16F687F1CCCD.gwt.rpc | 18 ++++ .../75169062F30CD22F885BEE830D67F983.gwt.rpc | 9 ++ .../FFACA86B833A137B1CFBFE4003EC1D8A.gwt.rpc | 6 ++ .../GestaoSHST/war/gestaoshst/GestaoSHST.css | 3 +- 28 files changed, 568 insertions(+), 59 deletions(-) rename trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/{ => actual}/ActualPanel.java (74%) create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.ui.xml create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.java rename trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/{ActualPanel.ui.xml => concluido/ConcluidoPanel.ui.xml} (60%) create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.ui.xml create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoTable.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/client/vo/ActualTableRow.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java create mode 100644 trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java create mode 100644 trunk/GestaoSHST/war/gestaoshst/4219B3A1733D0EC54B4663A77B9340DB.gwt.rpc create mode 100644 trunk/GestaoSHST/war/gestaoshst/66B58610AC8FE0AF961E16F687F1CCCD.gwt.rpc create mode 100644 trunk/GestaoSHST/war/gestaoshst/75169062F30CD22F885BEE830D67F983.gwt.rpc create mode 100644 trunk/GestaoSHST/war/gestaoshst/FFACA86B833A137B1CFBFE4003EC1D8A.gwt.rpc diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.java index 649815b9..c5bd0fe2 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.java +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.java @@ -1,8 +1,13 @@ package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho; import com.evolute.siprp.client.panels.apps.AnchorSair; +import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual.ActualPanel; +import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.concluido.ConcluidoPanel; +import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.seguimento.SeguimentoPanel; import com.evolute.siprp.client.panels.utils.AppConstants; import com.evolute.siprp.client.panels.utils.navigation.PageNavigation; +import com.evolute.siprp.client.panels.utils.permissoes.AccessConstants; +import com.evolute.siprp.client.panels.utils.permissoes.PermissionsController; import com.evolute.siprp.client.vo.Utilizador; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; @@ -34,15 +39,38 @@ public class AnaliseAcidentesTrabalhoPanel extends Composite @UiField protected Anchor lnkAjuda; @UiField protected ActualPanel panelActual; + @UiField protected SeguimentoPanel panelSeguimento; + @UiField protected ConcluidoPanel panelConcluido; private Utilizador userLogged; + private PermissionsController permsController; + public AnaliseAcidentesTrabalhoPanel() - { + { initWidget( uiBinder.createAndBindUi( this ) ); - userLogged = PageNavigation.getProvider().getUserLogged(); - + permsController = PermissionsController.getController(); + + if ( ! permsController.hasPermissionTo( AccessConstants.VIEW_ACTUAL_PANEL ) ) + { + this.panelActual.setVisible( false ); + } + if ( ! permsController.hasPermissionTo( AccessConstants.VIEW_SEGUIMENTO_PANEL ) ) + { + this.panelSeguimento.setVisible( false ); + } + if ( ! permsController.hasPermissionTo( AccessConstants.VIEW_CONCLUIDO_PANEL ) ) + { + this.panelConcluido.setVisible( false ); + } + + initComponents(); + } + + private void initComponents() + { + userLogged = PageNavigation.getProvider().getUserLogged(); lblUsername.setText( userLogged.getUsername() ); imgSiprp.setTitle( "SIPRP" ); @@ -56,7 +84,7 @@ public class AnaliseAcidentesTrabalhoPanel extends Composite lnkAlterarDados.setText( "alterar dados utilizador" ); lnkAjuda.setText( "ajuda" ); } - + @UiHandler( { "lnkPlanosActuacao", "lnkGerirUtilizadores", "lnkAlterarDados", "lnkAjuda" } ) protected void onClick( ClickEvent e ) { diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.ui.xml b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.ui.xml index cf41a76b..eef8203c 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.ui.xml +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoPanel.ui.xml @@ -2,7 +2,9 @@ @@ -59,28 +61,9 @@
- - - -
-
Em seguimento
- - table -
- -
-
Conclu\u00EDdos
- - table -
- + + diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/ActualPanel.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.java similarity index 74% rename from trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/ActualPanel.java rename to trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.java index 2975250f..318fa53a 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/ActualPanel.java +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.java @@ -1,4 +1,4 @@ -package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho; +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual; import com.evolute.siprp.client.panels.utils.permissoes.AccessConstants; import com.evolute.siprp.client.panels.utils.permissoes.PermissionsController; @@ -23,33 +23,31 @@ public class ActualPanel extends Composite @UiField protected Button btnNewAnalysis; - + @UiField protected ActualTable tableActual; public ActualPanel() { - permsController = new PermissionsController(); - + permsController = PermissionsController.getController(); if ( permsController.hasPermissionTo( AccessConstants.VIEW_ACTUAL_PANEL ) ) { - setupComponent(); + setupComponents(); } else { - SimplePanel sp = new SimplePanel(); - sp.setHeight( "0px" ); - initWidget( sp ); + initWidget( new SimplePanel() ); } } - private void setupComponent() + private void setupComponents() { initWidget( uiBinder.createAndBindUi( this ) ); - if ( permsController.hasPermissionTo( AccessConstants.VIEW_ACTUAL_PANEL_NOVA_ANALISE_BUTTON ) ) + btnNewAnalysis.setText( "Criar nova an\u00E1lise de acidentes de trabalho" ); + if ( ! permsController.hasPermissionTo( AccessConstants.VIEW_ACTUAL_PANEL_NOVA_ANALISE_BUTTON ) ) { - btnNewAnalysis.setText( "Criar nova an\u00E1lise de acidentes de trabalho" ); + btnNewAnalysis.setVisible( false ); } } @@ -59,7 +57,7 @@ public class ActualPanel extends Composite { if ( e.getSource().equals( btnNewAnalysis ) ) { - Window.alert( "new alanysis" ); + Window.alert( "new analysis" ); } } diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.ui.xml b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.ui.xml new file mode 100644 index 00000000..74d7d74e --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualPanel.ui.xml @@ -0,0 +1,48 @@ + + + + +.bodyDiv { + margin-top: 20px; + + width: 100%; + border: 1px solid black; + background-color: rgb( 238, 238, 238 ); +} + +.divActual { + margin-top: 15px; +} + +.btnNewAnalysis { + width: 80%; + height: 30px; +} + +.actualTable { + width: 816px; + margin-top: 10px; + margin-bottom: 15px; +} + + + + +
+
Actual
+
+ +
+
+ +
+
Processos com dados pendentes
+ +
+
+ + + \ No newline at end of file diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java new file mode 100644 index 00000000..7c02aae2 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java @@ -0,0 +1,83 @@ +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual; + +import java.util.Vector; + +import com.evolute.siprp.client.panels.utils.navigation.PageNavigation; +import com.evolute.siprp.client.vo.ActualTableRow; +import com.google.gwt.core.client.GWT; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; +import com.google.gwt.user.client.ui.FlexTable; + +public class ActualTable extends FlexTable +{ + private final DateTimeFormat D_F = DateTimeFormat.getFormat( "yyyy-MM-dd" ); + + private ActualTableServiceAsync actualService; + + public ActualTable() + { + super(); + + this.actualService = ( ActualTableServiceAsync ) GWT.create( ActualTableService.class ); + ServiceDefTarget serviceDef = ( ServiceDefTarget ) this.actualService; + serviceDef.setServiceEntryPoint( GWT.getModuleBaseURL() + "actualService" ); + + + this.setText( 0, 0, "Data do acidente" ); + this.setText( 0, 1, "Data da abertura" ); + this.setText( 0, 2, "Nº acidente" ); + this.setText( 0, 3, "POR" ); + this.setText( 0, 4, "Nome do acidentado" ); + this.setText( 0, 5, "Fase" ); + + CellFormatter cellFormatter = this.getCellFormatter(); + cellFormatter.setStyleName( 0, 0, "lblBold" ); + cellFormatter.setStyleName( 0, 1, "lblBold" ); + cellFormatter.setStyleName( 0, 2, "lblBold" ); + cellFormatter.setStyleName( 0, 3, "lblBold" ); + cellFormatter.setStyleName( 0, 4, "lblBold" ); + cellFormatter.setStyleName( 0, 5, "lblBold" ); + + + this.actualService.getActualTableData( PageNavigation.getProvider().getUserLogged(), new AsyncCallback< Vector< ActualTableRow > >() { + @Override + public void onFailure( Throwable caught ) + { + Window.alert( "Oops ! unable to fetch 'Actual' table data." ); + } + + @Override + public void onSuccess( Vector< ActualTableRow > result ) + { + buildTableData( result ); + } + }); + } + + private void buildTableData( Vector< ActualTableRow > tableRows ) + { + if ( tableRows == null ) + { + this.setText( 1, 0, "No items found." ); + this.getFlexCellFormatter().setColSpan( 1, 0, 6 ); + } + else + { + for ( int rowNumber = 1, columnNumber = 0; rowNumber < tableRows.size(); rowNumber++, columnNumber = 0 ) + { + ActualTableRow row = tableRows.get( rowNumber ); + + this.setText( rowNumber, columnNumber++, D_F.format( row.getDataAcidente() ) ); + this.setText( rowNumber, columnNumber++, D_F.format( row.getDataAbertura() ) ); + this.setText( rowNumber, columnNumber++, row.getNrAcidente() ); + this.setText( rowNumber, columnNumber++, row.getPOR() ); + this.setText( rowNumber, columnNumber++, row.getNomeAcidentado() ); + this.setText( rowNumber, columnNumber++, row.getFase() ); + } + } + } + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java new file mode 100644 index 00000000..10053121 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java @@ -0,0 +1,12 @@ +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual; + +import java.util.Vector; + +import com.evolute.siprp.client.vo.ActualTableRow; +import com.evolute.siprp.client.vo.Utilizador; +import com.google.gwt.user.client.rpc.RemoteService; + +public interface ActualTableService extends RemoteService +{ + public Vector< ActualTableRow > getActualTableData( Utilizador userLogged ); +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java new file mode 100644 index 00000000..9e220d40 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java @@ -0,0 +1,12 @@ +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual; + +import java.util.Vector; + +import com.evolute.siprp.client.vo.ActualTableRow; +import com.evolute.siprp.client.vo.Utilizador; +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface ActualTableServiceAsync +{ + public void getActualTableData( Utilizador userLogged, AsyncCallback< Vector< ActualTableRow > > callback ); +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.java new file mode 100644 index 00000000..bd0e1b13 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.java @@ -0,0 +1,38 @@ +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.concluido; + +import com.evolute.siprp.client.panels.utils.permissoes.AccessConstants; +import com.evolute.siprp.client.panels.utils.permissoes.PermissionsController; +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.Widget; + +public class ConcluidoPanel extends Composite { + + private static ConcluidoPanelUiBinder uiBinder = GWT.create( ConcluidoPanelUiBinder.class ); + interface ConcluidoPanelUiBinder extends UiBinder< Widget, ConcluidoPanel > { } + + private PermissionsController permsController; + + + public ConcluidoPanel() + { + permsController = PermissionsController.getController(); + if ( permsController.hasPermissionTo( AccessConstants.VIEW_CONCLUIDO_PANEL ) ) + { + setupComponents(); + } + else + { + initWidget( new SimplePanel() ); + } + } + + private void setupComponents() + { + initWidget( uiBinder.createAndBindUi( this ) ); + + } + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/ActualPanel.ui.xml b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.ui.xml similarity index 60% rename from trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/ActualPanel.ui.xml rename to trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.ui.xml index d5320e4e..e0194ce6 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/ActualPanel.ui.xml +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/concluido/ConcluidoPanel.ui.xml @@ -4,21 +4,25 @@ .bodyDiv { - margin-top: 20px; + margin-top: 10px; width: 100%; border: 1px solid black; background-color: rgb( 238, 238, 238 ); } +.divConcluido { + margin-top: 15px; +} + -
-
Actual
+
+
Conclu\u00EDdos
- -
+ table +
\ No newline at end of file diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.java new file mode 100644 index 00000000..536cf4ae --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.java @@ -0,0 +1,42 @@ +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.seguimento; + +import com.evolute.siprp.client.panels.utils.permissoes.AccessConstants; +import com.evolute.siprp.client.panels.utils.permissoes.PermissionsController; +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.Widget; + +public class SeguimentoPanel extends Composite { + + private static SeguimentoPanelUiBinder uiBinder = GWT.create( SeguimentoPanelUiBinder.class ); + interface SeguimentoPanelUiBinder extends UiBinder< Widget, SeguimentoPanel > { } + + private PermissionsController permsController; + + @UiField protected SeguimentoTable tableSeguimento; + + + public SeguimentoPanel() + { + permsController = PermissionsController.getController(); + if ( permsController.hasPermissionTo( AccessConstants.VIEW_SEGUIMENTO_PANEL ) ) + { + setupComponents(); + } + else + { + initWidget( new SimplePanel() ); + } + } + + private void setupComponents() + { + initWidget( uiBinder.createAndBindUi( this ) ); + + + } + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.ui.xml b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.ui.xml new file mode 100644 index 00000000..69a7ffdf --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoPanel.ui.xml @@ -0,0 +1,39 @@ + + + + +.bodyDiv { + margin-top: 20px; + + width: 100%; + border: 1px solid black; + background-color: rgb( 238, 238, 238 ); +} + +.divSeguimento { + margin-top: 15px; +} + +.seguimentoTable { + width: 816px; + margin-top: 10px; + margin-bottom: 15px; +} + + + + +
+
Em seguimento
+
+ +
+ +
+
+ + + \ No newline at end of file diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoTable.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoTable.java new file mode 100644 index 00000000..e1fa3434 --- /dev/null +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/seguimento/SeguimentoTable.java @@ -0,0 +1,8 @@ +package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.seguimento; + +import com.google.gwt.user.client.ui.FlexTable; + +public class SeguimentoTable extends FlexTable +{ + +} diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/login/LoginPanel.ui.xml b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/login/LoginPanel.ui.xml index a79e3639..a55a0fbb 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/login/LoginPanel.ui.xml +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/login/LoginPanel.ui.xml @@ -4,7 +4,11 @@ > - + +.loginBox { + height: 34px; +} + @@ -13,11 +17,11 @@ - + - + diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/recover_pwd/RecoverPwdPanel.ui.xml b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/recover_pwd/RecoverPwdPanel.ui.xml index f082a513..4346be9d 100644 --- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/recover_pwd/RecoverPwdPanel.ui.xml +++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/index/recover_pwd/RecoverPwdPanel.ui.xml @@ -9,9 +9,9 @@
-
Utilizador:
Palavra-chave:
+
- + 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 @@ /gestaoshst/recoverService + + actualServlet + com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.actual.ActualTableServiceImpl + + + actualServlet + /gestaoshst/actualService + + GestaoSHST.html diff --git a/trunk/GestaoSHST/war/gestaoshst/4219B3A1733D0EC54B4663A77B9340DB.gwt.rpc b/trunk/GestaoSHST/war/gestaoshst/4219B3A1733D0EC54B4663A77B9340DB.gwt.rpc new file mode 100644 index 00000000..4d8383e7 --- /dev/null +++ b/trunk/GestaoSHST/war/gestaoshst/4219B3A1733D0EC54B4663A77B9340DB.gwt.rpc @@ -0,0 +1,15 @@ +com.evolute.siprp.client.panels.index.login.LoginService, false, false, false, false, _, 169399566 +com.evolute.siprp.client.vo.Utilizador, true, true, false, false, com.evolute.siprp.client.vo.Utilizador/746657206, 746657206 +com.google.gwt.i18n.client.impl.DateRecord, true, true, false, false, com.google.gwt.i18n.client.impl.DateRecord/112389920, 112389920 +com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException, true, true, true, true, com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException/3936916533, 3936916533 +java.lang.Boolean, true, true, false, false, java.lang.Boolean/476441737, 476441737 +java.lang.Exception, true, false, true, false, java.lang.Exception/1920171873, 1920171873 +java.lang.Integer, true, true, false, false, java.lang.Integer/3438268394, 3438268394 +java.lang.Number, true, false, false, false, java.lang.Number/300033342, 300033342 +java.lang.RuntimeException, true, false, true, false, java.lang.RuntimeException/515124647, 515124647 +java.lang.String, true, true, true, true, java.lang.String/2004016611, 2004016611 +java.lang.Throwable, true, false, true, false, java.lang.Throwable/2953622131, 2953622131 +java.sql.Date, true, true, false, false, java.sql.Date/3996530531, 3996530531 +java.sql.Time, true, true, false, false, java.sql.Time/831929183, 831929183 +java.sql.Timestamp, true, true, false, false, java.sql.Timestamp/1769758459, 1769758459 +java.util.Date, true, true, false, false, java.util.Date/1659716317, 1659716317 diff --git a/trunk/GestaoSHST/war/gestaoshst/66B58610AC8FE0AF961E16F687F1CCCD.gwt.rpc b/trunk/GestaoSHST/war/gestaoshst/66B58610AC8FE0AF961E16F687F1CCCD.gwt.rpc new file mode 100644 index 00000000..bb60140c --- /dev/null +++ b/trunk/GestaoSHST/war/gestaoshst/66B58610AC8FE0AF961E16F687F1CCCD.gwt.rpc @@ -0,0 +1,18 @@ +com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual.ActualTableService, false, false, false, false, _, 3616117345 +com.evolute.siprp.client.vo.ActualTableRow, true, true, false, false, com.evolute.siprp.client.vo.ActualTableRow/3536573623, 3536573623 +com.evolute.siprp.client.vo.Utilizador, false, false, true, true, com.evolute.siprp.client.vo.Utilizador/746657206, 746657206 +com.google.gwt.i18n.client.impl.DateRecord, true, true, true, true, com.google.gwt.i18n.client.impl.DateRecord/112389920, 112389920 +com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException, true, true, true, true, com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException/3936916533, 3936916533 +java.lang.Boolean, false, false, true, true, java.lang.Boolean/476441737, 476441737 +java.lang.Exception, true, false, true, false, java.lang.Exception/1920171873, 1920171873 +java.lang.Integer, false, false, true, true, java.lang.Integer/3438268394, 3438268394 +java.lang.Number, false, false, true, false, java.lang.Number/300033342, 300033342 +java.lang.RuntimeException, true, false, true, false, java.lang.RuntimeException/515124647, 515124647 +java.lang.String, true, true, true, true, java.lang.String/2004016611, 2004016611 +java.lang.Throwable, true, false, true, false, java.lang.Throwable/2953622131, 2953622131 +java.sql.Date, true, true, true, true, java.sql.Date/3996530531, 3996530531 +java.sql.Time, true, true, true, true, java.sql.Time/831929183, 831929183 +java.sql.Timestamp, true, true, true, true, java.sql.Timestamp/1769758459, 1769758459 +java.util.Date, true, true, true, true, java.util.Date/1659716317, 1659716317 +java.util.Stack, true, true, false, false, java.util.Stack/1031431137, 1031431137 +java.util.Vector, true, true, false, false, java.util.Vector/3125574444, 3125574444 diff --git a/trunk/GestaoSHST/war/gestaoshst/75169062F30CD22F885BEE830D67F983.gwt.rpc b/trunk/GestaoSHST/war/gestaoshst/75169062F30CD22F885BEE830D67F983.gwt.rpc new file mode 100644 index 00000000..93118900 --- /dev/null +++ b/trunk/GestaoSHST/war/gestaoshst/75169062F30CD22F885BEE830D67F983.gwt.rpc @@ -0,0 +1,9 @@ +com.evolute.siprp.client.panels.index.login.LoginService, false, false, false, false, _, 169399566 +com.evolute.siprp.client.vo.Utilizador, true, true, false, false, com.evolute.siprp.client.vo.Utilizador/3153137530, 3153137530 +com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException, true, true, true, true, com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException/3936916533, 3936916533 +java.lang.Exception, true, false, true, false, java.lang.Exception/1920171873, 1920171873 +java.lang.Integer, true, true, false, false, java.lang.Integer/3438268394, 3438268394 +java.lang.Number, true, false, false, false, java.lang.Number/300033342, 300033342 +java.lang.RuntimeException, true, false, true, false, java.lang.RuntimeException/515124647, 515124647 +java.lang.String, true, true, true, true, java.lang.String/2004016611, 2004016611 +java.lang.Throwable, true, false, true, false, java.lang.Throwable/2953622131, 2953622131 diff --git a/trunk/GestaoSHST/war/gestaoshst/FFACA86B833A137B1CFBFE4003EC1D8A.gwt.rpc b/trunk/GestaoSHST/war/gestaoshst/FFACA86B833A137B1CFBFE4003EC1D8A.gwt.rpc new file mode 100644 index 00000000..5b8deb3c --- /dev/null +++ b/trunk/GestaoSHST/war/gestaoshst/FFACA86B833A137B1CFBFE4003EC1D8A.gwt.rpc @@ -0,0 +1,6 @@ +com.evolute.siprp.client.panels.index.recover_pwd.RecoverService, false, false, false, false, _, 3357099797 +com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException, true, true, true, true, com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException/3936916533, 3936916533 +java.lang.Exception, true, false, true, false, java.lang.Exception/1920171873, 1920171873 +java.lang.RuntimeException, true, false, true, false, java.lang.RuntimeException/515124647, 515124647 +java.lang.String, true, true, true, true, java.lang.String/2004016611, 2004016611 +java.lang.Throwable, true, false, true, false, java.lang.Throwable/2953622131, 2953622131 diff --git a/trunk/GestaoSHST/war/gestaoshst/GestaoSHST.css b/trunk/GestaoSHST/war/gestaoshst/GestaoSHST.css index 89314ca3..5838e564 100644 --- a/trunk/GestaoSHST/war/gestaoshst/GestaoSHST.css +++ b/trunk/GestaoSHST/war/gestaoshst/GestaoSHST.css @@ -85,4 +85,5 @@ a:hover { width: 80%; margin-left: auto; margin-right: auto; -} \ No newline at end of file +} +
Preencha os seguintes dados pessoaisPreencha os seguintes dados pessoais
Utilizador: