Changeset 6094

Timestamp:

Aug 30, 2012, 10:37:24 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1708: Allow more extracts to be associated with a derived bioassay

The edit dialog now uses the regular extract listing to select an extract. We should also implement a filter so that only extracts that are related to the physical bioassays are listed.

File:

• trunk/www/views/derivedbioassays/edit_bioassay.jsp (modified) (7 diffs)

trunk/www/views/derivedbioassays/edit_bioassay.jsp

@@ -357 +357 @@
         }
       }
+      var extractId = Math.abs(parseInt(frm.extract_id[frm.extract_id.selectedIndex].value));
+      if (extractId > 0) parents[parents.length] = 'EXTRACT:'+extractId;
       return parents;
     }
@@ -406 +408 @@
     {
       parentsChanged = true;
-      initExtracts();
     }
     
@@ -412 +413 @@
     {
       parentsChanged = true;
-      initExtracts();
     }
     
@@ -465 +465 @@
       list.selectedIndex = 1;
     }
+    
+    function selectExtractOnClick()
+    {
+      var frm = document.forms['bioAssay'];
+      var url = '../../biomaterials/extracts/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone';
+      url += '&callback=setExtractCallback&resetTemporary=1';
+      url += ItemSubtype.createRelatedFilter('bioAssay', 'EXTRACT');
+      if (frm.extract_id.length > 1)
+      {
+        var id = Math.abs(parseInt(frm.extract_id[1].value));       
+        url += '&item_id='+id;
+      }
+      Main.openPopup(url, 'SelectExtract', 1050, 700);
+    }
+
+    function setExtractCallback(id, name)
+    {
+      var frm = document.forms['bioAssay'];
+      var list = frm.extract_id;
+      if (list.length < 2 || list[1].value == '0') // >
+      {
+        Forms.addListOption(list, 1, new Option());
+      }
+      list[1].value = id;
+      list[1].text = name;
+      list.selectedIndex = 1;
+      extractOnChange();
+    }
+    
+    function extractOnChange()
+    {
+      parentsChanged = true;
+    }
 
     function addPhysicalBioAssayOnClick()
@@ -533 +566 @@
       {
         isRootOnChange();
-      }
-      else
-      {
-        initExtracts();
       }
     }
@@ -602 +631 @@
       Main.showHide('physicalBioAssaySection', isRoot);
       Main.showHide('parentBioAssaySection', !isRoot);
-      initExtracts();
-    }
-    
-    function initExtracts()
-    {
-      var frm = document.forms['bioAssay'];
-      var extracts = null;
-      <%
-      if (bioAssay == null)
-      {
-        %>
-        if (frm.isRoot[0].checked)
-        {
-          if (frm.physicalbioassay_id.selectedIndex >= 0)
-          {
-            extracts = getExtractsFromPhysicalBioAssay(frm.physicalbioassay_id[frm.physicalbioassay_id.selectedIndex].value);
-          }
-        }
-        else
-        {
-          if (frm.parent_id.selectedIndex >= 0)
-          {
-            extracts = getExtractsFromParentBioassay(frm.parent_id[frm.parent_id.selectedIndex].value);
-          }
-        }
-        <%
-      }
-      else
-      {
-        if (bioAssay.isRoot())
-        {
-          %>
-          extracts = getExtractsFromPhysicalBioAssays();
-          <%
-        }
-        else
-        {
-          %>
-          extracts = getExtractsFromParentBioassays();
-          <%
-        }
-      }
-      %>
-
-      var currentExtractId = frm.extract_id[frm.extract_id.selectedIndex].value;
-      frm.extract_id.length = 0;
-      frm.extract_id[frm.extract_id.length] = new Option('- none -', 0);
-      var currentWasFound = 0;
-      if (extracts != null)
-      {
-        for (var i = 0; i < extracts.length; i++)
-        {
-          var position = extracts[i].position;
-          var prefix = position ? position + ': ' : '';
-          frm.extract_id[frm.extract_id.length] = new Option(prefix + extracts[i].name, extracts[i].id);
-          if (currentExtractId == extracts[i].id) 
-          {
-            frm.extract_id.selectedIndex = frm.extract_id.length - 1;
-            currentWasFound = 1;
-          }
-        }
-      }
-      <%
-      if (currentExtract != null)
-      {
-        %>
-        if (currentExtractId && !currentWasFound)
-        {
-          frm.extract_id[frm.extract_id.length] = new Option('<%=HTML.javaScriptEncode(currentExtract.getName())%>', currentExtractId);
-          frm.extract_id.selectedIndex = frm.extract_id.length - 1;
-        }
-        <%
-      }
-      %>
-    }
-    
-    function getExtractsFromPhysicalBioAssay(physicalBioAssayId)
-    {
-      if (!physicalBioAssayId) return null;
-      var request = Ajax.getXmlHttpRequest();
-      var url = '../physicalbioassays/ajax.jsp?ID=<%=ID%>&cmd=GetSources';
-      url += '&item_id=' + physicalBioAssayId;
-      request.open("GET", url, false); 
-      request.send(null);
-      
-      var response = JSON.parse(request.responseText);
-      if (response.status != 'ok')
-      {
-        alert(response.message);
-        return null;
-      }
-      return response.sources;
-    }
-  
-    function getExtractsFromParentBioassay(bioAssayId)
-    {
-      if (!bioAssayId) return null;
-      var request = Ajax.getXmlHttpRequest();
-      var url = 'ajax.jsp?ID=<%=ID%>&cmd=GetExtracts';
-      url += '&item_id=' + bioAssayId;
-      request.open("GET", url, false); 
-      request.send(null);
-
-      var response = JSON.parse(request.responseText);
-      if (response.status != 'ok')
-      {
-        alert(response.message);
-        return null;
-      }
-      return response.sources;
-    }
+    }
+
     </script>
   </base:head>
@@ -881 +801 @@
         <th>Extract</th>
         <td>
-          <select name="extract_id" class="selectionlist">
-          <option value="">- none -
-          <%
-          if (currentExtract != null)
-          {
-            %>
-            <option value="<%=currentExtract.getId()%>" selected><%=HTML.encodeTags(currentExtract.getName())%>
-            <%
-          }
-          %>
-          </select>
+          <base:select 
+            id="extract_id"
+            clazz="selectionlist"
+            required="false"
+            current="<%=currentExtract%>"
+            denied="<%=!readCurrentExtract%>"
+            newitem="<%=bioAssay == null%>"
+            onselect="selectExtractOnClick()"
+            onchange="extractOnChange()"
+          />
         </td>
         <td></td>