[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates/portlets/html user-order.vm, 1.31, 1.32

[Stefan K. <sh...@us...>]

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32102/src/vmtemplates/portlets/html

Modified Files:
	user-order.vm 
Log Message:
extra column for robot orders


Index: user-order.vm
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** user-order.vm	14 Sep 2006 16:24:01 -0000	1.31
--- user-order.vm	15 Sep 2006 11:17:31 -0000	1.32
***************
*** 3,7 ****
    	<tr><td><a href="portal/pane0/Help;jsessionid=$data.getSession().getId()?URL=using.html#labadmin" style="color:white"><img src="images/help.png"></a></td></tr>
      <tr>
!       <td>You have the following <b>open orders</b> for labgroup operators:</td><td width="50"></td><td>You have the following <b>open orders</b> for self processing:</td><td width="50"></td><td>The following <b>orders have been (partly or fully) done</b> and wait for assignment:</td>
      </tr>
      <tr>
--- 3,7 ----
    	<tr><td><a href="portal/pane0/Help;jsessionid=$data.getSession().getId()?URL=using.html#labadmin" style="color:white"><img src="images/help.png"></a></td></tr>
      <tr>
!       <td>You have the following <b>open orders for labgroup operators</b>:</td><td width="50"></td><td>You have the following <b>open orders for self processing</b>:</td><td width="50"></td><td>You have the following <b>open orders for processing by robot</b>:</td><td width="50"></td><td>The following <b>orders have been (partly or fully) done</b> and wait for assignment:</td>
      </tr>
      <tr>
***************
*** 41,44 ****
--- 41,61 ----
        <td width="50"></td>
        <td>
+         #if($samplesrobot.size()==0)
+           None
+         #else
+           <table>
+             #foreach($sample in $samplesrobot)
+               #set($greyorwhite=$velocityCount%2)
+               <tr 
+               #if($greyorwhite==0)
+                 bgcolor="#D3D3D3" 
+               #end
+               ><td><a href="portal/pane0/NMR+lab+administration;jsessionid=$data.getSession().getId()?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
+             #end
+           </table>
+         #end
+       </td>
+       <td width="50"></td>
+       <td>
          #if($samplesdone.size()==0)
            None