Changeset 290

Timestamp:

Mar 22, 2010, 11:38:25 AM (13 years ago)

Author:

keesvb

Message:

debugged EventDescription?.save, added comment field for template fields, add code comments to setFieldValue, added missing events to PPSH demo in BootStrap?, cleaned up home menu, re-added searchable

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/conf/BootStrap.groovy (modified) (2 diffs)
• grails-app/controllers/dbnp/studycapturing/EventDescriptionController.groovy (modified) (3 diffs)
• grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (3 diffs)
• grails-app/domain/dbnp/studycapturing/TemplateField.groovy (modified) (2 diffs)
• grails-app/views/common/_partial.gsp (deleted)
• grails-app/views/common/_topnav.gsp (modified) (3 diffs)
• grails-app/views/eventDescription/showMyProtocolFilled.gsp (modified) (1 diff)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Thu Mar 18 16:30:01 CET 2010
+#Fri Mar 19 11:53:03 CET 2010
 app.grails.version=1.2.1
 app.name=gscf
@@ -10 +10 @@
 plugins.mail=0.9
 plugins.nimble=0.3-SNAPSHOT
+plugins.searchable=0.5.5
 plugins.shiro=1.0.1
 plugins.tomcat=1.2.1

trunk/grails-app/conf/BootStrap.groovy

@@ -198 +198 @@
                                 name: '#Mice in cage',type: TemplateFieldType.INTEGER))
                         .addToFields(new TemplateField(
-                                name: 'Litter size',type: TemplateFieldType.INTEGER))   
+                                name: 'Litter size',type: TemplateFieldType.INTEGER))
                         .addToFields(new TemplateField(
                                 name: 'Weight (g)', type: TemplateFieldType.DOUBLE, unit: 'gram'))
@@ -515 +515 @@
           }
 
-          humanStudy.addToEventGroups rootGroup
+          humanStudy.addToEvents(fastingEvent)
+          humanStudy.addToSamplingEvents(bloodSamplingEvent)
+          humanStudy.addToEventGroups rootGroup
           humanStudy.save()
 

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

@@ -116 +116 @@
             description.name=params['name']
 
-            // description.description=params['description']   // has to be a Term
+            description.description=params['description']
             // description.classification=params['classification']  // has to be a Term
             description.isSamplingEvent= params['isSample']=='true'?true:false
@@ -244 +244 @@
 
 
-        // make changes persitant
-
-        if (description.save(flush: true)) {
-            flash.message = "${message(code: 'default.created.message', args: [message(code: 'description.label', default: 'EventDescription'), description.id])}"
-            redirect(action: "show", id: description.id)
-        }
-        else {
-            render(view: "create", model: [description: description])
-        }
-
-        render( action: 'list' )
+        // Check for errors in protocol, and if none, persist it
+        protocol.validate()
+        if (protocol.hasErrors()) {
+                render "Errors during save of protool:\n"
+                for (e in description.errors) {
+                        render e
+                }
+        }
+        else {
+                protocol.save(flush:true)
+        }
+
+
+        // Important: add protocol to EventDescription
+        description.protocol = protocol
+
+
+        // Check for errors in EventDescription, if no errors, persist the data
+        description.validate()
+        if (description.hasErrors()) {
+                render "Errors during save of event description:\n"
+                for (e in description.errors) {
+                        render e
+                }
+        }
+        else {
+                if (description.save(flush: true)) {
+                        flash.message = "${message(code: 'default.created.message', args: [message(code: 'description.label', default: 'EventDescription'), description.id])}"
+                    redirect(view: "show", id: description.id)
+
+                }
+                else {
+                    redirect(view: "create", model: [description: description])
+                }
+        }
+
     }
 
@@ -264 +289 @@
         if (!eventDescriptionInstance) {
             flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'eventDescription.label', default: 'EventDescription'), params.id])}"
-            redirect(action: "list")
+            redirect(view: "list")
         }
 
         else {
             [eventDescriptionInstance: eventDescriptionInstance, params:params]
+            // Since show.gsp is not implemented yet, redirect to edit
+            redirect(action:'edit',id:params.id)
         }
     }

trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

@@ -70 +70 @@
 
         /**
-         * Find a template field by its name and return its value for this subject
-         * @param fieldName The name of the template subject field
+         * Find a template field by its name and return its value for this entity
+         * @param fieldName The name of the template field
          * @return the value of the field (class depends on the field type)
          * @throws NoSuchFieldException If the field is not found or the field type is not supported
@@ -81 +81 @@
         }
 
+        /**
+         * Set a template/entity field value
+         * @param fieldName The name of the template or entity field
+         * @param value The value to be set, this should align with the (template) field type, but there are some convenience setters
+         *
+         */
         def setFieldValue(String fieldName, value) {
+
+                // First, search if there is an entity property with the given name, and if so, set that
                 if (this.properties.containsKey(fieldName)) {
                         this[fieldName] = value
                 }
-                else
-                if (template == null) {
-                        throw new NoSuchFieldException("Field ${fieldName} not found in class properties")
+                // If not the found, then it is a template field, so check if there is a template
+                else if (template == null) {
+                        throw new NoSuchFieldException("Field ${fieldName} not found in class properties: template not set")
                 }
+                // If there is a template, check the template fields
                 else {
+                        // Find the target template field, if not found, throw an error
                         TemplateField field = this.template.fields.find { it.name == fieldName}
                         if (field == null) {
                                 throw new NoSuchFieldException("Field ${fieldName} not found in class properties or template fields")
                         }
+                        // Set the value of the found template field
                         else {
+                                // Convenience setter for template string list fields: find TemplateFieldListItem by name
                                 if (field.type == TemplateFieldType.STRINGLIST && value.class == String) {
-                                        // Convenience setter: find template item by name
                                         value = field.listEntries.find { it.name == value }
                                 }
 
-                                // handle string values for date fields
+                                // Convenience setter for dates: handle string values for date fields
                                 if (field.type == TemplateFieldType.DATE && value.class == String) {
                                         // a string was given, attempt to transform it into a date instance
@@ -119 +130 @@
                                 }
 
-                                // Caution: this assumes that all template...Field Maps are already initialized
-                                // Otherwise, the results are pretty much unpredictable!
+                                // Set the field value
+                                // Caution: this assumes that all template...Field Maps are already initialized (as is done now above as [:])
+                                // If that is ever changed, the results are pretty much unpredictable (random Java object pointers?)!
                                 getStore(field.type)[fieldName] = value
                                 return this

trunk/grails-app/domain/dbnp/studycapturing/TemplateField.groovy

@@ -13 +13 @@
         TemplateFieldType type
         String unit
+        String comment // help string for the user interface
 
     static hasMany = [listEntries : TemplateFieldListItem] // to store the entries to choose from when the type is 'item from predefined list'
@@ -19 +20 @@
                 name(unique: true)
                 unit(nullable: true, blank: true)
+                comment(nullable:true, blank: true)
+        }
+
+        static mapping = {
+                comment type: 'text'
         }
 

trunk/grails-app/views/common/_topnav.gsp

@@ -3 +3 @@
     <ul class="topnav">
      <li><g:link url="/${meta(name: 'app.name')}/">Home</g:link></li>
-     <li>
+<n:isLoggedIn>
+     <li><g:link controller="study" action="list">My studies</g:link></li>
+</n:isLoggedIn>     <li>
       <a href="#">Studies</a>
       <ul class="subnav">
@@ -10 +12 @@
       </ul>
      </li>
-     <li><g:link controller="load" action="index">Loading data</g:link></li>
+     <li>
+      <a href="#">Events</a>
+      <ul class="subnav">
+        <li><g:link controller="protocol" action="list">View protocols</g:link></li>
+        <li><g:link controller="eventDescription" action="list">View event descriptions</g:link></li>
+      </ul>
+     </li>
+         <li><g:link controller="importer" action="index">Import data</g:link></li>
+    <g:if env="development">
      <li><g:link controller="query" action="index">Query database</g:link></li>
-<n:isLoggedIn>
-     <li><g:link controller="study" action="list">My studies</g:link></li>
-</n:isLoggedIn>
-     <li>
+         <li>
           <a href="#">Scaffolded controllers</a>
           <ul class="subnav"><g:each var="c" in="${grailsApplication.controllerClasses}">
@@ -21 +28 @@
           </ul>
      </li>
+        </g:if>
 <n:isAdministrator>
      <li>

trunk/grails-app/views/eventDescription/showMyProtocolFilled.gsp

@@ -255 +255 @@
 
     <% def protocols = dbnp.studycapturing.Protocol.list() %>
+        <td>Name</td>
+</tr>
+<tr class="prop">
     <td>
            <g:if test="${protocol==null}">