Changeset 7659

Timestamp:

05/07/09 10:13:46 (15 months ago)

Author:

josowski

Message:

These are some Improvements to handle different use cases for competing interest statements.

Pending on how and when the widgets were created some things were not behaving quite as well as expected. That is, the first post, 2nd reply after first was cancelled, competing interest being filled in but not selected. This should help resolve these issues.

References #1281

Location:

head/ambra

Files:

• libs/js/src/main/scripts/ambra/rating.js (modified) (1 diff)
• libs/js/src/main/scripts/ambra/responsePanel.js (modified) (3 diffs)
• webapp/src/main/webapp/widget/discussionResponse.ftl (modified) (1 diff)
• webapp/src/main/webapp/widget/ratingDialog.ftl (modified) (1 diff)

head/ambra/libs/js/src/main/scripts/ambra/rating.js

@@ -124 +124 @@
       } else {
         _ratingsForm.ciStatement.value = '';
-        _ratingsForm.ciStatementArea.value = '';
+        _ratingsForm.ciStatementArea.value = _ratingsForm.ciStatementArea.title;
         _ratingsForm.isCompetingInterest.value = "false";
         _ratingsForm.competingInterest[0].checked = true; //Select the no CIS radio button

head/ambra/libs/js/src/main/scripts/ambra/responsePanel.js

@@ -98 +98 @@
   submit: function(targetObj) {
 
+    //Pending where this is called from (namely the start discussion page)
+    //this.targetForm may not be set.
+    if(!this.targetForm) {
+      this.targetForm = targetObj.form;
+    }
+    //Make sure the values we submit, match what we see
+    if (this.targetForm.responseArea.value == this.targetForm.responseArea.title) {
+      this.targetForm.comment.value = "";
+    }
+
     if (this.targetForm.competingInterest) {
       if (this.targetForm.competingInterest[0].checked == true) {
-        this.targetForm.ciStatementArea.value = "";
+        this.targetForm.ciStatement.value = "";
+      } else {
+        if (this.targetForm.ciStatementArea.value != this.targetForm.ciStatementArea.title) {
+          this.targetForm.ciStatement.value = this.targetForm.ciStatementArea.value;
+        }
       }
     }
-
+    
     submitResponseInfo(targetObj);
   },
@@ -115 +129 @@
     //This method gets used on more then one form.  Sometimes CI will not be there
     if(this.targetForm.competingInterest) {
+      this.targetForm.isCompetingInterest.value = "false";
       this.targetForm.competingInterest[0].checked = false;
       this.targetForm.competingInterest[1].checked = true;
       this.targetForm.ciStatementArea.value = "";
+      this.targetForm.ciStatement.value = "";
     }
     
@@ -212 +228 @@
        dojo.fx.wipeIn({ node:submitMsg, duration: 500 }).play();
        ambra.formUtil.enableFormFields(targetForm);
+
+       if (targetForm.competingInterest) {
+         if (targetForm.competingInterest[0].checked == true) {
+           targetForm.ciStatementArea.disabled = true;
+         }
+       }
+
        _ldc.hide();
      }

head/ambra/webapp/src/main/webapp/widget/discussionResponse.ftl

@@ -53 +53 @@
                 <li><label><input id="isCompetingInterestYes" type="radio" name="competingInterest" value="true"  /> Yes, I have competing interests to declare (enter below):</label></li>
               </ul>
-              <textarea name="ciStatementArea" id="ciStatementArea" disabled value="Enter your competing interests..." alt="Enter your competing interests...">Enter your competing interests...</textarea>
+              <textarea name="ciStatementArea" id="ciStatementArea" disabled value="Enter your competing interests..." title="Enter your competing interests...">Enter your competing interests...</textarea>
             </fieldset>
           </td>

head/ambra/webapp/src/main/webapp/widget/ratingDialog.ftl

@@ -100 +100 @@
                       <li><label><input id="isCompetingInterestYes" type="radio" name="competingInterest" value="true"  /> Yes, I have competing interests to declare (enter below):</label></li>
                     </ul>
-                    <textarea name="ciStatementArea" id="ciStatementArea" disabled value="Enter your competing interests..." alt="Enter your competing interests...">Enter your competing interests...</textarea>
+                    <textarea name="ciStatementArea" id="ciStatementArea" disabled value="Enter your competing interests..." title="Enter your competing interests...">Enter your competing interests...</textarea>
                   </fieldset>
                 </td>