From 44f02c700011927d5b880d0163bbbdd87755e95e Mon Sep 17 00:00:00 2001
From: Chris Knoll <cknoll@ohdsi.org>
Date: Wed, 24 Apr 2024 12:19:49 -0400
Subject: [PATCH] Allow Observation Period in censor events.

Fixes #2930.
---
 .../components/CensoringCriteriaEditor.js          | 14 ++++++++++++++
 js/components/cohortbuilder/const.js               |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/js/components/cohortbuilder/components/CensoringCriteriaEditor.js b/js/components/cohortbuilder/components/CensoringCriteriaEditor.js
index 1d61a1f9a..ce54de63e 100644
--- a/js/components/cohortbuilder/components/CensoringCriteriaEditor.js
+++ b/js/components/cohortbuilder/components/CensoringCriteriaEditor.js
@@ -140,6 +140,20 @@ define([
                     });
                 },
             },
+            {
+                ...constants.censoringEventList.addObservationPeriod,
+                selected: false,
+                action: function () {
+                    var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
+                    unwrappedExpression
+                        .CensoringCriteria.push({
+                        ObservationPeriod: new criteriaTypes.ObservationPeriod(
+                            null,
+                            unwrappedExpression.ConceptSets
+                        ),
+                    });
+                },
+            },
             {
                 ...constants.censoringEventList.addPayerPlanPeriod,
                 selected: false,
diff --git a/js/components/cohortbuilder/const.js b/js/components/cohortbuilder/const.js
index 755a2ddd2..92cb8edf9 100644
--- a/js/components/cohortbuilder/const.js
+++ b/js/components/cohortbuilder/const.js
@@ -95,7 +95,9 @@ define(["knockout"], function (ko) {
       title: 'const.eventsList.addObservationPeriod.title',
       defaultTitle: 'Add Observation Period',
       descriptionInitial: 'const.eventsList.addObservationPeriod.desc_initial',
-      defaultDescriptionInitial: 'Find patients based on observations.',
+      defaultDescriptionInitial: 'Find patients based on observation period.',
+      descriptionCensoring: 'const.eventsList.addObservationPeriod.desc_censoring',
+      defaultDescriptionCensoring: 'Exit cohort based on observaton period.',
       descriptionGroup: 'const.eventsList.addObservationPeriod.desc_group',
       defaultDescriptionGroup: 'Find patients based on observation periods.',
     },
@@ -1112,6 +1114,7 @@ define(["knockout"], function (ko) {
     'addDrugExposure',
     'addMeasurement',
     'addObservation',
+    'addObservationPeriod',
     'addPayerPlanPeriod',
     'addProcedureOccurrence',
     'addSpecimen',