Changeset 694

Timestamp:

Jul 22, 2010, 1:25:03 PM (13 years ago)

Author:

duh

Message:

• enabled samples page
• remove samples from study when user browses back

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (3 diffs)
• views/wizard/pages/_samples.gsp (modified) (2 diffs)

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

@@ -648 +648 @@
                         onRender {
                                 flow.page = 6
+
+                                // TEMPORARY FIX TO REMOVE ALL SAMPLES AND REGENERATE THEM
+                                // THEN USER BROWSED BACK
+                                println ".removing samples from study"
+
+                                // remove samples from study
+                                flow.samples.each() {
+                                        flow.study.removeFromSamples(it.sample)
+                                }
+
+                                // remove samples from flow
+                                flow.remove('samples')
+                                // END FIX
                         }
                         on("next").to "samples"
@@ -659 +672 @@
                                 flow.page = 6
 
-// for now, development only!
-if (grails.util.GrailsUtil.environment == "development") {
                                 // iterate through eventGroups
                                 if (!flow.samples) {
+                                        println ".generating samples"
                                         flow.samplesWithTemplate = 0
                                         flow.samples = []
@@ -704 +716 @@
                                         }
                                 }
-}
 
                                 success()

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

@@ -16 +16 @@
 %>
 <wizard:pageContent>
-
-<g:if env="production">
-
-        <span class="info">
-                <span class="title">Samples</span>
-                The sample input page is still under development and is not yet
-                production ready... We appologize for the inconvenience.
-        </span>
-
-</g:if><g:else>
-
 
         <g:if env="development">
@@ -97 +86 @@
                         </div>
                 </g:each>
-        </g:if>
-
-</g:else>
-        
+        </g:if> 
 </wizard:pageContent>