Changeset 3799

Timestamp:

Sep 28, 2007, 9:50:15 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #721: Added platform variants to web gui.

Location:

branches/filedb

Files:

• src/core/net/sf/basedb/core/PlatformVariant.java (modified) (6 diffs)
• www/admin/platforms/edit_platform.jsp (modified) (8 diffs)
• www/admin/platforms/variants (added)
• www/admin/platforms/variants/edit_variant.jsp (added)
• www/admin/platforms/variants/index.jsp (added)
• www/admin/platforms/variants/list_variants.jsp (added)
• www/admin/platforms/variants/view_variant.jsp (added)
• www/admin/platforms/view_platform.jsp (modified) (3 diffs)

branches/filedb/src/core/net/sf/basedb/core/PlatformVariant.java

@@ -51 +51 @@
     platform the new variant will also be a file-only variant.
     
-    @param dc
-    @param p
+    @param dc The DbControl to use for database access
+    @param platform The platform to create a variant for
+    @param externalId The external ID of the variant, it must be 
+      unique for all variants
     @return The new PlatformVariant item
   */
-  public static PlatformVariant getNew(DbControl dc, Platform p, String systemId)
-  {
-    if (p.isFileOnly())
-    {
-      return getNew(dc, p, systemId, p.getRawDataType().getChannels());
+  public static PlatformVariant getNew(DbControl dc, Platform platform, String externalId)
+  {
+    if (platform.isFileOnly())
+    {
+      return getNew(dc, platform, externalId, platform.getRawDataType().getChannels());
     }
     else
     {
-      return getNew(dc, p, systemId, p.getRawDataType());
+      return getNew(dc, platform, externalId, platform.getRawDataType());
     }
   }
@@ -72 +74 @@
     
     @param dc The DbControl to use for database access
+    @param platform The platform to create a variant for
     @param externalId The external ID of the variant, it must be 
       unique for all variants
@@ -77 +80 @@
     @return The new variant object
   */
-  public static PlatformVariant getNew(DbControl dc, Platform p, String externalId, int channels)
+  public static PlatformVariant getNew(DbControl dc, Platform platform, String externalId, int channels)
   {
     PlatformVariant v = dc.newItem(PlatformVariant.class);
-    v.setPlatform(p);
+    v.setPlatform(platform);
     v.getData().setFileOnly(true);
     v.setExternalId(externalId);
@@ -92 +95 @@
     
     @param dc The DbControl to use for database access
+    @param platform The platform to create a variant for
     @param externalId The external ID of the platform variant, must be 
       unique for all variants (including those for other platforms)
@@ -98 +102 @@
     @return The new platform object
   */
-  public static PlatformVariant getNew(DbControl dc, Platform p, String externalId, RawDataType rawDataType)
+  public static PlatformVariant getNew(DbControl dc, Platform platform, String externalId, RawDataType rawDataType)
   {
     PlatformVariant v = dc.newItem(PlatformVariant.class);
-    v.setPlatform(p);
+    v.setPlatform(platform);
     v.getData().setFileOnly(false);
     v.setExternalId(externalId);
@@ -387 +391 @@
     {
       // TODO - autogenerate a raw data type
+      rdt = new RawDataType(getExternalId(), getName(), getDescription(), getData().getChannels(), 
+          "file", null, null, null);
     }
     else
     {
-      RawDataTypes.getRawDataType(getData().getRawDataType());
+      rdt = RawDataTypes.getRawDataType(getData().getRawDataType());
     }
     return rdt;

branches/filedb/www/admin/platforms/edit_platform.jsp

@@ -77 +77 @@
   final String clazz = "class=\"text\"";
   final String requiredClazz = "class=\"text required\"";
+  final String unchangeableClazz = "class=\"text required unchangeable\"";
   %>
 
@@ -86 +87 @@
     {
       var frm = document.forms['platform'];
-      var fileOnly = Forms.getCheckedRadio(frm.fileOnly).value == '1';
       if (Main.trimString(frm.name.value) == '')
       {
@@ -93 +93 @@
         return false;
       }
-      else if (Main.trimString(frm.externalId.value) == '')
-      {
-        alert("You must enter an external ID");
-        frm.externalId.focus();
-        return false;
-      }
-      else if (fileOnly)
-      {
-        if (!Numbers.isInteger(frm.channels.value))
+      if (frm.externalId)
+      {
+        var fileOnly = Forms.getCheckedRadio(frm.fileOnly).value == '1';
+        if (Main.trimString(frm.externalId.value) == '')
         {
-          alert("You must enter the number of channels");
-          frm.channels.focus();
+          alert("You must enter an external ID");
+          frm.externalId.focus();
           return false;
         }
-        if (parseInt(frm.channels.value) <= 0)
+        else if (fileOnly)
         {
-          alert("The number of channels must be > 0");
-          frm.channels.focus();
-          return false;
+          if (!Numbers.isInteger(frm.channels.value))
+          {
+            alert("You must enter the number of channels");
+            frm.channels.focus();
+            return false;
+          }
+          if (parseInt(frm.channels.value) <= 0)
+          {
+            alert("The number of channels must be > 0");
+            frm.channels.focus();
+            return false;
+          }
         }
       }
@@ -182 +186 @@
         <tr>
           <td class="prompt">External ID</td>
-          <td><input <%=requiredClazz%> type="text" name="externalId" 
+          <td><input <%=unchangeableClazz%> type="text" name="externalId" 
             value="<%=HTML.encodeTags(cc.getPropertyValue("externalId"))%>" 
             size="40" maxlength="<%=Platform.MAX_EXTERNAL_ID_LENGTH%>"></td>
@@ -189 +193 @@
           <td class="prompt">File-only</td>
           <td>
-            <input type="radio" name="fileOnly" value="0" <%=!isFileOnly ? "checked" : ""%>
+            <input <%=unchangeableClazz%> type="radio" name="fileOnly" value="0" <%=!isFileOnly ? "checked" : ""%>
               onclick="fileOnlyOnClick()">no
-            <input type="radio" name="fileOnly" value="1" <%=isFileOnly ? "checked" : ""%>
+            <input <%=unchangeableClazz%> type="radio" name="fileOnly" value="1" <%=isFileOnly ? "checked" : ""%>
               onclick="fileOnlyOnClick()">yes
           </td>
@@ -199 +203 @@
           <td class="prompt">Raw data type</td>
           <td>
-            <select name="rawdatatype" class="required">
+            <select name="rawdatatype" <%=unchangeableClazz%>>
             <option value="">- any -
             <%
@@ -215 +219 @@
         <tr>
           <td class="prompt">Channels</td>
-          <td><input <%=requiredClazz%> type="text" name="channels" 
+          <td><input <%=unchangeableClazz%> type="text" name="channels" 
             value="<%=Values.getInt(cc.getPropertyValue("channels"), 1)%>" 
             size="12" maxlength="10" 
@@ -233 +237 @@
       </tr>
       </table>
-      <div align=right>&nbsp;<i><base:icon image="required.gif" /> = required information</i></div>
+      <div align=right>
+        &nbsp;<i><base:icon image="required.gif" /> = required information</i>
+        <%if (platform == null) {%><br>
+        <i><base:icon image="unchangeable.gif" /> = can't be changed later</i>
+        <%}%>
+        </div>
     </t:tab>
     </t:tabcontrol>

branches/filedb/www/admin/platforms/view_platform.jsp

@@ -101 +101 @@
       Main.viewOrEditItem('<%=ID%>', 'PLATFORMVARIANT', 0, true, '&platform_id=<%=itemId%>');
     }
+    function viewVariants()
+    {
+      location.href = 'variants/index.jsp?ID=<%=ID%>&cmd=List&platform_id=<%=itemId%>';
+    }
+    function switchTab(tabControlId, tabId)
+    {
+      if (tabId == 'variants')
+      {
+        viewVariants();
+      }
+      else
+      {
+        TabControl.setActiveTab(tabControlId, tabId);
+      }
+    }
     </script>
   </base:head>
@@ -110 +125 @@
     </p:path>
     
-    <t:tabcontrol id="main" active="properties">
+    <t:tabcontrol id="main" active="properties" switch="switchTab">
     <t:tab id="properties" title="Properties">
     
@@ -228 +243 @@
     </div>
       </t:tab>
+      <t:tab id="variants" title="Variants" 
+        tooltip="View and manage variants of this platform" />
       </t:tabcontrol>
       
-      <%
-      ItemQuery<PlatformVariant> variantQuery = platform.getVariants();
-      variantQuery.order(Orders.asc(Hql.property("name")));
-      ItemResultList<PlatformVariant> variants = variantQuery.list(dc);
-      if (variants.size() == 0)
-      {
-        %>
-        <h4>Variants</h4>
-        No variants of this platform exists
-        (or, you don't have permission to view them).
-        <%
-      }
-      else
-      {
-        %>
-        <h4 class="docked">Variants</h4>
-        <tbl:table
-          id="variants"
-          clazz="itemlist"
-          columns="all"
-          >
-        <tbl:columndef 
-          id="name"
-          title="Name"
-        />
-        <tbl:columndef 
-          id="description"
-          title="Description"
-        />
-        <tbl:data>
-          <tbl:columns>
-          </tbl:columns>
-          <tbl:rows>
-          <%
-          for (PlatformVariant item : variants)
-          {
-            %>
-            <tbl:row>
-              <tbl:cell column="name"><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell>
-              <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
-            </tbl:row>
-            <%
-          }
-          %>
-          </tbl:rows>
-        </tbl:data>
-        </tbl:table>
-        <%
-      }
-      %>
+
   </base:body>
   </base:page>