Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
## [Unreleased]
## 6.1.0 / 2026-03-24
### Changed
* Added NCRS_CHECK and NCRS_CHECKED actions to action filter
* Removed SCR_CHECK and SCR_CHECKED actions from action filter
### Fixed
* Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1

Expand Down
7 changes: 4 additions & 3 deletions lib/canql/grammars/e_base_records.treetop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ module Canql

rule accepted_action
'badger_search' / 'badger_checked' / 'coding_group' / 'complete' /
'delete' / 'fasp_categorisation' / 'msds_sent' / 'qa' /
'rare_disease_team' / 'reg_coding_forum' /
'scr_checked' / 'scr_check' / 'search' / 'sources_checked' / 'technical'
'delete' / 'fasp_categorisation' / 'msds_sent' /
'ncrs_checked' / 'ncrs_check' /
'qa' / 'rare_disease_team' / 'reg_coding_forum' /
'search' / 'sources_checked' / 'technical'
end

rule all_or_none_actions
Expand Down
2 changes: 1 addition & 1 deletion lib/canql/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

# This stores the current version of the Canql gem
module Canql
VERSION = '6.0.3'
VERSION = '6.1.0'
end
12 changes: 6 additions & 6 deletions test/nodes/e_base_records_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ def test_should_filter_by_qa_action_on_patients
assert_equal({ Canql::EQUALS => 'patient' }, parser.meta_data['results.subject'])
end

def test_should_filter_by_scr_check_action
parser = Canql::Parser.new('all cases with scr_check action')
def test_should_filter_by_ncrs_check_action
parser = Canql::Parser.new('all cases with NCRS_check action')
assert parser.valid?
assert_equal({ Canql::EQUALS => 'SCR_CHECK' }, parser.meta_data['action.actioninitiated'])
assert_equal({ Canql::EQUALS => 'NCRS_CHECK' }, parser.meta_data['action.actioninitiated'])
end

def test_should_filter_by_badger_search_action
Expand All @@ -38,10 +38,10 @@ def test_should_filter_by_badger_search_action_and_provider
assert_equal({ Canql::EQUALS => 'RGT01' }, parser.meta_data['action.providercode'])
end

def test_should_filter_by_scr_checked_action
parser = Canql::Parser.new('all cases with scr_checked action')
def test_should_filter_by_ncrs_checked_action
parser = Canql::Parser.new('all cases with NCRS_checked action')
assert parser.valid?
assert_equal({ Canql::EQUALS => 'SCR_CHECKED' }, parser.meta_data['action.actioninitiated'])
assert_equal({ Canql::EQUALS => 'NCRS_CHECKED' }, parser.meta_data['action.actioninitiated'])
end

def test_should_filter_by_action_hosital_code
Expand Down
Loading