Changeset 3847

Timestamp:

Oct 17, 2007, 7:52:56 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #788: Select project default platforms / variant

Location:

trunk

Files:

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

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

@@ -665 +665 @@
     POOLING_PROTOCOL("default_pooling_protocol", "Pooling protocol", Item.PROTOCOL, ProtocolType.POOLING),
     PRINTING_PROTOCOL("default_printing_protocol", "Printing protocol", Item.PROTOCOL, ProtocolType.PRINTING),
-    RAW_DATA_TYPE("default_raw_data_type", "Raw data type", null, null);
+    RAW_DATA_TYPE("default_raw_data_type", "Raw data type", null, null),
+    PLATFORM("default_platform", "Platform", Item.PLATFORM, null),
+    PLATFORM_VARIANT("default_variant", "Variant", Item.PLATFORMVARIANT, null);
     
     private String name;

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

@@ -266 +266 @@
       org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, 
         "GET_PLATFORMVARIANT_FOR_EXTERNAL_ID");
-      query.setString("externalId", id.substring(9));
+      query.setString("externalId", id.substring(8));
       PlatformVariantData variant = HibernateUtil.loadData(PlatformVariantData.class, query);
       if (variant == null || !variant.isFileOnly()) return null;

trunk/www/include/scripts/main.js

@@ -397 +397 @@
     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:570, height:400 };
+    this.controllers['PROJECT'] = { url:'my_base/projects/index.jsp', width:600, height:460 };
     this.controllers['FILE'] = { url:'filemanager/index.jsp', width:500, height:360 };
     this.controllers['DIRECTORY'] = { url:'filemanager/directories/index.jsp', width:500, height:360, xpopup:true };

trunk/www/my_base/projects/edit_project.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.Protocol"
+  import="net.sf.basedb.core.Platform"
+  import="net.sf.basedb.core.PlatformVariant"
   import="net.sf.basedb.core.User"
   import="net.sf.basedb.core.Group"
@@ -105 +107 @@
   List<ArrayDesign> recentArrayDesign = (List<ArrayDesign>)cc.getRecent(dc, Item.ARRAYDESIGN);
   
+  boolean deniedPlatform = false;
+  Platform currentPlatform = null;
+  PlatformVariant currentVariant = null;
   
   if (itemId == 0)
@@ -117 +122 @@
     title = "Edit project -- " + HTML.encodeTags(project.getName());
     
+    try
+    {
+      currentPlatform = (Platform)project.getDefaultItem(dc, Project.Default.PLATFORM);
+      currentVariant = (PlatformVariant)project.getDefaultItem(dc, Project.Default.PLATFORM_VARIANT);
+    }
+    catch (PermissionDeniedException ex)
+    {
+      deniedPlatform = true;
+    }
+    
     groupQuery = project.getGroups();
     groupQuery.order(Orders.asc(Hql.property("name")));
@@ -126 +141 @@
     throw new PermissionDeniedException(Permission.WRITE, itemType.toString());
   }
-  final StringBuilder sb = new StringBuilder();
+  RawDataType currentRawDataType = project != null ? 
+    project.getDefaultRawDataType() : null;
   
+  ItemQuery<Platform> platformQuery = Platform.getQuery();
+  platformQuery.order(Orders.asc(Hql.property("name")));
+  platformQuery.setCacheResult(true);
+  ItemResultList<Platform> platforms = platformQuery.list(dc);
+
+  ItemQuery<PlatformVariant> variantQuery = PlatformVariant.getQuery();
+  variantQuery.order(Orders.asc(Hql.property("name")));
+  variantQuery.setCacheResult(true);
+  ItemResultList<PlatformVariant> variants = variantQuery.list(dc);
+  
+  Set<Project.Default> ignore = EnumSet.of(
+    Project.Default.PLATFORM, Project.Default.PLATFORM_VARIANT, 
+    Project.Default.RAW_DATA_TYPE);
+  
+  final StringBuilder sb = new StringBuilder(); 
   final String clazz = "class=\"text\"";
   final String requiredClazz = "class=\"text required\"";
@@ -133 +164 @@
 
   <base:page type="popup" title="<%=title%>">
-  <base:head scripts="tabcontrol.js,linkitems.js,parameters.js" styles="tabcontrol.css,parameters.css">
+  <base:head scripts="tabcontrol.js,linkitems.js,parameters.js,platforms.js" styles="tabcontrol.css,parameters.css">
     <script language="JavaScript">
     // Validate the "Project" tab
@@ -176 +207 @@
       }
       %>
+      initPlatforms(<%=currentPlatform == null ? 0 : currentPlatform.getId()%>, <%=currentVariant == null ? 0 : currentVariant.getId()%>);
       initMembers();
       initDefaults();
+      platformOnChange();
+    }
+    function initPlatforms(platformId, variantId)
+    {
+      <%
+      for (Platform p : platforms)
+      {
+        RawDataType rdt = p.isFileOnly() ? null : p.getRawDataType();
+        %>
+        var p<%=p.getId()%> = new Platform(<%=p.getId()%>, '<%=HTML.javaScriptEncode(p.getExternalId())%>', '<%=HTML.javaScriptEncode(p.getName())%>', <%=p.isFileOnly()%>, '<%=rdt == null ? "" : rdt.getId()%>');
+        <%
+      }
+      for (PlatformVariant v : variants)
+      {
+        RawDataType rdt = v.isFileOnly() ? null : v.getRawDataType();
+        Platform p = v.getPlatform();
+        %>
+        var v<%=v.getId()%> = new Variant(p<%=p.getId()%>, <%=v.getId()%>, '<%=HTML.javaScriptEncode(v.getExternalId())%>', '<%=HTML.javaScriptEncode(v.getName())%>', <%=v.isFileOnly()%>, '<%=rdt == null ? "" : rdt.getId()%>');
+        <%
+      }
+      %>
+      var frm = document.forms['project'];
+      Platforms.populateList(frm.platform, platformId, variantId);
     }
     function initDefaults()
     {
       <%
+      // Platform/variant/raw data type
+      String icon = currentPlatform == null && currentVariant == null && currentRawDataType == null ? 
+        "notrequired_novalues.gif" : "notrequired_values.gif";
+      icon = "<span class=\"icon\"><img id=\"icon_default_platform\" src=\"../../images/"+icon+"\"></span>";
+      sb.append("<div class=\"param\" id=\"prompt_default_platform\" onclick=\"defaultItemOnClick('default_platform')\"");
+      sb.append(" onmouseover=\"Main.addClass(this, 'hover')\" onmouseout=\"Main.removeClass(this, 'hover')\" title=\"Platform / raw data type\">");
+      sb.append(icon+"<span class=\"label\">Platform / raw data type</span></div>\n");
       for (Project.Default d : Project.Default.values())
       {
@@ -187 +249 @@
         var values = new Array();
         <%
-        String icon = "";
+        icon = "";
         if (project != null)
         {
@@ -210 +272 @@
           {
             RawDataType rdt = project.getDefaultRawDataType();
-            String strValueId = "0";
+            String strValueId = "";
             if (rdt != null)
             {
@@ -229 +291 @@
           icon = "notrequired_novalues.gif";
         }
-        icon = "<span class=\"icon\"><img id=\"icon_"+d.getName()+"\" src=\"../../images/"+icon+"\"></span>";
-        sb.append("<div class=\"param\" id=\"prompt_"+d.getName()+"\" onclick=\"defaultItemOnClick('"+d.getName()+"')\"");
-        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");        
+        if (!ignore.contains(d))
+        {
+          icon = "<span class=\"icon\"><img id=\"icon_"+d.getName()+"\" src=\"../../images/"+icon+"\"></span>";
+          sb.append("<div class=\"param\" id=\"prompt_"+d.getName()+"\" onclick=\"defaultItemOnClick('"+d.getName()+"')\"");
+          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 di = new Parameter('<%=d.getName()%>', '<%=HTML.javaScriptEncode(d.getShortName())%>', 1, false, false, values);
@@ -403 +468 @@
       if (oldValueDiv) Main.hide(oldValueDiv);
       
-      var pp = Parameters.allParameters['ID'+defaultName];    
+      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;
@@ -491 +551 @@
     }
     
+    function platformOnChange()
+    {
+      var frm = document.forms['project'];
+      var platform = Platforms.getSelectedPlatform(frm.platform);
+      var variant = Platforms.getSelectedVariant(frm.platform);
+      var fileOnly = (variant != null && variant.fileOnly) || 
+        (variant == null && platform != null && platform.fileOnly);
+      var rawDataType = null;
+      if (variant != null) 
+      {
+        rawDataType = variant.rawDataType;
+      }
+      else if (platform != null)
+      {
+        rawDataType = platform.rawDataType;
+      }
+      if (frm.rawdatatype[frm.rawdatatype.length - 1].value == '')
+      {
+        frm.rawdatatype[frm.rawdatatype.length - 1] = null;
+      }
+      if (fileOnly)
+      {
+        frm.rawdatatype.disabled = true;
+        frm.rawdatatype[frm.rawdatatype.length] = new Option('- file only -', '');
+        frm.rawdatatype.selectedIndex = frm.rawdatatype.length - 1;
+      }
+      else if (rawDataType)
+      {
+        frm.rawdatatype.disabled = true;
+        Forms.selectListOption(frm.rawdatatype, rawDataType);
+      }
+      else
+      {
+        frm.rawdatatype.disabled = false;
+        rawDataType = frm.rawdatatype[frm.rawdatatype.selectedIndex].value;
+      }
+      var icon = document.getElementById('icon_default_platform');
+      var gif = getRoot()+'images/';
+      if (!platform && !variant && !rawDataType)
+      {
+        gif += 'notrequired_novalues.gif';
+      }
+      else
+      {
+        gif += 'notrequired_values.gif';
+      }
+      icon.src = gif;
+    }
+    
+    function rawDataTypeOnChange()
+    {
+      platformOnChange();
+    }
     </script>
   </base:head>
@@ -499 +612 @@
 
     <h3 class="docked"><%=title%> <base:help tabcontrol="settings" /></h3>
-    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*280)+"px;"%>" 
+    <t:tabcontrol id="settings" contentstyle="<%="height: "+(int)(scale*320)+"px;"%>" 
       position="bottom" remember="<%=project != null%>">
     <t:tab id="info" title="Project" validate="validateProject()" helpid="project.edit">
@@ -572 +685 @@
           <td width="40%">
             <b>Project defaults</b><br>
-            <div class="parameterlist" style="height: <%=(int)(scale*230)%>px; width:<%=(int)(scale*200)%>px; margin-top: 4px;">
+            <div class="parameterlist" style="height: <%=(int)(scale*260)%>px; width:<%=(int)(scale*200)%>px; margin-top: 4px;">
               <%=sb.toString()%>
             </div>
@@ -579 +692 @@
           <td width="60%">
             <br>
+            
+            <div id="value_default_platform_div" style="display: none">
+              <table>
+              <tr>
+                <td class="prompt">Platform</td>
+              </tr>
+              <tr>
+                <td>
+                  <select name="platform" onchange="platformOnChange()">
+                  <option value="">- none -</option>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td class="prompt">Raw data type</td>
+              </tr>
+              <tr>
+                <td>
+                  <select name="rawdatatype" onchange="rawDataTypeOnChange()">
+                  <option value="">- none -</option>
+                  <%
+                  for (RawDataType rdt : RawDataTypes.getRawDataTypes())
+                  {
+                    if (rdt.isStoredInDb())
+                    {
+                      String selected = rdt.equals(currentRawDataType) ? "selected" : "";
+                      %>
+                      <option value="<%=rdt.getId()%>" <%=selected%>><%=HTML.encodeTags(rdt.getName())%>
+                      <%
+                    }
+                  }
+                  %>
+                  </select>
+                </td>
+              </tr>
+              </table>
+              </div>
+            
             <%
             for (Project.Default d : Project.Default.values())
             {
-              String inputName = "value_" + d.getName();  
-              %>
-              <div id="<%=inputName%>_div" style="display: none;">
-                <table>
-                  <tr>
-                  <td class="prompt"><%=d.getShortName()%></td>
-                  </tr>
-                  <%
-                  if (d.getItemType() != null)
-                  {
-                    String selectDefaultItemOnClick = "";
-                    String defaultItemOnChange = "";  
-                    List recentItems = null;
-                    boolean readCurrentItem = true;
-                    BasicItem currentItem = null;
-                    try
-                    {
-                      currentItem = project != null ? project.getDefaultItem(dc, d) : null;
-                    }
-                    catch (PermissionDeniedException ex)
-                    {
-                      readCurrentItem = false;
-                    }
-                    
-                    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 + ")";
-                      recentItems = recentHardware;
-                    }
-                    else if (d.getItemType() == Item.SOFTWARE)
-                    {
-                      String url = "'../../admin/software/index.jsp?ID=" + ID + 
-                          "&cmd=UpdateContext&mode=selectone&callback=setDefaultItemCallback'";
-                      selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";
-                      recentItems = recentSoftware;
-                    }
-                    else if (d.getItemType() == Item.ARRAYDESIGN)
-                    {
-                      String url = "'../../lims/arraydesigns/index.jsp?ID=" + ID + 
-                          "&mode=selectone&callback=setDefaultItemCallback'";
-                      selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";                 
-                      recentItems = recentArrayDesign;
-                    }               
-                    %>    
+              String inputName = "value_" + d.getName();
+              if (!ignore.contains(d))
+              {
+                %>
+                <div id="<%=inputName%>_div" style="display: none;">
+                  <table>
                     <tr>
-                    <td>
-                      <base:select 
-                        id="<%=inputName%>"
-                        clazz="selectionlist"
-                        required="false"
-                        current="<%=currentItem%>"
-                        denied="<%=!readCurrentItem%>"
-                        recent="<%=recentItems%>"
-                        newitem="<%=project == null%>"
-                        onselect="<%=selectDefaultItemOnClick%>"
-                        onchange = 'defaultValueOnChange(this[this.selectedIndex].value)'
-                      />
-                    </td>
-                    </tr>                 
-                  <%
-                  }
-                  else if (d == Project.Default.RAW_DATA_TYPE)
-                  {
-                    RawDataType currentDefaultRawDataType = project != null ? project.getDefaultRawDataType() : null;
-                    %>
-                    <tr>
-                    <td>
-                      <div id="<%=inputName%>" class="selectionlist">
-                        <table border="0" cellspacing="0" cellpadding="0">
-                        <tr><td>
-                        <select name="<%=inputName%>" onchange="defaultValueOnChange(this[this.selectedIndex].value)">
-                          <option value="0">- none -</option>
-                          <%
-                          for (RawDataType rdt : RawDataTypes.getRawDataTypes())
-                          {
-                            String selected = rdt.equals(currentDefaultRawDataType) ? "selected" : "";
-                            %>
-                            <option value="<%=rdt.getId()%>" <%=selected%>><%=rdt.getName()%></option>
-                            <%
-                          }
-                          %>
-                        </select>
-                        </td></tr>
-                        </table>
-                      </div>
-                    </td>
+                    <td class="prompt"><%=d.getShortName()%></td>
                     </tr>
                     <%
-                  }
-                  %>
-                </table>                    
-              </div>
-              <%
+                    if (d.getItemType() != null)
+                    {
+                      String selectDefaultItemOnClick = "";
+                      String defaultItemOnChange = "";  
+                      List recentItems = null;
+                      boolean readCurrentItem = true;
+                      BasicItem currentItem = null;
+                      try
+                      {
+                        currentItem = project != null ? project.getDefaultItem(dc, d) : null;
+                      }
+                      catch (PermissionDeniedException ex)
+                      {
+                        readCurrentItem = false;
+                      }
+                      
+                      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 + ")";
+                        recentItems = recentHardware;
+                      }
+                      else if (d.getItemType() == Item.SOFTWARE)
+                      {
+                        String url = "'../../admin/software/index.jsp?ID=" + ID + 
+                            "&cmd=UpdateContext&mode=selectone&callback=setDefaultItemCallback'";
+                        selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";
+                        recentItems = recentSoftware;
+                      }
+                      else if (d.getItemType() == Item.ARRAYDESIGN)
+                      {
+                        String url = "'../../lims/arraydesigns/index.jsp?ID=" + ID + 
+                            "&mode=selectone&callback=setDefaultItemCallback'";
+                        selectDefaultItemOnClick = "selectDefaultItemOnClick(" + url + ")";                 
+                        recentItems = recentArrayDesign;
+                      }               
+                      %>    
+                      <tr>
+                      <td>
+                        <base:select 
+                          id="<%=inputName%>"
+                          clazz="selectionlist"
+                          required="false"
+                          current="<%=currentItem%>"
+                          denied="<%=!readCurrentItem%>"
+                          recent="<%=recentItems%>"
+                          newitem="<%=project == null%>"
+                          onselect="<%=selectDefaultItemOnClick%>"
+                          onchange = 'defaultValueOnChange(this[this.selectedIndex].value)'
+                        />
+                      </td>
+                      </tr>                 
+                    <%
+                    }
+                    %>
+                  </table>                    
+                </div>
+                <%
+              }
             }
             %>            

trunk/www/my_base/projects/index.jsp

@@ -35 +35 @@
   import="net.sf.basedb.core.User"
   import="net.sf.basedb.core.Group"
+  import="net.sf.basedb.core.Platform"
+  import="net.sf.basedb.core.PlatformVariant"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultIterator"
@@ -172 +174 @@
     
     // Default tab
+    
+    Platform platform = null;
+    PlatformVariant variant = null;
+    RawDataType rdt = null;
+    if (request.getParameter("platform") != null)
+    {
+      String[] pv = request.getParameter("platform").split(":");
+      int platformId = Values.getInt(pv[0], -1);
+      int variantId = pv.length > 1 ? Values.getInt(pv[1], -1) : -1;
+      if (platformId > 0) platform =  Platform.getById(dc, platformId);
+      if (variantId > 0) variant = PlatformVariant.getById(dc, variantId);
+    }
+    if (variant != null) rdt = variant.getRawDataType();
+    if (rdt == null && platform != null) rdt = platform.getRawDataType();
+    if (rdt == null) rdt = RawDataTypes.getRawDataType( request.getParameter("rawdatatype"));
+    project.setDefaultItem(dc, platform, Project.Default.PLATFORM);
+    project.setDefaultItem(dc, variant, Project.Default.PLATFORM_VARIANT);
+    project.setDefaultRawDataType(rdt);   
+    
     for (Project.Default d : Project.Default.values())
     {
@@ -184 +205 @@
         }
       }
-      else if (d == Project.Default.RAW_DATA_TYPE)
-      {
-        String selectId = request.getParameter(selectDefault);
-        if (selectId != null && selectId.length() > 0)
-        {
-          RawDataType rdt = selectId.equals("0") ? null :RawDataTypes.getRawDataType(selectId);
-          project.setDefaultRawDataType(rdt);
-        }
-      }
-    }
-
+    }
+    
     dc.commit();
     cc.removeObject("item");

trunk/www/my_base/projects/view_project.jsp

@@ -319 +319 @@
             boolean readDefaultValue = true;
             String defaultName = d.getShortName();
-            String value = "";
+            String value = null;
             if (d.getItemType() != null)
             {
@@ -340 +340 @@
             {
               RawDataType rdt = project.getDefaultRawDataType();
-              value = rdt != null ? rdt.getName() : "";
+              value = rdt != null ? rdt.getName() : null;
             }
-            if (value.length() > 0)
+            if (value != null)
             {
               %>