Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14857/src/vmtemplates/portlets/html
Modified Files:
user-order.vm worker-order.vm
Log Message:
separate listing of orders for different frequencies
Index: user-order.vm
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** user-order.vm 15 Sep 2006 11:17:31 -0000 1.32
--- user-order.vm 15 Sep 2006 11:57:00 -0000 1.33
***************
*** 161,166 ****
Field Strength
#if($submitorshow=="submit")
! (enter or choose): <input type="text" name="fstrength" size="15">
! <select name="fstrengths" size="1" onChange="document.restform.elements['fstrength'].value=''">
#foreach($existingcondition in $fstrengths)
<option value="$existingcondition.getConditionId()">$existingcondition.getValue()</option>
--- 161,165 ----
Field Strength
#if($submitorshow=="submit")
! : <select name="fstrengths" size="1" onChange="document.restform.elements['fstrength'].value=''">
#foreach($existingcondition in $fstrengths)
<option value="$existingcondition.getConditionId()">$existingcondition.getValue()</option>
Index: worker-order.vm
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** worker-order.vm 14 Sep 2006 16:24:01 -0000 1.13
--- worker-order.vm 15 Sep 2006 11:57:00 -0000 1.14
***************
*** 8,13 ****
#else
The following orders for your labgroup wait to be fullfilled:
<table>
! #foreach($sample in $openorders)
#set($greyorwhite=$velocityCount%2)
<tr
--- 8,59 ----
#else
The following orders for your labgroup wait to be fullfilled:
+ <table><tr><td>
+ <table>
+ <tr><th>250 MHz</th></tr>
+ #foreach($sample in $openorders250)
+ #set($greyorwhite=$velocityCount%2)
+ <tr
+ #if($greyorwhite==0)
+ bgcolor="#D3D3D3"
+ #end
+ ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
+ #end
+ </table></td><td>
+ <table>
+ <tr><th>300 MHz</th></tr>
+ #foreach($sample in $openorders300)
+ #set($greyorwhite=$velocityCount%2)
+ <tr
+ #if($greyorwhite==0)
+ bgcolor="#D3D3D3"
+ #end
+ ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
+ #end
+ </table></td><td>
+ <table>
+ <tr><th>400 MHz</th></tr>
+ #foreach($sample in $openorders400)
+ #set($greyorwhite=$velocityCount%2)
+ <tr
+ #if($greyorwhite==0)
+ bgcolor="#D3D3D3"
+ #end
+ ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
+ #end
+ </table></td><td>
+ <table>
+ <tr><th>500 MHz</th></tr>
+ #foreach($sample in $openorders500)
+ #set($greyorwhite=$velocityCount%2)
+ <tr
+ #if($greyorwhite==0)
+ bgcolor="#D3D3D3"
+ #end
+ ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
+ #end
+ </table></td><td>
<table>
! <tr><th>600 MHz</th></tr>
! #foreach($sample in $openorders600)
#set($greyorwhite=$velocityCount%2)
<tr
***************
*** 17,21 ****
><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
#end
! </table>
#end
</td>
--- 63,67 ----
><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr>
#end
! </table></td></tr></table>
#end
</td>
|
