Author: mareshkau
Date: 2008-01-22 13:02:54 -0500 (Tue, 22 Jan 2008)
New Revision: 5885
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/address.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/childs.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/competenceMeasures.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/contracts.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/cumuls.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/decorations.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/developmentCircles.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/diplomas.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/formations.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/illnesses.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/leaves.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/nok.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/pictureUpload.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/promotionExams.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/salaryRanks.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectEntry.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectSecretariat.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/transportation.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/workAccidents.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/employee.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/hr-layout.xhtml
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE1479/
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
Log:
junit adjustment, unused code was removed.
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/address.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/address.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/address.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,76 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html">
+<ui:composition>
+<table style="border:none;">
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Address.number']}"/>
+ </td>
+ <td>
+ <h:inputText value="#{address.number}" size="3"
id="addressnumber"/>
+ <h:message for="addressnumber" showDetails="true"
showSummary="false"/>
+ </td>
+ <td>
+ #{bundle['Address.street']}
+ </td>
+ <td>
+ <h:inputText value="#{address.street}" size="50"
id="street"/>
+ <h:message for="street" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Address.zip']}"/>
+ </td>
+ <td>
+ <h:inputText value="#{address.zip}" size="5"
id="zip"/>
+ <h:message for="zip" showDetails="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText value="#{bundle['Address.city']}"/>
+ </td>
+ <td>
+ <h:inputText value="#{address.city}" size="48"
id="city"/>
+ <h:message for="city" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Address.country']}"/>
+ </td>
+ <td colspan="3">
+ <h:selectOneMenu value="#{address.country}"
id="country">
+ <f:selectItems value="#{hrRequest.countries}"/>
+ </h:selectOneMenu>
+ <h:message for="country" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Address.phone']}"/>
+ </td>
+ <td>
+ <h:inputText value="#{address.phone}" size="15"
id="phone"/>
+ <h:message for="phone" showDetails="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText value="#{bundle['Address.gsm']}"/>
+ </td>
+ <td>
+ <h:inputText value="#{address.gsm}" size="15"
id="gsm"/>
+ <h:message for="gsm" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Address.fax']}"/>
+ </td>
+ <td colspan="3">
+ <h:inputText value="#{address.fax}" size="15"
id="fax"/>
+ <h:message for="fax" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+</table>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/childs.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/childs.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/childs.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,105 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <a4j:region id="childrenRegion">
+
+ <a4j:outputPanel id="a4jChildren" layout="block">
+ <fieldset><legend><h:outputText
+ value="#{bundle['Employee.children']}" /></legend>
+ <table border="0" width="100%" class="list">
+ <thead>
+ <tr>
+ <th><h:outputText value="#{bundle['Child.firstName']}"
/></th>
+ <th><h:outputText value="#{bundle['Child.lastName']}"
/></th>
+ <th><h:outputText value="#{bundle['Child.birthDate']}"
/></th>
+ <th><h:outputText value="#{bundle['Child.allocation']}"
/></th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList value="#{hrSession.employee.childrenArray}"
+ var="child" id="childs" rowIndexVar="index">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{child.firstName}" /></td>
+ <td><h:outputText value="#{child.lastName}" /></td>
+ <td><h:outputText value="#{child.birthDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td><h:graphicImage url="/images/icon_checked.png"
rendered="#{child.allocation}"/></td>
+ <td><a4j:commandLink action="#{hrActions.editChild}"
+ reRender=":#{parentClientId}:a4jChildren" limitToList="true"
+ immediate="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editChild" />
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tr>
+ <td align="right" colspan="5"><a4j:commandLink
immediate="true"
+ rendered="#{hrSession.edits.child == null}"
+ reRender=":#{parentClientId}:a4jChildren" limitToList="true"
+ action="#{hrActions.addChild}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset" />
+ <f:param name="containerToReset" value="editChild" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ <tr>
+ <td colspan="5"><s:subForm id="editChild"
+ rendered="#{hrSession.edits.child != null}">
+
+ <table border="0" width="100%">
+ <tr>
+ <td><h:outputText value="#{bundle['Child.firstName']}"
/></td>
+ <td><h:inputText value="#{hrSession.edits.child.firstName}"
id="firstname"/><h:message for="firstname"
showDetails="true" showSummary="false"/></td>
+ <td><h:outputText value="#{bundle['Child.lastName']}"
/></td>
+ <td><h:inputText value="#{hrSession.edits.child.lastName}"
id="lastname"/><h:message for="lastname"
showDetails="true" showSummary="false"/></td>
+ <td rowspan="3" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteChild}"
immediate="true"
+ reRender=":#{parentClientId}:a4jChildren" limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td><h:outputText value="#{bundle['Child.birthDate']}"
/></td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.child.birthDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="birthdate">
+
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="birthdate"
showDetails="true" showSummary="false"/></td>
+ <td>Leeftijd kind huidig jaar:</td>
+ <td><h:outputText value="#{hrSession.edits.child.age}"
/></td>
+ </tr>
+ <tr>
+ <td><h:outputText value="#{bundle['Child.allocation']}"
/></td>
+ <td><h:selectBooleanCheckbox
+ value="#{hrSession.edits.child.allocation}" /></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan="5" align="right"><a4j:commandButton
value="Done"
+ reRender=":#{parentClientId}:a4jChildren" limitToList="true"
+ action="#{hrActions.clearEdits}" actionFor="doneChild"
/></td>
+ </tr>
+ </table>
+
+ </s:subForm> <h:messages showDetail="true" /></td>
+ </tr>
+ </table>
+ </fieldset>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/competenceMeasures.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/competenceMeasures.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/competenceMeasures.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,410 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <style type="text/css">
+ tr.separator td,tr.separator th {
+ border-bottom:1px solid black;
+ }
+ </style>
+ <a4j:region id="compRegion">
+
+ <a4j:outputPanel id="a4jComp" layout="block">
+ <table class="list" width="100%">
+ <thead></thead>
+ <t:dataList id="measures" var="measure"
rowIndexVar="index"
+ value="#{competenceMeasures}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['CompetenceMeasure.name']}</td>
+ <td>#{measure.name}</td>
+ <td>#{bundle['CompetenceMeasure.reference']}</td>
+ <td>#{measure.reference}</td>
+ <td rowspan="11" valign="top"><a4j:commandLink
+ action="#{hrActions.editCompetenceMeasure}" immediate="true"
+ reRender=":#{parentClientId}:a4jComp" limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset" />
+ <f:param name="containerToReset"
value="editCompetenceMeasure" />
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.organismApplyDate']}</td>
+ <td><h:outputText value="#{measure.organismApplyDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{bundle['CompetenceMeasure.IRMApplyDate']}</td>
+ <td><h:outputText value="#{measure.IRMApplyDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.validityStart']}</td>
+ <td><h:outputText value="#{measure.validityStart}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{bundle['CompetenceMeasure.validityEnd']}</td>
+ <td><h:outputText value="#{measure.validityEnd}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.level']}</td>
+ <td>#{measure.level}</td>
+ <td>#{bundle['CompetenceMeasure.premium']}</td>
+ <td><h:outputText value="#{measure.premium}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td
valign="top">#{bundle['CompetenceMeasure.competenceMeasureTests']}</td>
+
+ <td colspan="3" valign="top">
+ <table class="list" style="border-spacing: 0px;">
+ <!-- <tr>
+ <th>#{bundle['CompetenceMeasureTest.date']}</th>
+ <th>#{bundle['CompetenceMeasureTest.score']}</th>
+ <th>#{bundle['CompetenceMeasureTest.result']}</th>
+ </tr> -->
+ <t:dataList rowIndexVar="index2" var="test"
+ value="#{measure.competenceMeasureTestsArray}">
+ <tr class="#{((index2+index)%2)==0?'odd':'even'}">
+ <td><h:outputText value="#{test.date}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{test.score}</td>
+ <td><h:outputText value="#{test.result}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText></td>
+ </tr>
+ </t:dataList>
+ </table>
+ </td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.evolution']}</td>
+ <td><h:outputText value="#{measure.evolution}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText></td>
+ <td>#{bundle['CompetenceMeasure.scoreTotal']}</td>
+ <td>#{measure.scoreTotal}</td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.pvDate']}</td>
+ <td><h:outputText value="#{measure.pvDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{bundle['CompetenceMeasure.nextDate']}</td>
+ <td><h:outputText value="#{measure.nextDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.nextSalaryScale']}</td>
+ <td>#{measure.nextSalaryScale}</td>
+ <td>#{bundle['CompetenceMeasure.nextSalaryScaleDate']}</td>
+ <td><h:outputText value="#{measure.nextSalaryScaleDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.location']}</td>
+ <td>#{measure.location}</td>
+ <td>#{bundle['CompetenceMeasure.duration']}</td>
+ <td>#{measure.duration}</td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['CompetenceMeasure.testNumber']}</td>
+ <td>#{measure.testNumber}</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td
valign="top">#{bundle['CompetenceMeasure.note']}</td>
+ <td colspan="3">#{measure.note}</td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="5" align="right">
+ <a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.competenceMeasure == null}"
+ reRender=":#{parentClientId}:a4jComp" limitToList="true"
+ action="#{hrActions.addCompetenceMeasure}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
value="editCompetenceMeasure" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <s:subForm id="editCompetenceMeasure"
+ rendered="#{hrSession.edits.competenceMeasure != null}">
+ <fieldset>
+ <table style="border-spacing: 0px;" width="100%">
+ <tr>
+ <td>#{bundle['CompetenceMeasure.name']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.name}"
id="cmname"/>
+ <h:message for="cmname" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.reference']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.reference}"
id="mref"/>
+ <h:message for="mref" showDetails="true"
showSummary="false"/></td>
+
+ <td rowspan="10" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteCompetenceMeasure}"
immediate="true"
+ reRender=":#{parentClientId}:a4jComp" limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.organismApplyDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.organismApplyDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmoadate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmoadate"
showDetails="true" showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.IRMApplyDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.IRMApplyDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmiadate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmiadate"
showDetails="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.validityStart']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.validityStart}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmvstart">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmvstart"
showDetails="true" showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.validityEnd']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.validityEnd}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmvend">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmvend"
showDetails="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.level']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.level}"
id="cmlevel"/>
+ <h:message for="cmlevel" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.premium']}</td>
+ <td><!-- <h:selectOneMenu
+ value="#{hrSession.edits.competenceMeasure.premium}"
id="cmpremium">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Competence premium']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.competenceMeasure.premium}" />
+ <ui:param name="id" value="cmpremium" />
+ <ui:param name="key" value="Competence premium" />
+ </ui:include>
+ <h:message for="cmpremium" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td
valign="top">#{bundle['CompetenceMeasure.competenceMeasureTests']}</td>
+ <td colspan="3" valign="top">
+ <a4j:region>
+ <a4j:outputPanel id="tests">
+ <table class="list">
+ <thead>
+ <tr>
+ <th>#{bundle['CompetenceMeasureTest.date']}</th>
+ <th>#{bundle['CompetenceMeasureTest.score']}</th>
+ <th>#{bundle['CompetenceMeasureTest.result']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList rowIndexVar="index2" var="test"
+ value="#{hrSession.edits.competenceMeasure.competenceMeasureTestsArray}">
+ <tbody class="highlight">
+ <tr
class="#{((index2+index)%2)==0?'odd':'even'}">
+ <td><h:outputText value="#{test.date}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{test.score}</td>
+ <td><h:outputText value="#{test.result}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText></td>
+ <td><a4j:commandLink
+ action="#{hrActions.editCompetenceMeasureTest}"
immediate="true"
+ reRender=":#{parentClientId}:editCompetenceMeasure:tests"
limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
+ value="editCompetenceMeasureTest" />
+ <f:param name="editId" value="#{index2}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="3"></td>
+ <td><a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.competenceMeasureTest == null}"
+ reRender=":#{parentClientId}:editCompetenceMeasure:tests"
limitToList="true"
+ action="#{hrActions.addCompetenceMeasureTest}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
+ value="editCompetenceMeasureTest" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ <tbody>
+ <tr>
+ <td colspan="4"><s:subForm
id="editCompetenceMeasureTest"
+ rendered="#{hrSession.edits.competenceMeasureTest != null}">
+ <fieldset>
+ <table style="border-spacing: 0px;">
+ <tr>
+ <td>#{bundle['CompetenceMeasureTest.date']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasureTest.date}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy" id="cmtdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmtdate"
showDetails="true" showSummary="false"/></td>
+
+ <td rowspan="3" valign="top">
+ <a4j:commandLink
action="#{hrActions.deleteCompetenceMeasureTest}" immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:editCompetenceMeasure:tests"
limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasureTest.score']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasureTest.score}"
maxlength="50" id="cmtscore"></h:inputText>
+ <h:message for="cmtscore" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasureTest.result']}</td>
+ <td><!-- <h:selectOneMenu
+ value="#{hrSession.edits.competenceMeasureTest.result}"
id="cmtresult">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Exam result']}" />
+ </h:selectOneMenu> -->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.competenceMeasureTest.result}" />
+ <ui:param name="id" value="cmtresult" />
+ <ui:param name="key" value="Exam result" />
+ </ui:include>
+ <h:message for="cmtresult" showDetails="true"
showSummary="false"/></td>
+ </tr>
+
+ </table>
+ <a4j:commandButton value="Done"
+ action="#{hrActions.clearCompetenceMeasureTestEdit}"
+ reRender=":#{parentClientId}:editCompetenceMeasure:tests"
limitToList="true"
+ actionFor="editCompetenceMeasureTest" /></fieldset>
+ </s:subForm></td>
+ </tr>
+ </tbody>
+ </table>
+ </a4j:outputPanel>
+ </a4j:region>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.evolution']}</td>
+ <td><!-- <h:selectOneMenu
+ value="#{hrSession.edits.competenceMeasure.evolution}"
id="cmevolution">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Competence evolution']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.competenceMeasure.evolution}" />
+ <ui:param name="id" value="cmevolution" />
+ <ui:param name="key" value="Competence evolution" />
+ </ui:include>
+ <h:message for="cmevolution" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.scoreTotal']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.scoreTotal}"
id="cmscoretotal"/>
+ <h:message for="cmscoretotal" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.pvDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.pvDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmpvdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmpvdate"
showDetails="true" showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.nextDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.nextDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmnextdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmnextdate"
showDetails="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.nextSalaryScale']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.nextSalaryScale}"
id="cmnextsalary"/>
+ <h:message for="cmnextsalary" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.nextSalaryScaleDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.competenceMeasure.nextSalaryScaleDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="cmnextsalarydate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cmnextsalarydate"
showDetails="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.location']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.location}"
id="cmlocation"/>
+ <h:message for="cmlocation" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['CompetenceMeasure.duration']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.duration}"
id="cmduration"/>
+ <h:message for="cmduration" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['CompetenceMeasure.testNumber']}</td>
+ <td><h:inputText
+ value="#{hrSession.edits.competenceMeasure.testNumber}"
id="cmtestnumber"/>
+ <h:message for="cmtestnumber" showDetails="true"
showSummary="false"/></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td
valign="top">#{bundle['CompetenceMeasure.note']}</td>
+ <td colspan="3"><h:inputTextarea
+ value="#{hrSession.edits.competenceMeasure.note}" cols="50"
+ rows="5" id="cmnote"/>
+ <h:message for="cmnote" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneCompetenceMeasure}"
+ reRender=":#{parentClientId}:a4jComp" limitToList="true"
+ actionFor="editCompetenceMeasure" /></fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/contracts.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/contracts.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/contracts.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,310 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+
+ <a4j:region id="contractRegion">
+
+ <a4j:outputPanel id="a4jContract" layout="block">
+ <table class="list" cellpadding="5" width="100%">
+ <thead>
+ <tr>
+ <th><h:outputText
value="#{bundle['Contract.reference']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.function']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.startDate']}" /></th>
+ <th><h:outputText value="#{bundle['Contract.endDate']}"
/></th>
+ <th><h:outputText
value="#{bundle['Contract.workPermitStart']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.workPermitEnd']}" /></th>
+ <th></th>
+ </tr>
+ <tr>
+ <th><h:outputText value="#{bundle['Contract.project']}"
/></th>
+ <th><h:outputText
value="#{bundle['Contract.projectBudget']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.remainingProjectBudget']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.financedBy']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.comptabilitySection']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.budgetSource']}" /></th>
+ <th></th>
+ </tr>
+ <tr>
+ <th colspan="3" align="center"><h:outputText
value="#{bundle['Contract.reason']}" /></th>
+ <th><h:outputText value="#{bundle['Contract.type']}"
/></th>
+ <th><h:outputText
value="#{bundle['Contract.contractCategory']}" /></th>
+ <th><h:outputText
value="#{bundle['Contract.workExperienceGiven']}" /></th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList id="contracts" var="contract"
rowIndexVar="index" value="#{contracts}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>
+ <h:outputText id="type"
value="#{contract.reference}"/>
+ </td>
+ <td><h:outputText id="function"
value="#{contract.function}"/></td>
+ <td>
+ <h:outputText value="#{contract.startDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </h:outputText>
+ </td>
+ <td>
+ <h:outputText value="#{contract.endDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </h:outputText>
+ </td>
+ <td>
+ <h:outputText value="#{contract.workPermitStart}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </h:outputText>
+ </td>
+ <td>
+ <h:outputText value="#{contract.workPermitEnd}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </h:outputText>
+ </td>
+ <td rowspan="3" valign="top">
+ <a4j:commandLink action="#{hrActions.editContract}"
+ immediate="true"
+ reRender=":#{parentClientId}:a4jContract"
limitToList="true">
+ <f:actionListener
type="be.rmi.intranet.listener.ContainerReset"/>
+ <f:param name="containerToReset" value="editContract"
/>
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>
+ <h:outputText id="project"
value="#{contract.project.proj_name}"/>
+ </td>
+ <td>
+ <h:outputText id="budget"
value="#{contract.projectBudget}"/>
+ </td>
+ <td>
+ <h:outputText id="remainingBudget"
value="#{contract.remainingProjectBudget}"/>
+ </td>
+ <td>
+ <h:outputText id="financedBy"
value="#{contract.financedBy}"/>
+ </td>
+ <td>
+ <h:outputText id="comptabilitySection"
value="#{contract.comptabilitySection}"><f:converter
converterId="SelectConverter" /></h:outputText>
+ </td>
+ <td>
+ <h:outputText id="budgetSource"
value="#{contract.budgetSource}"><f:converter
converterId="SelectConverter" /></h:outputText>
+ </td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td colspan="3">
+ <h:outputText id="reason"
value="#{contract.reason}"><f:converter
converterId="SelectConverter" /></h:outputText>
+ </td>
+ <td>
+ <h:outputText id="type"
value="#{contract.type}"><f:converter
converterId="SelectConverter" /></h:outputText>
+ </td>
+ <td>
+ <h:outputText id="category"
value="#{contract.contractCategory}"><f:converter
converterId="SelectConverter" /></h:outputText>
+ </td>
+ <td colspan="2">
+ <h:outputText id="workExperienceGiven"
value="#{contract.workExperienceGiven}"/>
+ </td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="7">
+ <a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.contract == null}"
+ action="#{hrActions.addContract}"
+ reRender=":#{parentClientId}:a4jContract"
limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editContract" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <s:subForm id="editContract" rendered="#{hrSession.edits.contract
!= null}">
+ <fieldset>
+ <table border="0" width="100%">
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Contract.reference']}"/>
+ <h:inputText value="#{hrSession.edits.contract.reference}"
id="creference"/>
+ <h:message for="creference" showDetail="true"
showSummary="false"/>
+
+
+ <h:outputText value="#{bundle['Contract.type']}" />
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.contract.type}" />
+ <ui:param name="id" value="ctype" />
+ <ui:param name="key" value="Contract type" />
+ </ui:include>
+ <h:message for="ctype" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText value="#{bundle['Contract.function']}" />
+ <h:inputText value="#{hrSession.edits.contract.function}"
id="cfunction"/>
+ <h:message for="cfunction" showDetail="true"
showSummary="false"/>
+ </td>
+
+ <td rowspan="7" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteContract}"
immediate="true"
+ reRender=":#{parentClientId}:a4jContract" limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ #{bundle['Contract.reason']}
+ <!-- <h:selectOneMenu value="#{hrSession.edits.contract.reason}"
id="creason">
+ <f:selectItems value="#{hrRequest.selectEntries['Contract
reason']}"/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.contract.reason}" />
+ <ui:param name="id" value="creason" />
+ <ui:param name="key" value="Contract reason" />
+ </ui:include>
+ <h:message for="creason" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ #{bundle['Contract.contractCategory']}
+ <!-- <h:selectOneMenu
value="#{hrSession.edits.contract.contractCategory}"
id="ccategory">
+ <f:selectItems value="#{hrRequest.selectEntries['Contract
category']}"/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.contract.contractCategory}" />
+ <ui:param name="id" value="ccategory" />
+ <ui:param name="key" value="Contract category" />
+ </ui:include>
+ <h:message for="ccategory" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Contract.startDate']}" />
+ <t:inputCalendar
+ value="#{hrSession.edits.contract.startDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="cstartdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar>
+ <h:message for="cstartdate" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText value="#{bundle['Contract.endDate']}" />
+ <t:inputCalendar
+ value="#{hrSession.edits.contract.endDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="cenddate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar>
+ <h:message for="cenddate" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Contract.workPermitStart']}"
/>
+ <t:inputCalendar
+ value="#{hrSession.edits.contract.workPermitStart}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="cworkstart">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar>
+ <h:message for="cworkstart" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText value="#{bundle['Contract.workPermitEnd']}"
/>
+ <t:inputCalendar
+ value="#{hrSession.edits.contract.workPermitEnd}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="cworkend">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar>
+ <h:message for="cworkend" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Contract.project']}" />
+ <h:selectOneMenu id="cproject"
value="#{hrSession.edits.contract.project}">
+ <f:selectItem itemValue="[nothing]" itemLabel=""/>
+ <f:selectItems value="#{hrRequest.projectItems}"/>
+ </h:selectOneMenu>
+ <a4j:commandLink action="dumb"
+ immediate="true" reRender="cproject"
limitToList="true" >
+ <h:graphicImage
+ url="/images/icon_reload.gif"
+ style="border:none;vertical-align:center;margin-right:1pt"
+ />
+ </a4j:commandLink>
+ <h:message for="cproject" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText
value="#{bundle['Contract.workExperienceGiven']}" />
+ <h:inputText value="#{hrSession.edits.contract.workExperienceGiven}"
id="cworkexp"/>
+ <h:message for="cworkexp" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Contract.projectBudget']}"
/>
+ <h:inputText value="#{hrSession.edits.contract.projectBudget}"
id="cprojbudget"/>
+ <h:message for="cprojbudget" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ <h:outputText
value="#{bundle['Contract.remainingProjectBudget']}" />
+ <h:inputText
value="#{hrSession.edits.contract.remainingProjectBudget}"
id="cremainbudget"/>
+ <h:message for="cremainbudget" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Contract.financedBy']}"
/>
+ <h:inputText value="#{hrSession.edits.contract.financedBy}"
id="cfinby"/>
+ <h:message for="cfinby" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ #{bundle['Contract.budgetSource']}
+ <!-- <h:selectOneMenu
value="#{hrSession.edits.contract.budgetSource}" id="cbsource">
+ <f:selectItems value="#{hrRequest.selectEntries['Budget
source']}"/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.contract.budgetSource}" />
+ <ui:param name="id" value="cbsource" />
+ <ui:param name="key" value="Budget source" />
+ </ui:include>
+ <h:message for="cbsource" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText
value="#{bundle['Contract.comptabilitySection']}" />
+ <!-- <h:selectOneMenu
value="#{hrSession.edits.contract.comptabilitySection}"
id="ccsection">
+ <f:selectItems
value="#{hrRequest.selectEntries['Comptability section']}"/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.contract.comptabilitySection}" />
+ <ui:param name="id" value="ccsection" />
+ <ui:param name="key" value="Comptability section" />
+ </ui:include>
+ <h:message for="ccsection" showDetail="true"
showSummary="false"/>
+ </td>
+ <td>
+ </td>
+ </tr>
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneContract}"
+ reRender=":#{parentClientId}:a4jContract" limitToList="true"
+ actionFor="editContract" />
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/cumuls.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/cumuls.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/cumuls.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,145 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <a4j:region id="cumulsRegion">
+
+ <a4j:outputPanel id="a4jCumul" layout="block">
+ <table class="list" width="100%">
+ <thead></thead>
+ <t:dataList var="cumul" rowIndexVar="index"
value="#{cumuls}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td align="right"><h:outputText
value="#{bundle['Cumul.subject']}"/></td>
+ <td><h:outputText value="#{cumul.subject}"/></td>
+ <td rowspan="8" valign="top">
+ <a4j:commandLink action="#{hrActions.editCumul}"
+ immediate="true" reRender=":#{parentClientId}:a4jCumul"
limitToList="true">
+ <f:actionListener
type="be.rmi.intranet.listener.ContainerReset"/>
+ <f:param name="containerToReset" value="editCumul" />
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td align="right"><h:outputText
value="#{bundle['Cumul.startDate']}"/></td>
+ <td><h:outputText value="#{cumul.startDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td align="right"><h:outputText
value="#{bundle['Cumul.endDate']}"/></td>
+ <td><h:outputText value="#{cumul.endDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td align="right"><h:outputText
value="#{bundle['Cumul.university']}"/></td>
+ <td align="right"><h:outputText
value="#{cumul.university}"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td align="right"><h:outputText
value="#{bundle['Cumul.teachingTitle']}"/></td>
+ <td align="right"><h:outputText
value="#{cumul.teachingTitle}"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td valign="top" align="right"><h:outputText
value="#{bundle['Cumul.location']}"/></td>
+ <td><h:outputText value="#{cumul.location}"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td valign="top" align="right"><h:outputText
value="#{bundle['Cumul.conditions']}"/></td>
+ <td><h:outputText value="#{cumul.conditions}"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td colspan="2"><h:outputText
value="#{cumul.note}"/></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="3" align="right">
+ <a4j:commandLink immediate="true"
rendered="#{hrSession.edits.cumul == null}"
+ reRender=":#{parentClientId}:a4jCumul" limitToList="true"
action="#{hrActions.addCumul}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editCumul" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <s:subForm id="editCumul" rendered="#{hrSession.edits.cumul !=
null}">
+ <table>
+ <tr>
+ <td><h:outputText
value="#{bundle['Cumul.subject']}"/></td>
+ <td colspan="3"><h:inputText
value="#{hrSession.edits.cumul.subject}" size="100"/></td>
+
+ <td rowspan="6" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteCumul}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:a4jCumul" limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['Cumul.startDate']}"/></td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.cumul.startDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="cstartdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cstartdate"
showDetail="true" showSummary="false"/></td>
+ <td><h:outputText
value="#{bundle['Cumul.endDate']}"/></td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.cumul.endDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="cenddate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="cenddate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>
+ <h:outputText value="#{bundle['Cumul.university']}" />
+ </td>
+ <td colspan="3">
+ <h:inputText value="#{hrSession.edits.cumul.university}"
id="university" size="100"/>
+ <h:message for="university"/>
+ </td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['Cumul.teachingTitle']}"/></td>
+ <td colspan="3"><h:inputText
value="#{hrSession.edits.cumul.teachingTitle}" id="cteachtitle"
size="100"/>
+ <h:message for="cteachtitle" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top"><h:outputText
value="#{bundle['Cumul.location']}"/></td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.cumul.location}" cols="80" rows="4"
id="clocation"/>
+ <h:message for="clocation" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top"><h:outputText
value="#{bundle['Cumul.conditions']}"/></td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.cumul.conditions}" cols="80"
rows="7" id="cconditions"/>
+ <h:message for="cconditions" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top"><h:outputText
value="#{bundle['Cumul.note']}"/></td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.cumul.note}" cols="80" rows="7"
id="cnote"/>
+ <h:message for="cnote" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneCumul}"
+ reRender=":#{parentClientId}:a4jCumul" limitToList="true"
+ actionFor="editCumul" />
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/decorations.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/decorations.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/decorations.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,105 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <a4j:region id="decorationRegion">
+
+ <a4j:outputPanel id="a4jDecorations" layout="block">
+ <table class="list" width="100%" cellpadding="5">
+ <thead>
+ <tr>
+ <th>#{bundle['Decoration.date']}</th>
+ <th>#{bundle['Decoration.kind']}</th>
+ <th>#{bundle['Decoration.decorationClass']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList var="deco" rowIndexVar="index"
value="#{decorations}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{deco.date}"><f:convertDateTime
pattern="dd MMMM yyyy" timeZone="Europe/Paris"
/></h:outputText></td>
+ <td><h:outputText value="#{deco.kind}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td><h:outputText
value="#{deco.decorationClass}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td><a4j:commandLink action="#{hrActions.editDecoration}"
immediate="true"
+ reRender=":#{parentClientId}:a4jDecorations"
limitToList="true">
+ <f:param name="editId" value="#{index}" />
+ <f:param name="containerToReset" value="editDecoration"
/>
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none" />
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="4" align="right"><a4j:commandLink
immediate="true"
+ rendered="#{hrSession.edits.decoration == null}"
+ reRender=":#{parentClientId}:a4jDecorations"
limitToList="true"
+ action="#{hrActions.addDecoration}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset" />
+ <f:param name="containerToReset" value="editDecoration"
/>
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </table>
+ <s:subForm id="editDecoration"
+ rendered="#{hrSession.edits.decoration != null}">
+ <fieldset>
+ <table style="border:none;">
+ <tr>
+ <td>#{bundle['Decoration.date']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.decoration.date}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar></td>
+
+ <td rowspan="4" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteDecoration}"
immediate="true"
+ reRender=":#{parentClientId}:a4jDecorations"
limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Decoration.kind']}</td>
+ <td>
+
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.decoration.kind}" />
+ <ui:param name="id" value="decoration_kind" />
+ <ui:param name="key" value="Decoration kind" />
+ </ui:include>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Decoration.decorationClass']}</td>
+ <td>
+
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.decoration.decorationClass}" />
+ <ui:param name="id" value="decoration_class" />
+ <ui:param name="key" value="Decoration class" />
+ </ui:include>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <a4j:commandButton value="Done"
action="#{hrActions.doneDecoration}"
+ reRender=":#{parentClientId}:a4jDecorations"
limitToList="true"
+ actionFor="editDecoration"
+ onclick="new Effect.Highlight('#{parentClientId}:a4jDecorations',
{duration:2,startcolor:'#ffffff',endcolor:'#808080',restorecolor:'#808080'});"
/>
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/developmentCircles.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/developmentCircles.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/developmentCircles.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,144 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <a4j:region id="circleRegion">
+
+ <a4j:outputPanel id="a4jCircle" layout="block">
+ <table class="list" width="100%">
+ <thead></thead>
+ <t:dataList var="circle" rowIndexVar="index"
value="#{developmentCircles}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.functionChiefName']}</td>
+ <td colspan="3">#{circle.functionChiefName}</td>
+ <td rowspan="7" valign="top"><a4j:commandLink
+ action="#{hrActions.editDevelopmentCircle}" immediate="true"
+ reRender=":#{parentClientId}:a4jCircle" limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
value="editDevelopmentCircle" />
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.duration']}</td>
+ <td colspan="3">#{circle.duration}</td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.planningMeetingDate']}</td>
+ <td><h:outputText
value="#{circle.planningMeetingDate}"><f:convertDateTime pattern="dd
MMMM yyyy" timeZone="Europe/Paris" /></h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.functionMeetingDate']}</td>
+ <td><h:outputText
value="#{circle.functionMeetingDate}"><f:convertDateTime pattern="dd
MMMM yyyy" timeZone="Europe/Paris" /></h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.workingMeetingDate']}</td>
+ <td><h:outputText
value="#{circle.workingMeetingDate}"><f:convertDateTime pattern="dd
MMMM yyyy" timeZone="Europe/Paris" /></h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.evaluationMeetingDate']}</td>
+ <td><h:outputText
value="#{circle.evaluationMeetingDate}"><f:convertDateTime
pattern="dd MMMM yyyy" timeZone="Europe/Paris"
/></h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{bundle['DevelopmentCircle.result']}</td>
+ <td>#{circle.result}</td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="5" align="right">
+ <a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.developmentCircle == null}"
+ reRender=":#{parentClientId}:a4jCircle" limitToList="true"
+ action="#{hrActions.addDevelopmentCircle}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
value="editDevelopmentCircle" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <s:subForm id="editDevelopmentCircle"
+ rendered="#{hrSession.edits.developmentCircle != null}">
+ <fieldset>
+ <table>
+ <tr>
+ <td>#{bundle['DevelopmentCircle.functionChiefName']}</td>
+ <td colspan="3">
+ <h:selectOneMenu id="chief"
value="#{hrSession.edits.developmentCircle.functionChiefName}">
+ <f:selectItem itemLabel="" itemValue="[nothing]"/>
+ <f:selectItems value="#{hrRequest.employees}"/>
+ </h:selectOneMenu>
+ <h:message for="chief"/>
+ </td>
+
+ <td rowspan="7" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteDevelopmentCircle}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:a4jCircle"
limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['DevelopmentCircle.duration']}</td>
+ <td colspan="3"><h:inputText
value="#{hrSession.edits.developmentCircle.duration}"
size="80"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['DevelopmentCircle.planningMeetingDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.developmentCircle.planningMeetingDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="pmdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="pmdate"
showDetail="true" showSummary="false"/></td>
+ <td rowspan="4"
valign="top">#{bundle['DevelopmentCircle.result']}</td>
+ <td rowspan="4" valign="top"><h:inputTextarea
value="#{hrSession.edits.developmentCircle.result}" cols="50"
rows="7" id="dcresult"/>
+ <h:message for="dcresult" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['DevelopmentCircle.functionMeetingDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.developmentCircle.functionMeetingDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="fmdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="fmdate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['DevelopmentCircle.workingMeetingDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.developmentCircle.workingMeetingDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="wmdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="wmdate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['DevelopmentCircle.evaluationMeetingDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.developmentCircle.evaluationMeetingDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="emdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="emdate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <a4j:commandButton value="Done"
action="#{hrActions.doneDevelopmentCircle}"
+ actionFor="editDevelopmentCircle"
+ reRender=":#{parentClientId}:a4jCircle" limitToList="true"
/></td>
+ </tr>
+ </table>
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/diplomas.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/diplomas.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/diplomas.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,110 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <a4j:region id="diplomasRegion">
+
+ <a4j:outputPanel id="a4jDiplomas" layout="block">
+ <fieldset><legend><h:outputText
+ value="#{bundle['Employee.diplomas']}" /></legend>
+ <table class="list" width="100%">
+ <thead>
+ <tr>
+ <th><h:outputText value="#{bundle['Diploma.title']}"
/></th>
+ <th><h:outputText value="#{bundle['Diploma.startDate']}"
/></th>
+ <th><h:outputText value="#{bundle['Diploma.endDate']}"
/></th>
+ <th><h:outputText value="#{bundle['Diploma.institution']}"
/></th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList value="#{hrSession.employee.diplomasArray}"
+ var="diploma" id="diplomas" rowIndexVar="index">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{diploma.title}" /></td>
+ <td><h:outputText value="#{diploma.startDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </h:outputText></td>
+ <td><h:outputText value="#{diploma.endDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </h:outputText></td>
+ <td>#{diploma.institution}</td>
+ <td><a4j:commandLink action="#{hrActions.editDiploma}"
+ immediate="true" reRender=":#{parentClientId}:a4jDiplomas"
limitToList="true">
+ <f:param name="editId" value="#{index}" />
+ <f:param name="containerToReset" value="editDiploma" />
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td align="right">
+ <a4j:commandLink immediate="true"
rendered="#{hrSession.edits.diploma == null}"
+ action="#{hrActions.addDiploma}"
reRender=":#{parentClientId}:a4jDiplomas" limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editDiploma" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ <tbody>
+ <tr>
+ <td><s:subForm id="editDiploma"
rendered="#{hrSession.edits.diploma != null}">
+
+ <table border="0" width="100%">
+ <tr>
+ <td><h:outputText value="#{bundle['Diploma.title']}"
/></td>
+ <td colspan="3"><h:inputText size="70"
value="#{hrSession.edits.diploma.title}" id="dtitle"/>
+ <h:message for="dtitle" showDetail="true"
showSummary="false"/></td>
+
+ <td rowspan="3" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteDiploma}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:a4jDiplomas"
limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['Diploma.startDate']}" /></td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.diploma.startDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="dstartdate">
+
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="dstartdate"
showDetail="true" showSummary="false"/></td>
+ <td><h:outputText value="#{bundle['Diploma.endDate']}"
/></td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.diploma.endDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="denddate">
+
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="denddate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['Diploma.institution']}" /></td>
+ <td colspan="3"><h:inputText size="70"
value="#{hrSession.edits.diploma.institution}" /></td>
+ </tr>
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneDiploma}"
+ reRender=":#{parentClientId}:a4jDiplomas" limitToList="true"
+ actionFor="editDiploma" />
+ </s:subForm> <h:messages showDetail="true"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </fieldset>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/formations.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/formations.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/formations.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,119 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <style type="text/css">
+ tr.separator td,tr.separator th {
+ border-bottom:1px solid black;
+ }
+ </style>
+ <a4j:region id="formationRegion">
+
+ <a4j:outputPanel id="a4jformation" layout="block">
+ <table class="list" width="100%">
+ <thead>
+ <tr>
+ <th><h:outputText value="#{bundle['Formation.name']}"
/></th>
+ <th><h:outputText value="#{bundle['Formation.reason']}"
/></th>
+ <th><h:outputText value="#{bundle['Formation.startDate']}"
/></th>
+ <th><h:outputText value="#{bundle['Formation.totalDays']}"
/></th>
+ <th><h:outputText value="#{bundle['Formation.location']}"
/></th>
+ <th></th>
+ </tr>
+ <tr>
+ <th colspan="5"><h:outputText
value="#{bundle['Formation.note']}" /></th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList id="formations" var="formation"
rowIndexVar="index" value="#{formations}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{formation.name}" /></td>
+ <td><h:outputText value="#{formation.reason}" /></td>
+ <td><h:outputText value="#{formation.startDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td><h:outputText value="#{formation.totalDays}"/></td>
+ <td><h:outputText value="#{formation.location}" /></td>
+ <td rowspan="2" valign="top">
+ <a4j:commandLink action="#{hrActions.editFormation}"
+ immediate="true" reRender=":#{parentClientId}:a4jformation"
limitToList="true">
+ <f:actionListener
type="be.rmi.intranet.listener.ContainerReset"/>
+ <f:param name="containerToReset" value="editFormation"
/>
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}
separator">
+ <td colspan="5"><h:outputText value="#{formation.note}"
/></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="6" align="right">
+ <a4j:commandLink immediate="true"
rendered="#{hrSession.edits.formation == null}"
+ reRender=":#{parentClientId}:a4jformation"
limitToList="true"
+ action="#{hrActions.addFormation}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editFormation"
/>
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <s:subForm id="editFormation" rendered="#{hrSession.edits.formation
!= null}">
+ <fieldset>
+ <table border="0" width="100%">
+ <tr>
+ <td><h:outputText value="#{bundle['Formation.name']}"
/></td>
+ <td><h:inputText value="#{hrSession.edits.formation.name}"
id="fname"/><h:message for="fname" showDetail="true"
showSummary="false"/></td>
+ <td><h:outputText value="#{bundle['Formation.reason']}"
/></td>
+ <td><h:inputText value="#{hrSession.edits.formation.reason}"
id="freason"/><h:message for="freason"
showDetail="true" showSummary="false"/></td>
+
+ <td rowspan="4" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteFormation}"
immediate="true"
+ reRender=":#{parentClientId}:a4jformation" limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td><h:outputText value="#{bundle['Formation.startDate']}"
/></td>
+ <td><t:inputCalendar
value="#{hrSession.edits.formation.startDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="fstartdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="fstartdate"
showDetail="true" showSummary="false"/></td>
+ <td><h:outputText value="#{bundle['Formation.totalDays']}"
/></td>
+ <td><h:inputText value="#{hrSession.edits.formation.totalDays}"
id="ftotaldays"/>
+ <h:message for="ftotaldays" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td valign="top"><h:outputText
value="#{bundle['Formation.location']}" /></td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.formation.location}" cols="50"
rows="3" id="flocation"/>
+ <h:message for="flocation" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td valign="top"><h:outputText
value="#{bundle['Formation.note']}" /></td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.formation.note}" cols="50" rows="3"
id="fnote"/>
+ <h:message for="fnote" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneFormation}"
+ reRender=":#{parentClientId}:a4jformation" limitToList="true"
+ actionFor="editFormation" />
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/illnesses.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/illnesses.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/illnesses.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,131 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <style type="text/css">
+ tr.separator td,tr.separator th {
+ border-bottom:1px solid black;
+ }
+ </style>
+ <a4j:region>
+ <a4j:outputPanel id="a4jIllness" layout="block">
+ <table class="list" width="100%">
+ <thead>
+ <tr>
+ <th>#{bundle['Illness.kind']}</th>
+ <th>#{bundle['Illness.startDate']}</th>
+ <th>#{bundle['Illness.endDate']}</th>
+ <th>#{bundle['Illness.workingDays']}</th>
+ <th>#{bundle['Illness.calendarDays']}</th>
+ <th>#{bundle['Illness.document']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList id="illnesses" var="illness"
rowIndexVar="index" value="#{illnesses}">
+ <tbody class="hightlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{illness.kind}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td><h:outputText value="#{illness.startDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td><h:outputText value="#{illness.endDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{illness.workingDays}</td>
+ <td>#{illness.calendarDays}</td>
+ <td>[document here later...]</td>
+ <td rowspan="2" valign="top">
+ <a4j:commandLink action="#{hrActions.editIllness}"
+ immediate="true" reRender=":#{parentClientId}:a4jIllness"
limitToList="true">
+ <f:actionListener
type="be.rmi.intranet.listener.ContainerReset"/>
+ <f:param name="containerToReset" value="editIllness"
/>
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td colspan="6">#{illness.note}</td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="7" align="right">
+ <a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.illness == null}"
+ action="#{hrActions.addIllness}"
+ reRender=":#{parentClientId}:a4jIllness"
limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editIllness" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <s:subForm id="editIllness" rendered="#{hrSession.edits.illness !=
null}">
+ <fieldset>
+ <table border="0" width="100%">
+ <tr>
+ <td>#{bundle['Illness.kind']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.edits.illness.kind}" id="ikind">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Illness type']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.illness.kind}" />
+ <ui:param name="id" value="ikind" />
+ <ui:param name="key" value="Illness type" />
+ </ui:include>
+ <h:message for="ikind" showDetail="true"
showSummary="false"/></td>
+ <td colspan="2"></td>
+
+ <td rowspan="4" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteIllness}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:a4jIllness"
limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Illness.startDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.illness.startDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="istartdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="istartdate"
showDetail="true" showSummary="false"/></td>
+ <td>#{bundle['Illness.endDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.edits.illness.endDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="ienddate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="ienddate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Illness.workingDays']}</td>
+ <td><h:inputText value="#{hrSession.edits.illness.workingDays}"
id="iwdays"/>
+ <h:message for="iwdays" showDetail="true"
showSummary="false"/></td>
+ <td>#{bundle['Illness.calendarDays']}</td>
+ <td><h:inputText
value="#{hrSession.edits.illness.calendarDays}" id="icdays"/>
+ <h:message for="icdays" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Illness.note']}</td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.illness.note}" rows="7"
cols="50"/> </td>
+ </tr>
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneIllness}"
+ actionFor="editIllness"
+ reRender=":#{parentClientId}:a4jIllness" limitToList="true" />
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/leaves.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/leaves.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/leaves.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,146 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <style type="text/css">
+ tr.separator td,tr.separator th {
+ border-bottom:1px solid black;
+ }
+ </style>
+ <a4j:region id="leaveRegion">
+
+ <a4j:outputPanel id="a4jLeave" layout="block">
+ <table class="list" cellpadding="5" width="100%">
+ <thead>
+ <tr>
+ <th>#{bundle['Leave.start']}</th>
+ <th>#{bundle['Leave.end']}</th>
+ <th>#{bundle['Leave.type']}</th>
+ <th>#{bundle['Leave.adminStatus']}</th>
+ <th>#{bundle['Leave.workingPercent']}</th>
+ <th>#{bundle['Leave.reason']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList var="leave" rowIndexVar="index"
value="#{leaves}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{leave.start}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td><h:outputText value="#{leave.end}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td><h:outputText value="#{leave.type}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td><h:outputText value="#{leave.adminStatus}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td>#{leave.workingPercent}</td>
+ <td><h:outputText value="#{leave.reason}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td valign="top"><a4j:commandLink
+ action="#{hrActions.editLeave}" immediate="true"
+ reRender=":#{parentClientId}:a4jLeave" limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editLeave" />
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr><td colspan="7" align="right">
+ <a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.leave == null}"
+ reRender=":#{parentClientId}:a4jLeave" limitToList="true"
+ action="#{hrActions.addLeave}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset" />
+ <f:param name="containerToReset" value="editLeave" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </table>
+ <s:subForm id="editLeave"
+ rendered="#{hrSession.edits.leave != null}">
+ <table style="border:none;">
+ <tr>
+ <td>#{bundle['Leave.start']}</td>
+ <td><t:inputCalendar value="#{hrSession.edits.leave.start}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="lstart">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lstart"
showDetail="true" showSummary="false"/></td>
+ <td>#{bundle['Leave.end']}</td>
+ <td><t:inputCalendar value="#{hrSession.edits.leave.end}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="lend">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lend"
showDetail="true" showSummary="false"/></td>
+
+ <td rowspan="5" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteLeave}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return
false"
+ reRender=":#{parentClientId}:a4jLeave"
limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Leave.type']}</td>
+ <td><!-- <h:selectOneMenu value="#{hrSession.edits.leave.type}"
id="ltype">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Leave type']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.edits.leave.type}"
/>
+ <ui:param name="id" value="ltype" />
+ <ui:param name="key" value="Leave type" />
+ </ui:include>
+ <h:message for="ltype" showDetail="true"
showSummary="false"/></td>
+ <td>#{bundle['Leave.adminStatus']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.edits.leave.adminStatus}" id="lastatus">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Administrative state']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.leave.adminStatus}" />
+ <ui:param name="id" value="lastatus" />
+ <ui:param name="key" value="Administrative state" />
+ </ui:include>
+ <h:message for="lastatus" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Leave.workingPercent']}</td>
+ <td colspan="3"><h:inputText
value="#{hrSession.edits.leave.workingPercent}" id="lwpercent"/>
+ <h:message for="lwpercent" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Leave.reason']}</td>
+ <td colspan="3">
+ <!-- <h:selectOneMenu
+ value="#{hrSession.edits.leave.reason}" cols="50"
rows="7" id="lreason">
+ <f:selectItems value="#{hrRequest.selectEntries['Leave
reason']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.leave.reason}" />
+ <ui:param name="id" value="lreason" />
+ <ui:param name="key" value="Leave reason" />
+ </ui:include>
+ <h:message for="lreason" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4" align="right">
+ <a4j:commandButton value="Done"
action="#{hrActions.doneLeave}"
+ reRender=":#{parentClientId}:a4jLeave" limitToList="true"
+ actionFor="editLeave" />
+ </td>
+ </tr>
+ </table>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/nok.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/nok.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/nok.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,78 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk">
+<ui:composition>
+ <table border="0" width="100%">
+ <tr>
+ <td><h:outputText
value="#{bundle['NextOfKin.partnerName']}"/></td>
+ <td><h:inputText value="#{nok.partnerName}" /></td>
+ <td><h:outputText
value="#{bundle['NextOfKin.relationship']}"/></td>
+ <td><!-- <h:selectOneMenu value="#{nok.relationship}"
id="nrelation">
+ <f:selectItems
value="#{hrRequest.selectEntries['Relationship']}"/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value" value="#{nok.relationship}" />
+ <ui:param name="id" value="nrelation" />
+ <ui:param name="key" value="Relationship" />
+ </ui:include>
+ <h:message for="nrelation" showDetail="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['NextOfKin.marriageDate']}"/></td>
+ <td><t:inputCalendar
+ value="#{nok.marriageDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="nmdate">
+
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="nmdate"
showDetail="true" showSummary="false"/></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['NextOfKin.haardToelage']}"/></td>
+ <td><h:selectBooleanCheckbox value="#{nok.haardToelage}"
id="nhtage"></h:selectBooleanCheckbox>
+ <h:message for="nhtage" showDetail="true"
showSummary="false"/></td>
+ <td><h:outputText
value="#{bundle['NextOfKin.haardToelageDate']}"/></td>
+ <td><t:inputCalendar
+ value="#{nok.haardToelageDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="nhtdate">
+
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="nhtdate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['NextOfKin.standplaatsToelage']}"/></td>
+ <td><h:selectBooleanCheckbox value="#{nok.standplaatsToelage}"
id="nstoelage"></h:selectBooleanCheckbox>
+ <h:message for="nstoelage" showDetail="true"
showSummary="false"/></td>
+ <td><h:outputText
value="#{bundle['NextOfKin.standplaatsToelageDate']}"/></td>
+ <td><t:inputCalendar
+ value="#{nok.standplaatsToelageDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="nstoeDate">
+
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="nstoeDate"
showDetail="true" showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <fieldset>
+ <legend><h:outputText
value="#{bundle['NextOfKin.address']}"/></legend>
+ <ui:include src="address.xhtml">
+ <ui:param name="address" value="#{nok.address}" />
+ </ui:include>
+ </fieldset>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top"><h:outputText
value="#{bundle['NextOfKin.note']}"/></td>
+ <td colspan="3">
+ <h:inputTextarea value="#{nok.note}" cols="40"
rows="8" id="nnote"/>
+ <h:message for="nnote" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ </table>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/pictureUpload.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/pictureUpload.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/pictureUpload.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,16 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition>
+
+ <h:graphicImage url="picture.xhtml" rendered="#{not empty
wrapper.employee.picture}"/>
+ <h:graphicImage url="/images/avatar.png" rendered="#{empty
wrapper.employee.picture}"/>
+ <rich:simpleTogglePanel switchType="client" opened="false"
label="#{bundle['Employee.picture.upload.label']}">
+ #{bundle['Employee.picture.upload.details']}<br/>
+ <t:inputFileUpload value="#{wrapper.pictureUploaded}"
id="upload"/><br/>
+ <t:commandButton
value="#{bundle['Employee.picture.upload.button']}"
action="#{wrapper.uploadPicture}"/>
+ </rich:simpleTogglePanel>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/promotionExams.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/promotionExams.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/promotionExams.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,162 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+
+ <style type="text/css">
+ tr.separator td,tr.separator th {
+ border-bottom:1px solid black;
+ }
+ </style>
+ <a4j:region id="promotionRegion">
+
+ <a4j:outputPanel id="a4jProm" layout="block">
+ <table class="list" width="100%">
+ <t:dataList id="promotionExams" var="exam"
rowIndexVar="index"
+ value="#{promotionExams}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.name']}</td>
+ <td>#{exam.name}</td>
+ <td>#{bundle['PromotionExam.reference']}</td>
+ <td>#{exam.reference}</td>
+
+ <td rowspan="5" valign="top"><a4j:commandLink
+ action="#{hrActions.editPromotionExam}" immediate="true"
+ reRender=":#{parentClientId}:a4jProm" limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editPromotionExam"
/>
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.number']}</td>
+ <td>#{exam.number}</td>
+ <td>#{bundle['PromotionExam.level']}</td>
+ <td>#{exam.level}</td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.inscriptionDate']}</td>
+ <td><h:outputText value="#{exam.inscriptionDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td>#{bundle['PromotionExam.examDate']}</td>
+ <td><h:outputText value="#{exam.examDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.result']}</td>
+ <td><h:outputText value="#{exam.result}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText></td>
+ <td>#{bundle['PromotionExam.pvDate']}</td>
+ <td><h:outputText value="#{exam.pvDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.note']}</td>
+ <td colspan="3">#{exam.note}</td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="5" align="right">
+ <a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.promotionExam == null}"
+ reRender=":#{parentClientId}:a4jProm" limitToList="true"
+ action="#{hrActions.addPromotionExam}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editPromotionExam"
/>
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <s:subForm id="editPromotionExam"
+ rendered="#{hrSession.edits.promotionExam != null}">
+ <fieldset>
+ <table style="border-spacing: 0px;" width="100%">
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.name']}</td>
+ <td><h:inputText value="#{hrSession.edits.promotionExam.name}"
id="pename"/>
+ <h:message for="pename" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['PromotionExam.reference']}</td>
+ <td><h:inputText
value="#{hrSession.edits.promotionExam.reference}" id="peref"/>
+ <h:message for="peref" showDetails="true"
showSummary="false"/></td>
+
+ <td rowspan="5" valign="top">
+ <a4j:commandLink action="#{hrActions.deletePromotionExam}"
immediate="true"
+ reRender=":#{parentClientId}:a4jProm" limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.number']}</td>
+ <td><h:inputText value="#{hrSession.edits.promotionExam.number}"
id="penumber"/>
+ <h:message for="penumber" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['PromotionExam.level']}</td>
+ <td><h:inputText value="#{hrSession.edits.promotionExam.level}"
id="pelevel"/>
+ <h:message for="pelevel" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.inscriptionDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.promotionExam.inscriptionDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="peinsdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="peinsdate"
showDetails="true" showSummary="false"/></td>
+ <td>#{bundle['PromotionExam.examDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.promotionExam.examDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="peexdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="peexdate"
showDetails="true" showSummary="false"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.result']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.edits.promotionExam.result}" id="peresult">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Exam result']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.promotionExam.result}" />
+ <ui:param name="id" value="peresult" />
+ <ui:param name="key" value="Exam result" />
+ </ui:include>
+ <h:message for="peresult" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['PromotionExam.pvDate']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.promotionExam.pvDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
id="pepvdate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="pepvdate"
showDetails="true" showSummary="false"/></td>
+ </tr>
+ <tr class="#{(index%2)==0?'even':'odd'}"
width="100%">
+ <td>#{bundle['PromotionExam.note']}</td>
+ <td colspan="3"><h:inputTextarea
value="#{hrSession.edits.promotionExam.note}" cols="50"
rows="5" id="penote"/>
+ <h:message for="penote" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ </table>
+ </fieldset>
+ <a4j:commandButton value="Done"
action="#{hrActions.donePromotionExam}"
+ reRender=":#{parentClientId}:a4jProm" limitToList="true"
+ actionFor="editPromotionExam" />
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/salaryRanks.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/salaryRanks.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/salaryRanks.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,96 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <a4j:region id="salaryRegion">
+
+ <a4j:outputPanel id="a4jSalary" layout="block">
+ <table class="list" width="100%" cellpadding="5">
+ <thead>
+ <tr>
+ <th>#{bundle['SalaryRank.scale']}</th>
+ <th>#{bundle['SalaryRank.start']}</th>
+ <th>#{bundle['SalaryRank.end']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList var="rank" rowIndexVar="index"
value="#{ranks}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td><h:outputText value="#{rank.scale}"/></td>
+ <td><h:outputText value="#{rank.start}"><f:convertDateTime
pattern="dd MMMM yyyy" timeZone="Europe/Paris"
/></h:outputText></td>
+ <td><h:outputText value="#{rank.end}"><f:convertDateTime
pattern="dd MMMM yyyy" timeZone="Europe/Paris"
/></h:outputText></td>
+ <td><a4j:commandLink action="#{hrActions.editSalaryRank}"
immediate="true"
+ reRender=":#{parentClientId}:a4jSalary"
limitToList="true">
+ <f:param name="editId" value="#{index}" />
+ <f:param name="containerToReset" value="editSalaryRank"
/>
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none" />
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="4" align="right"><a4j:commandLink
immediate="true"
+ rendered="#{hrSession.edits.salaryRank == null}"
+ reRender=":#{parentClientId}:a4jSalary" limitToList="true"
+ action="#{hrActions.addSalaryRank}">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset" />
+ <f:param name="containerToReset" value="editSalaryRank"
/>
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </table>
+ <s:subForm id="editSalaryRank"
+ rendered="#{hrSession.edits.salaryRank != null}">
+ <fieldset>
+ <table style="border:none;">
+ <tr>
+ <td>#{bundle['SalaryRank.start']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.salaryRank.start}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar></td>
+
+ <td rowspan="4" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteSalaryRank}"
immediate="true"
+ reRender=":#{parentClientId}:a4jSalary" limitToList="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['SalaryRank.end']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.edits.salaryRank.end}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </t:inputCalendar></td>
+ </tr>
+ <tr>
+ <td>#{bundle['SalaryRank.scale']}</td>
+ <td><h:inputText
value="#{hrSession.edits.salaryRank.scale}"/></td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <a4j:commandButton value="Done"
action="#{hrActions.doneSalaryRank}"
+ reRender=":#{parentClientId}:a4jSalary" limitToList="true"
+ actionFor="editSalaryRank" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectEntry.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectEntry.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectEntry.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,41 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <!--
+ this.previousSibling.style.setProperty('background-color','#202020','');
+ this.previousSibling.style.setProperty('border','1px solid
red','');
+ Effect.Fade(this.previousSibling, {endcolor:'#202020'});-->
+ <style>
+ .selectEntryAction {
+ visibility:hidden;
+ }
+ .selectEntry:hover .selectEntryAction, .sehover .selectEntryAction {
+ visibility:visible;
+ }
+ </style>
+ <div class="selectEntry" onmouseover="this.className+='
sehover'" onmouseout="this.className=this.className.replace(new RegExp('
sehover\\b'), '')">
+ <h:selectOneMenu value="#{value}" id="#{id}">
+ <f:selectItems value="#{hrRequest.selectEntries[key]}"/>
+ </h:selectOneMenu>
+ <h:outputLink styleClass="selectEntryAction" target="_blank"
value="#{facesContext.externalContext.requestContextPath}/faces/hr/edit/lists/selectEntriesEditor.xhtml">
+ <f:param name="editedList" value="#{key}"/>
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none;vertical-align:center;margin-right:1pt"/>
+ </h:outputLink>
+ <a4j:commandLink
+ styleClass="selectEntryAction"
+ action="refresh"
+ immediate="true"
+ reRender="#{id}"
+ limitToList="true"
+ onclick="new Effect.Highlight(this.previousSibling.previousSibling,
{duration:2,startcolor:'#ffffff',endcolor:'#808080',restorecolor:'#808080'});"
+ >
+ <h:graphicImage
+ url="/images/icon_reload.gif"
+ style="border:none;vertical-align:center;margin-right:1pt"
+ />
+ </a4j:commandLink>
+ </div>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectSecretariat.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectSecretariat.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/selectSecretariat.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,41 @@
+<html
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <!--
+ this.previousSibling.style.setProperty('background-color','#202020','');
+ this.previousSibling.style.setProperty('border','1px solid
red','');
+ Effect.Fade(this.previousSibling, {endcolor:'#202020'});-->
+ <style>
+ .selectEntryAction {
+ visibility:hidden;
+ }
+ .selectEntry:hover .selectEntryAction, .sehover .selectEntryAction {
+ visibility:visible;
+ }
+ </style>
+ <div class="selectEntry" onmouseover="this.className+='
sehover'" onmouseout="this.className=this.className.replace(new RegExp('
sehover\\b'), '')">
+ <h:selectOneMenu value="#{value}" id="#{id}">
+ <f:selectItem itemLabel="" itemValue="[nothing]" />
+ <f:selectItems value="#{hrRequest.secretariats}"/>
+ </h:selectOneMenu>
+ <h:outputLink styleClass="selectEntryAction" target="_blank"
value="#{facesContext.externalContext.requestContextPath}/faces/hr/edit/lists/secretariatsEditor.xhtml">
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none;vertical-align:center;margin-right:1pt"/>
+ </h:outputLink>
+ <a4j:commandLink
+ styleClass="selectEntryAction"
+ action="refresh"
+ immediate="true"
+ reRender="#{id}"
+ limitToList="true"
+ onclick="new Effect.Highlight(this.previousSibling.previousSibling,
{duration:2,startcolor:'#ffffff',endcolor:'#808080',restorecolor:'#808080'});"
+ >
+ <h:graphicImage
+ url="/images/icon_reload.gif"
+ style="border:none;vertical-align:center;margin-right:1pt"
+ />
+ </a4j:commandLink>
+ </div>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/transportation.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/transportation.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/transportation.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,108 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox">
+<ui:composition>
+
+ <table border="0" width="100%">
+ <tr>
+ <td><h:outputText value="#{bundle['Transportation.type']}"
/></td>
+ <td><!-- <h:selectOneMenu id="type"
value="#{transport.type}">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Transportation Type']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value" value="#{transport.type}" />
+ <ui:param name="id" value="type" />
+ <ui:param name="key" value="Transportation Type" />
+ </ui:include>
+ </td>
+ <td>#{bundle['Transportation.bicycleAllocation']}</td>
+ <td><h:selectBooleanCheckbox value="#{transport.bicycleAllocation}"
/></td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['Transportation.autoNumber']}" /></td>
+ <td><h:inputText value="#{transport.autoNumber}"
id="tanumber"/>
+ <h:message for="tanumber" showDetails="true"
showSummary="false"/></td>
+ <td><h:outputText
value="#{bundle['Transportation.autoModel']}" /></td>
+ <td><h:inputText value="#{transport.autoModel}"
id="tamodel"/>
+ <h:message for="tamodel" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td><h:outputText
+ value="#{bundle['Transportation.driverLicenceType']}"
/></td>
+ <td><!-- <h:selectOneMenu
+ value="#{transport.driverLicenceType}" id="tdlictype">
+ <f:selectItems value="#{hrRequest.selectEntries['Driver
Licence']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{transport.driverLicenceType}" />
+ <ui:param name="id" value="tdlictype" />
+ <ui:param name="key" value="Driver Licence" />
+ </ui:include>
+ <h:message for="tdlictype" showDetails="true"
showSummary="false"/></td>
+ <td><h:outputText
+ value="#{bundle['Transportation.driverLicenceNumber']}"
/></td>
+ <td><h:inputText value="#{transport.driverLicenceNumber}"
id="tdlicnumber"/>
+ <h:message for="tdlicnumber" showDetails="true"
showSummary="false"/></td>
+ </tr>
+
+ <tr>
+ <td><h:outputText
+ value="#{bundle['Transportation.subscriptionType']}"
/></td>
+ <td><!-- <h:selectOneMenu
+ value="#{transport.subscriptionType}" id="tsubtype">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Transportation Subscription']}"
/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value" value="#{transport.subscriptionType}"
/>
+ <ui:param name="id" value="tsubtype" />
+ <ui:param name="key" value="Transportation Subscription"
/>
+ </ui:include>
+ <h:message for="tsubtype" showDetails="true"
showSummary="false"/>
+ </td>
+ <td><h:outputText
+ value="#{bundle['Transportation.subscriptionDuration']}"
/></td>
+ <td><h:inputText value="#{transport.subscriptionDuration}"
id="tsubduration"/>
+ <h:message for="tsubduration" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ </table>
+ <table width="100%">
+ <tr>
+ <td colspan="9"><h:outputText
+ value="#{bundle['Transportation.transportMode']}" /></td>
+ </tr>
+ <tr>
+ <td><h:outputText
value="#{bundle['Transportation.usingFeet']}" /></td>
+ <td><h:outputText
+ value="#{bundle['Transportation.usingBicycle']}" /></td>
+ <td><h:outputText
value="#{bundle['Transportation.usingTrain']}" /></td>
+ <td><h:outputText
value="#{bundle['Transportation.usingStib']}" /></td>
+ <td><h:outputText
+ value="#{bundle['Transportation.usingDeLijn']}" /></td>
+ <td><h:outputText
value="#{bundle['Transportation.usingTec']}" /></td>
+ <td><h:outputText
+ value="#{bundle['Transportation.usingMotorcycle']}"
/></td>
+ <td><h:outputText
value="#{bundle['Transportation.usingCar']}" /></td>
+ <td><h:outputText
+ value="#{bundle['Transportation.usingCarSharing']}"
/></td>
+ </tr>
+ <tr>
+ <td><h:selectBooleanCheckbox value="#{transport.usingFeet}"
/></td>
+ <td><h:selectBooleanCheckbox value="#{transport.usingBicycle}"
/></td>
+ <td><h:selectBooleanCheckbox value="#{transport.usingTrain}"
/></td>
+ <td><h:selectBooleanCheckbox value="#{transport.usingStib}"
/></td>
+ <td><h:selectBooleanCheckbox value="#{transport.usingDeLijn}"
/></td>
+ <td><h:selectBooleanCheckbox value="#{transport.usingTec}"
/></td>
+ <td><h:selectBooleanCheckbox
+ value="#{transport.usingMotorcycle}" /></td>
+ <td><h:selectBooleanCheckbox value="#{transport.usingCar}"
/></td>
+ <td><h:selectBooleanCheckbox
+ value="#{transport.usingCarSharing}" /></td>
+ </tr>
+ </table>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/workAccidents.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/workAccidents.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/elements/workAccidents.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,303 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+<ui:composition>
+ <style type="text/css">
+ tr.separator td,tr.separator th {
+ border-bottom:1px solid black;
+ }
+ tr.small td, tr.small th, td.small {
+ font-size:smaller;
+ }
+ </style>
+ <a4j:region id="workAccidentRegion">
+
+ <a4j:outputPanel id="a4jWorkAccident" layout="block">
+ <table class="list" width="100%">
+ <thead>
+ <tr>
+ <th>#{bundle['WorkAccident.number']}</th>
+ <th>#{bundle['WorkAccident.type']}</th>
+ <th>#{bundle['WorkAccident.date']}</th>
+ <th>#{bundle['WorkAccident.illness']}</th>
+ <th colspan="6"></th>
+ </tr>
+ <tr class="separator small">
+ <th colspan="3"></th>
+ <th>#{bundle['Illness.kind']}</th>
+ <th>#{bundle['Illness.startDate']}</th>
+ <th>#{bundle['Illness.endDate']}</th>
+ <th>#{bundle['Illness.workingDays']}</th>
+ <th>#{bundle['Illness.calendarDays']}</th>
+ <th>#{bundle['Illness.document']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList id="accidents" var="accident"
rowIndexVar="index" value="#{accidents}">
+ <tbody class="highlight">
+ <tr class="#{(index%2)==0?'even':'odd'}">
+ <td>#{accident.number}</td>
+ <td>
+ <h:outputText value="#{accident.type}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText>
+ <h:outputText value="
(#{bundle['WorkAccident.thirdPartyCaused']})"
rendered="#{accident.thirdPartyCaused}"/>
+ </td>
+ <td><h:outputText value="#{accident.date}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td class="small"><h:outputText
value="#{accident.illness.kind}"><f:converter
converterId="SelectConverter" /></h:outputText></td>
+ <td class="small"><h:outputText
value="#{accident.illness.startDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td class="small"><h:outputText
value="#{accident.illness.endDate}">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris" />
+ </h:outputText></td>
+ <td class="small">#{accident.illness.workingDays}</td>
+ <td class="small">#{accident.illness.calendarDays}</td>
+ <td class="small">[document here later...]</td>
+ <td valign="top">
+ <a4j:commandLink action="#{hrActions.editWorkAccident}"
+ immediate="true"
reRender=":#{parentClientId}:a4jWorkAccident" limitToList="true" >
+ <f:actionListener
type="be.rmi.intranet.listener.ContainerReset"/>
+ <f:param name="containerToReset" value="editWorkAccident"
/>
+ <f:param name="editId" value="#{index}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="9" align="right">
+ <a4j:commandLink id="addWorkAccident" immediate="true"
rendered="#{hrSession.edits.workAccident == null}"
+ action="#{hrActions.addWorkAccident}"
reRender="a4jWorkAccident" limitToList="true" >
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset" value="editWorkAccident"
/>
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <s:subForm id="editWorkAccident"
rendered="#{hrSession.edits.workAccident != null}">
+ <fieldset>
+ <table border="0" width="100%">
+ <tr>
+ <td>#{bundle['WorkAccident.number']}</td>
+ <td>
+ <h:inputText id="number"
value="#{hrSession.edits.workAccident.number}"></h:inputText>
+ <h:message for="number" showDetails="true"
showSummary="false"/>
+ </td>
+
+ <td rowspan="9" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteWorkAccident}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:a4jWorkAccident"
limitToList="true" >
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.type']}</td>
+ <td>
+ <!-- <h:selectOneMenu
value="#{hrSession.edits.workAccident.type}" id="watype">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Accident type']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.workAccident.type}" />
+ <ui:param name="id" value="watype" />
+ <ui:param name="key" value="Accident type" />
+ </ui:include>
+ <h:message for="watype" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.lesions']}</td>
+ <td>
+ <a4j:outputPanel id="a4jlesions" layout="block">
+ <table class="list">
+ <thead>
+ <tr>
+ <th>#{bundle['WorkAccidentLesion.type']}</th>
+ <th>#{bundle['WorkAccidentLesion.location']}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <t:dataList rowIndexVar="index2" var="lesion"
+ value="#{hrSession.edits.workAccident.lesionsArray}">
+ <tbody class="highlight">
+ <tr
class="#{((index2+index)%2)==0?'odd':'even'}">
+ <td>
+ <h:outputText value="#{lesion.type}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText>
+ </td>
+ <td>
+ <h:outputText value="#{lesion.location}">
+ <f:converter converterId="SelectConverter" />
+ </h:outputText>
+ </td>
+ <td><a4j:commandLink
+ action="#{hrActions.editWorkAccidentLesion}"
immediate="true"
+ reRender=":#{parentClientId}:editWorkAccident:a4jlesions"
limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
+ value="editWorkAccidentLesion" />
+ <f:param name="editId" value="#{index2}" />
+ <h:graphicImage url="/images/icon_edit.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ </t:dataList>
+ <tbody>
+ <tr>
+ <td colspan="2"></td>
+ <td><a4j:commandLink immediate="true"
+ rendered="#{hrSession.edits.workAccidentLesion == null}"
+ action="#{hrActions.addWorkAccidentLesion}"
+ reRender="a4jlesions" limitToList="true">
+ <f:actionListener type="be.rmi.intranet.listener.ContainerReset"
/>
+ <f:param name="containerToReset"
+ value="editWorkAccidentLesion" />
+ <h:graphicImage url="/images/icon_create.gif"
style="border:none"/>
+ </a4j:commandLink></td>
+ </tr>
+ </tbody>
+ <s:subForm id="editWorkAccidentLesion"
+ rendered="#{hrSession.edits.workAccidentLesion != null}">
+ <tbody class="edit">
+ <tr>
+ <td>#{bundle['WorkAccidentLesion.type']}</td>
+ <td>
+ <!-- <h:selectOneMenu
value="#{hrSession.edits.workAccidentLesion.type}"
id="lesiontype">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Lesion type']}" />
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.workAccidentLesion.type}" />
+ <ui:param name="id" value="lesiontype" />
+ <ui:param name="key" value="Lesion type" />
+ </ui:include>
+ <h:message for="lesiontype" showDetail="true"
showSummary="false"/>
+ </td>
+ <td rowspan="2" valign="top">
+ <a4j:commandLink action="#{hrActions.deleteWorkAccidentLesion}"
immediate="true"
+ onclick="if
(!confirm('#{bundle['Interface.confirmDelete']}')) return false"
+ reRender=":#{parentClientId}:editWorkAccident:a4jlesions"
limitToList="true">
+ <h:graphicImage url="/images/icon_delete.gif"
style="border:none"/>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccidentLesion.location']}</td>
+ <td>
+ <!-- <h:selectOneMenu
value="#{hrSession.edits.workAccidentLesion.location}"
id="lesionloc">
+ <f:selectItems
+ value="#{hrRequest.selectEntries['Lesion localisation']}"
/>
+ </h:selectOneMenu>-->
+ <ui:include src="selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.edits.workAccidentLesion.location}" />
+ <ui:param name="id" value="lesionloc" />
+ <ui:param name="key" value="Lesion localisation" />
+ </ui:include>
+ <h:message for="lesionloc" showDetail="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <a4j:commandButton value="Done"
+ action="#{hrActions.clearWorkAccidentLesionEdit}"
+ actionFor="editWorkAccidentLesion"
+ reRender=":#{parentClientId}:editWorkAccident:a4jlesions"
limitToList="true"/>
+ </td>
+ </tr>
+ </tbody>
+ </s:subForm>
+ </table>
+
+ </a4j:outputPanel>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.date']}</td>
+ <td><t:inputCalendar
value="#{hrSession.edits.workAccident.date}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="wadate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="wadate"
showDetails="true" showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.illness']}</td>
+ <td><h:selectOneMenu
value="#{hrSession.edits.workAccident.illness}" id="waillness">
+ <f:selectItem itemLabel="" itemValue="[nothing]"/>
+ <f:selectItems
+ value="#{hrRequest.illnesses}" />
+ </h:selectOneMenu>
+ <a4j:commandLink action="dumb"
+ immediate="true" reRender="waillness"
limitToList="true" >
+ [refresh]
+ </a4j:commandLink>
+ <h:message for="waillness" showDetails="true"
showSummary="false"/></td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.thirdPartyCaused']}</td>
+ <td>
+ <h:selectBooleanCheckbox
value="#{hrSession.edits.workAccident.thirdPartyCaused}"
id="thirdParty"></h:selectBooleanCheckbox>
+ <h:message for="thirdParty" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.thirdPartyLastname']}</td>
+ <td>
+ <h:inputText value="#{hrSession.edits.workAccident.thirdPartyLastname}"
id="thirdPartyLastname"/>
+ <h:message for="thirdPartyLastname" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.thirdPartyFirstname']}</td>
+ <td>
+ <h:inputText
value="#{hrSession.edits.workAccident.thirdPartyFirstname}"
id="thirdPartyFirstname"/>
+ <h:message for="thirdPartyFirstname" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.thirdPartyAddress']}</td>
+ <td>
+ <ui:include src="address.xhtml">
+ <ui:param name="address"
value="#{hrSession.edits.workAccident.thirdPartyAddress}" />
+ </ui:include>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.thirdPartyPolicy']}</td>
+ <td>
+ <h:inputText value="#{hrSession.edits.workAccident.thirdPartyPolicy}"
id="thirdPartyPolicy"/>
+ <h:message for="thirdPartyPolicy" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['WorkAccident.thirdPartyInsurance']}</td>
+ <td>
+ <h:inputText
value="#{hrSession.edits.workAccident.thirdPartyInsurance}"
id="thirdPartyInsurance"/>
+ <h:message for="thirdPartyInsurance" showDetails="true"
showSummary="false"/>
+ </td>
+ </tr>
+
+
+ </table>
+ <a4j:commandButton value="Done"
action="#{hrActions.doneWorkAccident}"
+ actionFor="editWorkAccident"
reRender=":#{parentClientId}:a4jWorkAccident" limitToList="true"/>
+ </fieldset>
+ </s:subForm>
+ </a4j:outputPanel>
+ </a4j:region>
+</ui:composition>
+</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/employee.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/employee.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/employee.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,858 @@
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:t="http://myfaces.apache.org/tomahawk"
+
xmlns:s="http://myfaces.apache.org/sandbox"
+
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition template="hr-layout.xhtml">
+ <ui:param name="title" value="Edit Employee" />
+ <ui:define name="leftBar">
+ <ui:include src="../hr-actions.xhtml" />
+ </ui:define>
+ <ui:define name="content">
+ <f:loadBundle basename="resources.hr" var="bundle" />
+ <h1>Add/Edit Employee datas</h1>
+ <br />
+ <!-- <a
href="javascript:showListEditor('http://localhost:8080/intranet/faces/hr/edit/lists/gradesEditor.xhtml',function(){alert('Hello');})">[?]</a><br/>
-->
+ <h:form acceptcharset="UTF-8" id="employeeForm"
+ rendered="#{hrSession.employee != null}"
+ enctype="multipart/form-data">
+ <!-- <ui:include src="lists/listEditor.xhtml">
+ <ui:param name="wrapper" value="#{hrSession.employeeWrapper}"
/>
+ <ui:param name="parentClientId" value="employeeForm"/>
+ </ui:include> -->
+ <a4j:poll action="ajaxRefresh" id="refresh"
reRender="refresh"
+ limitToList="true" interval="60000">
+ </a4j:poll>
+ <s:subForm id="mainSubForm">
+ <table>
+ <tr>
+ <td>#{bundle['Employee.firstname']}</td>
+ <td><h:inputText id="firstname"
+ value="#{hrSession.employee.firstname}" size="50"
/><h:message
+ for="firstname" showDetails="true"
showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.lastname']}</td>
+ <td><h:inputText id="lastname"
+ value="#{hrSession.employee.lastname}" size="50"
/><h:message
+ for="lastname" showDetails="true"
showSummary="false" /></td>
+ </tr>
+ </table>
+ <t:panelTabbedPane width="100%" serverSideTabSwitch="false"
+ id="tabbedPane">
+ <t:panelTab label="#{bundle['main']}"
processValidators="true"
+ id="main">
+ <table border="0" width="100%">
+ <tr>
+ <td>#{bundle['Employee.language']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.employee.language}" id="language">
+ <f:selectItems
value="#{hrRequest.selectEntries['Language']}"/>
+ </h:selectOneMenu> --> <ui:include
src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.language}" />
+ <ui:param name="id" value="language" />
+ <ui:param name="key" value="Language" />
+ </ui:include> <h:message for="language"
showDetail="true" showSummary="false" />
+ </td>
+ <td>#{bundle['Employee.gender']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.employee.gender}" id="gender">
+ <f:selectItems
value="#{hrRequest.selectEntries['Gender']}"/>
+ </h:selectOneMenu> --> <ui:include
src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.gender}" />
+ <ui:param name="id" value="gender" />
+ <ui:param name="key" value="Gender" />
+ </ui:include> <h:message for="gender"
showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.formulation']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.employee.formulation}" id="formulation">
+ <f:selectItems
value="#{hrRequest.selectEntries['Formulation']}" />
+ </h:selectOneMenu> --> <ui:include
src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.formulation}" />
+ <ui:param name="id" value="formulation" />
+ <ui:param name="key" value="Formulation" />
+ </ui:include> <h:message for="formulation"
showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.title']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.employee.title}" id="title">
+ <f:selectItems value="#{hrRequest.selectEntries['Title']}"
/>
+ </h:selectOneMenu> --> <ui:include
src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.title}" />
+ <ui:param name="id" value="title" />
+ <ui:param name="key" value="Title" />
+ </ui:include> <h:message for="title"
showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.section']}</td>
+ <td colspan="3"><h:selectOneMenu
+ value="#{hrSession.employee.section}" id="section">
+ <f:selectItems value="#{hrRequest.sections}" />
+ </h:selectOneMenu> <h:message for="section"
showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ </table>
+ <rich:panel><f:facet
name="header">#{bundle['Employee.officeAddress']}</f:facet>
+ <table border="0" width="100%">
+ <tr>
+ <td rowspan="4"
style="text-align:center">#{bundle['Employee.picture']}<br />
+ <s:subForm id="pictureForm">
+ <ui:include src="elements/pictureUpload.xhtml">
+ <ui:param name="wrapper"
value="#{hrSession.employeeWrapper}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:main:pictureForm" />
+ </ui:include>
+ </s:subForm></td>
+ <td valign="top" colspan="3"><ui:include
+ src="elements/address.xhtml">
+ <ui:param name="address"
+ value="#{hrSession.employee.officeAddress}" />
+ </ui:include></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.email']}</td>
+ <td><h:inputText value="#{hrSession.employee.email}"
+ id="email" required="true" /> <h:message
for="email"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.login']}</td>
+ <td><h:inputText id="login"
+ value="#{hrSession.employee.login}" style="text-align:right"
/>(a)oma.be
+ <h:message for="login" showDetail="true"
showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.locationUnit']}</td>
+ <td><!-- <h:selectOneMenu
value="#{hrSession.employee.locationUnit}" id="locationUnit">
+ <f:selectItems value="#{hrRequest.selectEntries['Location
unit']}"/>
+ </h:selectOneMenu> --> <ui:include
src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.locationUnit}" />
+ <ui:param name="id" value="locationUnit" />
+ <ui:param name="key" value="Location unit" />
+ </ui:include> <h:message for="locationUnit"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ </rich:panel>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['private']}"
processValidators="true"
+ id="private">
+ <table width="100%" border="0">
+ <tr>
+ <td>#{bundle['Employee.birthDate']}</td>
+ <td><t:inputCalendar id="birthdate"
+ value="#{hrSession.employee.birthDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar>
+ <h:message for="birthdate"
+ showDetail="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.age']}</td>
+ <td><h:outputText value="#{hrSession.employee.age}"
+ id="age" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.birthPlace']}</td>
+ <td><h:inputText id="birthplace"
+ value="#{hrSession.employee.birthPlace}" /> <h:message
+ for="birthplace" showDetails="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.nationality']}</td>
+ <td><h:selectOneMenu
+ value="#{hrSession.employee.nationality}"
id="nationality">
+ <f:selectItems value="#{hrRequest.countries}" />
+ </h:selectOneMenu> <h:message for="nationality"
showDetails="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.nationalRegisterNumber']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.nationalRegisterNumber}"
id="nrn" />
+ <h:message for="nrn" showDetail="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.idCardNumber']}</td>
+ <td><h:inputText value="#{hrSession.employee.idCardNumber}"
+ id="idCard" /> <h:message for="idCard"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <rich:panel><f:facet
name="header">#{bundle['Employee.home']}</f:facet>
+ <ui:include src="elements/address.xhtml">
+ <ui:param name="address"
value="#{hrSession.employee.home}" />
+ </ui:include> #{bundle['Employee.lastHomeMove']}
<t:inputCalendar
+ value="#{hrSession.employee.lastHomeMove}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="lastHomeMove">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="lastHomeMove"
showDetails="true"
+ showSummary="false" /></rich:panel>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.bankAccountNumber']}</td>
+ <td colspan="3"><h:inputText
+ value="#{hrSession.employee.bankAccountNumber}"
+ id="bankAccount" /> <h:message for="bankAccount"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ </table>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['administrative']}"
+ processValidators="true" id="administrative">
+ <rich:panel><f:facet name="header">Status</f:facet>
+ <table border="0">
+ <tr>
+ <td colspan="2"><!-- <h:selectOneMenu
value="#{hrSession.employee.status1}" id="status1">
+ <f:selectItems value="#{hrRequest.selectEntries['Emp status
1']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.status1}" />
+ <ui:param name="id" value="status1" />
+ <ui:param name="key" value="Emp status 1" />
+ </ui:include> <h:message for="status1"
showDetail="true" showSummary="false" />
+ </td>
+ <td colspan="2"><!-- <h:selectOneMenu
value="#{hrSession.employee.status2}" id="status2">
+ <f:selectItems value="#{hrRequest.selectEntries['Emp status
2']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.status2}" />
+ <ui:param name="id" value="status2" />
+ <ui:param name="key" value="Emp status 2" />
+ </ui:include> <h:message for="status2"
showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['PData.status']}</td>
+ <td colspan="3"><!-- <h:selectOneMenu
id="pdataStatus" value="#{hrSession.employee.PData.status}">
+ <f:selectItem itemValue="[nothing]" itemLabel=""/>
+ <f:selectItems
value="#{hrRequest.selectEntries['Status']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.status}" />
+ <ui:param name="id" value="pdataStatus" />
+ <ui:param name="key" value="Status" />
+ </ui:include> <h:message for="pdataStatus"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.administrativeState']}</td>
+ <td><!-- <h:selectOneMenu id="administrativeState"
value="#{hrSession.employee.administrativeState}">
+ <f:selectItems value="#{hrRequest.selectEntries['Administrative
state']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.administrativeState}" />
+ <ui:param name="id" value="administrativeState" />
+ <ui:param name="key" value="Administrative state" />
+ </ui:include> <h:message for="administrativeState"
showDetail="true"
+ showSummary="false" /></td>
+ <td colspan="2"><h:selectBooleanCheckbox
+ value="#{hrSession.employee.scientific}" id="scientific"
/>
+ #{bundle['Employee.scientific']} <h:message
for="scientific"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.projects']}:</td>
+ <td colspan="3">#{bundle['hint.pickList']}
<s:selectManyPicklist
+ id="projects"
value="#{hrSession.employee.projectsArray}">
+ <f:selectItems value="#{hrRequest.projectItems}" />
+ </s:selectManyPicklist> <h:messages for="projects"
/></td>
+ </tr>
+
+ </table>
+ </rich:panel>
+ <rich:panel><f:facet
name="header">#{bundle['Employee.functionGroups']}</f:facet>
+ <h:dataTable value="#{functionGroup.functionGroups}"
var="fg">
+ <h:column>
+ <h:outputText value="#{fg}">
+ <f:converter converterId="NamedIdConverter" />
+ </h:outputText>
+ </h:column>
+ <h:column>
+ <h:selectOneMenu
+ value="#{hrSession.employee.functionGroups[fg]}">
+ <f:converter converterId="abstractId" />
+ <f:selectItem itemLabel="" itemValue="[nothing]"/>
+ <f:selectItems value="#{functionGroup.functionItems}" />
+ </h:selectOneMenu>
+ </h:column>
+ </h:dataTable></rich:panel>
+ <rich:panel><f:facet name="header">Rank</f:facet>
+ <table border="0">
+ <tr>
+ <td>#{bundle['Employee.workingPercent']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.workingPercent}"
+ id="workingPercent">
+ <f:validateLongRange minimum="0" maximum="100" />
+ </h:inputText> <h:message for="workingPercent"
showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.salaryScale']}</td>
+ <td><h:inputText value="#{hrSession.employee.salaryScale}"
+ id="salaryScale" /> <h:message for="salaryScale"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.expertSalaryScale']}</td>
+ <td colspan="3"><!-- <h:selectOneMenu
id="expertSalaryScale"
value="#{hrSession.employee.expertSalaryScale}">
+ <f:selectItems value="#{hrRequest.selectEntries['Expert salary
scale']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.expertSalaryScale}" />
+ <ui:param name="id" value="expertSalaryScale" />
+ <ui:param name="key" value="Expert salary scale" />
+ </ui:include> <h:message for="expertSalaryScale"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ </rich:panel>
+ <table border="0">
+ <tr>
+ <td>#{bundle['Employee.bilingualPremium']}</td>
+ <td colspan="3"><!-- <h:selectOneMenu
id="bilingualPremium"
value="#{hrSession.employee.bilingualPremium}">
+ <f:selectItems value="#{hrRequest.selectEntries['Bilingual
premium']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.bilingualPremium}" />
+ <ui:param name="id" value="bilingualPremium" />
+ <ui:param name="key" value="Bilingual premium" />
+ </ui:include> <h:message for="bilingualPremium"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.bilingualScale']}</td>
+ <td><h:inputText size="10" id="bilingualScale"
+ value="#{hrSession.employee.bilingualScale}" /><h:message
+ for="bilingualScale" showDetails="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.missionDuration']}</td>
+ <td><!-- <h:selectOneMenu id="missionDuration"
value="#{hrSession.employee.missionDuration}">
+ <f:selectItems value="#{hrRequest.selectEntries['Mission
duration']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.missionDuration}" />
+ <ui:param name="id" value="missionDuration" />
+ <ui:param name="key" value="Mission duration" />
+ </ui:include> <h:message for="missionDuration"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.officeLocation']}</td>
+ <td><h:inputText id="officeLocation"
+ value="#{hrSession.employee.officeLocation}" /><h:message
+ for="officeLocation" showDetails="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.officeKeyNumber']}</td>
+ <td><h:inputText id="officeKey"
+ value="#{hrSession.employee.officeKeyNumber}" /><h:message
+ for="officeKey" showDetails="true"
showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.trap']}</td>
+ <td><!-- <h:selectOneMenu id="trap"
value="#{hrSession.employee.trap}">
+ <f:selectItems
value="#{hrRequest.selectEntries['Trap']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.trap}"
/>
+ <ui:param name="id" value="trap" />
+ <ui:param name="key" value="Trap" />
+ </ui:include> <h:message for="trap"
showDetail="true" showSummary="false" />
+ </td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.badgeNumber']}</td>
+ <td><h:inputText id="badgeNumber"
+ value="#{hrSession.employee.badgeNumber}" /><h:message
+ for="badgeNumber" showDetails="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.timeclockCode']}</td>
+ <td><h:inputText id="badgeNumber"
+ value="#{hrSession.employee.timeclockCode}" /><h:message
+ for="badgeNumber" showDetails="true"
showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.adminNumber']}</td>
+ <td><h:inputText id="adminNumber"
+ value="#{hrSession.employee.adminNumber}" /><h:message
+ for="adminNumber" showDetails="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.frame']}</td>
+ <td><!-- <h:selectOneMenu id="adminNumber"
value="#{hrSession.employee.frame}">
+ <f:selectItems
value="#{hrRequest.selectEntries['Frame']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.frame}" />
+ <ui:param name="id" value="frame" />
+ <ui:param name="key" value="Frame" />
+ </ui:include> <h:message for="frame"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.IBGBadgeNumber']}</td>
+ <td><h:inputText id="ibg"
+ value="#{hrSession.employee.IBGBadgeNumber}" /><h:message
+ for="ibg" showDetails="true" showSummary="false"
/></td>
+ <td>#{bundle['Employee.dimonia']}</td>
+ <td><h:inputText id="dimonia"
+ value="#{hrSession.employee.dimonia}" /><h:message
for="ibg"
+ showDetails="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.phoneActivityCode']}</td>
+ <td><h:inputText id="phoneActivity"
+ value="#{hrSession.employee.phoneActivityCode}" /><h:message
+ for="phoneActivity" showDetails="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.replacement']}</td>
+ <td><ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value"
value="#{hrSession.employee.replacement}" />
+ <ui:param name="id" value="replacement" />
+ <ui:param name="key" value="Replacement status" />
+ </ui:include> <h:message for="replacement"
showDetail="true" showSummary="false" /></td>
+ </tr>
+ <!--
+ <tr>
+ <td>#{bundle['Employee.lifeClass']}</td>
+ <td>
+ <h:selectOneMenu value="#{hrSession.employee.lifeClass}"
id="lifeClass">
+ <f:selectItems value="#{hrRequest.lifeClasses}"/>
+ <f:converter converterId="NullableLong" />
+ </h:selectOneMenu>
+ <h:message for="lifeClass" showDetails="true"
showSummary="false"/></td>
+ <td>#{bundle['Employee.lifeClassDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.employee.lifeClassDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="lifeclassDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="lifeclassDate"
showDetails="true" showSummary="false"/></td>
+ </tr>-->
+ <tr>
+ <td>#{bundle['Employee.lifeClassDate18']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate18}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="lifeclassDate18">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate18"
showDetails="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.lifeClassDate23']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate23}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="lifeclassDate23">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate23"
showDetails="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.lifeClassDate20']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate20}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="lifeclassDate20">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate20"
showDetails="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.lifeClassDate24']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate24}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="lifeclassDate24">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate24"
showDetails="true"
+ showSummary="false" /></td>
+ </tr>
+
+ <tr>
+ <td>#{bundle['Employee.lifeClassDate21']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate21}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="lifeclassDate21">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate21"
showDetails="true"
+ showSummary="false" /></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan="4"><ui:include
src="elements/diplomas.xhtml">
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:administrative" />
+ </ui:include></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <rich:panel><f:facet
name="header">#{bundle['Employee.PData']}</f:facet>
+ <table width="100%">
+ <tr>
+ <td>#{bundle['PData.selorCode']}</td>
+ <td colspan="3">
+ <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.selorCode}" />
+ <ui:param name="id" value="selorCode" />
+ <ui:param name="key" value="Selor code" />
+ </ui:include> <h:message for="selorCode"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['PData.handicap']}</td>
+ <td colspan="3">
+ <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.handicap}" />
+ <ui:param name="id" value="handicap" />
+ <ui:param name="key" value="Handicap" />
+ </ui:include> <h:message for="handicap"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['PData.agdet']}</td>
+ <td colspan="3">
+ <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.agdet}" />
+ <ui:param name="id" value="agdet" />
+ <ui:param name="key" value="Agdet" />
+ </ui:include> <h:message for="agdet"
showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td><h:selectBooleanCheckbox
value="#{hrSession.employee.PData.managerGrant}"
id="managerGrant"/>#{bundle['PData.managerGrant']}?</td>
+ <td><h:selectBooleanCheckbox
value="#{hrSession.employee.PData.superiorGrant}"
id="superiorGrant"/>#{bundle['PData.superiorGrant']}?</td>
+ <td><h:selectBooleanCheckbox
value="#{hrSession.employee.PData.integrationGrant}"
id="integrationGrant"/>#{bundle['PData.integrationGrant']}?</td>
+ <td><h:selectBooleanCheckbox
value="#{hrSession.employee.PData.projectGrant}"
id="projectGrant"/>#{bundle['PData.projectGrant']}?</td>
+ </tr>
+ </table>
+ </rich:panel>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">#{bundle['Employee.note']}</td>
+ <td colspan="3"><h:inputTextarea id="note"
+ value="#{hrSession.employee.note}" rows="7"
cols="80" /><h:message
+ for="note" showDetails="true" showSummary="false"
/></td>
+ </tr>
+ </table>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['family']}"
processValidators="true"
+ id="family">
+ #{bundle['Employee.maritalStatus']}
+ <!-- <h:selectOneMenu id="maritalStatus"
value="#{hrSession.employee.maritalStatus}">
+ <f:selectItems value="#{hrRequest.selectEntries['Marital
status']}"/>
+ </h:selectOneMenu> -->
+ <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.maritalStatus}" />
+ <ui:param name="id" value="maritalStatus" />
+ <ui:param name="key" value="Marital status" />
+ </ui:include>
+ <h:message for="maritalStatus" showDetail="true"
+ showSummary="false" />
+ <br />
+ <rich:panel><f:facet
name="header">#{bundle['Employee.nextOfKin']}</f:facet>
+ <ui:include src="elements/nok.xhtml">
+ <ui:param name="nok"
value="#{hrSession.employee.nextOfKin}" />
+ </ui:include></rich:panel>
+ <!-- derived Hoeveel kinderen? <h:inputText value=""
size="2" disabled="true"/><br/> -->
+ <ui:include src="elements/childs.xhtml">
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:family" />
+ </ui:include>
+ <!-- <t:inputHtml addKupuLogo="false" value=""
allowEditSource="false"
allowExternalLinks="false"></t:inputHtml> -->
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.transportation']}"
+ processValidators="true" id="transportation">
+ <h:selectBooleanCheckbox id="driveAuthorization"
+ value="#{hrSession.employee.driveAuthorization}" />
+ #{bundle['Employee.driveAuthorization']}
+ <h:message for="driveAuthorization" showDetail="true"
+ showSummary="false" />
+ <ui:include src="elements/transportation.xhtml">
+ <ui:param name="transport"
+ value="#{hrSession.employee.transportation}" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['leaves']}"
processValidators="true"
+ id="leaves">
+ <t:panelTabbedPane id="panel" serverSideTabSwitch="false"
+ style="width:100%">
+ <t:panelTab label="#{bundle['Employee.leaves']}"
+ processValidators="true" id="leaves">
+ <ui:include src="elements/leaves.xhtml">
+ <ui:param name="leaves"
+ value="#{hrSession.employee.leavesArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:leaves:leaves" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.illnesses']}"
+ processValidators="true" id="illnesses">
+ <table>
+ <tr>
+ <td>#{bundle['Employee.medicalNumber']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.medicalNumber}" /></td>
+ <td>#{bundle['Employee.medicalCenter']}</td>
+ <td>
+ <ui:include src="elements/selectMedicalCenter.xhtml">
+ <ui:param name="id" value="medicalCenter"/>
+ <ui:param name="value"
value="#{hrSession.employee.medicalCenter}"/>
+ </ui:include>
+ <h:message for="medicalCenter" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.sickDayInBank']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.sickDayInBank}"
+ id="sickDayInBank" /> <h:message
for="sickDayInBank"
+ showDetail="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.sickDayForAge']}</td>
+ <td><h:inputText id="sickDayForAge"
+ value="#{hrSession.employee.sickDayForAge}" /> <h:message
+ for="sickDayForAge" showDetail="true"
showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.sickDayYearSpent']}</td>
+ <td><h:inputText id="sickDayYearSpent"
+ value="#{hrSession.employee.sickDayYearSpent}" /> <h:message
+ for="sickDayYearSpent" showDetail="true"
showSummary="false" />
+ </td>
+ <td>#{bundle['Employee.sickDayYearLeft']}</td>
+ <td><h:inputText id="sickDayYearLeft"
+ value="#{hrSession.employee.sickDayYearLeft}" /> <h:message
+ for="sickDayYearLeft" showDetail="true"
showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.illnessContact1']}</td>
+ <td>
+ <ui:include src="elements/selectSecretariat.xhtml">
+ <ui:param name="id" value="illness1"/>
+ <ui:param name="value"
value="#{hrSession.employee.illnessContact1}"/>
+ </ui:include><h:message for="illness1"
showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.illnessContact2']}</td>
+ <td>
+ <ui:include src="elements/selectSecretariat.xhtml">
+ <ui:param name="id" value="illness2"/>
+ <ui:param name="value"
value="#{hrSession.employee.illnessContact2}"/>
+ </ui:include>
+ <h:message for="illness2" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ <rich:panel><f:facet
name="header">#{bundle['Employee.illnesses']}</f:facet>
+ <ui:include src="elements/illnesses.xhtml">
+ <ui:param name="illnesses"
+ value="#{hrSession.employee.illnessesArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:leaves:illnesses" />
+ </ui:include></rich:panel>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.workAccidents']}"
+ processValidators="true" id="workAccidents">
+ <ui:include src="elements/workAccidents.xhtml">
+ <ui:param name="accidents"
+ value="#{hrSession.employee.workAccidentsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:leaves:workAccidents" />
+ </ui:include>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.contracts']}"
+ processValidators="true" id="contracts">
+ <ui:include src="elements/contracts.xhtml">
+ <ui:param name="contracts"
+ value="#{hrSession.employee.contractsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:contracts" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.cumuls']}"
+ processValidators="true" id="cumuls">
+ <ui:include src="elements/cumuls.xhtml">
+ <ui:param name="cumuls"
value="#{hrSession.employee.cumulsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:cumuls" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['career']}"
processValidators="true"
+ id="career">
+ <table width="100%">
+ <tr>
+ <td>#{bundle['Employee.firstJobDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.firstJobDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="firstJobDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="firstJobDate"
showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.workedOnPatrimonium']}</td>
+ <td><h:selectBooleanCheckbox id="patrimonium"
+ value="#{hrSession.employee.workedOnPatrimonium}" /> <h:message
+ for="patrimonium" showDetail="true"
showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.inDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.employee.inDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="inDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="inDate"
showDetail="true" showSummary="false" />
+ </td>
+ <td>#{bundle['Employee.outDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.employee.outDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="outDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="outDate"
showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.salaryInDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.salaryInDate}"
popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="salaryInDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="salaryInDate"
showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.nominationDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.nominationDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM
yyyy"
+ id="nominationDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="nominationDate"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.rankBeforeReform']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.rankBeforeReform}" id="oldRank"
/>
+ <h:message for="oldRank" showDetail="true"
showSummary="false" /></td>
+ <td>#{bundle['Employee.newRank']}</td>
+ <td><h:inputText value="#{hrSession.employee.newRank}"
+ id="newRank" /> <h:message for="newRank"
showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ <t:panelTabbedPane id="ranks" serverSideTabSwitch="false"
+ style="width:100%">
+
+ <t:panelTab label="#{bundle['Employee.careerRanks']}"
+ processValidators="true" id="rank">
+ <ui:include src="elements/careerRanks.xhtml">
+ <ui:param name="ranks"
+ value="#{hrSession.employee.careerRanksArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:rank" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.salaryRanks']}"
+ processValidators="true" id="salary">
+ <ui:include src="elements/salaryRanks.xhtml">
+ <ui:param name="ranks"
+ value="#{hrSession.employee.salaryRanksArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:salary" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.developmentCircles']}"
+ processValidators="true" id="circles">
+ <ui:include src="elements/developmentCircles.xhtml">
+ <ui:param name="developmentCircles"
+ value="#{hrSession.employee.developmentCirclesArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:circles" />
+ </ui:include>
+ </t:panelTab>
+
+ <t:panelTab label="#{bundle['Employee.decorations']}"
+ processValidators="true" id="decoration">
+ <ui:include src="elements/decorations.xhtml">
+ <ui:param name="decorations"
+ value="#{hrSession.employee.decorationsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:decoration" />
+ </ui:include>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['knowledge']}"
id="know">
+ <t:panelTabbedPane width="100%"
serverSideTabSwitch="false">
+ <t:panelTab label="#{bundle['Employee.competenceMeasures']}"
+ processValidators="true" id="compMeasure">
+ <ui:include src="elements/competenceMeasures.xhtml">
+ <ui:param name="competenceMeasures"
+ value="#{hrSession.employee.competenceMeasuresArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:know:compMeasure" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.promotionExams']}"
+ processValidators="true" id="prom">
+ <ui:include src="elements/promotionExams.xhtml">
+ <ui:param name="promotionExams"
+ value="#{hrSession.employee.promotionExamsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:know:prom" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.formations']}"
+ processValidators="true" id="formation">
+ <ui:include src="elements/formations.xhtml">
+ <ui:param name="formations"
+ value="#{hrSession.employee.formations}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:know:formation" />
+ </ui:include>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ <rich:toolBar itemSeparator="disc">
+ <h:commandLink action="#{hrActions.saveEmployee}"
value="#{bundle['actions.save']}"/>
+ <h:commandLink action="#{hrActions.storeEmployee}"
value="#{bundle['actions.saveAndContinue']}"/>
+ <h:commandLink action="validate"
value="#{bundle['actions.validate']}"/>
+ <h:commandLink action="#{hrActions.resetEmployee}"
immediate="true" value="#{bundle['actions.cancel']}"/>
+ </rich:toolBar>
+ </s:subForm>
+ <h:messages showSummary="false" showDetail="true" />
+ </h:form>
+ <a4j:log level="WARN" popup="false" width="400"
height="200" />
+ </ui:define>
+</ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/hr-layout.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/hr-layout.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1479/hr-layout.xhtml 2008-01-22
18:02:54 UTC (rev 5885)
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:c="http://java.sun.com/jstl/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"
/>
+<link rel="stylesheet" type="text/css"
href="#{facesContext.externalContext.requestContextPath}/css/workflow.css"/>
+<link rel="stylesheet" type="text/css"
href="#{facesContext.externalContext.requestContextPath}/css/RMI_intranet.css"/>
+<script
src="#{facesContext.externalContext.requestContextPath}/js/scriptaculous/prototype.js"
type="text/javascript"/>
+<script
src="#{facesContext.externalContext.requestContextPath}/js/scriptaculous/scriptcaulous.js"
type="text/javascript"/>
+<script
src="#{facesContext.externalContext.requestContextPath}/js/scriptaculous/effects.js"
type="text/javascript"/>
+<title>#{title}</title>
+</head>
+<body style="width:100%;margin:0pt;">
+ <f:view locale="#{strutsSession.locale}">
+ <div style="width:100%;
height:50px;text-align:center;background-repeat:no-repeat;background-image:url(#{facesContext.externalContext.requestContextPath}/images/logo-irm-kmi-intranet.jpg);"><!--
Header goes here--></div>
+ <!-- <div
style="width:90%;margin:0pt;padding:0pt;margin-left:auto;margin-right:auto">
-->
+ <div
style="width:100%;background-color:white;overflow:auto"><ui:insert
name="content"/></div>
+ <!-- </div> -->
+ </f:view>
+</body>
+</html>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-01-22
17:58:05 UTC (rev 5884)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-01-22
18:02:54 UTC (rev 5885)
@@ -55,11 +55,6 @@
importBean.setImportProjectName(JsfComponentTest.IMPORT_PROJECT_NAME);
importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
projectToImport.add(importBean);
- //bean for JBIDE-1479
- ImportBean importBeanJBIDE1479 = new ImportBean();
- importBeanJBIDE1479.setImportProjectName(JBIDE1479Test.IMPORT_PROJECT_NAME);
- importBeanJBIDE1479.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(importBeanJBIDE1479);
return new VpeTestSetup(suite,projectToImport);
}
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-01-22
17:58:05 UTC (rev 5884)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-01-22
18:02:54 UTC (rev 5885)
@@ -32,9 +32,9 @@
*/
public class JBIDE1479Test extends VpeTest {
- public static final String IMPORT_PROJECT_NAME = "JBIDE1479";
+ public static final String IMPORT_PROJECT_NAME = "jsfTest";
- public static final String TEST_PAGE_NAME = "seam/employee.xhtml";
+ public static final String TEST_PAGE_NAME = "JBIDE/1479/employee.xhtml";
public JBIDE1479Test(String name) {
super(name);