Changeset 1775

Timestamp:

Apr 19, 2011, 4:12:15 PM (9 years ago)

Author:

work@…

Message:

• resolves #400, study should contain at least one contact

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (3 diffs)
• domain/dbnp/studycapturing/Study.groovy (modified) (1 diff)
• i18n/messages.properties (modified) (1 diff)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (2 diffs)
• views/studyWizard/pages/_study.gsp (modified) (2 diffs)

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

@@ -1261 +1261 @@
         def handlePublications(flow, flash, params) {
                 flash.wizardErrors      = [:]
-                handleStudyPublications( flow.study, params );
+                handleStudyPublications( flow.study, params )
         }
 
@@ -1274 +1274 @@
                 flash.wizardErrors      = [:]
 
-                handleStudyContacts( flow.study, params );
+                handleStudyContacts( flow.study, params )
         }
 
@@ -1287 +1287 @@
         def handleUsers(flow, flash, params, type) {
                 flash.wizardErrors = [:]
-                handleStudyUsers( flow.study, params, type );
+                handleStudyUsers( flow.study, params, type )
         }
         

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

@@ -56 +56 @@
                 code(nullable: true, blank: true, unique: true, maxSize: 255)
                 studyUUID(nullable:true, unique:true, maxSize: 255)
+                persons(size:1..1000)
                 // TODO: add custom validator for 'published' to assess whether the study meets all quality criteria for publication
                 // tested by SampleTests.testStudyPublish

trunk/grails-app/i18n/messages.properties

@@ -59 +59 @@
 select.not.selected=You need to select a {0}
 select.not.selected.or.add=You need to select a {0}, or add one if it is not yet present
+dbnp.studycapturing.Study.persons.size.error=You need to add at least one contact to your study
 
 # TemplateEntity errors

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -204 +204 @@
 
         def ContactSelectElement = { attrs, body ->
-
                 attrs.description = 'Contacts';
+
                 // render list with publications currently available
+                attrs['required']='true'
                 baseElement.call(
                         '_contactList',
@@ -212 +213 @@
                         body
                 )
-
-                attrs.description = '';
-
-                // render 'publications list'
+                attrs.required          = false
+                attrs.description       = '';
+
+                // render 'constacts list'
                 out << '<div id="' + attrs.name + '_dialog" class="contacts_dialog" style="display: none;">'
                 baseElement.call(

trunk/grails-app/views/studyWizard/pages/_study.gsp

@@ -23 +23 @@
         </span>
 
-        <af:templateElement name="template" description="Template" value="${study?.template}" entity="${dbnp.studycapturing.Study}" addDummy="true" ajaxOnChange="switchTemplate" afterSuccess="onPage()">
+        <af:templateElement name="template" description="Template" value="${study?.template}" entity="${dbnp.studycapturing.Study}" addDummy="true" ajaxOnChange="switchTemplate" afterSuccess="onPage()" required="true" >
                 Choose the type of study you would like to create.
                 Depending on the chosen template specific fields can be filled out. If none of the templates contain all the necessary fields, a new template can be defined (based on other templates).
@@ -30 +30 @@
                 <af:templateElements entity="${study}"/>
                 <af:publicationSelectElement name="publication" value="${study?.publications}"/>
-                <af:contactSelectElement name="contacts" value="${study?.persons}"/>
+                <af:contactSelectElement name="contacts" value="${study?.persons}" />
                 <br/>
                 <div class="element">