Changeset 2939

Timestamp:

Nov 20, 2006, 4:23:40 PM (16 years ago)

Author:

Martin Svensson

Message:

References #334. Set default values for some BasicItems? in a project.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Project.java (modified) (9 diffs)
• www/include/scripts/main.js (modified) (1 diff)
• www/my_base/projects/edit_project.jsp (modified) (10 diffs)
• www/my_base/projects/index.jsp (modified) (2 diffs)

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

@@ -33 +33 @@
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.Collections;
@@ -86 +84 @@
   */
   public static final Item TYPE = Item.PROJECT;
-  
-//  public static final String DEFAULT_SCANNING_PROTOCOL = "default_scanning_protocol";
-//  public static final String DEFAULT_SAMPLING_PROTOCOL = "default_sampling_protocol";
-//  public static final String DEFAULT_EXTRACTING_PROTOCOL = "default_extracting_protocol";
-//  public static final String DEFAULT_LABELING_PROTOCOL = "default_labeling_protocol";
-//  public static final String DEFAULT_HYBRIDIZATION_PROTOCOL = "default_hybridization_protocol";
-//  public static final String DEFAULT_FEATURE_EXTRACTION_PROTOCOL = "default_feature_extraction_protocol";
-//  public static final String DEFAULT_POOLING_PROTOCOL = "default_pooling_protocol";
-//  public static final String DEFAULT_PRINTING_PROTOCOL = "default_printing_protocol";
-//  public static final String DEFAULT_SOFTWARE = "default_software";
-//  public static final String DEFAULT_ARRAYDESIGN = "default_arraydesign";
-//  public static final String DEFAULT_HYBRIDIZATION_HARDWARE = "default_hybridization_hardware";
-//  public static final String DEFAULT_SCANNER_HARDWARE = "default_scanner_hardware"; 
-//  public static final String DEFAULT_PRINTROBOT_HARDWARE = "default_print_robot_hardware";
-//    
-//  private static final List<String> defaultNames = null;
-//  
+
   /**
     This filter will limit a query to only return projects
@@ -469 +451 @@
 
   /**
-      Sets default item.       
+      Sets item as default for project.
       
       @param dc The <code>DbControl</code> which will be used for
       permission checking and database access.
-      @param defaultItem The {@link net.sf.basedb.core.BasicItem} to set as default.   
+      @param defaultItem The {@link net.sf.basedb.core.BasicItem} to set as default.
+        Use null when to remove a default value.
+      @param defaultType The {@link Default} to be set.
   */
   public void setDefaultItem(DbControl dc, BasicItem defaultItem, Default defaultType)
@@ -480 +464 @@
     if (defaultItem == null)
     {
-      AnyToAny.unlinkFrom(dc, this, defaultType.getName());
+      AnyToAny.unlinkFrom(dc, this, lnkName);
     }
     else
@@ -493 +477 @@
   
   /**
-      Gets the project's default item of a certain <code>itemType</code>.
+      Gets the project's default item of a certain itemType defined in <code>defaultType</code>.
       If no item of the specified type is found this will return Null 
       
       @param dc The <code>DbControl</code> which will be used for
       permission checking and database access.
-      @param itemType The {@linknet.sf.basedb.core.Item} type is expected to be..
-      @param linkName The link name that the default item has been saved as.
-      @return A BasicItem or null if no item of <code>itemType.
+      @param defaultType The project's <code>Default</code> to get.
+      @return A BasicItem or null if no item was found.
   */
   public BasicItem getDefaultItem(DbControl dc, Default defaultType)
@@ -589 +572 @@
   
   public enum Default
-  {
+  {   
+    SOFTWARE("default_software", "Software", Item.SOFTWARE, null),
+    ARRAYDESIGN("default_arraydesign", "Array design", Item.ARRAYDESIGN, null),
+    HYBRIDIZATION_HARDWARE("default_hybridization_hardware", "Hybridization station", Item.HARDWARE, HardwareType.HYBRIDIZATION_STATION),
+    SCANNER_HARDWARE("default_scanner_hardware", "Scanner", Item.HARDWARE, HardwareType.SCANNER), 
+    PRINTROBOT_HARDWARE("default_print_robot_hardware", "Print robot", Item.HARDWARE, HardwareType.PRINT_ROBOT),
     SCANNING_PROTOCOL("default_scanning_protocol", "Scanning protocol", Item.PROTOCOL, ProtocolType.SCANNING),
     SAMPLING_PROTOCOL("default_sampling_protocol", "Sampling protocol", Item.PROTOCOL, ProtocolType.SAMPLING),
@@ -595 +583 @@
     LABELING_PROTOCOL("default_labeling_protocol", "Labeling protocol", Item.PROTOCOL, ProtocolType.LABELING),
     HYBRIDIZATION_PROTOCOL("default_hybridization_protocol", "Hybridization protocol", Item.PROTOCOL, ProtocolType.HYBRIDIZATION),
-    FEATURE_EXTRACTION_PROTOCOL("default_feature_extraction_protocol", "Feature extraction protocol", Item.PROTOCOL, ProtocolType.FEATURE_EXTRACTION),
+    FEATURE_EXTRACTION_PROTOCOL("default_feature_extraction_protocol", "Feat. extraction protocol", Item.PROTOCOL, ProtocolType.FEATURE_EXTRACTION),
     POOLING_PROTOCOL("default_pooling_protocol", "Pooling protocol", Item.PROTOCOL, ProtocolType.POOLING),
-    PRINTING_PROTOCOL("default_printing_protocol", "Printing protocol", Item.PROTOCOL, ProtocolType.PRINTING),
-    SOFTWARE("default_software", "Software", Item.SOFTWARE, null),
-    ARRAYDESIGN("default_arraydesign", "Array design", Item.ARRAYDESIGN, null),
-    HYBRIDIZATION_HARDWARE("default_hybridization_hardware", "Hybridization station", Item.HARDWARE, HardwareType.HYBRIDIZATION_STATION),
-    SCANNER_HARDWARE("default_scanner_hardware", "Scanner", Item.HARDWARE, HardwareType.SCANNER), 
-    PRINTROBOT_HARDWARE("default_print_robot_hardware", "Print robot", Item.HARDWARE, HardwareType.PRINT_ROBOT);
+    PRINTING_PROTOCOL("default_printing_protocol", "Printing protocol", Item.PROTOCOL, ProtocolType.PRINTING);
     
     private String name;
@@ -609 +592 @@
     private String type;
     
-//    private static final Map<String, String>typeMapping = new HashMap<String, String>();
-//    private static final Map<Item, String>itemMapping = new HashMap<Item, String>();
-    
-//    static
-//    {
-//      for (Default d : Default.values())
-//      {
-//        String s = null;
-//        if (d.getType() != null)
-//        {
-//          s = typeMapping.put(d.getType(), d.getName());
-//          assert s == null : "Another name for type "+d.getType()+" already exists: " + s;
-//        }
-//        if (d.getItemType() != null)
-//        {
-//          s = itemMapping.put(d.getItemType(), d.getName());
-//          assert s == null : "Another name for item "+d.getItemType()+" already exists: " + s;
-//        }
-//      }
-//    }
-    
     private Default(String name, String shortName, Item itemType, String type)
     {
@@ -657 +619 @@
       return type;
     }
-//    
-//    public static String fromType(String type)
-//    {
-//      String s;
-//      s = typeMapping.get(type);
-//      assert s != null : "name == null for type " + type;
-//      return s;
-//    }
-//    
-//    public static String fromItem(Item itemType)
-//    {
-//      String s;
-//      s = itemMapping.get(itemType);
-//      assert s != null : "name == null for item " + itemType.toString();
-//      return s;
-//    }
   }
 }

trunk/www/include/scripts/main.js

@@ -369 +369 @@
     this.controllers['BIOSOURCE'] = { url:'biomaterials/biosources/index.jsp', width:800, height:500 };
     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:540, height:400 };
+    this.controllers['PROJECT'] = { url:'my_base/projects/index.jsp', width:570, height:400 };
     this.controllers['FILE'] = { url:'filemanager/index.jsp', width:500, height:360 };
     this.controllers['DIRECTORY'] = { url:'filemanager/directories/index.jsp', width:450, height:340, xpopup:true };

trunk/www/my_base/projects/edit_project.jsp

@@ -27 +27 @@
 --%>
 <%@ page
+  import="net.sf.basedb.core.ArrayDesign"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.Hardware"
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.ItemContext"
@@ -35 +37 @@
   import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.Project"
+  import="net.sf.basedb.core.Protocol"
   import="net.sf.basedb.core.User"
   import="net.sf.basedb.core.Group"
@@ -40 +43 @@
   import="net.sf.basedb.core.ItemResultList"
   import="net.sf.basedb.core.PermissionDeniedException"
+  import="net.sf.basedb.core.Software"
   import="net.sf.basedb.core.BaseException"
   import="net.sf.basedb.core.query.Orders"
@@ -91 +95 @@
   // Query to retrieve user members
   ItemQuery<User> userQuery = null;
+  
+  // Load recently used items
+  List<Protocol> recentProtocol = (List<Protocol>)cc.getRecent(dc, Item.PROTOCOL);
+  List<Software> recentSoftware = (List<Software>)cc.getRecent(dc, Item.SOFTWARE);
+  List<Hardware> recentHardware = (List<Hardware>)cc.getRecent(dc, Item.HARDWARE);
+  List<ArrayDesign> recentArrayDesign = (List<ArrayDesign>)cc.getRecent(dc, Item.ARRAYDESIGN);
+  
   
   if (itemId == 0)
@@ -119 +130 @@
 
   <base:page type="popup" title="<%=title%>">
-  <base:head scripts="tabcontrol.js,linkitems.js" styles="tabcontrol.css,parameters.css">
+  <base:head scripts="tabcontrol.js,linkitems.js,parameters.js" styles="tabcontrol.css,parameters.css">
     <script language="JavaScript">
     // Validate the "Project" tab
@@ -170 +181 @@
       for (Project.Default d : Project.Default.values())
       {
+        BasicItem defaultValue = null;
+        int valueId = 0;
         String icon = "";
         if (project != null)
         {
-          BasicItem defaultValue = project.getDefaultItem(dc, d);
+          defaultValue = project.getDefaultItem(dc, d);
           if (defaultValue != null)
           {
+            valueId = defaultValue.getId();
             icon = "notrequired_values.gif";
           }
@@ -191 +205 @@
         sb.append(" onmouseover=\"Main.addClass(this, 'hover')\" onmouseout=\"Main.removeClass(this, 'hover')\" title=\""+d.getShortName()+"\">");
         sb.append(icon+"<span class=\"label\">"+d.getShortName()+"</span></div>\n");        
-      }
+        %>
+        var values = new Array();
+        values[values.length] = <%=valueId%>;
+        var di = new Parameter('<%=d.getName()%>', '<%=HTML.javaScriptEncode(d.getShortName())%>', 1, false, false, values);
+        <%
+      }
+      // TODO Set default RawDataType
       %>
     }
@@ -226 +246 @@
       }
       %>
-    }
-    var oldValueDiv;
-    function defaultItemOnClick(defaultname)
-    {
-      
-    }   
+    }     
     function correctPermissions(checked)
     {
@@ -357 +372 @@
       Link.addItem(document.forms['project'].members, item);
     }
+    var oldValueDiv;
+    function defaultItemOnClick(defaultName)
+    {
+      var frm = document.forms['project'];
+      if (oldValueDiv) Main.hide(oldValueDiv);
+      
+      var pp = Parameters.allParameters['ID'+defaultName];    
+      setSelectedParameter(pp, defaultName);
+      oldValueDiv = 'value_'+pp.name+'_div';
+      Main.show(oldValueDiv);
+      
+      var valueElement = frm['value_'+pp.name];
+      if (valueElement.focus) valueElement.focus();
+      
+      
+    } 
+    var selectedParameter = null;
+    var selectedParameterName = null;
+    function getSelectedParameter()
+    {
+      return selectedParameter;
+    }   
+    function setSelectedParameter(parameter, name)
+    {
+      if (selectedParameter != null)
+      {
+        Main.removeClass(document.getElementById('prompt_'+selectedParameter.name), 'selected');
+      }
+      selectedParameter = parameter;
+      selectedParameterName = name;
+      if (selectedParameter != null)
+      {
+        Main.addClass(document.getElementById('prompt_'+selectedParameter.name), 'selected');
+      }
+    }
+    function updateSelectedStyle()
+    {
+      var pp = getSelectedParameter();
+      var icon = document.getElementById('icon_'+pp.name);
+      var gif = getRoot()+'images/';
+      if (pp.values[0] == 0)
+      {
+        gif += 'notrequired_novalues.gif';
+      }
+      else
+      {
+        gif += 'notrequired_values.gif';
+      }
+      icon.src = gif;   
+    }
+    function defaultItemOnChange(value)
+    {
+      var pp = getSelectedParameter();
+      if (value == null || value == '')
+      {
+        pp.removeValue(0);
+      }
+      else
+      {
+        pp.updateValue(0, value);
+      } 
+      updateSelectedStyle();    
+    }
+    function selectDefaultItemOnClick(url)
+    {
+      var frm = document.forms['project'];            
+      var select_id = 'value_' + getSelectedParameter().name;
+      var selectlist = frm[select_id];
+      if (selectlist.length > 1)
+      {
+        var id = Math.abs(parseInt(selectlist[1].value));       
+        url += '&item_id='+id;
+      }
+      Main.openPopup(url, 'SelectDefaultItem', 1000, 700);
+    }
+    function setDefaultItemCallback(id, name)
+    {
+      var frm = document.forms['project'];
+      var select_id = 'value_' + getSelectedParameter().name;
+      var selectlist = frm[select_id];
+      if (selectlist.length < 2)
+      {
+        Forms.addListOption(selectlist, 1, new Option());
+      }
+      selectlist[1].value = id;
+      selectlist[1].text = name;
+      selectlist.selectedIndex = 1; 
+      defaultItemOnChange(selectlist[1].value);   
+    }       
     function removeOnClick()
     {
@@ -442 +546 @@
         <tr valign="top">
           <td width="50%">
-          <b>Values</b><br>
-          <div class="parameterlist" style="height: <%=(int)(scale*230)%>px; margin-top: 4px;">
-            <%=sb.toString()%>
-          </div>
-          <base:icon image="hasvalues.gif" /> = Has value
+            <b>Project default items</b><br>
+            <div class="parameterlist" style="height: <%=(int)(scale*230)%>px; margin-top: 4px;">
+              <%=sb.toString()%>
+            </div>
+            <base:icon image="hasvalues.gif" /> = Has value
           </td>
           <td width="50%">
-
+            <br>
+            <%
+            for (Project.Default d : Project.Default.values())
+            {
+              String inputName = "value_" + d.getName();              
+              if (d.getItemType() != null)
+              {
+                String selectDefaultItemOnClick = "";
+                String defaultItemOnChange = "";  
+                List recentItems = null;
+                BasicItem currentItem = project != null ? project.getDefaultItem(dc, d) : null;
+                boolean readCurrentItem = sc.hasPermission(Permission.READ, d.getItemType());                             
+                if (d.getItemType() == Item.PROTOCOL) 
+                {
+                  int typeId = SystemItems.getId(d.getType());
+                  String url = "'../../admin/protocols/index.jsp?ID=" + ID + 
+                      "&cmd=UpdateContext&mode=selectone&callback=setDefaultItemCallback&filter:INT:protocolType=" + typeId + "'";
+                  selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";
+                  recentItems = recentProtocol;
+                }
+                else if (d.getItemType() == Item.HARDWARE)
+                {
+                  int typeId = SystemItems.getId(d.getType());
+                  String url = "'../../admin/hardware/index.jsp?ID=" + ID + 
+                      "&cmd=UpdateContext&mode=selectone&callback=setDefaultItemCallback&filter:INT:hardwareType=" + typeId + "'";
+                  selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";
+                }
+                else if (d.getItemType() == Item.SOFTWARE)
+                {
+                  String url = "'../../admin/software/index.jsp?ID=" + ID + 
+                      "&cmd=UpdateContext&mode=selectone&callback=setDefaultItemCallback'";
+                  selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";
+                }
+                else if (d.getItemType() == Item.ARRAYDESIGN)
+                {
+                  String url = "'../../lims/arraydesigns/index.jsp?ID=" + ID + 
+                      "&mode=selectone&callback=setDefaultItemCallback'";
+                  selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";                 
+                }               
+                %>
+                <div id="<%=inputName%>_div" style="display: none;">
+                  <table>
+                    <tr>
+                    <td class="prompt"><%=d.getShortName()%></td>
+                    </tr>
+                    
+                    <tr>
+                    <td>
+                      <base:select 
+                        id="<%=inputName%>"
+                        clazz="selectionlist"
+                        required="false"
+                        current="<%=currentItem%>"
+                        denied="<%=!readCurrentItem%>"
+                        recent="<%=recentItems%>"
+                        newitem="<%=project == null%>"
+                        onselect="<%=selectDefaultItemOnClick%>"
+                        onchange = 'defaultItemOnChange(this[this.selectedIndex].value)'
+                      />
+                    </td>
+                    </tr>
+                  </table>                    
+                </div>
+              <%
+              }
+            }
+            %>            
           </td>
         </tr>

trunk/www/my_base/projects/index.jsp

@@ -26 +26 @@
 --%>
 <%@ page
+  import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
@@ -166 +167 @@
       }
     }
+    
+    // Default tab
+    for (Project.Default d : Project.Default.values())
+    {
+      String selectDefault = "value_"+d.getName();
+      int selectId = Values.getInt(request.getParameter(selectDefault), -1);      
+      if (selectId >= 0)
+      {
+        BasicItem item = null;
+        item = selectId == 0 ? null : d.getItemType().getById(dc, selectId);
+        project.setDefaultItem(dc, item, d);
+      }
+    }
 
     dc.commit();