Changeset 1609 for trunk/grails-app/views/simpleWizard/simpleWizard

Timestamp:

Mar 9, 2011, 5:28:45 PM (11 years ago)

Author:

robert@…

Message:

Improved simple editing wizard

Location:

trunk/grails-app/views/simpleWizard/simpleWizard

Files:

• columns.gsp (modified) (1 diff)
• missingFields.gsp (modified) (1 diff)
• samples.gsp (modified) (2 diffs)

trunk/grails-app/views/simpleWizard/simpleWizard/columns.gsp

@@ -59 +59 @@
                                                                                                 %>
                                                                                                 <g:each in="${allFields}" var="field">
-                                                                                                        <% 
-                                                                                                                def value = entityTemplates.key + "||" + field.name
-                                                                                                                def selected = ( value == selectedValue );
-                                                                                                        %>
-                                                                                                        <option value="${value}" <g:if test="${selected}">selected="selected"</g:if>>
-                                                                                                                ${field.name} <g:if test="${field.preferredIdentifier}">[identifier]</g:if>
+                                                                                                        <g:if test="${field}">
+                                                                                                                <% 
+                                                                                                                        def value = entityTemplates.key + "||" + field.name
+                                                                                                                        def selected = ( value == selectedValue );
+                                                                                                                %>
+                                                                                                                <option value="${value}" <g:if test="${selected}">selected="selected"</g:if>>
+                                                                                                                        ${field.name} <g:if test="${field.preferredIdentifier}">[identifier]</g:if>
+                                                                                                                </option>
+                                                                                                        </g:if>
                                                                                                         
                                                                                                 </g:each>

trunk/grails-app/views/simpleWizard/simpleWizard/missingFields.gsp

@@ -31 +31 @@
                                 <g:if test="${imported.errors}">
                                         <br /><br />The following errors occurred:<br />
-                                        <g:each in="${imported.errors}" var="err">
+                                        <g:each in="${imported.errors.unique()}" var="err">
                                                 ${err}<br />
                                         </g:each>

trunk/grails-app/views/simpleWizard/simpleWizard/samples.gsp

@@ -48 +48 @@
                                             </td>
                                             <td>
-                                                        <g:select rel="template" entity="${encodedEntity.Sample}" name="sample_template_id" optionKey="id" optionValue="name" from="${templates.Sample}"/>
+                                                        <g:select rel="template" entity="${encodedEntity.Sample}" name="sample_template_id" optionKey="id" optionValue="name" from="${templates.Sample}" value="${sampleForm?.templateId?.Sample}"/>
                                             </td>
                                         </tr>
@@ -56 +56 @@
                                             </td>
                                             <td>
-                                                        <g:select rel="template" entity="${encodedEntity.Subject}" name="subject_template_id" optionKey="id" optionValue="name" from="${templates.Subject}"/>
+                                                        <g:select rel="template" entity="${encodedEntity.Subject}" name="subject_template_id" noSelection="${[null: '- no subject template -']}" optionKey="id" optionValue="name" from="${templates.Subject}"  value="${sampleForm?.templateId?.Subject}" />
                                             </td>
-                                        </tr>                                   
+                                        </tr>
+
+                                        <tr>
+                                            <td>
+                                                <div id="datatemplate">Choose type of sampling event template:</div>
+                                            </td>
+                                            <td>
+                                                        <g:select rel="template" entity="${encodedEntity.SamplingEvent}" name="samplingEvent_template_id" noSelection="${[null: '- no sampling event template -']}" optionKey="id" optionValue="name" from="${templates.SamplingEvent}"  value="${sampleForm?.templateId?.SamplingEvent}" />
+                                            </td>
+                                        </tr>           
                                 </table>        
                         </div>