[MMBASE CVS] contributions/natmm/templates/nmintra thumbs.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/nmintra
In directory james.mmbase.org:/tmp/cvs-serv14199/templates/nmintra

Modified Files:
        thumbs.jsp 
Log Message:
NMCMS-503


See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra
See also: http://www.mmbase.org/jira/browse/NMCMS-503


Index: thumbs.jsp
===================================================================
RCS file: /var/cvs/contributions/natmm/templates/nmintra/thumbs.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- thumbs.jsp  8 Nov 2006 10:54:14 -0000       1.13
+++ thumbs.jsp  8 May 2008 13:44:53 -0000       1.14
@@ -28,7 +28,9 @@
     </tr>
     </table><% 
 
-if(departmentId.equals("default")&&programId.equals("default")) { // *** 
select a random department ***
+String otherGroupsId = request.getParameter("othergroups"); 
if(otherGroupsId==null){ otherGroupsId="default"; }    
+    
+if(departmentId.equals("default")&&programId.equals("default")&&otherGroupsId.equals("default"))
 { // *** select a random department ***
     Vector departments = new Vector();
     %><mm:list path="afdelingen" constraints="afdelingen.importstatus!='-1' 
AND afdelingen.importstatus!='inactive'"
         ><mm:field name="afdelingen.number" jspvar="departments_number" 
vartype="String" write="false"><%
@@ -67,14 +69,33 @@
 ></mm:list><%
 // = employeeConstraint 
 %><%
+
 boolean employeeFound = false;
 int numberInRow = 0;
 int maxInRow = 3; 
-if(!departmentNodes.equals("default")) {
+
+if(departmentNodes.equals("default")) {
+   departmentNodes = "";  
+}
    %><mm:list nodes="<%= departmentNodes %>" path="<%= employeePath %>"
        orderby="medewerkers.firstname,medewerkers.lastname" directions="UP,UP" 
constraints="<%= employeeConstraint %>"
        fields="medewerkers.number" distinct="true"
-       ><mm:field name="medewerkers.number" jspvar="employees_number" 
vartype="String" write="false"><%
+       ><mm:field name="medewerkers.number" jspvar="employees_number" 
vartype="String" write="false">
+
+       <%
+       boolean matchProgram = true;
+       if (!otherGroupsId.equals("default")) {
+          matchProgram = false;
+          %><mm:listcontainer nodes="<%= employees_number %>"  
path="medewerkers,readmore,programs">
+                <mm:constraint field="programs.number" operator="=" value="<%= 
otherGroupsId %>" />
+                <mm:list max="1"><%
+                  matchProgram = true;
+                %></mm:list
+             ></mm:listcontainer>
+          <%
+       }
+
+       if (matchProgram) {
        if(!employeeFound) { 
            employeeFound = true;
            %><table cellpadding="0" cellspacing="0" align="center"><tr><%
@@ -94,9 +115,11 @@
            %></tr><tr><%
            numberInRow=0;
        } 
-       %></mm:field
+       }
+       %>
+
+       </mm:field
    ></mm:list><%
-}
 
 if(employeeFound) { 
     while(numberInRow<maxInRow) {
@@ -113,7 +136,10 @@
         }
         if(!programId.equals("default")) {
            %><mm:node number="<%= programId %>"><li><%if(!isFirst) { %> en<% 
}%> de lokatie <mm:field name="naam" /></li></mm:node><% 
-        } %>.</ul></span>
+        }
+        if(!otherGroupsId.equals("default")) {
+           %><mm:node number="<%= otherGroupsId %>"><li><%if(!isFirst) { %> 
en<% }%> de groep <mm:field name="title" /></li></mm:node><%
+        } %></ul></span>              
       <p>Er zijn geen medewerkers gevonden die voldoen aan je selectie.</p>
     </div><%
 }
@@ -153,7 +179,24 @@
             ></mm:field>
             </mm:field
         ></mm:list
-    ></select></td></tr>
+    ></select>&nbsp;<br><div align="right"><span 
class="light">en</span></div></td></tr>
+    <tr><td>
+
+    <select name="othergroups" style="width:195px;">
+     <option value="default" <%  if(otherGroupsId.equals("default")) { 
%>SELECTED<% }%>>alle overige groepen
+     <mm:list path="programs" orderby="programs.title" directions="UP"
+        ><mm:field name="programs.number" jspvar="programs_number" 
vartype="String" write="false"
+        ><mm:field name="programs.title" jspvar="programs_title" 
vartype="String" write="false"
+           ><mm:list nodes="<%= programs_number %>" 
path="programs,readmore,medewerkers" max="1"
+              ><option value="<%= programs_number %>" <%  
if(programs_number.equals(otherGroupsId))  { %>SELECTED<% }
+                 %>><%= programs_title
+           %></mm:list
+        ></mm:field>
+        </mm:field
+     ></mm:list>
+   </select>
+
+    </td></tr>
     <tr><td><img src="media/spacer.gif" width="1" height="20"></td></tr>
     <tr><td>
     <table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
@@ -175,7 +218,7 @@
    if(el!='clear') {
       var department = 
escape(document.smoelenboek.elements["department"].value);
       var program = escape(document.smoelenboek.elements["program"].value);
-      href += "&department=" + department + "&program=" + program; 
+      href += "&department=" + department + "&program=" + program + 
"&othergroups=" + othergroups;
    }    
    document.location = href; 
    return false; 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs