Changeset 1162 for trunk

Timestamp:

Nov 17, 2010, 6:05:04 PM (11 years ago)

Author:

work@…

Message:

• resolves improvement #1, generating an assay id suggestion in the assay page

File:

• trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (7 diffs)

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

@@ -647 +647 @@
             on("switchTemplate") {
                                 // handle form data
-                                assayPage(flow, flash, params)
-
-                                // find assay template
-                                def template = Template.findByName( params.get('template') )
-
-                                if (flow.assay) {
-                                        // set template
-                                        flow.assay.template = template
-                                } else {
-                                        // create a new assay instance
-                                        flow.assay = new Assay(template: template)
-                                }
+                    assayPage(flow, flash, params)
+
+                    // find assay template
+                    def template = Template.findByName(params.get('template'))
+                    if (flow.assay) {
+                            // set template
+                            flow.assay.template = template
+                            if (template) {
+                                    flow.assay.setFieldValue(
+                                            'externalAssayID',
+                                            this.ucwords(flow.study.code).replaceAll("([ ]{1,})", "") + '_' + this.ucwords(template.name).replaceAll("([ ]{1,})", "")
+                                    )
+                            }
+                    } else {
+                            // create a new assay instance
+                            flow.assay = new Assay(template: template)
+                            if (template) {
+                                    flow.assay.setFieldValue(
+                                            'externalAssayID',
+                                            this.ucwords(flow.study.code).replaceAll("([ ]{1,})", "") + '_' + this.ucwords(template.name).replaceAll("([ ]{1,})", "")
+                                    )
+                            }
+                    }
 
                                 // reset errors
@@ -890 +901 @@
          */
         def loadStudy(flow, flash, params, user) {
-//              def authenticationService
-
                 flash.wizardErrors = new LinkedHashMap()
                 
@@ -902 +911 @@
                         // the used should had never seen a link to this page, so he should never get
                         // here. That's why we just return false
-//                      if (!study.canWrite(authenticationService.getLoggedInUser())) {
             if (!study.canWrite(user)){
                                 return false
@@ -1324 +1332 @@
                                                                 // instantiate a sample for this subject / event
                                                                 def samplingEventName = this.ucwords(event.template.name)
-                                                                def eventGroupName = eventGroup.name.replaceAll(/\w+/, { it[0].toUpperCase() + ((it.size() > 1) ? it[1..-1] : '') }).replaceAll("([ ]{1,})", "")
+                                                                def eventGroupName = this.ucwords(eventGroup).replaceAll("([ ]{1,})", "")
                                                                 def sampleName = (this.ucwords(subject.name) + '_' + samplingEventName + '_' + eventGroupName + '_' + new RelTime(event.startTime).toString()).replaceAll("([ ]{1,})", "")
                                                                 def tempSampleIterator = 0
@@ -1421 +1429 @@
                                                 eventGroup.samplingEvents.each() { samplingEvent ->
                                                         def samplingEventName = this.ucwords(samplingEvent.template.name)
-                                                        def eventGroupName = eventGroup.name.replaceAll(/\w+/, { it[0].toUpperCase() + ((it.size() > 1) ? it[1..-1] : '') }).replaceAll("([ ]{1,})", "")
+                                                        def eventGroupName = this.ucwords(eventGroup)
                                                         def sampleName = (this.ucwords(subject.name) + '_' + samplingEventName + '_' + eventGroupName + '_' + new RelTime(samplingEvent.startTime).toString()).replaceAll("([ ]{1,})", "")
                                                         def tempSampleIterator = 0
@@ -1491 +1499 @@
                                 // set field value
                                 if (!(field.name == 'name' && !value)) {
-                                        println "setting "+field.name+" to "+value
+                                        log.info "setting "+field.name+" to "+value
                                         sample.setFieldValue(field.name, value)
                                 }
@@ -1506 +1514 @@
                                 errors = true
                                 this.appendErrors(sample, flash.wizardErrors, 'sample_' + sample.getIdentifier() + '_' )
-                                println 'error-> sample_'+sample.getIdentifier()
+                                log.info 'error-> sample_'+sample.getIdentifier()
                         }
                 }