Changeset 4731

Timestamp:

Jan 20, 2009, 9:02:44 AM (14 years ago)

Author:

Martin Svensson

Message:

References #979 The implementation of bioplates/biowells in the webclient is now done.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/BioWell.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/BioWellData.java (modified) (1 diff)
• www/biomaterials/bioplates/wells/edit_biowell.jsp (added)
• www/biomaterials/bioplates/wells/index.jsp (modified) (2 diffs)
• www/biomaterials/bioplates/wells/list_biowells.jsp (modified) (3 diffs)
• www/include/scripts/main.js (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/BioWell.java

@@ -112 +112 @@
   */
   /**
-    Adds the {@link MeasureBioMaterial},used in this well, to the Set.
+    Adds the {@link MeasuredBioMaterial},used in this well, to the Set.
    */
   @Override

trunk/src/core/net/sf/basedb/core/data/BioWellData.java

@@ -40 +40 @@
   /**
     The bioplate this well belongs to.
-    @see BioPlateData#getWells()
+    @see BioPlateData#getBioWells()
     @hibernate.many-to-one column="`bioplate_id`" not-null="true" outer-join="false" update="false"
   */

trunk/www/biomaterials/bioplates/wells/index.jsp

@@ -33 +33 @@
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.DataQuery"
+  import="net.sf.basedb.core.MeasuredBioMaterial"
   import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.PermissionDeniedException"
@@ -110 +111 @@
     // Update the properties on an item (will close the popup)
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
-    dc = sc.newDbControl();
-    BioWell biowell = (BioWell)cc.getObject("item");
-    dc.reattachItem(biowell);
-    message = "biowell updated";
+    final int maxRecent = Base.getMaxRecent(sc);    
+    message = "biowell updated";    
     
-    dc.commit();
+    int biomaterialId = Values.getInt(request.getParameter("biomaterial_id"));
+    if (biomaterialId >= 0)
+    {     
+      dc = sc.newDbControl();
+      BioWell biowell = (BioWell)cc.getObject("item");
+      dc.reattachItem(biowell);
+      MeasuredBioMaterial oldMbm = biowell.getBioMaterial();
+      if (oldMbm != null)
+      {
+        dc.reattachItem(oldMbm);
+        oldMbm.setBioWell(null);        
+      }
+      dc.commit();
+      if (biomaterialId > 0)
+      {
+        dc = sc.newDbControl();
+        Item biomaterialType = Item.valueOf(request.getParameter("biomaterial_type"));
+        MeasuredBioMaterial newMbm = (MeasuredBioMaterial)biomaterialType.getById(dc, biomaterialId);
+        newMbm.setBioWell(biowell);
+        dc.commit();
+      }
+      
+    }   
     cc.removeObject("item");
   }

trunk/www/biomaterials/bioplates/wells/list_biowells.jsp

@@ -109 +109 @@
     var submitPage = 'index.jsp';
     var formId = 'biowells';
-    
+
+    function editItem(itemId)
+    {
+      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', itemId, true);
+    }
     function itemOnClick(itemId)
     {
@@ -146 +150 @@
   
   <base:body>
-    <p>
-    <p:path>
-      <p:pathelement title="Bioplates" href="<%="../index.jsp?ID="+ID%>" />
-      <p:pathelement title="<%=HTML.encodeTags(bioplate.getName())%>" />
-    </p:path>
-
-    <t:tabcontrol id="main" active="biowells" switch="switchTab">
+    <%
+    if (!mode.isSelectionMode())
+    {
+      %>
+      <p>
+      <p:path>
+        <p:pathelement title="Bioplates" href="<%="../index.jsp?ID="+ID%>" />
+        <p:pathelement title="<%=HTML.encodeTags(bioplate.getName())%>" />
+      </p:path>
+      <%
+    }
+    %>
+
+    <t:tabcontrol id="main" active="biowells" switch="switchTab" notabs="<%=mode.isSelectionMode()%>">
     <t:tab id="properties" title="Properties" />
     <t:tab id="annotations" title="Annotations" />        
@@ -386 +397 @@
                 </tbl:cell>
                 <tbl:cell column="column"><%=item.getColumn()%></tbl:cell>
-                <tbl:cell column="bioMaterial.name">
+                <tbl:cell column="bioMaterial.name">                  
                 <%
-                  MeasuredBioMaterial bioMaterial = item.getBioMaterial();
-                  if (bioMaterial == null)
+                MeasuredBioMaterial bioMaterial = null;
+                boolean bmWritePermission = true;
+                try
+                {
+                  bioMaterial = item.getBioMaterial();
+                  if (bioMaterial != null)
                   {
-                    %>
-                    <i>- none -</i>
-                    <%
+                    bmWritePermission = bioMaterial.hasPermission(Permission.WRITE);                    
                   }
-                  else
-                  {
-                    %>
-                    <%=Base.getLink(ID, bioMaterial.getName(), bioMaterial.getType(), bioMaterial.getId(), true)%>
-                    <%
-                  }
+                }
+                catch (PermissionDeniedException ex)
+                {
+                  bmWritePermission = false;
+                }
                 %>
-                <base:icon 
-                  image="edit.gif" 
-                  tooltip="Change biomaterial of this biowell" 
-                  onclick="changeBioMaterial()"
-                />
+                  <base:propertyvalue 
+                      item="<%=item%>" 
+                      property="bioMaterial"
+                      enableEditLink="<%=mode.hasEditLink() && bmWritePermission%>" 
+                      enablePropertyLink="<%=mode.hasPropertyLink()%>"
+                  />
+                  <base:icon 
+                    image="<%=bmWritePermission ? "edit.gif" : "edit_disabled.gif" %>" 
+                    tooltip="<%=bmWritePermission ? "Change the biomaterial in this biowell" : 
+                      "You have not permission to change the current biomaterial"%>"
+                    onclick="<%=bmWritePermission ? "editItem("+item.getId()+")" : ""%>"
+                  />                
                 </tbl:cell>
                 <tbl:cell column="permission"><%=PermissionUtil.getShortPermissions(item)%></tbl:cell>

trunk/www/include/scripts/main.js

@@ -427 +427 @@
     this.controllers['BIOMATERIALLIST'] = { url:'biomaterials/lists/index.jsp', width:800, height:500 };
     this.controllers['BIOPLATE'] = { url:'biomaterials/bioplates/index.jsp', width:800, height:500 };
-    this.controllers['BIOWELL'] = { url:'biomaterials/bioplates/wells/index.jsp', width:800, height:500 };
+    this.controllers['BIOWELL'] = { url:'biomaterials/bioplates/wells/index.jsp', width:450, height:280 };
     this.controllers['MESSAGE'] = { url:'my_base/messages/index.jsp', width:600, height:420, popup:true, edit:false };
     this.controllers['PROJECT'] = { url:'my_base/projects/index.jsp', width:600, height:460 };