Update of /var/cvs/contributions/natmm/templates/nmintra/includes/peoplefinder
In directory
james.mmbase.org:/tmp/cvs-serv28254/templates/nmintra/includes/peoplefinder
Modified Files:
result.jsp form.jsp
Log Message:
NMCMS-563
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes/peoplefinder
See also: http://www.mmbase.org/jira/browse/NMCMS-563
Index: result.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/peoplefinder/result.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- result.jsp 7 May 2008 12:27:14 -0000 1.15
+++ result.jsp 24 Sep 2008 12:55:24 -0000 1.16
@@ -4,6 +4,7 @@
if(!(nameId.equals("")
&&firstnameId.equals("")
&&lastnameId.equals("")
+ &&tasksId.equals("")
&&descriptionId.equals("")
&&departmentId.equals("default")
&&locationId.equals("default")
@@ -35,6 +36,9 @@
employeeConstraint += "( UPPER(medewerkers.lastname) LIKE '%" +
lastnameId.toUpperCase() + "%')";
if(!nameId.equals("")) employeeConstraint += " ) ";
}
+ if(!tasksId.equals("")) {
+ employeeConstraint += " AND (UPPER(CAST(medewerkers.omschrijving_de
AS CHAR)) LIKE '%" + tasksId.toUpperCase() + "%')";
+ }
if(!descriptionId.equals("")) {
employeeConstraint += " AND (UPPER(CAST(medewerkers.omschrijving
AS CHAR)) LIKE '%" + descriptionId.toUpperCase() + "%')";
}
Index: form.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/peoplefinder/form.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- form.jsp 8 Nov 2006 10:54:14 -0000 1.10
+++ form.jsp 24 Sep 2008 12:55:24 -0000 1.11
@@ -17,6 +17,11 @@
<tr>
<td class="bold"> <span
class="light">Achternaam:</span> </td>
<td class="bold"><input type="text" tabindex="2"
style="width:103px;" name="lastname" value="<%= lastnameId %>">
+ <br><div align="right"><span class="light">en</span></div>
+ </tr>
+ <tr>
+ <td class="bold"> <span
class="light">Werkzaamheden:</span> </td>
+ <td class="bold"><input type="text" tabindex="3"
style="width:103px;" name="tasks" value="<%= tasksId %>">
<%
if(!onlyProgramSelect || showProgramSelect ||
iRubriekLayout==NMIntraConfig.SUBSITE1_LAYOUT) {
%> <br><div align="right"><span
class="light">en</span></div><%
@@ -29,13 +34,13 @@
%>
<tr>
<td class="bold"> <span class="light">En
verder:</span> </td>
- <td class="bold"><input type="text" tabindex="3"
style="width:103px;" name="description" size="13" value="<%= descriptionId %>">
+ <td class="bold"><input type="text" tabindex="4"
style="width:103px;" name="description" size="13" value="<%= descriptionId %>">
<br><div align="right"><span class="light">en</span></div>
</td>
</tr>
<tr>
<td colspan="2" class="bold">
- <select tabindex="4" name="department" style="width:195px;">
+ <select tabindex="5" name="department" style="width:195px;">
<option value="default" <% if(departmentId.equals("default"))
{ %>SELECTED<% }
%>>alle afdelingen en regio's
<mm:list path="afdelingen" orderby="afdelingen.naam"
directions="UP"
@@ -52,7 +57,7 @@
</tr>
<tr>
<td colspan="2" class="bold">
- <select tabindex="5" name="location" style="width:195px;">
+ <select tabindex="6" name="location" style="width:195px;">
<option value="default" <% if(programId.equals("default")) {
%>SELECTED<% }
%>>alle lokaties
<mm:list path="locations" orderby="locations.naam"
directions="UP"
@@ -79,7 +84,7 @@
%>
<tr>
<td colspan="2">
- <select tabindex="7" name="program" style="width:195px;">
+ <select tabindex="8" name="program" style="width:195px;">
<option value="default" <% if(programId.equals("default")) {
%>SELECTED<% }
%>><%= (!onlyProgramSelect ? "alle overige groepen" :
"alle teams") %>
<% if(!"".equals(thisPrograms)) { %>
@@ -106,7 +111,7 @@
if(iRubriekLayout==NMIntraConfig.SUBSITE1_LAYOUT) { %>
<tr>
<td colspan="2">
- <select tabindex="8" name="k" style="width:195px;">
+ <select tabindex="9" name="k" style="width:195px;">
<option value="" <% if(keywordId.equals("")) { %>SELECTED<% }
%>>alle termen
<mm:listnodes type="keywords" orderby="word" directions="UP">
<mm:field name="number" jspvar="keywords_number"
vartype="String" write="false">
@@ -122,10 +127,10 @@
<tr><td colspan="2"><img src="media/spacer.gif" width="1"
height="20"></td></tr>
<tr>
<td>
- <input type="button" name="submit" tabindex="10" value="Wis"
style="text-align:center;font-weight:bold;width:42px;"
onClick="javascript:clearForm();">
+ <input type="button" name="submit" tabindex="11" value="Wis"
style="text-align:center;font-weight:bold;width:42px;"
onClick="javascript:clearForm();">
</td>
<td>
- <div align="right"><input type="submit" tabindex="9" name="submit"
value="Zoek" style="text-align:center;font-weight:bold;width:42px;"> </div>
+ <div align="right"><input type="submit" tabindex="12"
name="submit" value="Zoek"
style="text-align:center;font-weight:bold;width:42px;"> </div>
</td>
</tr>
</table>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
