From 7802db83847598bee586554b34f7a232a70dc4fb Mon Sep 17 00:00:00 2001 From: Thorhildur Thorleiksdottir Date: Tue, 28 Jan 2025 11:30:00 +0000 Subject: [PATCH] chore(j-s): Update substances and combine drugs and prescribed medication lists --- .../IndictmentCountSubstanceEnum.strings.ts | 10 ++ .../Substances/SubstancesEnum.strings.ts | 12 +++ libs/judicial-system/types/src/index.ts | 3 +- .../types/src/lib/indictmentCount.ts | 95 ++----------------- .../types/src/lib/substances.ts | 88 +++++++++++++++++ 5 files changed, 121 insertions(+), 87 deletions(-) create mode 100644 libs/judicial-system/types/src/lib/substances.ts diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCountSubstanceEnum.strings.ts b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCountSubstanceEnum.strings.ts index 0bd6e3d1501b..96ecb153a4b6 100644 --- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCountSubstanceEnum.strings.ts +++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/IndictmentCountSubstanceEnum.strings.ts @@ -81,6 +81,11 @@ export const indictmentCountSubstanceEnum = defineMessages({ defaultMessage: 'brómazepam {amount} ng/ml', description: 'Notaður fyrir brómazepam í blóði', }, + BROMAZOLAM: { + id: 'judicial.system.core:indictments_indictment.indictment_offense_count_enum.bromazolam', + defaultMessage: 'brómazólam {amount} ng/ml', + description: 'Notaður fyrir brómazólam í blóði', + }, BUPRENORPHINE: { id: 'judicial.system.core:indictments_indictment.indictment_offense_count_enum.buprenorphine', defaultMessage: 'búprenorfín {amount} ng/ml', @@ -111,6 +116,11 @@ export const indictmentCountSubstanceEnum = defineMessages({ defaultMessage: 'flúnitrazepam {amount} ng/ml', description: 'Notaður fyrir flúnitrazepam í blóði', }, + FLUALPRAZOLAM: { + id: 'judicial.system.core:indictments_indictment.indictment_offense_count_enum.flualprazolam', + defaultMessage: 'flúalprazólam {amount} ng/ml', + description: 'Notaður fyrir flúalprazólam í blóði', + }, GABAPENTIN: { id: 'judicial.system.core:indictments_indictment.indictment_offense_count_enum.gabapentin', defaultMessage: 'gabapentín {amount} µg/ml', diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/SubstancesEnum.strings.ts b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/SubstancesEnum.strings.ts index 89fe9747c824..1ee222f70633 100644 --- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/SubstancesEnum.strings.ts +++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Substances/SubstancesEnum.strings.ts @@ -19,6 +19,18 @@ export const substanceEnum = defineMessages({ description: 'Notaður fyrir fenazepam í leitanlegum lyfja lista á ákæru skrefi í ákærum.', }, + FLUALPRAZOLAM: { + id: 'judicial.system.core:substances.flualprazolam', + defaultMessage: 'Flúalprazólam', + description: + 'Notaður fyrir flúalprazólam í leitanlegum lyfja lista á ákæru skrefi í ákærum.', + }, + BROMAZOLAM: { + id: 'judicial.system.core:substances.bromazolam', + defaultMessage: 'Brómazólam', + description: + 'Notaður fyrir bromazolam í leitanlegum lyfja lista á ákæru skrefi í ákærum.', + }, KETAMINE: { id: 'judicial.system.core:substances.ketamine', defaultMessage: 'Ketamín', diff --git a/libs/judicial-system/types/src/index.ts b/libs/judicial-system/types/src/index.ts index 75e842cad189..b0818f45984f 100644 --- a/libs/judicial-system/types/src/index.ts +++ b/libs/judicial-system/types/src/index.ts @@ -118,10 +118,11 @@ export type { export { IndictmentCountOffense, - Substance, offenseSubstances, } from './lib/indictmentCount' +export { Substance } from './lib/substances' + export { type Lawyer, mapToLawyer } from './lib/lawyer' export type { SubstanceMap } from './lib/indictmentCount' diff --git a/libs/judicial-system/types/src/lib/indictmentCount.ts b/libs/judicial-system/types/src/lib/indictmentCount.ts index 2966f6cb686c..0a6a4a49ea6b 100644 --- a/libs/judicial-system/types/src/lib/indictmentCount.ts +++ b/libs/judicial-system/types/src/lib/indictmentCount.ts @@ -1,3 +1,8 @@ +import { + ILLEGAL_DRUGS_AND_PRESCRIPTION_DRUGS_DRIVING, + Substance, +} from './substances' + export enum IndictmentCountOffense { DRIVING_WITHOUT_LICENCE = 'DRIVING_WITHOUT_LICENCE', DRUNK_DRIVING = 'DRUNK_DRIVING', @@ -5,49 +10,6 @@ export enum IndictmentCountOffense { PRESCRIPTION_DRUGS_DRIVING = 'PRESCRIPTION_DRUGS_DRIVING', } -export enum Substance { - ALCOHOL = 'ALCOHOL', - AMPHETAMINE = 'AMPHETAMINE', - ETIZOLAM = 'ETIZOLAM', - PHENAZEPAM = 'PHENAZEPAM', - KETAMINE = 'KETAMINE', - KETOBEMIDONE = 'KETOBEMIDONE', - COCAINE = 'COCAINE', - MDMA = 'MDMA', - METHAMPHETAMINE = 'METHAMPHETAMINE', - METHYLPHENIDATE = 'METHYLPHENIDATE', - O_DESMETHYLTRAMADOL = 'O_DESMETHYLTRAMADOL', - TETRAHYDROCANNABINOL = 'TETRAHYDROCANNABINOL', - TRAMADOL = 'TRAMADOL', - ZOPICLONE = 'ZOPICLONE', - ALPRAZOLAM = 'ALPRAZOLAM', - BROMAZEPAM = 'BROMAZEPAM', - BUPRENORPHINE = 'BUPRENORPHINE', - DEMOXEAPAM = 'DEMOXEAPAM', - DESMETHYLCHLORDIAZEPOXIDE = 'DESMETHYLCHLORDIAZEPOXIDE', - DIAZEPAM = 'DIAZEPAM', - FENTANYL = 'FENTANYL', - FLUNITRAZEPAM = 'FLUNITRAZEPAM', - GABAPENTIN = 'GABAPENTIN', - CLONAZEPAM = 'CLONAZEPAM', - CHLORDIAZEPOXIDE = 'CHLORDIAZEPOXIDE', - CODEINE = 'CODEINE', - LORAZEPAM = 'LORAZEPAM', - METHADONE = 'METHADONE', - MIDAZOLAM = 'MIDAZOLAM', - MORPHINE = 'MORPHINE', - NITRAZEPAM = 'NITRAZEPAM', - NORBUPRENORPHINE = 'NORBUPRENORPHINE', - NORDIAZEPAM = 'NORDIAZEPAM', - OXAZEPAM = 'OXAZEPAM', - OXYCODONE = 'OXYCODONE', - PREGABALIN = 'PREGABALIN', - QUETIAPINE = 'QUETIAPINE', - TEMAZEPAM = 'TEMAZEPAM', - TRIAZOLAM = 'TRIAZOLAM', - ZOLPIDEM = 'ZOLPIDEM', -} - export type SubstanceMap = { [key in Substance]?: string } export const offenseSubstances: { @@ -55,47 +17,8 @@ export const offenseSubstances: { } = { [IndictmentCountOffense.DRIVING_WITHOUT_LICENCE]: [], [IndictmentCountOffense.DRUNK_DRIVING]: [Substance.ALCOHOL], - [IndictmentCountOffense.ILLEGAL_DRUGS_DRIVING]: [ - Substance.AMPHETAMINE, - Substance.ETIZOLAM, - Substance.PHENAZEPAM, - Substance.KETAMINE, - Substance.KETOBEMIDONE, - Substance.COCAINE, - Substance.MDMA, - Substance.METHAMPHETAMINE, - Substance.METHYLPHENIDATE, - Substance.O_DESMETHYLTRAMADOL, - Substance.TETRAHYDROCANNABINOL, - Substance.TRAMADOL, - Substance.ZOPICLONE, - ], - [IndictmentCountOffense.PRESCRIPTION_DRUGS_DRIVING]: [ - Substance.ALPRAZOLAM, - Substance.BROMAZEPAM, - Substance.BUPRENORPHINE, - Substance.DEMOXEAPAM, - Substance.DESMETHYLCHLORDIAZEPOXIDE, - Substance.DIAZEPAM, - Substance.FENTANYL, - Substance.FLUNITRAZEPAM, - Substance.GABAPENTIN, - Substance.CLONAZEPAM, - Substance.CHLORDIAZEPOXIDE, - Substance.CODEINE, - Substance.LORAZEPAM, - Substance.METHADONE, - Substance.MIDAZOLAM, - Substance.MORPHINE, - Substance.NITRAZEPAM, - Substance.NORBUPRENORPHINE, - Substance.NORDIAZEPAM, - Substance.OXAZEPAM, - Substance.OXYCODONE, - Substance.PREGABALIN, - Substance.QUETIAPINE, - Substance.TEMAZEPAM, - Substance.TRIAZOLAM, - Substance.ZOLPIDEM, - ], + [IndictmentCountOffense.ILLEGAL_DRUGS_DRIVING]: + ILLEGAL_DRUGS_AND_PRESCRIPTION_DRUGS_DRIVING, + [IndictmentCountOffense.PRESCRIPTION_DRUGS_DRIVING]: + ILLEGAL_DRUGS_AND_PRESCRIPTION_DRUGS_DRIVING, } diff --git a/libs/judicial-system/types/src/lib/substances.ts b/libs/judicial-system/types/src/lib/substances.ts new file mode 100644 index 000000000000..f27013892cc7 --- /dev/null +++ b/libs/judicial-system/types/src/lib/substances.ts @@ -0,0 +1,88 @@ +export enum Substance { + ALCOHOL = 'ALCOHOL', + ALPRAZOLAM = 'ALPRAZOLAM', + AMPHETAMINE = 'AMPHETAMINE', + BROMAZEPAM = 'BROMAZEPAM', + BROMAZOLAM = 'BROMAZOLAM', + BUPRENORPHINE = 'BUPRENORPHINE', + CHLORDIAZEPOXIDE = 'CHLORDIAZEPOXIDE', + CLONAZEPAM = 'CLONAZEPAM', + COCAINE = 'COCAINE', + CODEINE = 'CODEINE', + DEMOXEAPAM = 'DEMOXEAPAM', + DESMETHYLCHLORDIAZEPOXIDE = 'DESMETHYLCHLORDIAZEPOXIDE', + DIAZEPAM = 'DIAZEPAM', + ETIZOLAM = 'ETIZOLAM', + FENTANYL = 'FENTANYL', + FLUALPRAZOLAM = 'FLUALPRAZOLAM', + FLUNITRAZEPAM = 'FLUNITRAZEPAM', + GABAPENTIN = 'GABAPENTIN', + KETAMINE = 'KETAMINE', + KETOBEMIDONE = 'KETOBEMIDONE', + LORAZEPAM = 'LORAZEPAM', + MDMA = 'MDMA', + METHADONE = 'METHADONE', + METHAMPHETAMINE = 'METHAMPHETAMINE', + METHYLPHENIDATE = 'METHYLPHENIDATE', + MIDAZOLAM = 'MIDAZOLAM', + MORPHINE = 'MORPHINE', + NITRAZEPAM = 'NITRAZEPAM', + NORBUPRENORPHINE = 'NORBUPRENORPHINE', + NORDIAZEPAM = 'NORDIAZEPAM', + O_DESMETHYLTRAMADOL = 'O_DESMETHYLTRAMADOL', + OXAZEPAM = 'OXAZEPAM', + OXYCODONE = 'OXYCODONE', + PHENAZEPAM = 'PHENAZEPAM', + PREGABALIN = 'PREGABALIN', + QUETIAPINE = 'QUETIAPINE', + TEMAZEPAM = 'TEMAZEPAM', + TETRAHYDROCANNABINOL = 'TETRAHYDROCANNABINOL', + TRAMADOL = 'TRAMADOL', + TRIAZOLAM = 'TRIAZOLAM', + ZOLPIDEM = 'ZOLPIDEM', + ZOPICLONE = 'ZOPICLONE', +} + +export const ILLEGAL_DRUGS_AND_PRESCRIPTION_DRUGS_DRIVING = [ + Substance.AMPHETAMINE, + Substance.ALPRAZOLAM, + Substance.BROMAZEPAM, + Substance.BROMAZOLAM, + Substance.BUPRENORPHINE, + Substance.CHLORDIAZEPOXIDE, + Substance.CLONAZEPAM, + Substance.COCAINE, + Substance.CODEINE, + Substance.DEMOXEAPAM, + Substance.DESMETHYLCHLORDIAZEPOXIDE, + Substance.DIAZEPAM, + Substance.ETIZOLAM, + Substance.FENTANYL, + Substance.FLUALPRAZOLAM, + Substance.FLUNITRAZEPAM, + Substance.GABAPENTIN, + Substance.KETAMINE, + Substance.KETOBEMIDONE, + Substance.LORAZEPAM, + Substance.MDMA, + Substance.METHADONE, + Substance.METHAMPHETAMINE, + Substance.METHYLPHENIDATE, + Substance.MIDAZOLAM, + Substance.MORPHINE, + Substance.NITRAZEPAM, + Substance.NORBUPRENORPHINE, + Substance.NORDIAZEPAM, + Substance.O_DESMETHYLTRAMADOL, + Substance.OXAZEPAM, + Substance.OXYCODONE, + Substance.PHENAZEPAM, + Substance.PREGABALIN, + Substance.QUETIAPINE, + Substance.TEMAZEPAM, + Substance.TETRAHYDROCANNABINOL, + Substance.TRAMADOL, + Substance.TRIAZOLAM, + Substance.ZOLPIDEM, + Substance.ZOPICLONE, +]