Changeset 210 for trunk/grails-app/views
- Timestamp:
- Feb 23, 2010, 10:23:37 AM (11 years ago)
- Location:
- trunk/grails-app/views/study
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/study/list.gsp
r171 r210 26 26 <table> 27 27 <tr> 28 <td ></td>28 <td width="50"></td> 29 29 <td colspan="3"> 30 30 <center><b>${studyInstance.title}</b></center> … … 36 36 <input type="checkbox" name="${studyInstance.title}" id="${studyInstance.title}"></td> 37 37 38 <td >38 <td width="150"> 39 39 <g:link action="show" id="${studyInstance.id}"> 40 40 ${message(code: 'study.id.label', default: 'Id')} : 41 41 ${fieldValue(bean: studyInstance, field: "id")}</g:link></td> 42 42 43 <td>43 <td width="300"> 44 44 <b>${message(code: 'study.template.label', default: 'Template')} </b>: 45 45 ${fieldValue(bean: studyInstance, field: "template")}</td> … … 57 57 58 58 <td > 59 <b>Assays </b>: </td> 59 <b>Assays </b>: 60 <g:each in="${studyInstance.assays}" var="assay"> 61 ${assay.name} 62 </g:each> 63 </td> 64 65 <td><b> Samples </b>: 66 <g:each in="${studyInstance.assays.samples}" var="samples"> 67 ${samples.name} 68 </g:each> 69 </td> 70 71 60 72 </tr> 61 73 <tr> -
trunk/grails-app/views/study/list_extended.gsp
r171 r210 69 69 <g:each in="${att_list}" var="att"> 70 70 <tr> 71 <td><b>${att }</b></td>71 <td><b>${att[0].toUpperCase()+att.substring(1)}</b></td> 72 72 <g:each in="${selectedStudies}" status="k" var="studyIns"> 73 73 <td>${fieldValue(bean: studyIns, field: att)}</td> … … 229 229 </div> 230 230 231 232 233 231 <% } %> 234 232 -
trunk/grails-app/views/study/show.gsp
r171 r210 38 38 <b> Start </b>:<g:formatDate date="${studyInstance?.startDate}" /> <br> 39 39 <b>Sampling Events </b>: 40 <g:each in="${studyInstance.samplingEvents}" var="s"><ul> 41 <li><g:link controller="samplingEvent" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li> 42 </g:each> 43 </ul><br> 40 41 <% def tmpList = [] %> 42 43 <g:each in="${studyInstance.events}" var="s"> 44 <g:if test="${s.eventDescription.isSamplingEvent}"> 45 tmpList.add(s.eventDescription) 46 </g:if> 47 </g:each> 48 49 <g:if test="${tmpList.size()==0}"> 50 - 51 </g:if> 52 53 <g:else> 54 <% def sampEvent = tmpList.get(0).name %> 55 ${sampEvent} 56 <g:each in="${tmpList}" var="samplingEvent"> 57 <g:if test="${(samplingEvent.name!=sampEvent)}"> 58 ${samplingEvents.name} 59 </g:if> 60 </g:each> 61 </g:else> 62 <br> 63 64 44 65 <b>Last Updated </b>:<g:formatDate date="${studyInstance?.lastUpdated}" /><br> 45 66 <b>Readers </b>:<ul> … … 90 111 <% print s.templateStringFields.get(g.toString()) %> 91 112 <% } %> 113 <% if (g.type==dbnp.studycapturing.TemplateFieldType.FLOAT){ %> 114 <% print s.templateFloatFields.get(g.toString()) %> 115 <% } %> 92 116 93 117 </td> … … 98 122 </div> 99 123 100 <a href="#"> Groups </a> <div><ul> 124 <a href="#"> Groups </a> <div> 125 <g:if test="${studyInstance.groups.size()==0}"> 126 No groups in this study 127 </g:if> 128 <g:else> 101 129 <g:each in="${studyInstance.groups}" var="g"> 102 <li><g:link controller="subjectGroup" action="show" id="${g.id}">${g?.encodeAsHTML()}</g:link></li> 103 </g:each> 104 </ul> </div> 130 ${g.name} 131 </g:each> 132 </g:else> 133 </div> 105 134 106 135 <a href="#"> Protocols </a><div> … … 136 165 <table> 137 166 <tr> 138 <td><b>Event Description</b></td>167 139 168 <td><b>Subject</b></td> 140 169 <td><b>Start Time</b></td> 141 <td><b>End Time</b></td>142 170 <td><b>Duration</b></td> 171 <td><b>Event Description</b></td> 172 <td><b>Sampling Event</b></td> 173 <td><b>Parameters</b></td> 143 174 </tr> 144 175 <g:each in="${studyInstance.events}" var="e"> 145 176 <tr> 146 <td><g:link controller="event" action="show" id="${e.id}"> ${e.eventDescription.name}</g:link></td> 147 <td>${e.subject.id}</td> 148 <td>${e.startTime}</td> 149 <td>${e.endTime}</td> 150 <td>${e.getDurationString()}</td> 177 178 <td><g:link controller="event" action="edit" id="${e.id}">${e.subject.id}</g:link></td> 179 <td>${e.getPrettyDuration(studyInstance.startDate,e.startTime)}</td> 180 <td>${e.getPrettyDuration()}</td> 181 <td><g:link controller="event" action="show" id="${e.id}"> ${e.eventDescription.name}</g:link></td> 182 <g:if test="${e.eventDescription.isSamplingEvent}"> 183 <td><input type="checkbox" id="" disabled="false" value="true"></td> 184 </g:if> 185 <g:else> 186 <td><input type="checkbox" id="" disabled="false" value="false"></td> 187 </g:else> 188 <td>${e.eventDescription.protocol.parameters.name}</td> 151 189 </tr> 152 190 </g:each> … … 154 192 </div> 155 193 194 <a href="#"> Event Description </a><div> 195 <table> 196 <tr> 197 198 <td><b>Name</b></td> 199 <td><b>Parameters </b></td> 200 </tr> 201 <tr> 202 <td><b></b></td> 203 <td><b>Name</b></td> 204 <td><b>Description</b></td> 205 <td><b>Unit</b></td> 206 <td><b>Reference</b></td> 207 <td><b>Options</b></td> 208 <td><b>Type</b></td> 209 </tr> 210 <g:each in="${dbnp.studycapturing.EventDescription.list()}" var="e"> 211 <g:if test="${(studyInstance.events.eventDescription.contains(e))}" > 212 <tr> 213 <td>${e.name} </td></tr><tr> 214 <g:each in="${e.protocol.parameters}" var="p"> 215 <td></td> 216 <td>${p.name}</td> 217 <td>${p.description}</td> 218 <td>${p.unit}</td> 219 <td>${p.reference}</td> 220 <g:if test="${(p.listEntries.size()==0)}" > 221 <td>-</td> 222 </g:if> 223 <g:else> 224 <td>${p.listEntries}</td> 225 </g:else> 226 <td>${p.type}</td> 227 </tr> 228 </g:each> 229 </g:if> 230 </g:each> 231 </table> 232 233 <g:form> 234 235 <span class="button"><g:actionSubmit class="event" action="create" value="${message(code: 'default.button.create.label', default: 'Create')}" /></span> 236 </g:form> 237 238 </div> 239 156 240 <a href="#"> Assays </a><div> 241 <g:if test="${studyInstance.assays.size()==0}"> 242 No assays in this study 243 </g:if> 244 <g:else> 245 <g:each in="${studyInstance.assays}" var="assay"> 246 ${assay.name} 247 </g:each> 248 </g:else> 157 249 </div> 158 250
Note: See TracChangeset
for help on using the changeset viewer.
