Changeset 396 for trunk/grails-app/views

Timestamp:

May 7, 2010, 2:24:27 PM (12 years ago)

Author:

duh

Message:

• fixed incomplete implementation of domain fields (getters, setters and constrains logic were all not implemented correctly)
• refactored wizards pages
• TODO: constraints on (templated) domain fields are not working anymore, this needs to be implemented properly in TemplateEntity?

Location:

trunk/grails-app/views/wizard/pages

Files:

• _study.gsp (modified) (1 diff)
• _subjects.gsp (modified) (2 diffs)

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

@@ -25 +25 @@
                 The template to use for this study
         </wizard:templateElement>
-        <wizard:textFieldElement name="title" description="Title" error="title" value="${study?.title}">
-                The title of the study you are creating
-        </wizard:textFieldElement>
-        <wizard:dateElement name="startDate" description="Start date" error="startDate" value="${study?.startDate}">
-                The start date of the study
-        </wizard:dateElement>
         <g:if test="${study}"><wizard:templateElements entity="${study}" /></g:if>
 </wizard:pageContent>

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

@@ -38 +38 @@
 <g:if test="${subjects}">
         <g:each var="subjectTemplate" in="${subjectTemplates}">
+                <g:set var="showHeader" value="${true}" />
                 <h1>${subjectTemplate.getValue().name} template</h1>
                 <div class="table">
+                <g:each var="subjectId" in="${subjectTemplate.getValue().subjects}">
+                        <g:if test="${showHeader}">
+                        <g:set var="showHeader" value="${false}" />
                         <div class="header">
                                 <div class="firstColumn">#</div>
                                 <div class="firstColumn"></div>
-                                <div class="column">name</div>
-                                <div class="column">species</div>
-                                <wizard:templateColumnHeaders template="${subjectTemplate.getValue().template}" class="column" />
+                                <wizard:templateColumnHeaders entity="${subjects[ subjectId ]}" class="column" />                               
                         </div>
-                <g:each var="subjectId" in="${subjectTemplate.getValue().subjects}">
+                        </g:if>
                         <div class="row">
                                 <div class="firstColumn">${subjectId + 1}</div>
@@ -53 +55 @@
                                         <wizard:ajaxButton name="delete" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${subjectId});" afterSuccess="onWizardPage()" />
                                 </div>
-                                <div class="column"><g:textField name="subject_${subjectId}_name" value="${subjects[ subjectId ].name}" size="12" maxlength="12" /></div>
-                                <div class="column">
-                                        <wizard:termSelect value="${subjects[ subjectId ].species}" name="subject_${subjectId}_species" ontology="1132" />
-                                </div>
-                                <wizard:templateColumns id="${subjectId}" entity="${subjects[ subjectId ]}" template="${subjects[ subjectId ].template}" name="subject_${subjectId}" class="column" subject="${subjects[ subjectId ]}" />                               
+                                <wizard:templateColumns id="${subjectId}" entity="${subjects[ subjectId ]}" template="${subjects[ subjectId ].template}" name="subject_${subjectId}" class="column" subject="${subjects[ subjectId ]}" />
                         </div>
                 </g:each>