Changeset 863

Timestamp:

30-08-10 17:22:25 (4 years ago)

Author:

duh

Message:

- added method to properly delete Assays from study

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (4 diffs)
• domain/dbnp/studycapturing/Study.groovy (modified) (1 diff)

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

@@ -670 +670 @@
                         }.to "assays"
                         on("deleteAssay") {
+                                println params
+                                
                                 // handle form data
                                 assayPage(flow, flash, params)
@@ -694 +696 @@
                                 // handle form data
                                 assayPage(flow, flash, params) ? success() : error()
-                        }.to "assayGroups"
+                        }.to "assayNext"
                         on("quickSave") {
                                 // handle form data
                                 assayPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                }
+
+                // assayNext
+                assayNext {
+                        action {
+                                // have we got samples and assays?
+                                if (flow.study.assays && flow.study.samples) {
+                                        // yes, go to the group page
+                                        toAssayGroups()
+                                } else {
+                                        // no need to show the group page as
+                                        // there's nothing to group
+                                        toConfirm()
+                                }
+                        }
+                        on("toAssayGroups").to "assayGroups"
+                        on("toConfirm").to "confirm"
                 }
 
@@ -726 +745 @@
                 }
 
+                // confirm Previous
+                confirmPrevious {
+                        action {
+                                // have we got samples and assays?
+                                if (flow.study.assays && flow.study.samples) {
+                                        // yes, go to the group page
+                                        toAssayGroups()
+                                } else {
+                                        // no need to show the group page as
+                                        // there's nothing to group
+                                        toAssays()
+                                }
+                        }
+                        on("toAssayGroups").to "assayGroups"
+                        on("toAssays").to "assays"
+                }
+
                 // confirmation
                 confirm {
@@ -736 +772 @@
                         on("toEvents").to "events"
                         on("toGroups").to "groups"
-                        on("previous").to "samples"
+                        on("toSamples").to "samples"
+                        on("toAssays").to "assays"
+                        on("toAssayGroups").to "assayGroups"
+                        on("previous").to "confirmPrevious"
                         on("next").to "waitForSave"
                         on("quickSave").to "waitForSave"

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

@@ -227 +227 @@
          */
         def deleteAssay(Assay assay) {
-                // remove this assay from the study
-                this.removeFromAssays( assay )
+                if (assay && assay instanceof Assay) {
+                        // iterate through linked samples
+                        assay.samples.findAll { true }.each() { sample ->
+                                assay.removeFromSamples(sample)
+                        }
+
+                        // remove this assay from the study
+                        this.removeFromAssays(assay)
+
+                        // and delete it explicitly
+                        assay.delete()
+                }
         }