Changeset 469 for trunk

Timestamp:

May 26, 2010, 12:10:54 PM (13 years ago)

Author:

duh

Message:

• bugfix #59, #60 & #61 --> all related to eachother
• refactored internal handling of storing, adding and deleting of subjects

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (5 diffs)
• views/wizard/pages/_groups.gsp (modified) (1 diff)
• views/wizard/pages/_subjects.gsp (modified) (2 diffs)

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

@@ -180 +180 @@
                                                 name: subjectTemplateName,
                                                 template: subjectTemplate,
-                                                subjects: []
+                                                subjects: [:]
                                         ]
                                 }
@@ -186 +186 @@
                                 // add x subjects of species y
                                 (params.addNumber as int).times {
-                                        def increment = flow.subjects.size()
+                                        def increment = (flow.subjects.size()) ? (flow.subjects.keySet().max() + 1) : 0
                                         def subject = new Subject(
                                                 name: 'Subject ' + (increment + 1),
@@ -197 +197 @@
 
                                         // and remember the subject id with the template
-                                        def subjectsSize = flow.subjectTemplates[ subjectTemplateName ]['subjects'].size()
-                                        flow.subjectTemplates[ subjectTemplateName ]['subjects'][ subjectsSize ] = increment
-                                }
+                                        def subjectsSize = (flow.subjectTemplates[ subjectTemplateName ].subjects.size()) ? (flow.subjectTemplates[ subjectTemplateName ].subjects.keySet().max() + 1) : 0
+                                        flow.subjectTemplates[ subjectTemplateName ].subjects[ subjectsSize ] = increment
+                                }
+println flow.subjects
+println flow.subjectTemplates
                         }.to "subjects"
                         on("next") {
@@ -222 +224 @@
                                 flash.errors = [:]
                                 def delete = params.get('do') as int;
+println "delete: "+delete
 
                                 // remove subject
                                 if (flow.subjects[ delete ] && flow.subjects[ delete ] instanceof Subject) {
+                                        // remove subject from templates
                                         flow.subjectTemplates.each() { templateName, templateData ->
-                                                templateData.subjects.remove(delete)
+                                                templateData.subjects.remove( delete )
+println flow.subjectTemplates
+println "max: "+templateData.subjects.keySet().max()
                                         }
 
+                                        // remove subject altogether
                                         flow.subjects.remove( delete )
+println flow.subjects
                                 }
                         }.to "subjects"
@@ -590 +598 @@
                 flow.subjectTemplates.each() { subjectTemplate ->
                         // iterate through subjects
-                        subjectTemplate.getValue().subjects.each() { subjectId ->
+                        subjectTemplate.getValue().subjects.each() { subjectIncrement, subjectId ->
                                 // iterate through fields (= template fields and domain properties)
                                 flow.subjects[ subjectId ].giveFields().each() { subjectField ->

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

@@ -25 +25 @@
                 </g:each></g:if>
         </div>
-<g:each var="subjectTemplate" in="${subjectTemplates}">
+<g:each var="sTemplate" in="${subjectTemplates}">
+  <g:set var="subjectTemplate" value="${sTemplate.getValue()}" />
   <g:set var="showHeader" value="${true}" />
-  <g:each var="subjectId" in="${subjectTemplate.getValue().subjects}">
+  <g:each var="sId" in="${subjectTemplate.subjects}">
+        <g:set var="subjectId" value="${sId.getValue()}" />
         <div class="row">
                 <div class="column">
                         <g:if test="${showHeader}">
                                 <g:set var="showHeader" value="${false}" />
-                                ${subjectTemplate.getValue().name} template
+                                ${subjectTemplate.name} template
                         </g:if>
                 </div>

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

@@ -39 +39 @@
 
 <g:if test="${subjects}">
-        <g:each var="subjectTemplate" in="${subjectTemplates}">
+        <g:each var="sTemplate" in="${subjectTemplates}">
                 <g:set var="showHeader" value="${true}" />
-                <h1>${subjectTemplate.getValue().name} template</h1>
+                <g:set var="subjectTemplate" value="${sTemplate.getValue()}" />
+                <h1>${subjectTemplate.name} template</h1>
                 <div class="table">
-                <g:each var="subjectId" in="${subjectTemplate.getValue().subjects}">
+                <g:each status="i" var="sId" in="${subjectTemplate.subjects}">
+                  <g:set var="subjectId" value="${sId.getValue()}" />
+                  <g:if test="${subjects[ subjectId ]}">
                         <g:if test="${showHeader}">
                         <g:set var="showHeader" value="${false}" />
@@ -59 +62 @@
                                 <wizard:templateColumns id="${subjectId}" entity="${subjects[ subjectId ]}" template="${subjects[ subjectId ].template}" name="subject_${subjectId}" class="column" subject="${subjects[ subjectId ]}" />
                         </div>
+                  </g:if>
                 </g:each>
                 </div>