Changeset 216 for trunk/grails-app

Timestamp:

Feb 26, 2010, 3:23:03 PM (13 years ago)

Author:

duh

Message:

• event grouping data is now handled properly
• added image support to ajaxButton which now renders to an "input type='image'" instead of the default "input type='button'"
• changed some in grouping to famfamfam icons
• evenGroup deletions
• eventGroup names are now uniquely generated
• improved CSS
• improved javascript

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (11 diffs)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (2 diffs)
• views/wizard/common/_wizard.gsp (modified) (1 diff)
• views/wizard/pages/_events.gsp (modified) (3 diffs)

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

@@ -52 +52 @@
                                 [title: 'Event Descriptions'],  // event descriptions
                                 [title: 'Events'],                              // events
-                                [title: 'Confirmation'],        // confirmation page
+                                [title: 'Confirmation'],                // confirmation page
                                 [title: 'Done']                                 // finish page
                         ]
@@ -271 +271 @@
 
                                 // get eventDescription instance by name
-                                params.eventDescription = this.getObjectByName(params.get('eventDescription'),flow.eventDescriptions)
+                                params.eventDescription = this.getObjectByName(params.get('eventDescription'), flow.eventDescriptions)
 
                                 // instantiate Event with parameters
                                 def event = new Event(params)
+
+                                // handle event groupings
+                                this.handleEventGrouping(flow, flash, params)
 
                                 // validate event
@@ -287 +290 @@
                                         this.appendErrors(event, flash.errors)
 
-                                        flash.startTime                 = params.startTime
-                                        flash.endTime                   = params.endTime
-                                        flash.eventDescription  = params.eventDescription
-                                        
+                                        flash.startTime = params.startTime
+                                        flash.endTime = params.endTime
+                                        flash.eventDescription = params.eventDescription
+
                                         error()
                                 }
@@ -296 +299 @@
                         on("addEventGroup") {
                                 def increment = flow.eventGroups.size()
-                                flow.eventGroups[ increment ] = new EventGroup(name: "Group "+(increment+1))
+                                def groupName = "Group " + (increment + 1)
+
+                                // check if group name exists
+                                def nameExists = true
+                                def u = 0
+
+                                // make sure a unique name is generated
+                                while (nameExists) {
+                                        u++
+                                        def count = 0
+                                        
+                                        flow.eventGroups.each() {
+                                                if (it.name == groupName) {
+                                                        groupName = "Group " + (increment + 1) + "," + u
+                                                } else {
+                                                        count++
+                                                }
+                                        }
+
+                                        nameExists = !(count == flow.eventGroups.size())
+                                }
+
+                                flow.eventGroups[increment] = new EventGroup(name: groupName)
+                        }.to "events"
+                        on("deleteEventGroup") {
+                                def delete = params.get('do') as int;
+
+                                // handle event groupings
+                                this.handleEventGrouping(flow, flash, params)
+
+                                // remove the group with this specific id
+                                if (flow.eventGroups[delete] && flow.eventGroups[delete] instanceof EventGroup) {
+                                        // remove this eventGroup
+                                        flow.eventGroups.remove(delete)
+                                }
                         }.to "events"
                         on("previous") {
-                                // TODO
+                                // handle event groupings
+                                this.handleEventGrouping(flow, flash, params)
                         }.to "eventDescriptions"
                         on("next") {
                                 flash.errors = new LinkedHashMap()
+
+                                // handle event groupings
+                                this.handleEventGrouping(flow, flash, params)
 
                                 // check if we have at least one subject
@@ -312 +353 @@
                                         error()
                                 }
-                        }.to "confirm"
+                        }.to "events"
                 }
 
@@ -338 +379 @@
                                 // TODO
                         }.to "confirm"
+                }
+        }
+
+        /**
+         * re-usable code for handling event grouping in a web flow
+         * @param Map LocalAttributeMap (the flow scope)
+         * @param Map localAttributeMap (the flash scope)
+         * @param Map GrailsParameterMap (the flow parameters = form data)
+         * @returns boolean
+         */
+        def handleEventGrouping(flow, flash, params) {
+                // walk through eventGroups
+                def g = 0
+                flow.eventGroups.each() {
+                        def e = 0
+                        def eventGroup = it
+
+                        // reset events
+                        eventGroup.events = new HashSet()
+
+                        // walk through events
+                        flow.events.each() {
+                                if (params.get('event_' + e + '_group_' + g) == 'on') {
+                                        eventGroup.addToEvents(it)
+                                        //} else {
+                                        //      eventGroup.events.minus(it)
+                                }
+                                e++
+                        }
+                        g++
                 }
         }
@@ -396 +467 @@
 
                 flow.eventDescriptions.each() {
-                        it.name                         = params.get('eventDescription_' + id + '_name')
-                        it.description          = params.get('eventDescription_' + id + '_description')
-                        it.classification       = Term.findByName(params.get('eventDescription_' + id + '_classification'))
-                        it.isSamplingEvent      = (params.containsKey('eventDescription_' + id + '_isSamplingEvent'))
+                        it.name = params.get('eventDescription_' + id + '_name')
+                        it.description = params.get('eventDescription_' + id + '_description')
+                        it.classification = Term.findByName(params.get('eventDescription_' + id + '_classification'))
+                        it.isSamplingEvent = (params.containsKey('eventDescription_' + id + '_isSamplingEvent'))
 
                         // validate eventDescription
@@ -443 +514 @@
                                         // yeah, also mention the first
                                         // occurrence in the error message
-                                        this.appendErrorMap(name: 'The subject name needs to be unique!', flash.errors, 'subject_'+names[it.name]['firstId']+'_')
+                                        this.appendErrorMap(name: 'The subject name needs to be unique!', flash.errors, 'subject_' + names[it.name]['firstId'] + '_')
                                 }
 
                                 // add to error map
-                                this.appendErrorMap([name: 'The subject name needs to be unique!'], flash.errors, 'subject_'+id+'_')
+                                this.appendErrorMap([name: 'The subject name needs to be unique!'], flash.errors, 'subject_' + id + '_')
                                 errors = true
                         }
@@ -502 +573 @@
         }
 
-
         /**
          * return the object from a map of objects by searching for a name
-         * @param String        name
-         * @param Map           map of objects
+         * @param String name
+         * @param Map map of objects
          * @return Object
          */
@@ -545 +615 @@
                 this.appendErrorMap(this.getHumanReadableErrors(object), map)
         }
+
         def appendErrors(object, map, prepend) {
                 this.appendErrorMap(this.getHumanReadableErrors(object), map, prepend)
@@ -560 +631 @@
                 }
         }
+
         def appendErrorMap(map, mapToExtend, prepend) {
                 map.each() {key, value ->

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

@@ -55 +55 @@
                 // javascript function to call after success
                 def afterSuccess = attrs['afterSuccess']
+
+                // src parameter?
+                def src = attrs['src']
+                def alt = attrs['alt']
 
                 // generate a normal submitToRemote button
@@ -89 +93 @@
                 if (afterSuccess) {
                         button = button.replaceFirst(/\.html\(data\)\;/, '.html(data);' + afterSuccess + ';')
+                }
+
+                // got an src parameter?
+                if (src) {
+                        def replace = 'type="image" src="' + src + '"'
+
+                        if (alt) replace = replace + ' alt="' + alt + '"'
+
+                        button = button.replaceFirst(/type="button"/, replace)
                 }
 

trunk/grails-app/views/wizard/common/_wizard.gsp

@@ -18 +18 @@
         <h1>Create a new study</h1>
         <g:form action="pages" name="wizardForm" id="wizardForm">
+        <g:hiddenField name="do" value="" />
                 <div id="wizardPage">
                         <wizard:ajaxFlowRedirect form="form#wizardForm" name="next" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />

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

@@ -45 +45 @@
                         <div class="column">duration</div>
                         <g:if test="${eventGroups}"><g:each var="eventGroup" status="i" in="${eventGroups}">
-                        <div class="column"><g:textField name="eventGroup_${i}_name" value="${eventGroup.name}" /></div>
+                        <div class="column">
+                                <g:textField name="eventGroup_${i}_name" value="${eventGroup.name}" />
+                                <wizard:ajaxButton name="deleteEventGroup" src="../images/icons/famfamfam/delete.png" alt="delete this eventgroup" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${i});" afterSuccess="onWizardPage()" />
+                        </div>
                         </g:each></g:if>
-                        <div class="column"><wizard:ajaxButton name="addEventGroup" value="+" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" /></div>
+                        <div class="column">
+                                <wizard:ajaxButton name="addEventGroup" src="../images/icons/famfamfam/add.png" alt="add a new eventgroup" class="famfamfam" value="+" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
+                        </div>
                 </div>
         <g:each var="event" status="i" in="${events}">
@@ -57 +62 @@
                         <div class="column">${event.getShortDuration()}</div>
                         <g:if test="${eventGroups}"><g:each var="eventGroup" status="j" in="${eventGroups}">
-                        <div class="column"><input type="checkbox" name="event_${i}_group_${j}"/></div>
+                        <div class="column">
+                                <g:if test="${eventGroup.events.find{ it == event} }">
+                                        <input type="checkbox" name="event_${i}_group_${j}" checked="checked" />
+                                </g:if><g:else>
+                                        <input type="checkbox" name="event_${i}_group_${j}"/>
+                                </g:else>
+                        </div>
                         </g:each></g:if>
                         <div class="column"></div>
@@ -63 +74 @@
         </g:each>
         </div>
+        <div class="sliderContainer">
+                <div class="slider"/>
+        </div>
 </g:if>
 </wizard:pageContent>