Changeset 262

Timestamp:

Mar 12, 2010, 5:42:19 PM (11 years ago)

Author:

duh

Message:

• some bug fixes, improvements and comments

Location:

trunk

Files:

• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (3 diffs)
• grails-app/views/wizard/pages/_confirmation.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_demo.gsp (added)
• grails-app/views/wizard/pages/_done.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_eventDescriptions.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_events.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_start.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_study.gsp (modified) (2 diffs)
• grails-app/views/wizard/pages/_subjects.gsp (modified) (2 diffs)
• web-app/css/wizard.css (modified) (1 diff)
• web-app/images/icons/famfamfam/new.png (added)
• web-app/images/icons/famfamfam/wrench.png (added)
• web-app/images/icons/famfamfam/wrench_orange.png (added)
• web-app/images/icons/famfamfam/zoom.png (added)
• web-app/images/icons/famfamfam/zoom_in.png (added)
• web-app/images/icons/famfamfam/zoom_out.png (added)
• web-app/js/ontology-chooser.js (modified) (1 diff)
• web-app/js/table-editor.js (modified) (1 diff)

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

@@ -631 +631 @@
                                 case 'ONTOLOGYTERM':
                                         // @see http://www.bioontology.org/wiki/index.php/NCBO_Widgets#Term-selection_field_on_a_form
-                                        // @see table-editor.js
+                                        // @see ontology-chooser.js, table-editor.js
                                         //out << it.getClass()
                                         out << textField(
@@ -638 +638 @@
                                                 rel: 'ontology-all-name',
                                                 size: 100
+                                        )
+                                        out << hiddenField(
+                                                name: attrs.name + '_' + it.name + '-concept_id'
+                                        )
+                                        out << hiddenField(
+                                                name: attrs.name + '_' + it.name + '-ontology_id'
+                                        )
+                                        out << hiddenField(
+                                                name: attrs.name + '_' + it.name + '-full_id'
                                         )
                                         break
@@ -682 +691 @@
                                                 }
                                                 break
+                                        case 'ONTOLOGYTERM':
+                                                // @see http://www.bioontology.org/wiki/index.php/NCBO_Widgets#Term-selection_field_on_a_form
+                                                // @see ontology-chooser.js
+                                                out << textFieldElement(
+                                                        name: it.name,
+                                                        value: fieldValue,
+                                                        rel: 'ontology-all-name',
+                                                        size: 100
+                                                )
+                                                out << hiddenField(
+                                                        name: it.name + '-concept_id'
+                                                )
+                                                out << hiddenField(
+                                                        name: it.name + '-ontology_id'
+                                                )
+                                                out << hiddenField(
+                                                        name: it.name + '-full_id'
+                                                )
+                                                break
                                         case 'DATE':
                                                 out << dateElement(

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

@@ -70 +70 @@
 </div>
 
+
+<span class="info">
+        <span class="todo">TODO</span>
+        <ul>
+                <li>this page is not complete yet, finish it to summerize the study you are about to store in the database</li>
+        </ul>
+</span>
+
 </wizard:pageContent>

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

@@ -18 +18 @@
 You are done!
 
-TODO: store data in database....
+        <span class="info">
+                <span class="todo">TODO</span>
+                <ul>
+                        <li>persist the data to the database :) nothing is currently being saved...</li>
+                </ul>
+        </span>
 </wizard:pageContent>

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

@@ -62 +62 @@
         </div>
 </g:if>
+
+        <span class="info">
+                <span class="known">Known issues</span>
+                <ul>
+                        <li>no protocol selection available yet</li>
+                </ul>
+        </span>
 </wizard:pageContent>

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

@@ -82 +82 @@
         </div>
 </g:if>
+
+        <span class="info">
+                <span class="todo">TODO</span>
+                <ul>
+                        <li>parameter values should still be asked and implemented</li>
+                </ul>
+        </span>
 </wizard:pageContent>

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

@@ -22 +22 @@
                 to continue
         </span>
+
+        <span class="info">
+                <span class="known">Known issues</span>
+                <ul>
+                        <li>navigating away from the wizard will result in loss of work. While you are currently warned when
+                            clicking links outside of the wizard, this problem still exists when clicking 'refresh' or the
+                                back / forward buttons</li>
+                        <li>no data is actually stored yet at the end of the wizard</li>
+                </ul>
+        </span>
+
+        <!-- g:render template="pages/demo" //-->
+
 </wizard:pageContent>

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

@@ -41 +41 @@
         </wizard:textFieldElement>
         <wizard:dateElement name="startDate" description="Start date" error="startDate" value="${study?.startDate}">
-                The start date of the study     
+                The start date of the study
         </wizard:dateElement>
 
         <span class="info">
-                <span class="title">TODO</span>
+                <span class="todo">TODO</span>
                 Below you will see the template fields of the study template selected above. These fields are not yet
                 properly handled so you can ignore them for now... To be completed at a later stage
@@ -53 +53 @@
 
         <span class="info">
-                <span class="title">Known issues</span>
+                <span class="known">Known issues</span>
                 <ul>
                         <li>the templated fields appear in random order</li>

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

@@ -58 +58 @@
 
         <span class="info">
-                <span class="title">Known issues</span>
+                <span class="known">Known issues</span>
                 <ul>
                         <li>autocomplete fields (like ontologies) deselect the selected rows and hence don't replicate</li>
@@ -66 +66 @@
                         <li>ontology hidden fields should be processed by the back-end as well (not yet implemented)</li>
                         <li>ontology fields now show suggestions for <i>all</i> available ontologies. This has to be narrowed down in the future.</li>
+                        <li>ontology hidden fields should be handled by the taglibrary / controller as well</li>
                 </ul>
         </span>

trunk/web-app/css/wizard.css

@@ -21 +21 @@
     padding-left: 20px;
     background: url(../images/icons/famfamfam/information.png) no-repeat center left;
+}
+
+.wizard .info .todo {
+    color:#006DBA;
+    font-size:14px;
+    font-weight:normal;
+    display: block;
+    margin-bottom: 5px;
+    padding-left: 20px;
+    background: url(../images/icons/famfamfam/wrench.png) no-repeat center left;
+}
+
+.wizard .info .known {
+    color:#006DBA;
+    font-size:14px;
+    font-weight:normal;
+    display: block;
+    margin-bottom: 5px;
+    padding-left: 20px;
+    background: url(../images/icons/famfamfam/eye.png) no-repeat center left;
 }
 

trunk/web-app/js/ontology-chooser.js

@@ -139 +139 @@
         if (searchElement.size() > 0) {
             // yeah, set it
-            searchElement[0].value = value;
+            $(searchElement[0]).val(value);
         } else {
             // no, dynamically insert it after the input elemtn
-            inputElement.after('<input type="hidden" name="' + elementName + '" value="' + value + '"/>');
+            inputElement.after('<input type="text" name="' + elementName + '" value="' + value + '"/>');
         }
     },

trunk/web-app/js/table-editor.js

@@ -153 +153 @@
             $(that.columnIdentifier + ':eq(' + columnNumber + ') ' + elementSelector, $(this)).each(function() {
                 var me = $(this)
-                var myVal = that.getValue(me);
-                if (myVal != v) {
-                    that.setValue(me, v);
+                if (me.attr('type') != "hidden") {
+                    var myVal = that.getValue(me);
+                    if (myVal != v) {
+                        that.setValue(me, v);
+                    }
                 }
             })