Merge pull request #4240 from sanger/anospp-modify-sample-desc-valida…

…tion ANOSPP - modify specimen plate barcode column validation
sanger · Jul 29, 2024 · 63a0379 · 63a0379
2 parents c521413 + c125c64
commit 63a0379
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/app/sequencescape_excel/sequencescape_excel/validation.rb b/app/sequencescape_excel/sequencescape_excel/validation.rb
@@ -68,7 +68,7 @@ def inspect
     ##
     # formula1 is defined within the options, however it needs to be updated
     # with:
-    # 1) A provided rage in the case of lists
+    # 1) A provided range in the case of lists
     # 2) Proper cell names in the case of custom formulas
     # 3) AXLSX doesn't escape text fields for us, so we do that ourselves
     def formula1

diff --git a/config/sample_manifest_excel/columns.yml b/config/sample_manifest_excel/columns.yml
@@ -731,6 +731,26 @@ sample_description_specimen_plate_barcode:
         operator: ">"
         operand: 20
     is_number:
+sample_description_specimen_plate_barcode_mandatory:
+  heading: SAMPLE DESCRIPTION
+  updates: sample_description
+  unlocked: true
+  validation:
+    options:
+      type: :custom
+      operator: :between
+      formula1: "=AND(LEN(A1)>=7,LEN(A1)<=11)"
+      allowBlank: false
+      showInputMessage: true
+      promptTitle: "Sample Description - Specimen Plate Barcode"
+      prompt: "Please enter the specimen plate barcode (NB. should be the same for all wells on the input plate, and between 7 and 11 characters in length)."
+      showErrorMessage: true
+      errorStyle: :stop
+      errorTitle: "Sample Description - Specimen Plate Barcode"
+      error: "The barcode length must be between 7 and 11 characters in length."
+  conditional_formattings:
+    empty_mandatory_cell:
+    is_number:
 sample_strain_att:
   heading: STRAIN
   unlocked: true

diff --git a/config/sample_manifest_excel/manifest_types.yml b/config/sample_manifest_excel/manifest_types.yml
@@ -273,7 +273,7 @@ plate_anospp:
     - :date_of_sample_collection
     - :sample_taxon_id
     - :sample_common_name
-    - :sample_description_specimen_plate_barcode
+    - :sample_description_specimen_plate_barcode_mandatory
     - :sample_type
     - :donor_id
     - :control_type

diff --git a/spec/data/sample_manifest_excel/columns.yml b/spec/data/sample_manifest_excel/columns.yml
@@ -686,6 +686,26 @@ sample_description_specimen_plate_barcode:
         operator: ">"
         operand: 20
     is_number:
+sample_description_specimen_plate_barcode_mandatory:
+  heading: SAMPLE DESCRIPTION
+  updates: sample_description
+  unlocked: true
+  validation:
+    options:
+      type: :custom
+      operator: :between
+      formula1: "=AND(LEN(A1)>=7,LEN(A1)<=11)"
+      allowBlank: false
+      showInputMessage: true
+      promptTitle: "Sample Description - Specimen Plate Barcode"
+      prompt: "Please enter the specimen plate barcode (NB. should be the same for all wells on the input plate, and between 7 and 11 characters in length)."
+      showErrorMessage: true
+      errorStyle: :stop
+      errorTitle: "Sample Description - Specimen Plate Barcode"
+      error: "The barcode length must be between 7 and 11 characters in length."
+  conditional_formattings:
+    empty_mandatory_cell:
+    is_number:
 sample_strain_att:
   heading: STRAIN
   unlocked: true

diff --git a/spec/data/sample_manifest_excel/manifest_types.yml b/spec/data/sample_manifest_excel/manifest_types.yml
@@ -206,7 +206,7 @@ plate_anospp:
     - :date_of_sample_collection
     - :sample_taxon_id
     - :sample_common_name
-    - :sample_description_specimen_plate_barcode
+    - :sample_description_specimen_plate_barcode_mandatory
     - :sample_type
     - :donor_id
     - :control_type