Changeset 138

Timestamp:

Jan 26, 2010, 4:46:01 PM (13 years ago)

Author:

duh

Message:

• added development version of wizard subjects page and logic
• modified some domain classes (again, who reverted them?) to implement Serializable

Location:

trunk

Files:

• grails-app/conf/BootStrap.groovy (modified) (1 diff)
• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (6 diffs)
• grails-app/domain/dbnp/data/Term.groovy (modified) (1 diff)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/studycapturing/Subject.groovy (modified) (2 diffs)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (4 diffs)
• grails-app/views/wizard/pages/_subjects.gsp (moved) (moved from trunk/grails-app/views/wizard/pages/_two.gsp) (2 diffs)
• grails-app/views/wizard/pages/_three.gsp (modified) (1 diff)
• web-app/css/wizard.css (modified) (1 diff)

trunk/grails-app/conf/BootStrap.groovy

@@ -18 +18 @@
 class BootStrap {
         def init = {servletContext ->
+                // define timezone
+                System.setProperty('user.timezone', 'CET')      
 
                 if (GrailsUtil.environment == GrailsApplication.ENV_DEVELOPMENT) {

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

@@ -2 +2 @@
 
 import dbnp.studycapturing.*
+import dbnp.data.*
 import grails.converters.*
 
@@ -49 +50 @@
                         flow.pages = [
                                 [title: 'Study'],               // study
-                                [title: 'Twoooo'],
-                                [title: 'Trois']
+                                [title: 'Subjects'],    // subjects
+                                [title: 'Form elements demo page']
                         ]
 
@@ -75 +76 @@
                         }
                         on("next") {
+                                // create date instance from date string?
+                                // @see WizardTagLibrary::dateElement{...}
+                                if (params.get('startDate')) {
+                                        params.startDate = new Date().parse("d/M/yyyy", params.get('startDate').toString())
+                                }
+
                                 // create a study instance
                                 flow.study = new Study(params)
@@ -80 +87 @@
                                 // validate study
                                 if (flow.study.validate()) {
+                                        println "ok"
                                         success()
                                 } else {
@@ -87 +95 @@
                                         error()
                                 }
-                        }.to "pageTwo"
+                        }.to "subjects"
                 }
 
                 // render page two
-                pageTwo {
-                        render(view: "_two")
+                subjects {
+                        render(view: "_subjects")
                         onRender {
-                                println "render page two"
                                 flow.page = 2
+
+                                if (!flow.subjects) {
+                                        flow.subjects = new LinkedHashMap()
+                                }
                         }
+                        on ("add") {
+                                def speciesTerm = Term.findByName(params.addSpecies)
+                                
+                                // add x subject of species y
+                                (params.addNumber as int).times {
+                                        def increment = flow.subjects.size()
+                                        flow.subjects[ increment ] = new Subject(
+                                                name: 'Subject ' + (increment+1),
+                                                species: speciesTerm
+                                        )
+                                }
+                        }.to "subjects"
                         on("next") {
-                                println "next page!"
+                                // got one or more subjects?
+                                if (flow.subjects.size() < 1) {
+                                        error()
+                                }
                         }.to "pageThree"
                         on("previous") {
-                                println "previous page!"
+                                // handle data?
+                                // go to study page
                         }.to "study"
                 }
@@ -114 +141 @@
                         on("previous") {
                                 println "previous page!"
-                        }.to "pageTwo"
+                        }.to "subjects"
                 }
         }

trunk/grails-app/domain/dbnp/data/Term.groovy

@@ -7 +7 @@
  * The Term object should point to an existing term in an online ontology, therefore instances of this class can also
  * be seen as a cache of elements of the external ontology.
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
  */
-class Term {
+class Term implements Serializable {
+        String name
+        Ontology ontology
+        String accession
 
-    String name
-    Ontology ontology
-    String accession
+        static constraints = {
+        }
 
-    static constraints = {
-    }
-
-  def String toString() {
-    return name
-  }
-
-
+        def String toString() {
+                return name
+        }
 }

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

@@ -9 +9 @@
  * $Date$
  */
-class Study {
+class Study implements Serializable {
         nimble.User owner
         String title
@@ -21 +21 @@
         Template template
 
-        static hasMany = [      editors:                nimble.User,
-                                readers:                nimble.User,
-                                subjects:               Subject,
-                                groups:                 SubjectGroup,
-                                events:                 Event,
-                                samplingEvents: SamplingEvent
+        static hasMany = [      editors: nimble.User,
+                                                readers: nimble.User,
+                                                subjects: Subject,
+                                                groups: SubjectGroup,
+                                                events: Event,
+                                                samplingEvents: SamplingEvent
         ]
 

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

@@ -1 +1 @@
 package dbnp.studycapturing
-
 import dbnp.data.Term
 
 /**
  * This domain class describes the subjects in a study.
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
  */
-class Subject {
-
+class Subject implements Serializable {
         String name
         Term species
@@ -16 +19 @@
 
         static hasMany = [
-                templateStringFields : String,
-                templateNumberFields : float,
-                templateStringListFields : String,
-                templateTermFields : Term
+                templateStringFields: String,
+                templateNumberFields: float,
+                templateStringListFields: String,
+                templateTermFields: Term
         ]
-        
+
         static constraints = {
         }

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

@@ -2 +2 @@
 
 import org.codehaus.groovy.grails.plugins.web.taglib.JavascriptTagLib
+import dbnp.data.Term
 
 /**
@@ -90 +91 @@
 
                 // replace double semi colons
-                button = button.replaceAll(/;{2,}/, '!!!')
+                button = button.replaceAll(/;{2,}/, ';')
                 
                 // render button
@@ -236 +237 @@
          */
         def dateElement = { attrs, body ->
+                // transform value?
+                if (attrs.value instanceof Date) {
+                        // transform date instance to formatted string (dd/mm/yyyy)
+                        attrs.value = String.format('%td/%<tm/%<tY', attrs.value)
+                }
+                
                 // set some textfield values
                 attrs.maxlength = 10
@@ -246 +253 @@
                 out << '<script type="text/javascript">'
                 out << '$(document).ready(function() {'
-                out << '        $("#' + attrs.get('name') + '").datepicker({altField: \'#' + attrs.get('name') + 'Example\', altFormat: \'DD, d MM, yy\'});'
+                out << '        $("#' + attrs.get('name') + '").datepicker({'
+                out << '                dateFormat: \'dd/mm/yy\','
+                out << '                altField: \'#' + attrs.get('name') + 'Example\', altFormat: \'DD, d MM, yy\''
+                out << '        });'
                 out << '});'
                 out << '</script>'
         }
+
+        /**
+         * render a species select element
+         * @param Map attrs
+         * @param Closure body (help text)
+         */
+        def speciesSelect = { attrs, body ->
+                // fetch all species
+                attrs.from = Term.findAll()     // for now, all terms, should be refactored to be species ontology only!
+
+                // got a name?
+                if (!attrs.name) {
+                        attrs.name = 'species'
+                }
+
+                out << select(attrs)
+        }
 }

trunk/grails-app/views/wizard/pages/_subjects.gsp

@@ -1 +1 @@
 <%
 /**
- * Wizard page two
+ * Subjects page
  *
  * @author  Jeroen Wesbeek
@@ -16 +16 @@
 %>
 <wizard:pageContent>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sodales porta enim, sed ornare sapien molestie mollis. Maecenas at pretium turpis. Duis fermentum lectus vitae nisl venenatis id hendrerit sapien dictum. Duis blandit ornare augue nec porttitor. Quisque at tortor sapien, ac volutpat sem. Nullam venenatis placerat risus a euismod. Donec massa dui, porttitor sed fermentum eu, ornare ac velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In id odio nisl, non semper neque. Vivamus facilisis, neque sed lacinia blandit, odio nisi sagittis turpis, accumsan iaculis tellus magna at velit. In sed turpis metus. Phasellus id sem eget dui sollicitudin ultrices. Duis cursus vehicula diam vel pharetra. Donec mattis libero eget tortor venenatis at cursus felis scelerisque. Nunc hendrerit metus quis leo sollicitudin sodales. In urna quam, aliquet in eleifend eget, rutrum tempor elit.</p>
-
-  <p>Suspendisse magna mauris, pretium eget elementum sed, aliquam nec neque. Nam et lorem lacus. Phasellus dapibus, erat nec tristique commodo, turpis tellus tempor est, tincidunt dignissim urna tortor at dui. Nulla faucibus, velit in lobortis venenatis, neque sapien lobortis neque, ut varius sem tortor id purus. Duis posuere condimentum ante, quis mattis arcu fringilla quis. Vivamus in augue tellus, posuere mattis nisl. Praesent sit amet ligula a turpis ullamcorper elementum non quis felis. Nulla elit ipsum, viverra ut cursus at, pharetra eget nibh. Vivamus mauris velit, elementum eu ornare vitae, imperdiet id velit. Phasellus sit amet mi vel est lobortis sagittis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. </p>
+<wizard:ajaxButton name="add" value="Add" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="attachHelpTooltips()" />
+<input name="addNumber" size="4" maxlength="4" value="1">
+subjects of species
+<wizard:speciesSelect name="addSpecies" />
+<g:if test="${subjects}">
+<div class="subjects">
+<g:each var="subject" status="i" in="${subjects}">
+        <div class="subject<g:if test="${i>0}"> topborder</g:if>">
+                <div class="row">subject ${i}</div>
+                <div class="row">${subject}</div>
+        </div>
+</g:each>
+</div>
+</g:if>
 </wizard:pageContent>

trunk/grails-app/views/wizard/pages/_three.gsp

@@ -30 +30 @@
                 <p>Nullam a blandit quam. Cras porta tempus lectus, vel varius lacus vulputate in. Aenean ac nunc lectus, hendrerit tempor elit. Sed ut varius diam.</p>
         </wizard:textFieldElement>
+        <wizard:dateElement name="startDate" description="Date element" error="startDate" value="${study?.startDate}">
+                <object width="320" height="265"><param name="movie" value="http://www.youtube.com/v/2WNrx2jq184&hl=en_US&fs=1&rel=0"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/2WNrx2jq184&hl=en_US&fs=1&rel=0" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="320" height="265"></embed></object>
+        </wizard:dateElement>
 </wizard:pageContent>

trunk/web-app/css/wizard.css

@@ -122 +122 @@
     display: none;
 }
+
+.wizard .subjects {
+    display: block;
+    /*
+    background-color: #c0ddea;
+    border: 1px solid #575a5d;
+    margin-top: 2px;
+    */
+    border: 1px solid #575a5d;
+    background-color: #ebf7fc;
+    margin-top: 10px;
+}
+
+.wizard .subjects .subject {
+    display: block;
+}
+
+.wizard .topborder {
+    border-top: 1px solid #8e908f;
+}
+
+.wizard .subjects .subject .row {
+    display: inline-block;
+    /*
+    border: 1px solid #575a5d;
+    margin: 1px 1px 0px 0px;
+    */
+}