Changeset 942

Timestamp:

Oct 14, 2010, 1:06:06 PM (10 years ago)

Author:

business@…

Message:

added a showByToken for assays, updated generated assay view

Location:

trunk

Files:

• application.properties (modified) (1 diff)
• grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (1 diff)
• grails-app/views/assay/show.gsp (modified) (1 diff)
• grails-app/views/study/show.gsp (modified) (2 diffs)

trunk/application.properties

@@ -5 +5 @@
 app.servlet.version=2.4
 app.version=0.5.0
-#plugins.aaaa=0.3.5
+plugins.aaaa=0.3.5
 plugins.crypto=2.0
 plugins.db-util=0.4

trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

@@ -47 +47 @@
         }
     }
+
+        def showByToken = {
+            def assayInstance = Assay.findByExternalAssayID(params.id)
+            if (!assayInstance) {
+                flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'assay.label', default: 'Assay'), params.id])}"
+                redirect(action: "list")
+            }
+            else {
+                    redirect(action: "show", id: assayInstance.id)
+            }
+        }
 
     def edit = {

trunk/grails-app/views/assay/show.gsp

@@ -57 +57 @@
                             
                         </tr>
-                    
+
+                        <g:each var="field" in="${assayInstance.giveTemplateFields()}">
+                                                        <tr class="prop">
+                                                                <td valign="top" class="name">${field.name}</td>
+
+                                                                <td valign="top" class="value">${assayInstance.getFieldValue(field.name)?.encodeAsHTML()}</td>
+                                                        </tr>
+                                                </g:each>
+
                         <tr class="prop">
                             <td valign="top" class="name"><g:message code="assay.samples.label" default="Samples" /></td>

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

@@ -597 +597 @@
                     <th></th>
                   </g:if>
+                        <th width="100">Assay Code</th>
                   <th width="100">Assay Name</th>
                   <th width="100">Module</th>
@@ -614 +615 @@
                       </td>
                     </g:if>
+                          <td>${assay.token}</td>
                     <td>${assay.name}</td>
                     <td>${assay.module.name}</td>