[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates/portlets/html user-order.vm, 1.36, 1.37 worker-o
Brought to you by:
steinbeck
Menu
▾
▴
[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates/portlets/html user-order.vm, 1.36, 1.37 worker-order.vm, 1.16, 1.17
|
From: Stefan K. <sh...@us...> - 2006-09-21 12:22:19
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7898/src/vmtemplates/portlets/html Modified Files: user-order.vm worker-order.vm Log Message: delete only for open orders, design stuff Index: user-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** user-order.vm 20 Sep 2006 12:50:04 -0000 1.36 --- user-order.vm 21 Sep 2006 12:22:12 -0000 1.37 *************** *** 1,10 **** #if($data.User.isLabgroupUser($data)) ! <table align="center"> ! <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 sample changer</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> ! <td> #if($samples.size()==0) None --- 1,10 ---- + <a href="portal/pane0/Help;jsessionid=$data.getSession().getId()?URL=using.html#labadmin" style="color:white"><img src="images/help.png"></a> #if($data.User.isLabgroupUser($data)) ! <table align="center" border="3" rules="cols"> <tr> ! <td>You have the following <b>open orders for labgroup operators</b>:</td><td>You have the following <b>open orders for self processing</b>:</td><td>You have the following <b>open orders for processing by sample changer</b>:</td><td>The following <b>orders have been (partly or fully) done</b> and wait for assignment:</td> </tr> <tr> ! <td align="left" valign="top"> #if($samples.size()==0) None *************** *** 22,27 **** #end </td> ! <td width="50"></td> ! <td> #if($samplesself.size()==0) None --- 22,26 ---- #end </td> ! <td align="left" valign="top"> #if($samplesself.size()==0) None *************** *** 39,44 **** #end </td> ! <td width="50"></td> ! <td> #if($samplesrobot.size()==0) None --- 38,42 ---- #end </td> ! <td align="left" valign="top"> #if($samplesrobot.size()==0) None *************** *** 56,61 **** #end </td> ! <td width="50"></td> ! <td> #if($samplesdone.size()==0) None --- 54,58 ---- #end </td> ! <td align="left" valign="top"> #if($samplesdone.size()==0) None *************** *** 82,86 **** <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"> Here you can submit a <b>new order</b>:<br> ! I want this order to be processed by <input type="radio" name="process" #if($ordertype=="worker") checked #end value="worker"> a lab worker <input type="radio" name="process" #if($ordertype=="self") checked #end value="self"> myself <input type="radio" name="process" #if($ordertype=="robot") checked #end value="robot"> myself via sample changer<br> #else <b>Order $sample.getUsersId()</b> has the following properties: --- 79,83 ---- <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"> Here you can submit a <b>new order</b>:<br> ! I want this order to be processed by <input type="radio" name="process" #if($ordertype=="worker") checked #end value="worker"> a lab operator <input type="radio" name="process" #if($ordertype=="self") checked #end value="self"> myself <input type="radio" name="process" #if($ordertype=="robot") checked #end value="robot"> myself via sample changer<br> #else <b>Order $sample.getUsersId()</b> has the following properties: *************** *** 203,207 **** </form> #else ! <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"><input type="hidden" name="id" value="$sample.getSampleId()"><input type="submit" name="eventSubmit_doDeleteorder" value="Delete order"/> Confirm deletion by checking <input type="checkbox" name="confirm" value="confirm"></form> #end </td> --- 200,206 ---- </form> #else ! #if($sample.isDeletable()) ! <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"><input type="hidden" name="id" value="$sample.getSampleId()"><input type="submit" name="eventSubmit_doDeleteorder" value="Delete order"/> Confirm deletion by checking <input type="checkbox" name="confirm" value="confirm"></form> ! #end #end </td> Index: worker-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/worker-order.vm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** worker-order.vm 20 Sep 2006 11:35:47 -0000 1.16 --- worker-order.vm 21 Sep 2006 12:22:13 -0000 1.17 *************** *** 8,12 **** #else The following orders for your labgroup wait to be fullfilled: ! <table><tr><td> <table> <tr><th>250 MHz</th></tr> --- 8,12 ---- #else The following orders for your labgroup wait to be fullfilled: ! <table border="3" rules="cols">><tr><td align="left" valign="top"> <table> <tr><th>250 MHz</th></tr> *************** *** 19,23 **** ><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> --- 19,23 ---- ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr> #end ! </table></td><td align="left" valign="top"> <table> <tr><th>300 MHz</th></tr> *************** *** 30,34 **** ><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> --- 30,34 ---- ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr> #end ! </table></td><td align="left" valign="top"> <table> <tr><th>400 MHz</th></tr> *************** *** 41,45 **** ><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> --- 41,45 ---- ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr> #end ! </table></td><td align="left" valign="top"> <table> <tr><th>500 MHz</th></tr> *************** *** 52,56 **** ><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> --- 52,56 ---- ><td><a href="portal/pane0/NMR+lab+administration?submitorshow=show&id=$sample.getSampleId()">$sample.getUsersId()</a></td></tr> #end ! </table></td><td align="left" valign="top"> <table> <tr><th>600 MHz</th></tr> |
