diff --git a/trunk/PlanosActuacao/nbproject/faces-config.NavData b/trunk/PlanosActuacao/nbproject/faces-config.NavData index 365f6c28..1468899f 100644 --- a/trunk/PlanosActuacao/nbproject/faces-config.NavData +++ b/trunk/PlanosActuacao/nbproject/faces-config.NavData @@ -3,8 +3,8 @@ - + diff --git a/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml b/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml index 35688e62..7f2d9ad4 100644 --- a/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml +++ b/trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml @@ -1,7 +1,7 @@ - + diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index 4c819eb6..31c74e2e 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -405,7 +405,7 @@ public class PlanosDataProvider extends GenericDataProvider{ sql += "WHERE fase = 4"; break; } - if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS) + if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA) { sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); } diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java b/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java index f8731420..762aad98 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java @@ -8,17 +8,14 @@ package planosactuacao; import com.sun.rave.web.ui.appbase.AbstractPageBean; -import com.sun.webui.jsf.component.Button; -import com.sun.webui.jsf.component.ImageComponent; +import com.sun.webui.jsf.component.Hyperlink; import db.entidades.Utilizador; import db.providers.UtilizadoresDataProvider; import java.sql.Connection; import java.util.ArrayList; import java.util.ListIterator; import javax.faces.FacesException; -import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -import utils.Logos; /** *

Page bean that corresponds to a similarly named JSP page. This @@ -39,23 +36,23 @@ public class Dummy extends AbstractPageBean { */ private void _init() throws Exception { } - private Button butImage = new Button(); + private Hyperlink hyperlink1 = new Hyperlink(); - public Button getButImage() { - return butImage; + public Hyperlink getHyperlink1() { + return hyperlink1; } - public void setButImage(Button b) { - this.butImage = b; + public void setHyperlink1(Hyperlink h) { + this.hyperlink1 = h; } - private ImageComponent image1 = new ImageComponent(); + private Hyperlink link = new Hyperlink(); - public ImageComponent getImage1() { - return image1; + public Hyperlink getLink() { + return link; } - public void setImage1(ImageComponent ic) { - this.image1 = ic; + public void setLink(Hyperlink h) { + this.link = h; } // @@ -124,6 +121,8 @@ public class Dummy extends AbstractPageBean { */ @Override public void prerender() { + + //Verbatim verbatim = new Verbatim(); //printUsers(); } diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java index 7abc34b2..a1b7ba7c 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java @@ -7,6 +7,7 @@ package planosactuacao; import com.sun.rave.web.ui.appbase.AbstractPageBean; +import com.sun.webui.jsf.component.Anchor; import com.sun.webui.jsf.component.Button; import com.sun.webui.jsf.component.Calendar; import com.sun.webui.jsf.component.Checkbox; @@ -1043,6 +1044,9 @@ public class EditarPlano extends AbstractPageBean { pg.getChildren().add(st); } +// Anchor ancora = new Anchor(); +// ancora.setId("calendario"); +// gridResponsavel.getChildren().add(ancora); HtmlPanelGrid grd = new HtmlPanelGrid(); grd.setColumns(2); grd.setColumnClasses("gridCol15, gridCol85"); @@ -1057,7 +1061,7 @@ public class EditarPlano extends AbstractPageBean { { dtInicio = new Calendar(); dtInicio.setId("dtInicio"); - + dtInicio.setDateFormatPattern("dd-MM-yyyy"); dtInicio.setValue(r.getData_inicio()); java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar(); @@ -1406,7 +1410,8 @@ public class EditarPlano extends AbstractPageBean { // case name where null will return to the same page. try { - gravarPlano(); + gravarPlano(); + getSessionBean1().setMsg("Os dados do Plano de Actuação foram guardados"); } catch(Exception ex) { @@ -2346,6 +2351,7 @@ public class EditarPlano extends AbstractPageBean { // TODO: Process the action. Return value is a navigation // case name where null will return to the same page. return "lista_planos"; + } public String butLimparDados_action() { diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java index 9804584e..9749783e 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java @@ -8,6 +8,7 @@ package planosactuacao; import com.sun.rave.web.ui.appbase.AbstractPageBean; import com.sun.webui.jsf.component.Button; +import com.sun.webui.jsf.component.Hyperlink; import com.sun.webui.jsf.component.PanelGroup; import com.sun.webui.jsf.component.StaticText; import db.entidades.Area; @@ -64,6 +65,7 @@ public class ViewPlano extends AbstractPageBean { // HtmlPanelGrid gridPlano; HtmlPanelGrid gridArea; + HtmlPanelGrid gridAreaContainer; HtmlPanelGrid gridRisco; HtmlPanelGrid gridValor; HtmlPanelGrid gridMedida; @@ -195,13 +197,15 @@ public class ViewPlano extends AbstractPageBean { private void showAreas(List areas) { + int i = 0; for(Area area : areas) { + i++; gridArea = new HtmlPanelGrid(); gridArea.setColumns(1); gridArea.setColumnClasses("gridColCenter"); gridArea.setWidth("100%"); - + gridPlano.getChildren().add(gridArea); pg = new PanelGroup(); @@ -211,10 +215,30 @@ public class ViewPlano extends AbstractPageBean { st.setText("Área: "); pg.getChildren().add(st); st = new StaticText(); + st.setId("fakeLink" + i); + st.setStyleClass("fakeLink"); + st.setOnMouseOver("this.style.textDecoration = 'underline'"); + st.setOnMouseOut("this.style.textDecoration = 'none'"); + st.setOnClick("expand(this)"); st.setEscape(false); st.setText(area.getDescricao()); pg.getChildren().add(st); + gridArea.getChildren().add(pg); + + gridAreaContainer = new HtmlPanelGrid(); + gridAreaContainer.setId("area_container" + i); + gridAreaContainer.setStyleClass("hidden"); + gridAreaContainer.setColumns(1); + gridAreaContainer.setColumnClasses("gridColCenter"); + gridAreaContainer.setWidth("100%"); + + st = new StaticText(); + st.setEscape(false); + st.setText(" "); + gridAreaContainer.getChildren().add(st); + + gridArea.getChildren().add(gridAreaContainer); showRiscos(area.getRiscos()); } } @@ -226,8 +250,9 @@ public class ViewPlano extends AbstractPageBean { HtmlPanelGrid grd = new HtmlPanelGrid(); grd.setColumns(1); grd.setWidth("100%"); - grd.setStyleClass("centerBlock"); - gridArea.getChildren().add(grd); + //grd.setStyleClass("centerBlock"); + //gridArea.getChildren().add(grd); + gridAreaContainer.getChildren().add(grd); gridRisco = new HtmlPanelGrid(); gridRisco.setStyleClass("centerBlock"); diff --git a/trunk/PlanosActuacao/web/Dummy.jsp b/trunk/PlanosActuacao/web/Dummy.jsp index 26cc07b6..1e1d3731 100644 --- a/trunk/PlanosActuacao/web/Dummy.jsp +++ b/trunk/PlanosActuacao/web/Dummy.jsp @@ -25,13 +25,73 @@ width: 90%; } + - + - - + + + + + + + + + + + + + + + + + diff --git a/trunk/PlanosActuacao/web/EditarPlano.jsp b/trunk/PlanosActuacao/web/EditarPlano.jsp index 3c4cd0c4..019f6644 100644 --- a/trunk/PlanosActuacao/web/EditarPlano.jsp +++ b/trunk/PlanosActuacao/web/EditarPlano.jsp @@ -12,6 +12,11 @@ diff --git a/trunk/PlanosActuacao/web/resources/images/puls_more.gif b/trunk/PlanosActuacao/web/resources/images/puls_more.gif new file mode 100755 index 00000000..f10da648 Binary files /dev/null and b/trunk/PlanosActuacao/web/resources/images/puls_more.gif differ diff --git a/trunk/PlanosActuacao/web/resources/stylesheet.css b/trunk/PlanosActuacao/web/resources/stylesheet.css index 45fdacad..b4a0aeb8 100644 --- a/trunk/PlanosActuacao/web/resources/stylesheet.css +++ b/trunk/PlanosActuacao/web/resources/stylesheet.css @@ -158,6 +158,11 @@ body {background-color: #f8f8f0;} display : none; } +.fakeLink{ + cursor: pointer; + color: #0000cc; +} + .infoMessage { font-size : 13px; color: black;