Changeset 7005

Timestamp:

Nov 9, 2015, 10:48:11 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1958: Add Kit item

Added KitValidator for validating kit items in the "Item overview".

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/taglib/Select.java (modified) (1 diff)
• core/net/sf/basedb/util/overview/OverviewUtil.java (modified) (4 diffs)
• core/net/sf/basedb/util/overview/Validator.java (modified) (3 diffs)
• core/net/sf/basedb/util/overview/validator/BasicItemNodeValidatorFactory.java (modified) (1 diff)
• core/net/sf/basedb/util/overview/validator/KitValidator.java (added)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Select.java

@@ -598 +598 @@
     sb.append("<div class=\"interactable ").append(getButtonclass()).append(disabled ? " disabled": "").append("\"");
     sb.append(" id=\"").append(getId()).append(".select\"");
-    sb.append(" data-list-name=\"").append(getId()).append(".list\"");
+    sb.append(" data-list-name=\"").append(getId()).append("\"");
     if (!disabled)
     {

trunk/src/core/net/sf/basedb/util/overview/OverviewUtil.java

@@ -111 +111 @@
             Validator.MISSING_DERIVEDBIOASSAY, Validator.MISSING_ARRAYDESIGN, Validator.MISSING_PROTOCOL, 
             Validator.MISSING_HARDWARE, Validator.MISSING_SOFTWARE, Validator.MISSING_TAG,
+            Validator.MISSING_KIT,
             Validator.MISSING_ARRAYSLIDE, Validator.MISSING_ARRAYBATCH, Validator.MISSING_ANYTOANY
           })
@@ -122 +123 @@
             Validator.INCORRECT_DERIVEDBIOASSAY_TYPE, Validator.INCORRECT_PROTOCOLTYPE,
             Validator.INCORRECT_HARDWARETYPE, Validator.INCORRECT_SOFTWARETYPE,
-            Validator.INCORRECT_TAGTYPE
+            Validator.INCORRECT_TAGTYPE, Validator.INCORRECT_KITTYPE
           })
         );
@@ -155 +156 @@
             Validator.DENIED_BIOSOURCE, Validator.DENIED_SAMPLE, Validator.DENIED_EXTRACT, Validator.DENIED_BIOPLATE,
             Validator.DENIED_TAG, Validator.DENIED_PHYSICALBIOASSAY, Validator.DENIED_DERIVEDBIOASSAY,
-            Validator.DENIED_ARRAYDESIGN, Validator.DENIED_PLATFORM, Validator.DENIED_PROTOCOL, Validator.DENIED_HARDWARE,
-            Validator.DENIED_SOFTWARE, Validator.DENIED_ARRAYSLIDE, Validator.DENIED_ARRAYBATCH,
+            Validator.DENIED_ARRAYDESIGN, Validator.DENIED_PLATFORM, Validator.DENIED_PROTOCOL, 
+            Validator.DENIED_HARDWARE, Validator.DENIED_SOFTWARE, Validator.DENIED_KIT, 
+            Validator.DENIED_ARRAYSLIDE, Validator.DENIED_ARRAYBATCH,
             Validator.DENIED_ANYTOANY
           })
@@ -176 +178 @@
           {
             Validator.NONMATCHING_SPOTCOUNT, Validator.INCORRECT_BIOASSAY_POSITION,
-            Validator.NONUNIQUE_NAME_FOR_TYPE, Validator.NONUNIQUE_NAME_GLOBAL
+            Validator.NONUNIQUE_NAME_FOR_TYPE, Validator.NONUNIQUE_NAME_GLOBAL,
+            Validator.KIT_USED_AFTER_EXPIRATIONDATE
           })
         );

trunk/src/core/net/sf/basedb/util/overview/Validator.java

@@ -154 +154 @@
 
   /**
+    Validator rule that checks for missing kits. Default severity level
+    is WARNING.
+    @since 3.7
+  */
+  public static final Validator MISSING_KIT = new Validator(
+      "missing.kit", "Missing kit", 
+      "Checks if a kit has been specified for " +
+      "item that can have a kit.",
+      "Missing kit", Severity.WARNING
+    );
+  
+  /**
+    Validator rule that checks for denied access to kit. Default severity level
+    is WARNING.
+    @since 3.7
+  */
+  public static final Validator DENIED_KIT = new Validator(
+      "denied.kit", "Access denied to kit", 
+      "Checks if the user is denied access to a kit",
+      "Access denied to kit", Severity.WARNING
+    );
+
+  
+  /**
     Validator rule that checks for missing physical bioassay. Default severity level
     is WARNING.
@@ -549 +573 @@
     );
   
+  /**
+    Validator rule that checks if the kit attached to an item
+    has a correct kit type. Default severity level is WARNING.
+    @since 3.7
+  */
+  public static final Validator INCORRECT_KITTYPE = new Validator(
+      "subtype.kit", "Incorrect kit subtype",
+      "Checks if the kit attached to an item has a correct kit type.",
+      "Incorrect kit subtype", Severity.WARNING
+    );
+
   /**
     Validator that checks if the parent biosource of a sample
@@ -874 +909 @@
       "Too many files", Severity.WARNING
     );
-  
+
+  /**
+    Validator rule that checks if a kit has been used after
+    it's exiration date. Default severity level is WARNING.
+    @since 3.7
+  */
+  public static final Validator KIT_USED_AFTER_EXPIRATIONDATE = new Validator(
+      "kit.usedafterexpirationdate", "Kit used after expiration date",
+      "Checks if a kit has been used after the expiration date.",
+      "Kit used after expiration date", Severity.WARNING
+    );
+
   private String id;
   private String title;

trunk/src/core/net/sf/basedb/util/overview/validator/BasicItemNodeValidatorFactory.java

@@ -213 +213 @@
     registerCheckedNodeValidator(Item.SOFTWARE, SoftwareValidator.class);
     registerCheckedNodeValidator(Item.HARDWARE, HardwareValidator.class);
+    registerCheckedNodeValidator(Item.KIT, KitValidator.class);
     registerCheckedNodeValidator(Item.ANNOTATION, AnnotationValidator.class);
     registerCheckedNodeValidator(Item.PLATFORM, PlatformValidator.class);