add humfre code column to all the manifests

config/sample_manifest_excel/columns.yml

@@ -1080,3 +1080,19 @@ legacy_donor_id:
 legacy_date_of_sample_collection:
   heading: DATE OF SAMPLE COLLECTION (MM/YY or YYYY only)
   updates: date_of_sample_collection
+huMFre_code:
+  heading: HuMFre Code
+  updates: huMFre_code
+  unlocked: true
+  validation:
+    options:
+      type: :custom
+      formula1: '=OR(
+        AND(LEN(A1)<=16, ISNUMBER(FIND("/", A1)), ISNUMBER(VALUE(LEFT(A1, 2))), ISNUMBER(VALUE(MID(A1, 4, LEN(A1)-3)))),
+        AND(LEN(A1)<=16, ISNUMBER(FIND("/", A1)), ISNUMBER(FIND("-", A1)), ISNUMBER(VALUE(LEFT(A1, 2))), ISNUMBER(VALUE(MID(A1, 4, 4))), ISNUMBER(VALUE(RIGHT(A1, 3))))
+        )'
+      allowBlank: true
+      showErrorMessage: true
+      errorStyle: :stop
+      errorTitle: "HuMFre Code"
+      error: "HuMFre code must match a valid format, e.g. 12/34 or 12/2023-001"

config/sample_manifest_excel/manifest_types.yml

@@ -37,6 +37,7 @@ plate_default: &plate_default
     - :donor_id
     - :phenotype
     - :control_type
+    - :huMFre_code
 plate_default_with_h12_empty:
   <<: *plate_default
   heading: "Default Plate with H12 empty"
@@ -95,6 +96,7 @@ plate_full:
     - :sample_ebi_accession_number
     - :donor_id
     - :control_type
+    - :huMFre_code
 plate_rnachip:
   heading: "RNA/ChIP Plate"
   asset_type: "plate"
@@ -126,6 +128,7 @@ plate_rnachip:
     - :organism_part
     - :sample_ebi_accession_number
     - :donor_id
+    - :huMFre_code
 plate_library:
   heading: "Library Plate - custom tags"
   asset_type: "library_plate"
@@ -184,6 +187,7 @@ plate_library:
     - :sample_ebi_accession_number
     - :donor_id
     - :primer_panel
+    - :huMFre_code
 plate_dual_index_tag_library:
   heading: "Library Plate - dual index tag plate"
   asset_type: "library_plate"
@@ -241,6 +245,7 @@ plate_dual_index_tag_library:
     - :disease
     - :sample_ebi_accession_number
     - :donor_id
+    - :huMFre_code
 plate_chromium_library:
   heading: "Chromium Library Plate"
   asset_type: "library_plate"
@@ -298,6 +303,7 @@ plate_chromium_library:
     - :disease
     - :sample_ebi_accession_number
     - :donor_id
+    - :huMFre_code
 plate_bioscan:
   heading: "Bioscan Plate"
   asset_type: "plate"
@@ -316,6 +322,7 @@ plate_bioscan:
     - :sample_type
     - :donor_id
     - :bioscan_control_type
+    - :huMFre_code
 plate_anospp:
   heading: "ANOSPP Plate"
   asset_type: "plate"
@@ -334,6 +341,7 @@ plate_anospp:
     - :sample_type
     - :donor_id
     - :control_type
+    - :huMFre_code
 plate_scrna_core_pools:
   heading: "scRNA Core Pools Plate"
   asset_type: "plate"
@@ -351,6 +359,7 @@ plate_scrna_core_pools:
     - :sample_ebi_accession_number
     - :sample_taxon_id
     - :sample_common_name
+    - :huMFre_code
 tube_default:
   heading: "Default Tube"
   asset_type: "1dtube"
@@ -387,6 +396,7 @@ tube_default:
     - :sample_ebi_accession_number
     - :donor_id
     - :phenotype
+    - :huMFre_code
 tube_full:
   heading: "Full Tube"
   asset_type: "1dtube"
@@ -438,6 +448,7 @@ tube_full:
     - :disease
     - :sample_ebi_accession_number
     - :donor_id
+    - :huMFre_code
 tube_rnachip:
   heading: "RNA/ChIP Tube"
   asset_type: "1dtube"
@@ -467,6 +478,7 @@ tube_rnachip:
     - :organism_part
     - :sample_ebi_accession_number
     - :donor_id
+    - :huMFre_code
 tube_multiplexed_library:
   heading: "Multiplexed Library Tube"
   asset_type: "multiplexed_library"
@@ -512,6 +524,7 @@ tube_multiplexed_library:
     - :phenotype
     - :primer_panel
     - :control_type
+    - :huMFre_code
 tube_library_with_tag_sequences:
   heading: "Library Tube with Tag Sequences"
   asset_type: "library"
@@ -554,6 +567,7 @@ tube_library_with_tag_sequences:
     - :donor_id
     - :phenotype
     - :primer_panel
+    - :huMFre_code
 tube_chromium_library:
   heading: "Chromium Library Tube"
   asset_type: "library"
@@ -595,6 +609,7 @@ tube_chromium_library:
     - :sample_ebi_accession_number
     - :donor_id
     - :phenotype
+    - :huMFre_code
 tube_multiplexed_library_with_tag_sequences:
   heading: "Multiplexed Library Tube with Tag Sequences"
   asset_type: "multiplexed_library"
@@ -638,6 +653,7 @@ tube_multiplexed_library_with_tag_sequences:
     - :phenotype
     - :primer_panel
     - :control_type
+    - :huMFre_code
 tube_multiplexed_chromium_library:
   heading: "Multiplexed Chromium Library Tube"
   asset_type: "multiplexed_library"
@@ -679,6 +695,7 @@ tube_multiplexed_chromium_library:
     - :sample_ebi_accession_number
     - :donor_id
     - :phenotype
+    - :huMFre_code
 tube_rack_default:
   heading: "Default Tube Rack"
   asset_type: "tube_rack"
@@ -715,6 +732,7 @@ tube_rack_default:
     - :sample_ebi_accession_number
     - :donor_id
     - :phenotype
+    - :huMFre_code
 long_read:
   heading: "Long Read"
   asset_type: "1dtube"
@@ -734,6 +752,7 @@ long_read:
     - :library_type_long_read
     - :country_of_origin
     - :date_of_sample_collection
+    - :huMFre_code
 long_read_plate:
   heading: "Long Read Plate"
   asset_type: "plate"
@@ -755,6 +774,7 @@ long_read_plate:
     - :library_type_long_read
     - :country_of_origin
     - :date_of_sample_collection
+    - :huMFre_code
 heron:
   heading: "Heron"
   asset_type: "plate"
@@ -808,6 +828,7 @@ heron:
     - :sample_ebi_accession_number
     - :control_type
     - :priority
+    - :huMFre_code
 cardinal:
   heading: "Cardinal"
   asset_type: "1dtube"
@@ -817,6 +838,7 @@ cardinal:
     - :supplier_name
     - :volume
     - :collected_by_for_cardinal
+    - :huMFre_code
 scrna_core:
   heading: "scRNA Core"
   asset_type: "1dtube"
@@ -828,6 +850,7 @@ scrna_core:
     - :supplier_name
     - :volume
     - :retention_instruction
+    - :huMFre_code
 tube_controls:
   heading: "Control tubes"
   asset_type: "1dtube"
@@ -837,6 +860,7 @@ tube_controls:
     - :supplier_name
     - :control_type
     - :collected_by_for_controls
+    - :huMFre_code
 tube_extraction:
   heading: "Extraction Tube"
   asset_type: "1dtube"
@@ -874,3 +898,4 @@ tube_extraction:
     - :sample_ebi_accession_number
     - :donor_id
     - :phenotype
+    - :huMFre_code

spec/data/sample_manifest_excel/columns.yml

@@ -1026,3 +1026,19 @@ retention_instruction:
   conditional_formattings:
     empty_cell:
     is_error:
+huMFre_code:
+  heading: HuMFre Code
+  updates: huMFre_code
+  unlocked: true
+  validation:
+    options:
+      type: :custom
+      formula1: '=OR(
+        AND(LEN(A1)<=16, ISNUMBER(FIND("/", A1)), ISNUMBER(VALUE(LEFT(A1, 2))), ISNUMBER(VALUE(MID(A1, 4, LEN(A1)-3)))),
+        AND(LEN(A1)<=16, ISNUMBER(FIND("/", A1)), ISNUMBER(FIND("-", A1)), ISNUMBER(VALUE(LEFT(A1, 2))), ISNUMBER(VALUE(MID(A1, 4, 4))), ISNUMBER(VALUE(RIGHT(A1, 3))))
+        )'
+      allowBlank: true
+      showErrorMessage: true
+      errorStyle: :stop
+      errorTitle: "HuMFre Code"
+      error: "HuMFre code must match a valid format, e.g. 12/34 or 12/2023-001"