Changeset 199

Show
Ignore:
Timestamp:
15-02-10 16:50:34 (4 years ago)
Author:
jahn
Message:

Still trying to build a proper overview of the samples. jquery's (stadnard) accordion is not a good solution because it does not allow to open two items at time.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/searchable/selectsample.gsp

    r196 r199  
    3333           <td><b> Sample Name </b></td> 
    3434           <td><b> Sample Material </b></td> 
    35            <td><b> Duration </b></td> 
     35           <td><b> Start Time </b></td> 
    3636           <g:if test="${subgroups.size>0}"> <td><b> Subgroups </b></td> </g:if> 
    3737         </tr> 
     
    4545 
    4646 
    47   <g:each in ="${studyIns.events}" var="events"> 
     47  <g:if test="${studyIns.samplingEvents.size ()>0}" > 
     48  <g:each in ="${studyIns.samplingEvents}" var="event"> 
     49     <g:each in ="${event.samples}" var="sample"> 
    4850        <tr> 
    4951          <td></td><td></td> 
    50           <td> <input type="checkbox" name="${studyIns.id}.${events.subject.name}" id="${events.subject.name}" class="checkbox2${studyIns.id}" > 
    51                ${events.subject.name} </td> 
     52          <td> <input type="checkbox" name="${studyIns.id}.${event.subject.name}" id="${event.subject.name}" class="checkbox2${studyIns.id}" > 
     53               ${event.subject.name} </td> 
    5254          <td> ${studyIns.samplingEvents} </td> 
    53           <td> ${studyIns.samplingEvents.samples.name}</td> 
    54           <td> ${studyIns.samplingEvents.samples.material}</td> 
    55           <td> ${events.getDurationString()}</td> 
     55          <td> ${sample.name}</td> 
     56          <td> ${sample.material}</td> 
     57          <td> ${event.getPrettyDuration( studyIns.startDate, event.startTime)} </td> 
    5658 
    5759          <g:if test="${subgroups.size>0}"> 
     
    6466        </tr> 
    6567     </g:each> 
     68    </g:each> 
     69  </g:if> 
    6670 
    6771 
     72  <g:else> 
     73        <tr> 
     74            <td></td> <td>Study does not cotain any samples. </td> 
     75            <td></td> <td></td> <td></td> <td></td> <td></td> 
     76            <g:if test="${subgroups.size>0}"> <td></td> </g:if> 
     77        </tr> 
     78    </g:else> 
    6879    </g:each> 
    69         
     80 
    7081     </table> 
    7182 
     
    8697        </script> 
    8798    </g:each> 
    88  
    89  
    9099 
    91100  <%}%>