Changeset 1040

Timestamp:

Nov 1, 2010, 6:11:23 PM (12 years ago)

Author:

j.a.m.wesbeek@…

Message:

• made column widths changeable by adding:

columnWidths="[Name:200, Species: 150, MyColumnName: 300]"

where the key is the CamelCased? column name without spaces (and info)
resolves issue #152

Location:

trunk

Files:

• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (3 diffs)
• grails-app/views/wizard/pages/_groups.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_subjects.gsp (modified) (1 diff)
• web-app/js/wizard.js (modified) (3 diffs)

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -20 +20 @@
  */
 class WizardTagLib extends JavascriptTagLib {
-
-        def AuthenticationService
+        def AuthenticationService
         
         // define the tag namespace (e.g.: <wizard:action ... />
@@ -853 +852 @@
                 def entity              = (attrs.get('entity'))
                 def template    = (entity && entity instanceof TemplateEntity) ? entity.template : null
+                def columnWidths= (attrs.get('columnWidths')) ? attrs.remove('columnWidths') : []
 
                 // got a template?
@@ -867 +867 @@
                                 }
 
-                                out << '<div class="' + attrs.get('class') + '">' + ucName + (it.unit ? " (${it.unit})" : '')
+                                // strip spaces
+                                def ucNameSpaceless = ucName.replaceAll(/ /) { '' }
+
+                                // do we have to use a specific width for this column?
+                                if (columnWidths[ucName]) {
+                                        out << '<div class="' + attrs.get('class') + '" style="width:' + columnWidths[ucNameSpaceless] + 'px;" rel="resized">' + ucName + (it.unit ? " (${it.unit})" : '')
+                                } else {
+                                        out << '<div class="' + attrs.get('class') + '">' + ucName + (it.unit ? " (${it.unit})" : '')
+                                }
                                 if (it.comment) {
                                         out << '<div class="helpIcon"></div>'

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

@@ -26 +26 @@
                 <div class="header">
                         <div class="column">Template</div>
-                        <div class="column">Subjects</div>
+                        <div class="column" style="width:150px;" rel="resized">Subjects</div>
                         <g:if test="${study.eventGroups}"><g:each var="eventGroup" in="${study.eventGroups}">
                                 <div class="column">

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

@@ -50 +50 @@
                                 <div class="header">
                                   <div class="firstColumn"></div>
-                                  <wizard:templateColumnHeaders class="column" entity="${subject}" />
+                                  <wizard:templateColumnHeaders class="column" entity="${subject}" columnWidths="[Name:200, Species: 150]" />
                                 </div>
                                 </g:if>

trunk/web-app/js/wizard.js

@@ -248 +248 @@
         var column = 0;
         var columns = [];
+        var resized = [];
 
         // calculate total width of elements in header
@@ -265 +266 @@
 
             // remember column
+            resized[ column ] = (c.attr('rel') == 'resized');
             columns[ column ] = c.width();
             column++;
@@ -278 +280 @@
             var column = 0;
             row.children().each(function() {
-                $(this).css({ width: columns[ column] + 'px' });
+                var child = $(this);
+                child.css({ width: columns[ column] + 'px' });
+                if (resized[ column ]) {
+                    $(':input',child).each(function() {
+                        $(this).css({width: (columns[ column ] - 10) + 'px'});
+                    });
+                }
                 column++;
             });