Changeset 2495

Timestamp:

Aug 8, 2006, 2:52:42 PM (17 years ago)

Author:

Martin Svensson

Message:

Fixes #173 Fully functional to create/delete HardwareType? and
attach a hardware to PlateEvent? and BiomaterialEvent?.

Location:

trunk

Files:

• src/core/common-queries.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/HardwareType.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Update.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/data/HardwareTypeData.java (modified) (2 diffs)
• src/install/net/sf/basedb/install/InitDB.java (modified) (1 diff)
• www/admin/hardwaretypes/edit_hardwaretype.jsp (modified) (1 diff)
• www/admin/hardwaretypes/index.jsp (modified) (2 diffs)
• www/admin/hardwaretypes/list_hardwaretypes.jsp (modified) (6 diffs)
• www/admin/hardwaretypes/view_hardwaretype.jsp (modified) (4 diffs)

trunk/src/core/common-queries.xml

@@ -2055 +2055 @@
     </description>
   </query>
-
+  
+  <query id="SET_REMOVED_FOR_HARDWARETYPES" type="HQL">
+    <sql>
+      UPDATE HardwareTypeData hwd
+      SET hwd.removed = false
+      WHERE hwd.removed IS NULL
+    </sql>
+    <description>
+      A Hibernate query that sets the removed property to false for a
+      HardwareTypeData if it has NULL value.
+    </description>
+  </query>
+  
 </predefined-queries>

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

@@ -41 +41 @@
 public class HardwareType
   extends BasicItem<HardwareTypeData>
-  implements Nameable, SystemItem
+  implements Nameable, SystemItem, Removable
 {
 
@@ -67 +67 @@
     hybridization station.
   */
-  public static final String HYBRIDIZATION_STATION = "net.sf.basedb.core.HarwareType.HYBRIDIZATION_STATION";
+  public static final String HYBRIDIZATION_STATION = "net.sf.basedb.core.HardwareType.HYBRIDIZATION_STATION";
   
   /**
@@ -176 +176 @@
     return TYPE;
   }
+  //  -------------------------------------------
+  /*
+    From the Removable interface
+    -------------------------------------------
+  */
+  public boolean isRemoved()
+  {
+    return getData().isRemoved();
+  }
+  public void setRemoved(boolean removed)
+    throws PermissionDeniedException
+  {
+    checkPermission(removed ? Permission.DELETE : Permission.WRITE);
+    getData().setRemoved(removed);
+  }
   // -------------------------------------------
   /*

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

@@ -92 +92 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = 8;
+  public static final int NEW_SCHEMA_VERSION = 9;
 
   public static synchronized void createTables(boolean update, final ProgressReporter progress)

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

@@ -123 +123 @@
       <ul>
       <li>Added {@link net.sf.basedb.core.data.HardwareData} to BioMaterialEvents and PlateEvents.
+      </ul>
+    </td>
+  </tr>
+  
+  <tr>
+    <td>9</td>
+    <td>
+      <ul>
+      <li>Added removable property to {@link net.sf.basedb.core.data.HardwareTypesData}
+        The update of existing data is done before the database is initiated.
       </ul>
     </td>
@@ -222 +232 @@
         schemaVersion = setSchemaVersionInTransaction(8);
       }
-      /*
+      
       if (schemaVersion < 9)
       {
         if (progress != null) progress.display((int)(8*progress_factor), "--Updating to schema version 9...");
         schemaVersion = setSchemaVersionInTransaction(9);
+      }
+      /*
+      if (schemaVersion < 10)
+      {
+        if (progress != null) progress.display((int)(9*progress_factor), "--Updating to schema version 10...");
+        schemaVersion = setSchemaVersionInTransaction(10);
       }
       ... etc... 
@@ -459 +475 @@
     return schemaVersion;
   } 
-    
+  
+  /**
+    Adjust the existing items in the database to be compatible with the latest mappings 
+      @param update FALSE if it is an installation. TRUE if it is an update.
+      @param progress An object implementing the {@link ProgressReporter}
+      interface
+      @param rootLogin The root user login
+      @param rootPassword The root user password
+      @throws BaseException
+  */
+  public static synchronized void adjustExistingItems(boolean update, ProgressReporter progress, String rootLogin, String rootPassword)
+    throws BaseException
+  {
+    if (update)
+    {
+      org.hibernate.Transaction tx = null;
+      try
+      {
+        Application.start(false);
+  
+        // Test root user account
+        SessionControl sc = Application.newSessionControl(null, null, null);
+        sc.login(rootLogin, rootPassword, null, false);
+        if (sc.getLoggedInUserId() != SystemItems.getId(User.ROOT))
+        {
+          throw new PermissionDeniedException("User '" + rootLogin + "' is not the root account.");
+        }
+        
+        session = HibernateUtil.newSession();
+        
+        //Update the items in Hardware types.
+        if (getSchemaVersion() < 9)
+        {
+          tx = HibernateUtil.newTransaction(session);
+          
+          // Set removed to FALSE for all Hardware types with a null value
+          org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "SET_REMOVED_FOR_HARDWARETYPES");
+          /*
+            UPDATE HardwareTypeData hwd
+            SET hwd.removed = false
+            WHERE hwd.removed IS NULL
+          */
+          HibernateUtil.executeUpdate(query);
+          
+          //Correct a misspelt system_id for hardware type 'Hybridization station' in the latest schema_version
+          query = HibernateUtil.createQuery(session, "UPDATE HardwareTypeData hwd SET hwd.systemId='net.sf.basedb.core.HardwareType.HYBRIDIZATION_STATION' WHERE systemId = 'net.sf.basedb.core.HarwareType.HYBRIDIZATION_STATION'");
+          HibernateUtil.executeUpdate(query);
+          
+          //  Commit the changes
+          HibernateUtil.commit(tx);
+          log.info("adjustExistingSystemItems: OK");          
+        }           
+      }
+      catch (BaseException ex)
+      {
+        if (tx != null) HibernateUtil.rollback(tx);
+        if (progress != null) progress.display(100, "The adjustment of the existing items failed: " + ex.getMessage()+"\n");
+        log.info("adjustExistingItems: FAILED");
+        throw ex;
+      }
+      finally
+      {
+        HibernateUtil.close(session);
+        session = null;
+        Application.stop();
+      }   
+    }
+  }
 }

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

@@ -38 +38 @@
 public class HardwareTypeData
   extends BasicData
-  implements NameableData, SystemData
+  implements NameableData, SystemData, RemovableData
 {
   /*
@@ -64 +64 @@
   {
     this.description = description;
+  }
+  //  -------------------------------------------
+  /*
+    From the RemovableData interface
+    -------------------------------------------
+  */
+  private boolean removed;
+  public boolean isRemoved()
+  {
+    return removed;
+  }
+  public void setRemoved(boolean removed)
+  {
+    this.removed = removed;
   }
   // -------------------------------------------

trunk/src/install/net/sf/basedb/install/InitDB.java

@@ -64 +64 @@
         Install.createTables(update, progress);
         progress.setRange(35, 70);
+        Update.adjustExistingItems(update, progress, rootLogin, rootPassword);
         Install.initDatabase(update, progress, rootLogin, rootPassword);
         progress.setRange(75, 90);

trunk/www/admin/hardwaretypes/edit_hardwaretype.jsp

@@ -55 +55 @@
   if (itemId == 0)
   {
-    throw new PermissionDeniedException(Permission.CREATE, itemType.toString());
+    title="Create hardware type";
+    cc.removeObject("item");
   }
   else

trunk/www/admin/hardwaretypes/index.jsp

@@ -108 +108 @@
     redirect = editPage;
   }
+  else if ("NewItem".equals(cmd))
+  {
+    // Display the edit page for a new item (should be opened in a popup)
+    if (!sc.hasPermission(Permission.CREATE, itemType))
+    {
+      throw new PermissionDeniedException(Permission.CREATE, itemType.toString());
+    }
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    cc.setId(0);
+    redirect = editPage;
+  }
   else if ("UpdateItem".equals(cmd))
   {
@@ -114 +125 @@
     dc = sc.newDbControl();
     HardwareType hardwareType = (HardwareType)cc.getObject("item");
-    dc.reattachItem(hardwareType);
-    message = "Hardware type updated";
+    if (hardwareType == null)
+    {
+      hardwareType = HardwareType.getNew(dc);
+      message = "Hardware type created";
+      dc.saveItem(hardwareType);
+    }
+    else
+    {
+      dc.reattachItem(hardwareType);
+      message = "Hardware type updated";
+    }
     hardwareType.setName(Values.getStringOrNull(request.getParameter("name")));
     hardwareType.setDescription(Values.getStringOrNull(request.getParameter("description")));
     dc.commit();
     cc.removeObject("item");
+  }
+  else if ("DeleteItem".equals(cmd))
+  {
+    // Delete a single item and then return to the view page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    RemovableUtil.setRemoved(dc, itemType, Collections.singleton(cc.getId()), true);
+    dc.commit();
+    redirect = viewPage;
+  }
+  else if ("DeleteItems".equals(cmd))
+  {
+    // Delete all selected items on the list page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    int numTotal = cc.getSelected().size();
+    int numRemoved = RemovableUtil.setRemoved(dc, itemType, cc.getSelected(), true);
+    dc.commit();
+    if (numTotal != numRemoved)
+    {
+      message = (numRemoved == 0 ? "No" : "Only "+numRemoved+" of "+numTotal) + " items could be deleted, because you have no DELETE permission";
+    }
+    redirect = listPage+(message != null ? "&popmessage="+HTML.urlEncode(message) : "");
+  }
+  else if ("RestoreItem".equals(cmd))
+  {
+    // Restore a single item and then return to the view page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    RemovableUtil.setRemoved(dc, itemType, Collections.singleton(cc.getId()), false);
+    dc.commit();
+    redirect = viewPage;
+  }
+  else if ("RestoreItems".equals(cmd))
+  {
+    // Restore all selected items on the list page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    int numTotal = cc.getSelected().size();
+    int numRemoved = RemovableUtil.setRemoved(dc, itemType, cc.getSelected(), false);
+    dc.commit();
+    if (numTotal != numRemoved)
+    {
+      message = (numRemoved == 0 ? "No" : "Only "+numRemoved+" of "+numTotal) + " items could be deleted, because you have no DELETE permission";
+    }
+    redirect = listPage+(message != null ? "&popmessage="+HTML.urlEncode(message) : "");
   }
   else if ("ExportItems".equals(cmd))

trunk/www/admin/hardwaretypes/list_hardwaretypes.jsp

@@ -64 +64 @@
 final String ID = sc.getId();
 final boolean writePermission = sc.hasPermission(Permission.WRITE, itemType);
+final boolean createPermission = sc.hasPermission(Permission.CREATE, itemType);
+final boolean deletePermission = sc.hasPermission(Permission.DELETE, itemType);
 final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, null);
 
@@ -90 +92 @@
   {
     cc.setMessage(t.getMessage());
+    t.printStackTrace();
   }
   int numListed = 0;
@@ -98 +101 @@
     var submitPage = 'index.jsp';
     var formId = 'hardwareTypes';
+    function newItem()
+    {
+      Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', 0, true);
+    }
     function editItem(itemId)
     {
@@ -109 +116 @@
     {
       Table.itemOnClick(formId, evt, itemId, '<%=mode.getName()%>', viewItem, editItem, returnSelected);
+    }
+    function deleteItems()
+    {
+      var frm = document.forms[formId];
+      if (Forms.numChecked(frm) == 0)
+      {
+        alert('Please select at least one item in the list');
+        return; 
+      }
+      frm.action = submitPage;
+      frm.cmd.value = 'DeleteItems';
+      frm.submit();
+    }
+    function restoreItems()
+    {
+      var frm = document.forms[formId];
+      if (Forms.numChecked(frm) == 0)
+      {
+        alert('Please select at least one item in the list');
+        return; 
+      }
+      frm.action = submitPage;
+      frm.cmd.value = 'RestoreItems';
+      frm.submit();
     }
     function configureColumns()
@@ -199 +230 @@
         visible="<%=mode.hasToolbar()%>"
         >
+        <tbl:button
+          disabled="<%=createPermission ? false : true %>"
+          image="<%=createPermission ? "new.gif" : "new_disabled.gif"%>"
+          onclick="newItem()"
+          title="New&hellip;" 
+          tooltip="<%=createPermission ? "Create new hardware type" : "You do not have permission to create hardware types"%>"
+        />
+        <tbl:button
+          disabled="<%=deletePermission ? false : true %>"
+          image="<%=deletePermission ? "delete.gif" : "delete_disabled.gif"%>"
+          onclick="deleteItems()"
+          title="Delete"
+          tooltip="<%=deletePermission ? "Delete the selected items" : "You do not have permission to delete hardware types" %>" 
+        />
+        <tbl:button 
+          disabled="<%=writePermission ? false : true%>" 
+          image="<%=writePermission ? "restore.gif" : "restore_disabled.gif"%>" 
+          onclick="restoreItems()" 
+          title="Restore" 
+          tooltip="<%=writePermission ? "Restore the selected (deleted) items" : "You do not have permission to edit hardware types" %>" 
+        />
         <tbl:button 
           image="columns.gif" 
@@ -302 +354 @@
                   clazz="icons" 
                   visible="<%=mode.hasIcons()%>"
-                  ><base:icon
+                  ><base:icon 
+                    image="deleted.gif" 
+                    tooltip="This item has been scheduled for deletion" 
+                    visible="<%=item.isRemoved()%>"
+                  /><base:icon
                     image="systemitem.gif"
                     tooltip="This item is a system item"

trunk/www/admin/hardwaretypes/view_hardwaretype.jsp

@@ -73 +73 @@
   final boolean usePermission = hardwareType.hasPermission(Permission.USE);
   final boolean writePermission = hardwareType.hasPermission(Permission.WRITE);
+  final boolean deletePermission = hardwareType.hasPermission(Permission.DELETE);
   %>
 
@@ -81 +82 @@
     {
       Main.viewOrEditItem('<%=ID%>', '<%=itemType.name()%>', <%=itemId%>, true);
+    }
+    function deleteItem()
+    {
+      location.replace('index.jsp?ID=<%=ID%>&cmd=DeleteItem&item_id=<%=itemId%>');
+    }
+    function restoreItem()
+    {
+      location.replace('index.jsp?ID=<%=ID%>&cmd=RestoreItem&item_id=<%=itemId%>');
     }
     function runPlugin(cmd)
@@ -111 +120 @@
         tooltip="<%=writePermission ? "Edit this hardware type" : "You do not have permission to edit this hardware type"%>" 
       />
+      <tbl:button 
+        disabled="<%=deletePermission ? false : true%>" 
+        image="<%=deletePermission ? "delete.gif" : "delete_disabled.gif"%>" 
+        onclick="deleteItem()" 
+        title="Delete"
+        visible="<%=!hardwareType.isRemoved()%>"
+        tooltip="<%=deletePermission ? "Delete this hardware type" : "You do not have permission to delete this hardware type"%>" 
+      />
+      <tbl:button 
+        disabled="<%=writePermission ? false : true%>" 
+        image="<%=writePermission ? "restore.gif" : "restore_disabled.gif"%>" 
+        onclick="restoreItem()" 
+        title="Restore"
+        visible="<%=hardwareType.isRemoved()%>"
+        tooltip="<%=writePermission ? "Restore this hardware type" : "You do not have permission to restore this hardware type"%>" 
+      />
       <tbl:button
         image="add.png"
@@ -141 +166 @@
     <div class="boxedbottom">
       <div class="itemstatus">Permissions on this item: <i><%=PermissionUtil.getFullPermissionNames(hardwareType)%></i></div>
+      <%
+      if (hardwareType.isRemoved())
+      {
+        %>
+        <div class="itemstatus">
+          <base:icon image="deleted.gif"
+            visible="<%=hardwareType.isRemoved()%>"> This item has been flagged for deletion<br></base:icon>
+        </div>
+        <%
+      }
+      %>
       <table class="form" cellspacing=0>
       <tr>