From 14354ed11d838f3088caae218e504df17ed83bd8 Mon Sep 17 00:00:00 2001 From: yoldas Date: Wed, 20 Nov 2024 09:54:46 +0000 Subject: [PATCH 1/6] Added scRNA bed verification for LRC GEM-X 5p cDNA PCR to LRC GEM-X 5p cDNA PCR XP --- config/robots.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/config/robots.rb b/config/robots.rb index 18970194b..edc295939 100644 --- a/config/robots.rb +++ b/config/robots.rb @@ -3688,6 +3688,29 @@ } ) + # scRNA pipeline + # Hamilton bed verification + # LRC GEM-X 5p cDNA PCR to LRC GEM-X 5p cDNA PCR XP + # Transfers 1:1 + custom_robot( + 'hamilton-lrc-gem-x-cdna-pcr-to-lrc-gem-x-5p-cdna-pcr-xp', + name: 'Hamilton LRC GEM-X 5p cDNA PCR => LRC GEM-X 5p cDNA PCR XP', + beds: { + bed(13).barcode => { + purpose: 'LRC GEM-X 5p cDNA PCR', + states: ['passed'], + label: 'Bed 13' + }, + bed(3).barcode => { + purpose: 'LRC GEM-X 5p cDNA PCR XP', + states: ['pending'], + label: 'Bed 3', + parent: bed(13).barcode, + target_state: 'passed' + } + } + ) + # ANOSPP Beckman bed verification # LANS-96 Stock ethanol removal step custom_robot( From e43cc0ea476b44e3590da86d47ebfb6d457422c3 Mon Sep 17 00:00:00 2001 From: yoldas Date: Wed, 20 Nov 2024 10:00:14 +0000 Subject: [PATCH 2/6] Add require_robot flag to bed verification LRC GEM-X 5p cDNA PCR to LRC GEM-X 5p cDNA PCR XP --- config/robots.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/robots.rb b/config/robots.rb index edc295939..ca9add1eb 100644 --- a/config/robots.rb +++ b/config/robots.rb @@ -3695,6 +3695,7 @@ custom_robot( 'hamilton-lrc-gem-x-cdna-pcr-to-lrc-gem-x-5p-cdna-pcr-xp', name: 'Hamilton LRC GEM-X 5p cDNA PCR => LRC GEM-X 5p cDNA PCR XP', + require_robot: true, beds: { bed(13).barcode => { purpose: 'LRC GEM-X 5p cDNA PCR', From 557a7f1d68e7bec81fa6f290f79800c873bfb1e6 Mon Sep 17 00:00:00 2001 From: Dasun Pubudumal Date: Thu, 28 Nov 2024 16:54:06 +0000 Subject: [PATCH 3/6] Fixing the label printing issue --- app/controllers/print_jobs_controller.rb | 2 +- app/models/print_job.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/print_jobs_controller.rb b/app/controllers/print_jobs_controller.rb index 896c186d9..29a7cb4d2 100644 --- a/app/controllers/print_jobs_controller.rb +++ b/app/controllers/print_jobs_controller.rb @@ -28,7 +28,7 @@ def print_job_params # While we COULD carefully define the current label structure, we gain nothing by doing so and make # future changes more painful. permitted[:labels] = params.require(:print_job)[:labels].map(&:permit!) - permitted[:labels_sprint] = params.require(:print_job)[:labels_sprint][:sprint].map(&:permit!) + permitted[:labels_sprint] = params.require(:print_job)[:labels_sprint].permit! end end diff --git a/app/models/print_job.rb b/app/models/print_job.rb index b7639f99b..eac78d4c3 100644 --- a/app/models/print_job.rb +++ b/app/models/print_job.rb @@ -90,6 +90,8 @@ def print_to_sprint label_template = get_label_template_by_service('SPrint') + label_array = labels_sprint.values + # label_array: # [{ # "right_text"=>"DN9000003B", @@ -99,7 +101,7 @@ def print_to_sprint # "extra_left_text"=>"10-NOV-2020" # }] - merge_fields_list = labels_sprint * number_of_copies + merge_fields_list = label_array * number_of_copies # assumes all labels use the same label template SPrintClient.send_print_request(printer_name, label_template, merge_fields_list) From 1148579099eb11cd900e002fe0e28b96a96b9ff9 Mon Sep 17 00:00:00 2001 From: Dasun Pubudumal Date: Thu, 28 Nov 2024 17:14:23 +0000 Subject: [PATCH 4/6] Fixing the label printing issue tests --- spec/models/print_job_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/models/print_job_spec.rb b/spec/models/print_job_spec.rb index 3303d0dab..162c88b2d 100644 --- a/spec/models/print_job_spec.rb +++ b/spec/models/print_job_spec.rb @@ -188,15 +188,15 @@ describe 'print_to_sprint' do let(:labels_sprint) do - [ - { + { + 'sprint' => { 'right_text' => 'DN9000003B', 'left_text' => 'DN9000003B', 'barcode' => 'DN9000003B', 'extra_right_text' => 'DN9000003B LTHR-384 RT', 'extra_left_text' => '10-NOV-2020' } - ] + } end it 'will send a print request to SPrintClient' do @@ -215,7 +215,7 @@ expect(SPrintClient).to receive(:send_print_request).with( printer_sprint.name, label_template_name_sprint, - labels_sprint + labels_sprint.values ) expect(pj.print_to_sprint).to eq(true) end From 8c5e77a1c380bd26296bbee5dd830155807599ce Mon Sep 17 00:00:00 2001 From: Dasun Pubudumal Date: Fri, 29 Nov 2024 10:04:57 +0000 Subject: [PATCH 5/6] Fixing the label printing issue tests --- app/models/print_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/print_job.rb b/app/models/print_job.rb index eac78d4c3..4d8c72e57 100644 --- a/app/models/print_job.rb +++ b/app/models/print_job.rb @@ -90,7 +90,7 @@ def print_to_sprint label_template = get_label_template_by_service('SPrint') - label_array = labels_sprint.values + label_array = labels_sprint.values.flatten # label_array: # [{ From d4d7cb8bd6cd601a46e8e2199584866e86d980d9 Mon Sep 17 00:00:00 2001 From: Dasun Pubudumal Date: Fri, 29 Nov 2024 10:22:27 +0000 Subject: [PATCH 6/6] Bumping release version --- .release-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-version b/.release-version index 2219e6b05..8c00627aa 100644 --- a/.release-version +++ b/.release-version @@ -1 +1 @@ -3.64.1 +3.64.2