Changeset 3909

Timestamp:

Nov 6, 2007, 8:57:58 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #721: Store data in files instead of in the database

Remember most recently used platform/variant when creating raw bioassays/array designs

Location:

trunk/www

Files:

• include/scripts/platforms.js (modified) (1 diff)
• lims/arraydesigns/edit_design.jsp (modified) (1 diff)
• lims/arraydesigns/index.jsp (modified) (1 diff)
• views/rawbioassays/edit_rawbioassay.jsp (modified) (1 diff)
• views/rawbioassays/index.jsp (modified) (1 diff)

trunk/www/include/scripts/platforms.js

@@ -70 +70 @@
   this.populateList = function(list, platformId, variantId)
   {
+    // Check that variant is part of platform; if ignore the variant
+    if (platformId && variantId)
+    {
+      var platform = this.getPlatformById(platformId);
+      if (platform)
+      {
+        var variant = platform.getVariantById(variantId);
+        if (!variant) variantId = null;
+      }
+    }
     for (var p = 0; p < allPlatforms.length; p++)
     {

trunk/www/lims/arraydesigns/edit_design.jsp

@@ -76 +76 @@
     title = "Create array design";
     cc.removeObject("item");
+    int currentPlatformId = Values.getInt(cc.getRecent(Item.PLATFORM.name(), 0), 0);
+    int currentVariantId = Values.getInt(cc.getRecent(Item.PLATFORMVARIANT.name(), 0), 0);
+    try
+    {
+      if (currentPlatformId != 0) currentPlatform = Platform.getById(dc, currentPlatformId);
+      if (currentVariantId != 0) currentVariant = PlatformVariant.getById(dc, currentVariantId);
+    }
+    //catch (Throwable t)
+    finally
+    {}
   }
   else

trunk/www/lims/arraydesigns/index.jsp

@@ -146 +146 @@
     Platform platform = platformId > 0 ? Platform.getById(dc, platformId) : null;
     PlatformVariant variant = variantId > 0 ? PlatformVariant.getById(dc, variantId) : null;
+    if (platform != null) cc.setRecent(platform, maxRecent);
+    if (variant != null) cc.setRecent(variant, maxRecent);
     if (design == null)
     {

trunk/www/views/rawbioassays/edit_rawbioassay.jsp

@@ -145 +145 @@
       currentPlatformId = Values.getInt(cc.getRecent(Item.PLATFORM.name(), 0), 0);
     }
-    if (currentPlatformId != 0) currentPlatform = Platform.getById(dc, currentPlatformId);
+    int currentVariantId = Values.getInt(cc.getRecent(Item.PLATFORMVARIANT.name(), 0), 0);
+    
+    try
+    {
+      if (currentVariantId != 0) currentVariant = PlatformVariant.getById(dc, currentVariantId);
+      if (currentPlatformId != 0) currentPlatform = Platform.getById(dc, currentPlatformId);
+    }
+    catch (Throwable t)
+    {}
     
     currentRawDataType = RawDataTypes.getRawDataType(cc.getPropertyValue("rawDataType"));

trunk/www/views/rawbioassays/index.jsp

@@ -228 +228 @@
       if (variantId > 0) variant = PlatformVariant.getById(dc, variantId);
     }
-    
     RawDataType rdt = RawDataTypes.getRawDataType(Values.getStringOrNull(request.getParameter("rawdatatype")));
+    if (platform != null) cc.setRecent(platform, maxRecent);
+    if (variant != null) cc.setRecent(variant, maxRecent);
     if (rdt != null) cc.setRecent("RawDataType", rdt.getId(), maxRecent);