Changeset 3913

Timestamp:

Nov 6, 2007, 10:42:09 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #778: Add expression to formula

Location:

trunk/www

Files:

• common/expression_builder.jsp (modified) (2 diffs)
• include/scripts/main.js (modified) (1 diff)
• views/formulas/edit_formula.jsp (modified) (1 diff)

trunk/www/common/expression_builder.jsp

@@ -57 +57 @@
   String form = request.getParameter("form");
   String textarea = request.getParameter("textarea");
+  String callback = request.getParameter("callback");
   Formula.Type formulaType = Formula.Type.valueOf(request.getParameter("formulatype"));
   RawDataType rawDataType = RawDataTypes.getRawDataType(request.getParameter("rawdatatype"));
@@ -97 +98 @@
     function setExpressionAndClose()
     {
-      var textElement = window.opener.document.forms['<%=form%>'].elements['<%=textarea%>'];
       var value = document.forms['expression'].expression.value;
-      if (textElement.type == 'text') value = value.replace(/\n/g, '');
-      textElement.value = value;
+      <%
+      if (callback != null)
+      {
+        StringBuilder sb = new StringBuilder();
+        sb.append("window.opener.");
+        sb.append(callback).append("(");
+        if (form != null) sb.append("'").append(form).append("',");
+        if (textarea != null) sb.append("'").append(textarea).append("',");
+        sb.append("value)");
+        %>
+        <%=sb.toString()%>
+        <%
+      }
+      else
+      {
+        %>
+        var textElement = window.opener.document.forms['<%=form%>'].elements['<%=textarea%>'];
+        if (textElement.type == 'text') value = value.replace(/\n/g, '');
+        textElement.value = value;
+        <%
+      }
+      %>
       window.close();
     }

trunk/www/include/scripts/main.js

@@ -114 +114 @@
   }
   
-  this.expressionBuilder = function(ID, title, form, textarea, formulaType, rawDataType, channels, restrictions, bioAssaySetId)
-  {
-    var url = getRoot()+'common/expression_builder.jsp?ID='+ID+'&title='+title+'&form='+form+'&textarea='+textarea;
+  this.expressionBuilder = function(ID, title, form, textarea, formulaType, rawDataType, channels, restrictions, bioAssaySetId, callback)
+  {
+    var url = getRoot()+'common/expression_builder.jsp?ID='+ID+'&title='+title;
+    if (form) url += '&form='+form;
+    if (textarea) url += '&textarea='+textarea;
+    if (callback) url += '&callback='+callback;
     url += '&formulatype='+formulaType;
     url += '&rawdatatype='+rawDataType;

trunk/www/views/formulas/edit_formula.jsp

@@ -302 +302 @@
       var channels = frm.channels.value;
       var restrictions = formulaType == '<%=Formula.Type.COLUMN_RESTRICTION.name()%>';
-      Main.expressionBuilder('<%=ID%>', 'Expression', 'formula', 'expression', formulaType, rdt, channels, restrictions);
+      Main.expressionBuilder('<%=ID%>', 'Expression', 'formula', 'expression', formulaType, rdt, channels, restrictions, null, 'setExpressionFromBuilder');
+    }
+  
+    function setExpressionFromBuilder(form, textarea, value)
+    {
+      var frm = document.forms['formula'];
+      frm[textarea].value = value;
+      if (frm.expressions.length == 0) 
+      {
+        addOnClick();
+      }
+      else
+      {
+        expressionOnBlur();
+      }
     }