Changeset 171 for trunk


Ignore:
Timestamp:
Feb 4, 2010, 2:34:56 PM (11 years ago)
Author:
ademcan
Message:

new view for studies comparison and study details

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/application.properties

    r139 r171  
    11#Grails Metadata file
    2 #Tue Jan 26 12:10:14 CET 2010
     2#Wed Feb 03 11:58:08 CET 2010
    33app.grails.version=1.2.0
    44app.name=gscf

  • trunk/grails-app/views/study/list.gsp

    r165 r171  
    2121      <div class="message">${flash.message}</div>
    2222    </g:if>
    23     <div class="list">
    2423
    25       <g:each in="${studyInstanceList}" status="i" var="studyInstance">
     24      <g:each in="${studyInstanceList}" var="studyInstance">
    2625        <br>
    2726        <table>
    28           <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
     27          <tr>
     28            <td></td>
     29            <td colspan="3">
     30              <center><b>${studyInstance.title}</b></center>
     31            </td>
     32          </tr>
     33          <tr>
    2934            <td>
     35
    3036              <input type="checkbox" name="${studyInstance.title}" id="${studyInstance.title}"></td>
    3137
    32             <td width=200>
     38            <td>
    3339          <g:link action="show" id="${studyInstance.id}">
    3440${message(code: 'study.id.label', default: 'Id')} :
    3541${fieldValue(bean: studyInstance, field: "id")}</g:link></td>
    3642
    37           <td width=300>
    38 ${message(code: 'study.template.label', default: 'Template')} :
     43          <td >
     44<b>${message(code: 'study.template.label', default: 'Template')} </b>:
    3945${fieldValue(bean: studyInstance, field: "template")}</td>
    4046
    41           <td width=500>
    42 ${message(code: 'study.startDate.label', default: 'Start Date')} :
    43           <g:formatDate date="${studyInstance.startDate}" /></td>
     47<td >
     48<b>${message(code: 'study.subjects.label', default: 'Subjects')} </b>:
     49${studyInstance.subjects.size()} subjects</td>
    4450
    45           <td width=500>
    46 ${message(code: 'study.lastUpdated.label', default: 'Last Updated')} :
    47           <g:formatDate date="${studyInstance.lastUpdated}" /></td>
     51        </tr>
     52        <tr>
     53          <td></td>
     54          <td >
     55<b>${message(code: 'study.owner.label', default: 'Owner')} </b>:
     56${fieldValue(bean: studyInstance, field: "owner")}</td>
    4857
    49           <td width=300>
    50 ${message(code: 'study.code.label', default: 'Code')} :
    51 ${fieldValue(bean: studyInstance, field: "code")}</td>
    52 
    53           <td width=300>
    54 ${message(code: 'study.ecCode.label', default: 'Ec Code')} :
    55 ${fieldValue(bean: studyInstance, field: "ecCode")}</td>
    56 
    57           </tr>
     58          <td >
     59            <b>Assays </b>: </td>
     60        </tr>
     61        <tr>
     62          <td></td>
     63          <td colspan="3">
     64            <b>${message(code: 'study.description.label', default: 'Description')} </b>:
     65${fieldValue(bean: studyInstance, field: "description")}</td>
     66        </tr>
    5867        </table>
    5968      </g:each>
    60       </table>
    61     </div>
     69   
    6270    <div class="paginateButtons">
    6371      <g:paginate total="${studyInstanceTotal}" />

  • trunk/grails-app/views/study/list_extended.gsp

    r165 r171  
    1919
    2020  <% studyList = dbnp.studycapturing.Study.list() %>
    21   <% def att_list = ['startDate','code','title'] %>
     21  <% def att_list = ['template','startDate','samplingEvents','lastUpdated','readers','code','editors','ecCode','researchQuestion','title','description','owner','dateCreated'] %>
    2222  <% def selectedStudies = [] %>
    2323  <% def tmpList = [] %>
    … …  
    2525  <div class="nav">
    2626    <span class="menuButton"><a class="home" href="${createLink(uri: '/')}">Home</a></span>
     27    <span class="menuButton"><g:link class="list" action="list"><g:message code="default.list.label" args="[entityName]" /></g:link></span>
    2728    <span class="menuButton"><g:link class="create" action="create"><g:message code="default.new.label" args="[entityName]" /></g:link></span>
    2829  </div>
    2930
    3031  <div class="body">
    31     <h1>Compare Studies</h1>
     32    <h1>Studies Comparison</h1>
    3233    <g:if test="${flash.message}">
    3334      <div class="message">${flash.message}</div>

  • trunk/grails-app/views/study/show.gsp

    r165 r171  
    3434      <a href="#"> Study Information </a>
    3535       
    36        <div> Id : ${fieldValue(bean: studyInstance, field: "id")} <br>
    37        Template :<g:link controller="template" action="show" id="${studyInstance?.template?.id}">${studyInstance?.template?.encodeAsHTML()}</g:link><br>
    38        Start :<g:formatDate date="${studyInstance?.startDate}" /> <br>
    39       Sampling Events :
     36       <div><b> Id </b>: ${fieldValue(bean: studyInstance, field: "id")} <br>
     37         <b>Template </b>:<g:link controller="template" action="show" id="${studyInstance?.template?.id}">${studyInstance?.template?.encodeAsHTML()}</g:link><br>
     38         <b> Start </b>:<g:formatDate date="${studyInstance?.startDate}" /> <br>
     39         <b>Sampling Events </b>:
    4040          <g:each in="${studyInstance.samplingEvents}" var="s"><ul>
    4141            <li><g:link controller="samplingEvent" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
    4242          </g:each>
    4343        </ul><br>
    44        Last Updated :<g:formatDate date="${studyInstance?.lastUpdated}" /><br>
    45              Readers :<ul>
     44        <b>Last Updated </b>:<g:formatDate date="${studyInstance?.lastUpdated}" /><br>
     45        <b>Readers </b>:<ul>
    4646          <g:each in="${studyInstance.readers}" var="r">
    4747            <li><g:link controller="user" action="show" id="${r.id}">${r?.encodeAsHTML()}</g:link></li>
    4848          </g:each>
    4949        </ul> <br>
    50       Code : ${fieldValue(bean: studyInstance, field: "code")} <br>
    51       Editors : <ul>
     50        <b>Code </b>: ${fieldValue(bean: studyInstance, field: "code")} <br>
     51        <b>Editors </b>: <ul>
    5252          <g:each in="${studyInstance.editors}" var="e">
    5353            <li><g:link controller="user" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
    5454          </g:each>
    5555        </ul> <br>
    56      EC Code : ${fieldValue(bean: studyInstance, field: "ecCode")} <br>
    57      Research Question : ${fieldValue(bean: studyInstance, field: "researchQuestion")} <br>
    58      Title : ${fieldValue(bean: studyInstance, field: "title")} <br>
    59      Description : ${fieldValue(bean: studyInstance, field: "description")} <br>
    60      Owner :<g:link controller="user" action="show" id="${studyInstance?.owner?.id}">${studyInstance?.owner?.encodeAsHTML()}</g:link> <br>
    61       Date Created :<g:formatDate date="${studyInstance?.dateCreated}" /> <br>
     56        <b>EC Code </b>: ${fieldValue(bean: studyInstance, field: "ecCode")} <br>
     57        <b>Research Question </b>: ${fieldValue(bean: studyInstance, field: "researchQuestion")} <br>
     58        <b>Title </b>: ${fieldValue(bean: studyInstance, field: "title")} <br>
     59        <b>Description </b>: ${fieldValue(bean: studyInstance, field: "description")} <br>
     60        <b>Owner </b>:<g:link controller="user" action="show" id="${studyInstance?.owner?.id}">${studyInstance?.owner?.encodeAsHTML()}</g:link> <br>
     61        <b>Date Created </b>:<g:formatDate date="${studyInstance?.dateCreated}" /> <br>
    6262       </div>
    6363
Note: See TracChangeset for help on using the changeset viewer.