From ba299f78cbc32eda7e11796d5a8ebc3c8a923935 Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Mon, 15 Jan 2024 13:58:31 -0600
Subject: [PATCH 01/22] adjust filter cohort definitions with add more options
 of timer filter

---
 .../cohortbuilder/CohortExpression.js         | 13 ++++++-
 .../EndStrategies/CustomEraStrategy.js        | 28 ++++++++++++++-
 .../EndStrategies/DateOffsetStrategy.js       | 12 +++++++
 .../cohortbuilder/InputTypes/Window.js        | 30 ++++++++++++++--
 .../CohortExpressionEditorTemplate.html       | 16 ++++++---
 .../components/CustomEraStrategyTemplate.html | 30 ++++++++++------
 .../DateOffsetStrategyTemplate.html           | 16 +++++----
 .../components/WindowInputTemplate.html       | 36 ++++++++++++-------
 js/components/cohortbuilder/options.js        | 12 +++++++
 9 files changed, 155 insertions(+), 38 deletions(-)

diff --git a/js/components/cohortbuilder/CohortExpression.js b/js/components/cohortbuilder/CohortExpression.js
index e5df5af3a..0389f4643 100644
--- a/js/components/cohortbuilder/CohortExpression.js
+++ b/js/components/cohortbuilder/CohortExpression.js
@@ -27,10 +27,21 @@ define(function (require, exports) {
 		self.CensoringCriteria = ko.observableArray(data.CensoringCriteria && data.CensoringCriteria.map(function (criteria) {
 			return CriteriaTypes.GetCriteriaFromObject(criteria, self.ConceptSets);
 		}));
-		self.CollapseSettings = {CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ) }
+		self.CollapseSettings = { CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ), EraPadUnitValue: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnitValue || 0), EraPadUnit: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnit || 'day') }
 		self.CensorWindow = ko.observable(new Period(data.CensorWindow));
 
 		self.cdmVersionRange = data.cdmVersionRange || null;
+
+		self.CollapseSettings.EraPadUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.CollapseSettings.EraPadUnitValue(insertValue ? Number(insertValue) : 0);
+			self.CollapseSettings.EraPadUnit() === 'day' && self.CollapseSettings.EraPad(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.CollapseSettings.EraPadUnit.subscribe(function (newValue){
+			self.CollapseSettings.EraPad(newValue === 'day' ? self.CollapseSettings.EraPadUnitValue() : 0);
+		})
+		
 	}
 	return CohortExpression;
 });
\ No newline at end of file
diff --git a/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js b/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
index 4a6addddb..b78d4fe81 100644
--- a/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
+++ b/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
@@ -6,7 +6,11 @@ define(['knockout'], function (ko) {
 
 		self.DrugCodesetId = ko.observable(data.DrugCodesetId);
 		self.GapDays = ko.observable(data.GapDays || 0);
+		self.GapUnit = ko.observable(data.GapUnit || 'day');
+		self.GapUnitValue = ko.observable(data.GapUnitValue || 0);
 		self.Offset = ko.observable(data.Offset || 0);
+		self.OffsetUnitValue = ko.observable(data.OffsetUnitValue || 0);
+		self.OffsetUnit = ko.observable(data.OffsetUnit || 'day');
 		self.DaysSupplyOverride = ko.observable(data.DaysSupplyOverride);
 		
 		// set up subscription to update DrugCodesetId if the item is removed from conceptSets
@@ -17,7 +21,29 @@ define(['knockout'], function (ko) {
 						self.DrugCodesetId(null);
 				}
 			});
-		}, null, "arrayChange");		
+		}, null, "arrayChange");	
+		
+		self.OffsetUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.OffsetUnitValue(insertValue ? Number(insertValue) : 0);
+			self.OffsetUnit() === 'day' && self.Offset(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.OffsetUnit.subscribe(function (newValue){
+			self.GapUnit(newValue);
+			self.Offset(newValue === 'day' ? self.OffsetUnitValue() : 0);
+		})
+
+		self.GapUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.GapUnitValue(insertValue ? Number(insertValue) : 0);
+			self.GapUnit() === 'day' && self.GapDays(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.GapUnit.subscribe(function (newValue){
+			self.OffsetUnit(newValue);
+			self.GapDays(newValue === 'day' ? self.GapUnitValue() : 0);
+		})
 	}
 
 	CustomEraStrategy.prototype.toJSON = function () {
diff --git a/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js b/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js
index ce5ce53bc..a0c8f8b69 100644
--- a/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js
+++ b/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js
@@ -6,6 +6,18 @@ define(['knockout'], function (ko) {
 
 		self.DateField = ko.observable(data.DateField || "StartDate");
 		self.Offset = ko.observable(data.Offset || 0);
+		self.OffsetUnitValue = ko.observable(data.OffsetUnitValue || 0);
+		self.OffsetUnit = ko.observable(data.OffsetUnit || 'day');
+
+		self.OffsetUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.OffsetUnitValue(insertValue ? Number(insertValue) : 0);
+			self.OffsetUnit() === 'day' && self.Offset(insertValue ? Number(insertValue) : 0);
+		})
+		
+		self.OffsetUnit.subscribe(function (newValue){
+			self.Offset(newValue === 'day' ? self.OffsetUnitValue() : 0);
+		})
 	}
 
 	DateOffsetStrategy.prototype.toJSON = function () {
diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 11c750566..37cc1037f 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -6,16 +6,42 @@ define(['knockout'], function (ko) {
 
 		self.Start = {
 			Days: ko.observable((data.Start && data.Start.Days) === 0 ? 0 : (data.Start && data.Start.Days) || null),
-			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1)
+			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1),
+			TimeUnit: ko.observable((data.Start && data.Start.TimeUnit) || 'day'),
+			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) || null),
 		};
 		
 		self.End = {
 			Days: ko.observable((data.End && data.End.Days) === 0 ? 0 : (data.End && data.End.Days) || null),
-			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1)
+			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1),
+			TimeUnit: ko.observable((data.End && data.End.TimeUnit) ||  'day'),
+			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) || null),
 		};
 		
 		self.UseIndexEnd = ko.observable(data.UseIndexEnd || false);
 		self.UseEventEnd = ko.observable(data.UseEventEnd || false);
+
+		self.Start.TimeUnitValue.subscribe(function (newValue){
+			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : null;
+			self.Start.TimeUnitValue(insertValue ? Number(insertValue) : null);
+			self.Start.TimeUnit() === 'day' &&	self.Start.Days(insertValue ? Number(insertValue) : null);
+		})
+
+		self.End.TimeUnitValue.subscribe(function (newValue){
+			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : null;
+			self.End.TimeUnitValue(insertValue ? Number(insertValue) : null);
+			self.End.TimeUnit() === 'day' && self.End.Days(insertValue ? Number(insertValue) : null);
+		})
+
+		self.Start.TimeUnit.subscribe(function (newValue){
+			self.End.TimeUnit(newValue);
+			self.Start.Days(newValue === 'day' ? self.Start.TimeUnitValue() : null);
+		})
+
+		self.End.TimeUnit.subscribe(function (newValue){
+			self.Start.TimeUnit(newValue);
+			self.End.Days(newValue === 'day' ? self.End.TimeUnitValue() : null);
+		})
 		
 	}
 
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
index ead0c21bd..aaca4f9f2 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
+++ b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
@@ -196,13 +196,19 @@
 		<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasTitle', 'Cohort Eras')"></span>
 	</div>
 	<div class="panel-body">
+		<div data-bind="with: expression().CollapseSettings">
+			<li>
+				<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasText_1', 'Specify era collapse gap size:')"></span>
+				<span contenteditable="true" class="numericInputField dropdown" data-bind="htmlValue: EraPadUnitValue, eventType: 'blur', ko_autocomplete: { value: EraPadUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }" />
+				<select data-bind="options: $component.options.windowTimeOptions,
+					optionsText: function(item) { return item.name },
+					optionsValue: 'value',
+					value: EraPadUnit">
+				</select>
+			</li>
+		</div>
 		<div data-bind="with: expression">
 			<ul>
-				<li>
-					<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasText_1', 'Specify era collapse gap size:')"></span>
-					<span contenteditable="true" class="numericInputField dropdown" data-bind="htmlValue: CollapseSettings.EraPad.numeric(), eventType: 'blur', ko_autocomplete: { value: CollapseSettings.EraPad, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }" />
-					<span data-bind="text: ko.i18n('components.cohortExpressionEditor.days', 'days')"></span>
-				</li>
 				<!-- ko if: $component.showCensorWindow -->
 				<li>
 					<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasText_2', 'Left censor cohort start dates to')"></span>
diff --git a/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html b/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html
index 8a1930bd0..334b1a409 100644
--- a/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html
+++ b/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html
@@ -1,9 +1,9 @@
 <!-- ko if: strategy()-->
-<div>
+<div data-bind="with: strategy()">
 	<b
 		data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_1', 'Continuous Exposure Persistence:')"></b><br />
 	<span
-		data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_2', 'Specify a concept set that contains one or more drugs.  A drug era will be derived from all drug exposure events for any of the drugs within the concept set, using the specified persistence window as a maximum allowable gap in days between successive exposure events and adding a specified surveillance window to the final exposure event.  If no exposure event end date is provided, then an exposure event end date is inferred to be event start date + days supply in cases when days supply is available or event start date + 1 day otherwise. This event persistence assures that the cohort end date will be no greater than the drug era end date.')"></span>
+		data-bind="text: ko.i18nformat('components.customEraStrategy.customEraStrategyText_20', 'Specify a concept set that contains one or more drugs.  A drug era will be derived from all drug exposure events for any of the drugs within the concept set, using the specified persistence window as a maximum allowable gap in <%=unitFilter%> between successive exposure events and adding a specified surveillance window to the final exposure event.  If no exposure event end date is provided, then an exposure event end date is inferred to be event start date + <%=unitFilter%> supply in cases when <%=unitFilter%> supply is available or event start date + 1 <%=addUnitFilter%> otherwise. This event persistence assures that the cohort end date will be no greater than the drug era end date.', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name(), addUnitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.lessName()})"></span>
 </div>
 <div style="padding: 5px 0px">
 	<span
@@ -12,26 +12,34 @@
 		params="conceptSetId: strategy().DrugCodesetId, conceptSets: conceptSets, defaultText: ko.i18n('components.customEraStrategy.selectDrugConceptSet', 'Select Drug Concept Set')">
 	</conceptset-selector>
 	<ul>
-		<li>
+		<li data-bind="with: strategy()">
 			<span
 				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_4', 'Persistence window: allow for a maximum of ')"></span>
 			<span contenteditable="true" class="numericInputField dropdown"
-				data-bind="htmlValue: strategy().GapDays.numeric(), eventType:'blur', ko_autocomplete: { value: strategy().GapDays, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
-			<span
-				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_5', 'days between exposure records when inferring the era of persistence exposure')"></span>
+				data-bind="htmlValue: GapUnitValue, eventType:'blur', ko_autocomplete: { value: GapUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+			<select data-bind="options: $component.options.windowTimeOptions,
+				optionsText: function(item) { return item.name },
+				optionsValue: 'value',
+				value: GapUnit">
+			</select>	
 		</li>
-		<li>
+		<li data-bind="with: strategy()">
 			<span
 				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_6', 'Surveillance window: add ')"></span>
 			<span contenteditable="true" class="numericInputField dropdown"
-				data-bind="htmlValue: strategy().Offset.numeric(), eventType:'blur', ko_autocomplete: { value: strategy().Offset, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+				data-bind="htmlValue: OffsetUnitValue, eventType:'blur', ko_autocomplete: { value: OffsetUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+			<select data-bind="options: $component.options.windowTimeOptions,
+				optionsText: function(item) { return item.name },
+				optionsValue: 'value',
+				value: OffsetUnit">
+			</select>
 			<span
-				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_7', 'days to the end of the era of persistence exposure as an additional period of surveillance prior to cohort exit.')"></span>
+				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_21', 'to the end of the era of persistence exposure as an additional period of surveillance prior to cohort exit.')"></span>
 		</li>
 		<!-- ko if: strategy().DaysSupplyOverride() == null -->
-		<li>
+		<li data-bind="with: strategy()">
 			<span
-				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_8', 'Use days supply and exposure end date for exposure duration. ')"></span>
+				data-bind="text: ko.i18nformat('components.customEraStrategy.customEraStrategyText_22', 'Use <%=unitFilter%> supply and exposure end date for exposure duration. ', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name()})"></span>
 			<span class="linkish" data-bind="click: $component.addDaysSupplyOverride">
 				<i>
 					<span data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_9', 'change')"></span>
diff --git a/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html b/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html
index 48839d017..32d4f06c2 100644
--- a/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html
+++ b/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html
@@ -3,8 +3,8 @@
 	<b
 		data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_1', 'Fixed Duration Persistence:')"></b><br />
 </div>
-<div>
-	<span data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_2', 'The event end date is derived from adding a number of days to the event\'s start or end date. If an offset is added to the event\'s start date, all cohort episodes will have the same fixed duration (subject to further censoring).  If an offset is added to the event\'s end date, persons in the cohort may have varying cohort duration times due to the varying event durations (such as eras of persistent drug exposure or visit length of stay).  This event persistence assures that the cohort end date will be no greater than the selected index event date, plus the days offset.')"></span>
+<div data-bind="with: strategy()">
+	<span data-bind="text: ko.i18nformat('components.dateOffsetStrategy.dateOffsetStrategyText_9', 'The event end date is derived from adding a number of <%=unitFilter%>s to the event\'s start or end date. If an offset is added to the event\'s start date, all cohort episodes will have the same fixed duration (subject to further censoring).  If an offset is added to the event\'s end date, persons in the cohort may have varying cohort duration times due to the varying event durations (such as eras of persistent drug exposure or visit length of stay).  This event persistence assures that the cohort end date will be no greater than the selected index event date, plus the <%=unitFilter%>s offset.', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name()})"></span>
 </div>
 <div style="padding: 5px 0px">
 	<ul>
@@ -13,12 +13,16 @@
 			<select data-bind="options: $component.fieldOptions, optionsText: 'name', optionsValue: 'id', value: strategy().DateField" />
 			<span data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_3_1', '')"></span>
 		</li>
-		<li>
+		<li data-bind="with: strategy()">
 			<span
-				data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_4', 'Number of days offset:')"></span>
+				data-bind="text: ko.i18nformat('components.dateOffsetStrategy.dateOffsetStrategyText_10', 'Number of <%=unitFilter%>s offset:', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name()})"></span>
 			<span contenteditable="true" class="numericInputField dropdown"
-				data-bind="htmlValue: strategy().Offset.numeric(), eventType:'blur', ko_autocomplete: { value: strategy().Offset, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
-			<span data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_5', 'days')"></span>
+				data-bind="htmlValue: OffsetUnitValue, eventType:'blur', ko_autocomplete: { value: OffsetUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+			<select data-bind="options: $component.options.windowTimeOptions,
+				optionsText: function(item) { return item.name },
+				optionsValue: 'value',
+				value: OffsetUnit">
+			</select>
 		</li>
 	</ul>
 </div>
diff --git a/js/components/cohortbuilder/components/WindowInputTemplate.html b/js/components/cohortbuilder/components/WindowInputTemplate.html
index 4f56bb2e1..120a68e55 100644
--- a/js/components/cohortbuilder/components/WindowInputTemplate.html
+++ b/js/components/cohortbuilder/components/WindowInputTemplate.html
@@ -1,18 +1,30 @@
-<span contenteditable="true" class="dropdown numericInputField" data-bind="
+<div data-bind="with: Window.Start" style="display: inline-block">
+   <span contenteditable="true" class="dropdown numericInputField" data-bind="
         placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
-        htmlValue: Window.Start.Days.numeric(),
+        htmlValue: TimeUnitValue,
         eventType: 'blur',
-        ko_autocomplete: { value: Window.Start.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+        ko_autocomplete: { value: TimeUnitValue, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
         selectOnFocus: {events: ['click']},
     " />
-<span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+    <select data-bind="options: $component.options.windowTimeOptions,
+      optionsText: function(item) { return item.name },
+      optionsValue: 'value',
+      value: TimeUnit">
+</select>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.Start.Coeff" />
-<span data-bind="text:ko.i18n('components.windowInput.windowInputText_3', 'and')"></span>
-<span contenteditable="true" class="dropdown numericInputField" data-bind="
-        placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
-        htmlValue: Window.End.Days.numeric(),
-        eventType: 'blur', ko_autocomplete: { value: Window.End.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
-        selectOnFocus: {events: ['click']},
-" />
-<span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+<span data-bind="text:ko.i18n('components.windowInput.windowInputText_3', 'and'), style: { marginLeft: '13px', marginRight: '13px'}" ></span>
+<div data-bind="with: Window.End" style="display: inline-block">
+  <span contenteditable="true" class="dropdown numericInputField" data-bind="
+    placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
+    htmlValue: TimeUnitValue,
+    eventType: 'blur', ko_autocomplete: { value: TimeUnitValue, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+    selectOnFocus: {events: ['click']},
+  " />
+    <select data-bind="options: $component.options.windowTimeOptions,
+        optionsText: function(item) { return item.name },
+        optionsValue: 'value',
+        value: TimeUnit">
+    </select>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.End.Coeff" />
\ No newline at end of file
diff --git a/js/components/cohortbuilder/options.js b/js/components/cohortbuilder/options.js
index 9cece2728..ab16b4ce6 100644
--- a/js/components/cohortbuilder/options.js
+++ b/js/components/cohortbuilder/options.js
@@ -4,6 +4,7 @@ define(["knockout"], function (ko) {
 
     options.dayOptions = ['0', '1', '7', '14', '21', '30', '60', '90', '120', '180', '365', '548', '730', '1095'];
     options.monthOptions = [1, 3, 6, 9, 12, 24, 36];
+    options.timeOptions = ['options.days', 'options.hours', 'options.minutes', 'options.seconds'];
 
     options.ageOptions = new Array();
     for (i = 1; i < 100; i++) {
@@ -37,6 +38,17 @@ define(["knockout"], function (ko) {
             value: options.dayOptions[i]
         });
     }
+    
+    options.windowTimeOptions = new Array();
+    for (i = 0; i < options.timeOptions.length; i++) {
+        const currentOption = options.timeOptions[i];
+        const value = currentOption.split('.').slice(-1)[0].slice(0, -1);
+        options.windowTimeOptions.push({
+            name: ko.i18n(currentOption, currentOption.split('.').slice(-1)[0]),
+            value: value,
+            lessName: ko.i18n( `options.${value}`, value)
+        });
+    }
     options.windowCoeffOptions = [{
         value: -1,
         name: ko.i18n('options.before', 'Before')

From b07f987eaf95bbf3f91e26ec977eccf4978f29b6 Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@gmail.com>
Date: Fri, 19 Jan 2024 17:50:12 +0300
Subject: [PATCH 02/22] adds TimeUnit attribute to Criteria

---
 .../cohortbuilder/components/CriteriaGroup.js      | 14 +++++++++++++-
 js/components/cohortbuilder/utils.js               | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/js/components/cohortbuilder/components/CriteriaGroup.js b/js/components/cohortbuilder/components/CriteriaGroup.js
index f4147c942..315cc3fe9 100644
--- a/js/components/cohortbuilder/components/CriteriaGroup.js
+++ b/js/components/cohortbuilder/components/CriteriaGroup.js
@@ -30,6 +30,15 @@ define([
 			return optionsArray;
 		});
 
+		const getUpdateTimeUnitFn = c => unit => utils.updateTimeUnit(c.Criteria, unit);
+
+		ko.unwrap(ko.unwrap(self.group).CriteriaList).forEach(c => {
+			const updateTimeUnitFn = getUpdateTimeUnitFn(c);
+			c.StartWindow.Start.TimeUnit.subscribe(updateTimeUnitFn);
+			const endWindow = ko.unwrap(c.EndWindow);
+			endWindow && endWindow.Start.TimeUnit.subscribe(updateTimeUnitFn);
+		});
+
 		self.getCriteriaComponent = utils.getCriteriaComponent;
 
 		self.addActions = [
@@ -255,10 +264,13 @@ define([
 		};
 
 		self.addEndWindow = function (corelatedCriteria) {
-			corelatedCriteria.EndWindow(new Window({UseEventEnd:true}));
+			const window = new Window({UseEventEnd:true});
+			corelatedCriteria.EndWindow(window);
+			window.tuSub = window.Start.TimeUnit.subscribe(getUpdateTimeUnitFn(corelatedCriteria));
 		};
 
 		self.removeEndWindow = function (corelatedCriteria) {
+			corelatedCriteria.EndWindow().tuSub && corelatedCriteria.EndWindow().tuSub.dispose();
 			corelatedCriteria.EndWindow(null);
 		};
 
diff --git a/js/components/cohortbuilder/utils.js b/js/components/cohortbuilder/utils.js
index 3db6af990..ef7a847da 100644
--- a/js/components/cohortbuilder/utils.js
+++ b/js/components/cohortbuilder/utils.js
@@ -51,11 +51,22 @@ function(
 		var selectedConceptSet = conceptSetList().find(function (item) { return item.id == ko.utils.unwrapObservable(conceptSetId)});
 		return 	ko.utils.unwrapObservable(selectedConceptSet && selectedConceptSet.name) || defaultName;
 	}
+
+	function updateTimeUnit(data, newUnit) {
+		const criteria = ["ConditionOccurrence", "ConditionEra", "Death", "DeviceExposure", "DoseEra", "DrugEra", "DrugExposure", "Measurement", "Observation",
+			"ObservationPeriod", "PayerPlanPeriod", "ProcedureOccurrence", "Specimen", "VisitOccurrence"];
+		criteria.forEach(c => {
+			if (data.hasOwnProperty(c)) {
+				data[c].IntervalUnit = newUnit;
+			}
+		});
+	}
 	
 	return {
 		getCriteriaComponent,
 		formatDropDownOption,
-		getConceptSetName
+		getConceptSetName,
+		updateTimeUnit,
 	};
 
 });
\ No newline at end of file

From b9204b979d3f352abbb9df4452d1254953514dca Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@gmail.com>
Date: Fri, 19 Jan 2024 18:13:17 +0300
Subject: [PATCH 03/22] set timeunit to minimal value of Start and End

---
 js/components/cohortbuilder/components/CriteriaGroup.js | 2 +-
 js/components/cohortbuilder/utils.js                    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/components/cohortbuilder/components/CriteriaGroup.js b/js/components/cohortbuilder/components/CriteriaGroup.js
index 315cc3fe9..09fa6a04f 100644
--- a/js/components/cohortbuilder/components/CriteriaGroup.js
+++ b/js/components/cohortbuilder/components/CriteriaGroup.js
@@ -30,7 +30,7 @@ define([
 			return optionsArray;
 		});
 
-		const getUpdateTimeUnitFn = c => unit => utils.updateTimeUnit(c.Criteria, unit);
+		const getUpdateTimeUnitFn = c => unit => utils.updateTimeUnit(c, unit);
 
 		ko.unwrap(ko.unwrap(self.group).CriteriaList).forEach(c => {
 			const updateTimeUnitFn = getUpdateTimeUnitFn(c);
diff --git a/js/components/cohortbuilder/utils.js b/js/components/cohortbuilder/utils.js
index ef7a847da..5971414c6 100644
--- a/js/components/cohortbuilder/utils.js
+++ b/js/components/cohortbuilder/utils.js
@@ -55,9 +55,13 @@ function(
 	function updateTimeUnit(data, newUnit) {
 		const criteria = ["ConditionOccurrence", "ConditionEra", "Death", "DeviceExposure", "DoseEra", "DrugEra", "DrugExposure", "Measurement", "Observation",
 			"ObservationPeriod", "PayerPlanPeriod", "ProcedureOccurrence", "Specimen", "VisitOccurrence"];
+		const startUnit = ko.unwrap(data.StartWindow.Start.TimeUnit);
+		const endUnit = data.EndWindow() && ko.unwrap(data.EndWindow().Start.TimeUnit);
 		criteria.forEach(c => {
-			if (data.hasOwnProperty(c)) {
-				data[c].IntervalUnit = newUnit;
+			if (data.Criteria.hasOwnProperty(c)) {
+				const newUnit = (startUnit === 'day') ? (endUnit || startUnit) : startUnit;
+				data.Criteria[c].IntervalUnit = newUnit;
+				console.log("New time unit:", data.Criteria, newUnit);
 			}
 		});
 	}

From 1df7504c4cb5fde737dfa5e71b590d3aab334346 Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@gmail.com>
Date: Fri, 19 Jan 2024 18:13:35 +0300
Subject: [PATCH 04/22] remove console log

---
 js/components/cohortbuilder/utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/components/cohortbuilder/utils.js b/js/components/cohortbuilder/utils.js
index 5971414c6..439c78aae 100644
--- a/js/components/cohortbuilder/utils.js
+++ b/js/components/cohortbuilder/utils.js
@@ -61,7 +61,6 @@ function(
 			if (data.Criteria.hasOwnProperty(c)) {
 				const newUnit = (startUnit === 'day') ? (endUnit || startUnit) : startUnit;
 				data.Criteria[c].IntervalUnit = newUnit;
-				console.log("New time unit:", data.Criteria, newUnit);
 			}
 		});
 	}

From 90ea52e78e3ea538f3823d069e021b813f7a5d0e Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Tue, 23 Jan 2024 10:37:45 +0700
Subject: [PATCH 05/22] Make filter cohort definitions dynamic by adding more
 options for timer filter expression

---
 .../cohortbuilder/CohortExpression.js         | 12 ++++++-
 .../EndStrategies/CustomEraStrategy.js        | 26 ++++++++++++++
 .../EndStrategies/DateOffsetStrategy.js       | 12 +++++++
 .../cohortbuilder/InputTypes/Window.js        | 30 ++++++++++++++--
 .../CohortExpressionEditorTemplate.html       | 16 ++++++---
 .../components/CustomEraStrategyTemplate.html | 30 ++++++++++------
 .../DateOffsetStrategyTemplate.html           | 16 +++++----
 .../components/WindowInputTemplate.html       | 34 +++++++++++++------
 js/components/cohortbuilder/options.js        | 12 +++++++
 9 files changed, 152 insertions(+), 36 deletions(-)

diff --git a/js/components/cohortbuilder/CohortExpression.js b/js/components/cohortbuilder/CohortExpression.js
index e5df5af3a..bedb80a12 100644
--- a/js/components/cohortbuilder/CohortExpression.js
+++ b/js/components/cohortbuilder/CohortExpression.js
@@ -27,10 +27,20 @@ define(function (require, exports) {
 		self.CensoringCriteria = ko.observableArray(data.CensoringCriteria && data.CensoringCriteria.map(function (criteria) {
 			return CriteriaTypes.GetCriteriaFromObject(criteria, self.ConceptSets);
 		}));
-		self.CollapseSettings = {CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ) }
+		self.CollapseSettings = {CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ), EraPadUnitValue: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnitValue || 0), EraPadUnit: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnit || 'day')}
 		self.CensorWindow = ko.observable(new Period(data.CensorWindow));
 
 		self.cdmVersionRange = data.cdmVersionRange || null;
+
+		self.CollapseSettings.EraPadUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.CollapseSettings.EraPadUnitValue(insertValue ? Number(insertValue) : 0);
+			self.CollapseSettings.EraPadUnit() === 'day' && self.CollapseSettings.EraPad(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.CollapseSettings.EraPadUnit.subscribe(function (newValue){
+			self.CollapseSettings.EraPad(newValue === 'day' ? self.CollapseSettings.EraPadUnitValue() : 0);
+		})
 	}
 	return CohortExpression;
 });
\ No newline at end of file
diff --git a/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js b/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
index 4a6addddb..79346c5d8 100644
--- a/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
+++ b/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
@@ -6,7 +6,11 @@ define(['knockout'], function (ko) {
 
 		self.DrugCodesetId = ko.observable(data.DrugCodesetId);
 		self.GapDays = ko.observable(data.GapDays || 0);
+		self.GapUnit = ko.observable(data.GapUnit || 'day');
+		self.GapUnitValue = ko.observable(data.GapUnitValue || 0);
 		self.Offset = ko.observable(data.Offset || 0);
+		self.OffsetUnitValue = ko.observable(data.OffsetUnitValue || 0);
+		self.OffsetUnit = ko.observable(data.OffsetUnit || 'day');
 		self.DaysSupplyOverride = ko.observable(data.DaysSupplyOverride);
 		
 		// set up subscription to update DrugCodesetId if the item is removed from conceptSets
@@ -18,6 +22,28 @@ define(['knockout'], function (ko) {
 				}
 			});
 		}, null, "arrayChange");		
+		
+		self.OffsetUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.OffsetUnitValue(insertValue ? Number(insertValue) : 0);
+			self.OffsetUnit() === 'day' && self.Offset(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.OffsetUnit.subscribe(function (newValue){
+			self.GapUnit(newValue);
+			self.Offset(newValue === 'day' ? self.OffsetUnitValue() : 0);
+		})
+
+		self.GapUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.GapUnitValue(insertValue ? Number(insertValue) : 0);
+			self.GapUnit() === 'day' && self.GapDays(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.GapUnit.subscribe(function (newValue){
+			self.OffsetUnit(newValue);
+			self.GapDays(newValue === 'day' ? self.GapUnitValue() : 0);
+		})
 	}
 
 	CustomEraStrategy.prototype.toJSON = function () {
diff --git a/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js b/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js
index ce5ce53bc..bd6f3ac12 100644
--- a/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js
+++ b/js/components/cohortbuilder/EndStrategies/DateOffsetStrategy.js
@@ -6,6 +6,18 @@ define(['knockout'], function (ko) {
 
 		self.DateField = ko.observable(data.DateField || "StartDate");
 		self.Offset = ko.observable(data.Offset || 0);
+		self.OffsetUnitValue = ko.observable(data.OffsetUnitValue || 0);
+		self.OffsetUnit = ko.observable(data.OffsetUnit || 'day');
+
+		self.OffsetUnitValue.subscribe(function (newValue){
+			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
+			self.OffsetUnitValue(insertValue ? Number(insertValue) : 0);
+			self.OffsetUnit() === 'day' && self.Offset(insertValue ? Number(insertValue) : 0);
+		})
+
+		self.OffsetUnit.subscribe(function (newValue){
+			self.Offset(newValue === 'day' ? self.OffsetUnitValue() : 0);
+		})
 	}
 
 	DateOffsetStrategy.prototype.toJSON = function () {
diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 11c750566..43da1a95a 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -6,16 +6,42 @@ define(['knockout'], function (ko) {
 
 		self.Start = {
 			Days: ko.observable((data.Start && data.Start.Days) === 0 ? 0 : (data.Start && data.Start.Days) || null),
-			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1)
+			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1),
+			TimeUnit: ko.observable((data.Start && data.Start.TimeUnit) || 'day'),
+			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) || null)
 		};
 		
 		self.End = {
 			Days: ko.observable((data.End && data.End.Days) === 0 ? 0 : (data.End && data.End.Days) || null),
-			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1)
+			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1),
+			TimeUnit: ko.observable((data.End && data.End.TimeUnit) ||  'day'),
+			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) || null)
 		};
 		
 		self.UseIndexEnd = ko.observable(data.UseIndexEnd || false);
 		self.UseEventEnd = ko.observable(data.UseEventEnd || false);
+
+		self.Start.TimeUnitValue.subscribe(function (newValue){
+			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : null;
+			self.Start.TimeUnitValue(insertValue ? Number(insertValue) : null);
+			self.Start.TimeUnit() === 'day' &&	self.Start.Days(insertValue ? Number(insertValue) : null);
+		})
+			
+		self.End.TimeUnitValue.subscribe(function (newValue){
+			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : null;
+			self.End.TimeUnitValue(insertValue ? Number(insertValue) : null);
+			self.End.TimeUnit() === 'day' && self.End.Days(insertValue ? Number(insertValue) : null);
+		})
+			
+		self.Start.TimeUnit.subscribe(function (newValue){
+			self.End.TimeUnit(newValue);
+			self.Start.Days(newValue === 'day' ? self.Start.TimeUnitValue() : null);
+		})
+			
+		self.End.TimeUnit.subscribe(function (newValue){
+			self.Start.TimeUnit(newValue);
+			self.End.Days(newValue === 'day' ? self.End.TimeUnitValue() : null);
+		})
 		
 	}
 
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
index ead0c21bd..aaca4f9f2 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
+++ b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
@@ -196,13 +196,19 @@
 		<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasTitle', 'Cohort Eras')"></span>
 	</div>
 	<div class="panel-body">
+		<div data-bind="with: expression().CollapseSettings">
+			<li>
+				<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasText_1', 'Specify era collapse gap size:')"></span>
+				<span contenteditable="true" class="numericInputField dropdown" data-bind="htmlValue: EraPadUnitValue, eventType: 'blur', ko_autocomplete: { value: EraPadUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }" />
+				<select data-bind="options: $component.options.windowTimeOptions,
+					optionsText: function(item) { return item.name },
+					optionsValue: 'value',
+					value: EraPadUnit">
+				</select>
+			</li>
+		</div>
 		<div data-bind="with: expression">
 			<ul>
-				<li>
-					<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasText_1', 'Specify era collapse gap size:')"></span>
-					<span contenteditable="true" class="numericInputField dropdown" data-bind="htmlValue: CollapseSettings.EraPad.numeric(), eventType: 'blur', ko_autocomplete: { value: CollapseSettings.EraPad, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }" />
-					<span data-bind="text: ko.i18n('components.cohortExpressionEditor.days', 'days')"></span>
-				</li>
 				<!-- ko if: $component.showCensorWindow -->
 				<li>
 					<span data-bind="text: ko.i18n('components.cohortExpressionEditor.cohortErasText_2', 'Left censor cohort start dates to')"></span>
diff --git a/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html b/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html
index 8a1930bd0..578b5f52c 100644
--- a/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html
+++ b/js/components/cohortbuilder/components/CustomEraStrategyTemplate.html
@@ -1,9 +1,9 @@
 <!-- ko if: strategy()-->
-<div>
+<div data-bind="with: strategy()">
 	<b
 		data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_1', 'Continuous Exposure Persistence:')"></b><br />
 	<span
-		data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_2', 'Specify a concept set that contains one or more drugs.  A drug era will be derived from all drug exposure events for any of the drugs within the concept set, using the specified persistence window as a maximum allowable gap in days between successive exposure events and adding a specified surveillance window to the final exposure event.  If no exposure event end date is provided, then an exposure event end date is inferred to be event start date + days supply in cases when days supply is available or event start date + 1 day otherwise. This event persistence assures that the cohort end date will be no greater than the drug era end date.')"></span>
+		data-bind="text: ko.i18nformat('components.customEraStrategy.customEraStrategyText_20', 'Specify a concept set that contains one or more drugs.  A drug era will be derived from all drug exposure events for any of the drugs within the concept set, using the specified persistence window as a maximum allowable gap in <%=unitFilter%> between successive exposure events and adding a specified surveillance window to the final exposure event.  If no exposure event end date is provided, then an exposure event end date is inferred to be event start date + <%=unitFilter%> supply in cases when <%=unitFilter%> supply is available or event start date + 1 <%=addUnitFilter%> otherwise. This event persistence assures that the cohort end date will be no greater than the drug era end date.', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name(), addUnitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.lessName()})"></span>
 </div>
 <div style="padding: 5px 0px">
 	<span
@@ -12,26 +12,34 @@
 		params="conceptSetId: strategy().DrugCodesetId, conceptSets: conceptSets, defaultText: ko.i18n('components.customEraStrategy.selectDrugConceptSet', 'Select Drug Concept Set')">
 	</conceptset-selector>
 	<ul>
-		<li>
+		<li data-bind="with: strategy()">
 			<span
 				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_4', 'Persistence window: allow for a maximum of ')"></span>
 			<span contenteditable="true" class="numericInputField dropdown"
-				data-bind="htmlValue: strategy().GapDays.numeric(), eventType:'blur', ko_autocomplete: { value: strategy().GapDays, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
-			<span
-				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_5', 'days between exposure records when inferring the era of persistence exposure')"></span>
+				data-bind="htmlValue: GapUnitValue, eventType:'blur', ko_autocomplete: { value: GapUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+			<select data-bind="options: $component.options.windowTimeOptions,
+				optionsText: function(item) { return item.name },
+				optionsValue: 'value',
+				value: GapUnit">
+			</select>
 		</li>
-		<li>
+		<li data-bind="with: strategy()">
 			<span
 				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_6', 'Surveillance window: add ')"></span>
 			<span contenteditable="true" class="numericInputField dropdown"
-				data-bind="htmlValue: strategy().Offset.numeric(), eventType:'blur', ko_autocomplete: { value: strategy().Offset, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+				data-bind="htmlValue: OffsetUnitValue, eventType:'blur', ko_autocomplete: { value: OffsetUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+			<select data-bind="options: $component.options.windowTimeOptions,
+				optionsText: function(item) { return item.name },
+				optionsValue: 'value',
+				value: OffsetUnit">
+			</select>
 			<span
-				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_7', 'days to the end of the era of persistence exposure as an additional period of surveillance prior to cohort exit.')"></span>
+				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_21', 'to the end of the era of persistence exposure as an additional period of surveillance prior to cohort exit.')"></span>
 		</li>
 		<!-- ko if: strategy().DaysSupplyOverride() == null -->
-		<li>
+		<li data-bind="with: strategy()">
 			<span
-				data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_8', 'Use days supply and exposure end date for exposure duration. ')"></span>
+				data-bind="text: ko.i18nformat('components.customEraStrategy.customEraStrategyText_22', 'Use <%=unitFilter%> supply and exposure end date for exposure duration. ', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name()})"></span>
 			<span class="linkish" data-bind="click: $component.addDaysSupplyOverride">
 				<i>
 					<span data-bind="text: ko.i18n('components.customEraStrategy.customEraStrategyText_9', 'change')"></span>
diff --git a/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html b/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html
index 48839d017..32d4f06c2 100644
--- a/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html
+++ b/js/components/cohortbuilder/components/DateOffsetStrategyTemplate.html
@@ -3,8 +3,8 @@
 	<b
 		data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_1', 'Fixed Duration Persistence:')"></b><br />
 </div>
-<div>
-	<span data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_2', 'The event end date is derived from adding a number of days to the event\'s start or end date. If an offset is added to the event\'s start date, all cohort episodes will have the same fixed duration (subject to further censoring).  If an offset is added to the event\'s end date, persons in the cohort may have varying cohort duration times due to the varying event durations (such as eras of persistent drug exposure or visit length of stay).  This event persistence assures that the cohort end date will be no greater than the selected index event date, plus the days offset.')"></span>
+<div data-bind="with: strategy()">
+	<span data-bind="text: ko.i18nformat('components.dateOffsetStrategy.dateOffsetStrategyText_9', 'The event end date is derived from adding a number of <%=unitFilter%>s to the event\'s start or end date. If an offset is added to the event\'s start date, all cohort episodes will have the same fixed duration (subject to further censoring).  If an offset is added to the event\'s end date, persons in the cohort may have varying cohort duration times due to the varying event durations (such as eras of persistent drug exposure or visit length of stay).  This event persistence assures that the cohort end date will be no greater than the selected index event date, plus the <%=unitFilter%>s offset.', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name()})"></span>
 </div>
 <div style="padding: 5px 0px">
 	<ul>
@@ -13,12 +13,16 @@
 			<select data-bind="options: $component.fieldOptions, optionsText: 'name', optionsValue: 'id', value: strategy().DateField" />
 			<span data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_3_1', '')"></span>
 		</li>
-		<li>
+		<li data-bind="with: strategy()">
 			<span
-				data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_4', 'Number of days offset:')"></span>
+				data-bind="text: ko.i18nformat('components.dateOffsetStrategy.dateOffsetStrategyText_10', 'Number of <%=unitFilter%>s offset:', {unitFilter: $component.options.windowTimeOptions.find(option => option.value ===  OffsetUnit())?.name()})"></span>
 			<span contenteditable="true" class="numericInputField dropdown"
-				data-bind="htmlValue: strategy().Offset.numeric(), eventType:'blur', ko_autocomplete: { value: strategy().Offset, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
-			<span data-bind="text: ko.i18n('components.dateOffsetStrategy.dateOffsetStrategyText_5', 'days')"></span>
+				data-bind="htmlValue: OffsetUnitValue, eventType:'blur', ko_autocomplete: { value: OffsetUnitValue, source: $component.options.dayOptions, minLength: 0, maxShowItems: 10, scroll: true }"></span>
+			<select data-bind="options: $component.options.windowTimeOptions,
+				optionsText: function(item) { return item.name },
+				optionsValue: 'value',
+				value: OffsetUnit">
+			</select>
 		</li>
 	</ul>
 </div>
diff --git a/js/components/cohortbuilder/components/WindowInputTemplate.html b/js/components/cohortbuilder/components/WindowInputTemplate.html
index 4f56bb2e1..ddcdfbae7 100644
--- a/js/components/cohortbuilder/components/WindowInputTemplate.html
+++ b/js/components/cohortbuilder/components/WindowInputTemplate.html
@@ -1,18 +1,30 @@
-<span contenteditable="true" class="dropdown numericInputField" data-bind="
+<div data-bind="with: Window.Start" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
         placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
-        htmlValue: Window.Start.Days.numeric(),
+        htmlValue: TimeUnitValue,
         eventType: 'blur',
-        ko_autocomplete: { value: Window.Start.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+        ko_autocomplete: { value: TimeUnitValue, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
         selectOnFocus: {events: ['click']},
     " />
-<span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+<select data-bind="options: $component.options.windowTimeOptions,
+    optionsText: function(item) { return item.name },
+    optionsValue: 'value',
+    value: TimeUnit">
+</select>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.Start.Coeff" />
-<span data-bind="text:ko.i18n('components.windowInput.windowInputText_3', 'and')"></span>
-<span contenteditable="true" class="dropdown numericInputField" data-bind="
-        placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
-        htmlValue: Window.End.Days.numeric(),
-        eventType: 'blur', ko_autocomplete: { value: Window.End.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
-        selectOnFocus: {events: ['click']},
+<span data-bind="text:ko.i18n('components.windowInput.windowInputText_3', 'and'), style: { marginLeft: '13px', marginRight: '13px'}"></span>
+<div data-bind="with: Window.End" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
+    placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
+    htmlValue: TimeUnitValue,
+    eventType: 'blur', ko_autocomplete: { value: TimeUnitValue, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+    selectOnFocus: {events: ['click']},
 " />
-<span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+<select data-bind="options: $component.options.windowTimeOptions,
+    optionsText: function(item) { return item.name },
+    optionsValue: 'value',
+    value: TimeUnit">
+</select>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.End.Coeff" />
\ No newline at end of file
diff --git a/js/components/cohortbuilder/options.js b/js/components/cohortbuilder/options.js
index 9cece2728..06dc19857 100644
--- a/js/components/cohortbuilder/options.js
+++ b/js/components/cohortbuilder/options.js
@@ -4,6 +4,7 @@ define(["knockout"], function (ko) {
 
     options.dayOptions = ['0', '1', '7', '14', '21', '30', '60', '90', '120', '180', '365', '548', '730', '1095'];
     options.monthOptions = [1, 3, 6, 9, 12, 24, 36];
+    options.timeOptions = ['options.days', 'options.hours', 'options.minutes', 'options.seconds'];
 
     options.ageOptions = new Array();
     for (i = 1; i < 100; i++) {
@@ -37,6 +38,17 @@ define(["knockout"], function (ko) {
             value: options.dayOptions[i]
         });
     }
+
+    options.windowTimeOptions = new Array();
+    for (i = 0; i < options.timeOptions.length; i++) {
+        const currentOption = options.timeOptions[i];
+        const value = currentOption.split('.').slice(-1)[0].slice(0, -1);
+        options.windowTimeOptions.push({
+            name: ko.i18n(currentOption, currentOption.split('.').slice(-1)[0]),
+            value: value,
+            lessName: ko.i18n( `options.${value}`, value)
+        });
+    }
     options.windowCoeffOptions = [{
         value: -1,
         name: ko.i18n('options.before', 'Before')

From 36efbe30df8ec5971b0f9c96805ae2679407338e Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Tue, 23 Jan 2024 11:27:33 +0700
Subject: [PATCH 06/22] Remove restrict filter inclusion expression is the same
 unit inline

---
 js/components/cohortbuilder/InputTypes/Window.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 43da1a95a..10e300ce1 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -34,12 +34,10 @@ define(['knockout'], function (ko) {
 		})
 			
 		self.Start.TimeUnit.subscribe(function (newValue){
-			self.End.TimeUnit(newValue);
 			self.Start.Days(newValue === 'day' ? self.Start.TimeUnitValue() : null);
 		})
 			
 		self.End.TimeUnit.subscribe(function (newValue){
-			self.Start.TimeUnit(newValue);
 			self.End.Days(newValue === 'day' ? self.End.TimeUnitValue() : null);
 		})
 		

From c25d0ea48b98de5af61c68050d9dd67d0477f23b Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Tue, 23 Jan 2024 18:38:13 +0700
Subject: [PATCH 07/22] Revert logic for filtering only day for Drug Era, Dose
 Era, Condition Era in criteria group

---
 .../cohortbuilder/InputTypes/Window.js        |  1 -
 .../cohortbuilder/components/CriteriaGroup.js | 12 +++++++++
 .../components/CriteriaGroupTemplate.html     |  4 +--
 .../cohortbuilder/components/WindowInput.js   |  1 +
 .../components/WindowInputTemplate.html       | 25 ++++++++++++++++---
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 599276bb3..c34c52ff4 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -39,7 +39,6 @@ define(['knockout'], function (ko) {
 		})
 
 		self.End.TimeUnit.subscribe(function (newValue){
-			self.Start.TimeUnit(newValue);
 			self.End.Days(newValue === 'day' ? self.End.TimeUnitValue() : null);
 		})
 		
diff --git a/js/components/cohortbuilder/components/CriteriaGroup.js b/js/components/cohortbuilder/components/CriteriaGroup.js
index 09fa6a04f..b2b83f651 100644
--- a/js/components/cohortbuilder/components/CriteriaGroup.js
+++ b/js/components/cohortbuilder/components/CriteriaGroup.js
@@ -301,6 +301,18 @@ define([
 			}
 		}
 
+		self.isDropdownTimer = function (data) {
+			switch (self.getCriteriaComponent(data)) {
+				case "drug-era-criteria":
+				case "dose-era-criteria":
+				case "condition-era-criteria":
+					return false;
+					break;
+				default:
+					return true;
+			}
+		}
+
 		self.getDistinctOptions = function (criteria) {
 			let distinctOptions = [{id: "DOMAIN_CONCEPT", name: "Standard Concept"}, {id: "START_DATE", name: "Start Date"}];
 			if (self.hasVO(criteria)) {
diff --git a/js/components/cohortbuilder/components/CriteriaGroupTemplate.html b/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
index c3205f73d..9c3629fc9 100644
--- a/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
+++ b/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
@@ -137,8 +137,8 @@
 										params="{value: StartWindow.UseEventEnd, options: $component.options.EventDateOptions}">
 									</cycle-toggle-input>
 									<span data-bind="text:ko.i18n('components.criteriaGroup.between','between')"></span><br />
-
-									<window-input params="Window: StartWindow"></window-input>
+									
+									<window-input params="Window: StartWindow, isDropdownTimer: $component.isDropdownTimer($data.Criteria)"></window-input>
 									<cycle-toggle-input
 										params="{value: StartWindow.UseIndexEnd, options: $component.options.IndexDateOptions}">
 									</cycle-toggle-input>
diff --git a/js/components/cohortbuilder/components/WindowInput.js b/js/components/cohortbuilder/components/WindowInput.js
index 3e58f689b..83521f0c9 100644
--- a/js/components/cohortbuilder/components/WindowInput.js
+++ b/js/components/cohortbuilder/components/WindowInput.js
@@ -8,6 +8,7 @@ define([
     var self = this;
     self.options = options;
     self.Window = ko.utils.unwrapObservable(params.Window); // this will be a Window input type.
+    self.isDropdownTimer = ko.utils.unwrapObservable(params.isDropdownTimer)
   }
 
   // return compoonent definition
diff --git a/js/components/cohortbuilder/components/WindowInputTemplate.html b/js/components/cohortbuilder/components/WindowInputTemplate.html
index 095bc0963..e8dd8b6d0 100644
--- a/js/components/cohortbuilder/components/WindowInputTemplate.html
+++ b/js/components/cohortbuilder/components/WindowInputTemplate.html
@@ -1,4 +1,4 @@
-<div data-bind="with: Window.Start" style="display: inline-block">
+<div data-bind="with: Window.Start, visible: isDropdownTimer" style="display: inline-block">
     <span contenteditable="true" class="dropdown numericInputField" data-bind="
         placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
         htmlValue: TimeUnitValue,
@@ -12,10 +12,20 @@
       value: TimeUnit">
     </select>
 </div>
+<div data-bind="visible: !isDropdownTimer" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
+        placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
+        htmlValue: Window.Start.Days.numeric(),
+        eventType: 'blur',
+        ko_autocomplete: { value: Window.Start.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+        selectOnFocus: {events: ['click']},
+    " />
+    <span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.Start.Coeff" />
 <span data-bind="text:ko.i18n('components.windowInput.windowInputText_3', 'and'), style: { marginLeft: '13px', marginRight: '13px'}"></span>
-<div data-bind="with: Window.End" style="display: inline-block">
-  <span contenteditable="true" class="dropdown numericInputField" data-bind="
+<div data-bind="with: Window.End, visible: isDropdownTimer" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
     placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
     htmlValue: TimeUnitValue,
     eventType: 'blur', ko_autocomplete: { value: TimeUnitValue, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
@@ -27,4 +37,13 @@
     value: TimeUnit">
   </select>
 </div>
+<div data-bind="visible: !isDropdownTimer" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
+        placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
+        htmlValue: Window.End.Days.numeric(),
+        eventType: 'blur', ko_autocomplete: { value: Window.End.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+        selectOnFocus: {events: ['click']},
+    " />
+    <span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.End.Coeff" />
\ No newline at end of file

From d393796acff26335a13fcdee624fd6edc9fb124a Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Tue, 23 Jan 2024 18:38:13 +0700
Subject: [PATCH 08/22] Revert logic for filtering only day for Drug Era, Dose
 Era, Condition Era in criteria group

---
 .../cohortbuilder/CohortExpression.js         |  2 +-
 .../EndStrategies/CustomEraStrategy.js        |  2 +-
 .../cohortbuilder/InputTypes/Window.js        |  1 -
 .../cohortbuilder/components/CriteriaGroup.js | 12 +++++++++
 .../components/CriteriaGroupTemplate.html     |  4 +--
 .../cohortbuilder/components/WindowInput.js   |  1 +
 .../components/WindowInputTemplate.html       | 25 ++++++++++++++++---
 7 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/js/components/cohortbuilder/CohortExpression.js b/js/components/cohortbuilder/CohortExpression.js
index 0389f4643..21b7635cb 100644
--- a/js/components/cohortbuilder/CohortExpression.js
+++ b/js/components/cohortbuilder/CohortExpression.js
@@ -27,7 +27,7 @@ define(function (require, exports) {
 		self.CensoringCriteria = ko.observableArray(data.CensoringCriteria && data.CensoringCriteria.map(function (criteria) {
 			return CriteriaTypes.GetCriteriaFromObject(criteria, self.ConceptSets);
 		}));
-		self.CollapseSettings = { CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ), EraPadUnitValue: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnitValue || 0), EraPadUnit: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnit || 'day') }
+		self.CollapseSettings = {CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ), EraPadUnitValue: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnitValue || 0), EraPadUnit: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnit || 'day')}
 		self.CensorWindow = ko.observable(new Period(data.CensorWindow));
 
 		self.cdmVersionRange = data.cdmVersionRange || null;
diff --git a/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js b/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
index b5465a25c..17515868f 100644
--- a/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
+++ b/js/components/cohortbuilder/EndStrategies/CustomEraStrategy.js
@@ -21,7 +21,7 @@ define(['knockout'], function (ko) {
 						self.DrugCodesetId(null);
 				}
 			});
-		}, null, "arrayChange");	
+		}, null, "arrayChange");		
 		
 		self.OffsetUnitValue.subscribe(function (newValue){
 			const insertValue = newValue.toString().replace(/[\D\.]/g, '');
diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 599276bb3..c34c52ff4 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -39,7 +39,6 @@ define(['knockout'], function (ko) {
 		})
 
 		self.End.TimeUnit.subscribe(function (newValue){
-			self.Start.TimeUnit(newValue);
 			self.End.Days(newValue === 'day' ? self.End.TimeUnitValue() : null);
 		})
 		
diff --git a/js/components/cohortbuilder/components/CriteriaGroup.js b/js/components/cohortbuilder/components/CriteriaGroup.js
index 09fa6a04f..b2b83f651 100644
--- a/js/components/cohortbuilder/components/CriteriaGroup.js
+++ b/js/components/cohortbuilder/components/CriteriaGroup.js
@@ -301,6 +301,18 @@ define([
 			}
 		}
 
+		self.isDropdownTimer = function (data) {
+			switch (self.getCriteriaComponent(data)) {
+				case "drug-era-criteria":
+				case "dose-era-criteria":
+				case "condition-era-criteria":
+					return false;
+					break;
+				default:
+					return true;
+			}
+		}
+
 		self.getDistinctOptions = function (criteria) {
 			let distinctOptions = [{id: "DOMAIN_CONCEPT", name: "Standard Concept"}, {id: "START_DATE", name: "Start Date"}];
 			if (self.hasVO(criteria)) {
diff --git a/js/components/cohortbuilder/components/CriteriaGroupTemplate.html b/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
index c3205f73d..9c3629fc9 100644
--- a/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
+++ b/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
@@ -137,8 +137,8 @@
 										params="{value: StartWindow.UseEventEnd, options: $component.options.EventDateOptions}">
 									</cycle-toggle-input>
 									<span data-bind="text:ko.i18n('components.criteriaGroup.between','between')"></span><br />
-
-									<window-input params="Window: StartWindow"></window-input>
+									
+									<window-input params="Window: StartWindow, isDropdownTimer: $component.isDropdownTimer($data.Criteria)"></window-input>
 									<cycle-toggle-input
 										params="{value: StartWindow.UseIndexEnd, options: $component.options.IndexDateOptions}">
 									</cycle-toggle-input>
diff --git a/js/components/cohortbuilder/components/WindowInput.js b/js/components/cohortbuilder/components/WindowInput.js
index 3e58f689b..83521f0c9 100644
--- a/js/components/cohortbuilder/components/WindowInput.js
+++ b/js/components/cohortbuilder/components/WindowInput.js
@@ -8,6 +8,7 @@ define([
     var self = this;
     self.options = options;
     self.Window = ko.utils.unwrapObservable(params.Window); // this will be a Window input type.
+    self.isDropdownTimer = ko.utils.unwrapObservable(params.isDropdownTimer)
   }
 
   // return compoonent definition
diff --git a/js/components/cohortbuilder/components/WindowInputTemplate.html b/js/components/cohortbuilder/components/WindowInputTemplate.html
index 095bc0963..fb4048778 100644
--- a/js/components/cohortbuilder/components/WindowInputTemplate.html
+++ b/js/components/cohortbuilder/components/WindowInputTemplate.html
@@ -1,4 +1,4 @@
-<div data-bind="with: Window.Start" style="display: inline-block">
+<div data-bind="with: Window.Start, visible: isDropdownTimer" style="display: inline-block">
     <span contenteditable="true" class="dropdown numericInputField" data-bind="
         placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
         htmlValue: TimeUnitValue,
@@ -12,10 +12,20 @@
       value: TimeUnit">
     </select>
 </div>
+<div data-bind="visible: !isDropdownTimer" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
+        placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
+        htmlValue: Window.Start.Days.numeric(),
+        eventType: 'blur',
+        ko_autocomplete: { value: Window.Start.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+        selectOnFocus: {events: ['click']},
+    " />
+<span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.Start.Coeff" />
 <span data-bind="text:ko.i18n('components.windowInput.windowInputText_3', 'and'), style: { marginLeft: '13px', marginRight: '13px'}"></span>
-<div data-bind="with: Window.End" style="display: inline-block">
-  <span contenteditable="true" class="dropdown numericInputField" data-bind="
+<div data-bind="with: Window.End, visible: isDropdownTimer" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
     placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
     htmlValue: TimeUnitValue,
     eventType: 'blur', ko_autocomplete: { value: TimeUnitValue, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
@@ -27,4 +37,13 @@
     value: TimeUnit">
   </select>
 </div>
+<div data-bind="visible: !isDropdownTimer" style="display: inline-block">
+    <span contenteditable="true" class="dropdown numericInputField" data-bind="
+        placeholder: ko.i18n('components.windowInput.windowInputText_1', 'All'),
+        htmlValue: Window.End.Days.numeric(),
+        eventType: 'blur', ko_autocomplete: { value: Window.End.Days, source: $component.options.windowDayOptions, minLength: 0, maxShowItems: 10, scroll: true },
+        selectOnFocus: {events: ['click']},
+" />
+<span data-bind="text:ko.i18n('components.windowInput.windowInputText_2', 'days')"></span>
+</div>
 <select data-bind="options: $component.options.windowCoeffOptions, optionsText: 'name', optionsValue: 'value', value: Window.End.Coeff" />
\ No newline at end of file

From 940e8df2394782c5b02b7b1f68aca641a7bc3623 Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@gmail.com>
Date: Thu, 25 Jan 2024 12:39:38 +0300
Subject: [PATCH 09/22] add subscriptions to EndWindow

---
 .../cohortbuilder/CriteriaTypes/Criteria.js   |  2 +-
 .../cohortbuilder/components/CriteriaGroup.js | 34 +++++++++++++++----
 js/components/cohortbuilder/utils.js          | 12 ++++---
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/js/components/cohortbuilder/CriteriaTypes/Criteria.js b/js/components/cohortbuilder/CriteriaTypes/Criteria.js
index e204c5851..ec2407f06 100644
--- a/js/components/cohortbuilder/CriteriaTypes/Criteria.js
+++ b/js/components/cohortbuilder/CriteriaTypes/Criteria.js
@@ -8,7 +8,7 @@ define(['require', 'knockout', '../InputTypes/Range','conceptpicker/InputTypes/C
 		
 		self.CorrelatedCriteria = ko.observable(data.CorrelatedCriteria && new CriteriaGroup(data.CorrelatedCriteria, conceptSets));
 		self.DateAdjustment = ko.observable(data.DateAdjustment && new DateAdjustment(data.DateAdjustment));
-
+		self.IntervalUnit = data.IntervalUnit;
 	}
 	
 	return Criteria;
diff --git a/js/components/cohortbuilder/components/CriteriaGroup.js b/js/components/cohortbuilder/components/CriteriaGroup.js
index b2b83f651..4287b1dea 100644
--- a/js/components/cohortbuilder/components/CriteriaGroup.js
+++ b/js/components/cohortbuilder/components/CriteriaGroup.js
@@ -32,12 +32,34 @@ define([
 
 		const getUpdateTimeUnitFn = c => unit => utils.updateTimeUnit(c, unit);
 
-		ko.unwrap(ko.unwrap(self.group).CriteriaList).forEach(c => {
-			const updateTimeUnitFn = getUpdateTimeUnitFn(c);
-			c.StartWindow.Start.TimeUnit.subscribe(updateTimeUnitFn);
-			const endWindow = ko.unwrap(c.EndWindow);
-			endWindow && endWindow.Start.TimeUnit.subscribe(updateTimeUnitFn);
-		});
+		const subscribeGroup = group =>
+			ko.unwrap(group.CriteriaList).map(c => {
+				const updateTimeUnitFn = getUpdateTimeUnitFn(c);
+				const startWindow = {
+					start: c.StartWindow.Start.TimeUnit.subscribe(updateTimeUnitFn),
+					end: c.StartWindow.End.TimeUnit.subscribe(updateTimeUnitFn),
+				};
+				const endWindowObject = ko.unwrap(c.EndWindow);
+				const endWindow = endWindowObject && {
+					start: endWindowObject.Start.TimeUnit.subscribe(updateTimeUnitFn),
+					end: endWindowObject.End.TimeUnit.subscribe(updateTimeUnitFn),
+				};
+				return {startWindow, endWindow};
+			});
+
+		const disposeWindow = (w) => {
+			w.start && w.start.dispose();
+			w.end && w.end.dispose();
+		};
+
+		if (self.subscriptions) {
+			self.subscriptions.forEach(sub => {
+				sub.startWindow && disposeWindow(sub.startWindow);
+				sub.endWindow && disposeWindow(sub.endWindow);
+			});
+		}
+		self.subscriptions = self.group.subscribe(g => subscribeGroup(ko.unwrap(g)));
+		subscribeGroup(ko.unwrap(self.group));
 
 		self.getCriteriaComponent = utils.getCriteriaComponent;
 
diff --git a/js/components/cohortbuilder/utils.js b/js/components/cohortbuilder/utils.js
index 439c78aae..4062fea23 100644
--- a/js/components/cohortbuilder/utils.js
+++ b/js/components/cohortbuilder/utils.js
@@ -53,14 +53,18 @@ function(
 	}
 
 	function updateTimeUnit(data, newUnit) {
+		console.log("Update Time Unit", newUnit);
 		const criteria = ["ConditionOccurrence", "ConditionEra", "Death", "DeviceExposure", "DoseEra", "DrugEra", "DrugExposure", "Measurement", "Observation",
 			"ObservationPeriod", "PayerPlanPeriod", "ProcedureOccurrence", "Specimen", "VisitOccurrence"];
-		const startUnit = ko.unwrap(data.StartWindow.Start.TimeUnit);
-		const endUnit = data.EndWindow() && ko.unwrap(data.EndWindow().Start.TimeUnit);
+		const units = [
+			ko.unwrap(data.StartWindow.Start.TimeUnit),
+			ko.unwrap(data.StartWindow.End.TimeUnit),
+			data.EndWindow() && ko.unwrap(data.EndWindow().Start.TimeUnit),
+			data.EndWindow() && ko.unwrap(data.EndWindow().End.TimeUnit),
+		];
 		criteria.forEach(c => {
 			if (data.Criteria.hasOwnProperty(c)) {
-				const newUnit = (startUnit === 'day') ? (endUnit || startUnit) : startUnit;
-				data.Criteria[c].IntervalUnit = newUnit;
+				data.Criteria[c].IntervalUnit = units.filter(item => !!item).find(u => u !== 'day') || 'day';
 			}
 		});
 	}

From e5c8756a6851844c3fb81a6ada9306ad35b82e90 Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Mon, 29 Jan 2024 10:48:33 +0700
Subject: [PATCH 10/22] Add timer filter logic into EndWindow

---
 .../cohortbuilder/components/CriteriaGroupTemplate.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/components/cohortbuilder/components/CriteriaGroupTemplate.html b/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
index 9c3629fc9..0efec703c 100644
--- a/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
+++ b/js/components/cohortbuilder/components/CriteriaGroupTemplate.html
@@ -148,7 +148,7 @@
 										<span data-bind="text:ko.i18n('components.criteriaGroup.and', 'and')"></span>
 										<cycle-toggle-input params="{value: EndWindow().UseEventEnd, options: $component.options.EventDateOptions}"></cycle-toggle-input>
 										<span data-bind="text:ko.i18n('components.criteriaGroup.between', 'between')"></span>
-										<window-input params="Window: EndWindow"></window-input>
+										<window-input params="Window: EndWindow, isDropdownTimer: $component.isDropdownTimer($data.Criteria)"></window-input>
 										<cycle-toggle-input params="{value: EndWindow().UseIndexEnd, options: $component.options.IndexDateOptions}"></cycle-toggle-input>
 									</div>
 									<!-- /ko -->

From 3c9e81127ce281ec78c6844ffa6b18e32d7378ec Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@odysseusinc.com>
Date: Tue, 30 Jan 2024 14:48:07 +0300
Subject: [PATCH 11/22] Adds subscription on add action

---
 .../cohortbuilder/components/CriteriaGroup.js | 125 +++++++++++-------
 js/components/cohortbuilder/utils.js          |   6 +-
 2 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/js/components/cohortbuilder/components/CriteriaGroup.js b/js/components/cohortbuilder/components/CriteriaGroup.js
index 4287b1dea..28c162396 100644
--- a/js/components/cohortbuilder/components/CriteriaGroup.js
+++ b/js/components/cohortbuilder/components/CriteriaGroup.js
@@ -32,20 +32,21 @@ define([
 
 		const getUpdateTimeUnitFn = c => unit => utils.updateTimeUnit(c, unit);
 
-		const subscribeGroup = group =>
-			ko.unwrap(group.CriteriaList).map(c => {
-				const updateTimeUnitFn = getUpdateTimeUnitFn(c);
-				const startWindow = {
-					start: c.StartWindow.Start.TimeUnit.subscribe(updateTimeUnitFn),
-					end: c.StartWindow.End.TimeUnit.subscribe(updateTimeUnitFn),
-				};
-				const endWindowObject = ko.unwrap(c.EndWindow);
-				const endWindow = endWindowObject && {
-					start: endWindowObject.Start.TimeUnit.subscribe(updateTimeUnitFn),
-					end: endWindowObject.End.TimeUnit.subscribe(updateTimeUnitFn),
-				};
-				return {startWindow, endWindow};
-			});
+		const subscribeCriteria = c => {
+			const updateTimeUnitFn = getUpdateTimeUnitFn(c);
+			const startWindow = {
+				start: c.StartWindow.Start.TimeUnit.subscribe(updateTimeUnitFn),
+				end: c.StartWindow.End.TimeUnit.subscribe(updateTimeUnitFn),
+			};
+			const endWindowObject = ko.unwrap(c.EndWindow);
+			const endWindow = endWindowObject && {
+				start: endWindowObject.Start.TimeUnit.subscribe(updateTimeUnitFn),
+				end: endWindowObject.End.TimeUnit.subscribe(updateTimeUnitFn),
+			};
+			return {startWindow, endWindow};
+		};
+
+		const subscribeGroup = group => ko.unwrap(group.CriteriaList).map(subscribeCriteria);
 
 		const disposeWindow = (w) => {
 			w.start && w.start.dispose();
@@ -76,11 +77,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							ConditionEra: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				},
 			},
 			{
@@ -88,11 +91,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							ConditionOccurrence: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -100,11 +105,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							Death: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -112,11 +119,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							DeviceExposure: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -124,11 +133,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							DoseEra: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -136,11 +147,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							DrugEra: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -148,11 +161,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							DrugExposure: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -160,12 +175,14 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							LocationRegion: {}
 						},
 						IgnoreObservationPeriod: true,
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -173,11 +190,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							Measurement: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -185,11 +204,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							Observation: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -197,11 +218,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							ObservationPeriod: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -209,11 +232,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							PayerPlanPeriod: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -221,11 +246,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							ProcedureOccurrence: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -233,11 +260,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							Specimen: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -245,11 +274,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							VisitOccurrence: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
@@ -257,11 +288,13 @@ define([
 				selected: false,
 				action: function () {
 					var unwrappedExpression = ko.utils.unwrapObservable(self.expression);
-					self.group().CriteriaList.push(new AdditionalCriteria({
+					const additionalCriteria = new AdditionalCriteria({
 						Criteria: {
 							VisitDetail: {}
 						}
-					}, unwrappedExpression.ConceptSets));
+					}, unwrappedExpression.ConceptSets);
+					subscribeCriteria(additionalCriteria);
+					self.group().CriteriaList.push(additionalCriteria);
 				}
 			},
 			{
diff --git a/js/components/cohortbuilder/utils.js b/js/components/cohortbuilder/utils.js
index 4062fea23..79c47f409 100644
--- a/js/components/cohortbuilder/utils.js
+++ b/js/components/cohortbuilder/utils.js
@@ -53,7 +53,7 @@ function(
 	}
 
 	function updateTimeUnit(data, newUnit) {
-		console.log("Update Time Unit", newUnit);
+		// console.log("Update Time Unit", newUnit);
 		const criteria = ["ConditionOccurrence", "ConditionEra", "Death", "DeviceExposure", "DoseEra", "DrugEra", "DrugExposure", "Measurement", "Observation",
 			"ObservationPeriod", "PayerPlanPeriod", "ProcedureOccurrence", "Specimen", "VisitOccurrence"];
 		const units = [
@@ -64,7 +64,9 @@ function(
 		];
 		criteria.forEach(c => {
 			if (data.Criteria.hasOwnProperty(c)) {
-				data.Criteria[c].IntervalUnit = units.filter(item => !!item).find(u => u !== 'day') || 'day';
+				const newUnit = units.filter(item => !!item).find(u => u !== 'day') || 'day';
+				// console.log("New Unit", c, newUnit);
+				data.Criteria[c].IntervalUnit = newUnit;
 			}
 		});
 	}

From 02367e195d8939d6d8121ed19455cd175e4d4834 Mon Sep 17 00:00:00 2001
From: Juan Carlos Namendi Pineda <juan.namendi@odysseusinc.com>
Date: Thu, 1 Feb 2024 10:54:58 +0700
Subject: [PATCH 12/22] Fix can not adjust filter value to 0 in inclusion
 criteria

---
 js/components/cohortbuilder/InputTypes/Window.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index c34c52ff4..17f84854f 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -8,29 +8,29 @@ define(['knockout'], function (ko) {
 			Days: ko.observable((data.Start && data.Start.Days) === 0 ? 0 : (data.Start && data.Start.Days) || null),
 			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1),
 			TimeUnit: ko.observable((data.Start && data.Start.TimeUnit) || 'day'),
-			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) || null)
+			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) === 0 ? 0 : (data.Start && data.Start.TimeUnitValue)|| null)
 		};
 		
 		self.End = {
 			Days: ko.observable((data.End && data.End.Days) === 0 ? 0 : (data.End && data.End.Days) || null),
 			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1),
 			TimeUnit: ko.observable((data.End && data.End.TimeUnit) ||  'day'),
-			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) || null)
+			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) === 0 ? 0 : (data.End && data.End.TimeUnitValue) || null)
 		};
 		
 		self.UseIndexEnd = ko.observable(data.UseIndexEnd || false);
 		self.UseEventEnd = ko.observable(data.UseEventEnd || false);
 
 		self.Start.TimeUnitValue.subscribe(function (newValue){
-			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : null;
-			self.Start.TimeUnitValue(insertValue ? Number(insertValue) : null);
-			self.Start.TimeUnit() === 'day' &&	self.Start.Days(insertValue ? Number(insertValue) : null);
+			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : newValue.toString().trim() === '0' ? 0 : null;
+			self.Start.TimeUnitValue(insertValue === null ? null : Number(insertValue));
+			self.Start.TimeUnit() === 'day' &&	self.Start.Days(insertValue === null ? null : Number(insertValue));
 		})
 
 		self.End.TimeUnitValue.subscribe(function (newValue){
-			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : null;
-			self.End.TimeUnitValue(insertValue ? Number(insertValue) : null);
-			self.End.TimeUnit() === 'day' && self.End.Days(insertValue ? Number(insertValue) : null);
+			const insertValue = newValue ? newValue.toString().replace(/[\D\.]/g, '') : newValue.toString().trim() === '0' ? 0 : null;
+			self.End.TimeUnitValue(insertValue === null ? null : Number(insertValue));
+			self.End.TimeUnit() === 'day' && self.End.Days(insertValue === null ? null : Number(insertValue));
 		})
 
 		self.Start.TimeUnit.subscribe(function (newValue){

From 946fc71f5acd7840625d47c49fb1f3fcc2a8361d Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@gmail.com>
Date: Fri, 2 Feb 2024 15:48:03 +0300
Subject: [PATCH 13/22] add useDateTime option

---
 js/components/cohortbuilder/CohortExpression.js    |  2 ++
 .../components/CohortExpressionEditor.js           |  2 ++
 .../components/CohortExpressionEditor.less         |  8 +++++++-
 .../components/CohortExpressionEditorTemplate.html | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/js/components/cohortbuilder/CohortExpression.js b/js/components/cohortbuilder/CohortExpression.js
index 21b7635cb..631c0d4c6 100644
--- a/js/components/cohortbuilder/CohortExpression.js
+++ b/js/components/cohortbuilder/CohortExpression.js
@@ -41,6 +41,8 @@ define(function (require, exports) {
 		self.CollapseSettings.EraPadUnit.subscribe(function (newValue){
 			self.CollapseSettings.EraPad(newValue === 'day' ? self.CollapseSettings.EraPadUnitValue() : 0);
 		})
+
+		self.useDateTime = ko.observable(!!data.useDateTime);
 		
 	}
 	return CohortExpression;
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditor.js b/js/components/cohortbuilder/components/CohortExpressionEditor.js
index 118c34fd5..c724a7719 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditor.js
+++ b/js/components/cohortbuilder/components/CohortExpressionEditor.js
@@ -39,6 +39,8 @@ define([
     self.expression = params.expression;
     self.options = options;
 
+    self.useDateTime = self.expression().useDateTime;
+    // self.useDateTime.subscribe(val => self.expression().useDateTime = val);
     self.showCensorWindow = ko.observable(
       self.expression().CensorWindow().StartDate() ||
         self.expression().CensorWindow().EndDate()
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditor.less b/js/components/cohortbuilder/components/CohortExpressionEditor.less
index e58a5f125..41a2d8aa4 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditor.less
+++ b/js/components/cohortbuilder/components/CohortExpressionEditor.less
@@ -8,4 +8,10 @@
 		flex-grow: 1;
 		padding-left: 1rem;
 	}
-}
\ No newline at end of file
+}
+
+.expression-editor {
+	&__options-label {
+		margin-left: 0.5rem;
+	}
+}
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
index aaca4f9f2..b14599ddd 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
+++ b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
@@ -35,6 +35,20 @@
 	</div>
 </atlas-modal>
 
+<div class="panel panel-primary">
+	<div class="panel-heading">Options</div>
+	<div class="panel-body">
+		<div>
+			<input name="useDateTime" type="radio" data-bind="checkedValue: true, checked: useDateTime">
+			<span class="expression-editor__options-label" data-bind="text: 'Evaluate cohort start and end dates with date and time'"></span>
+		</div>
+		<div>
+			<input name="useDateTime" type="radio" data-bind="checkedValue: false, checked: useDateTime">
+			<span class="expression-editor__options-label" data-bind="text: 'Evaluate cohort start and end dates with only date'"></span>
+		</div>
+	</div>
+</div>
+
 <div class="panel panel-primary cohort-definition-panel ui-front">
 	<div class="panel-heading">
 		<span

From 732da543a65ebd3056a58afa54f4f068cca3ffeb Mon Sep 17 00:00:00 2001
From: wivern <vitaly.koulakov@gmail.com>
Date: Fri, 2 Feb 2024 15:51:40 +0300
Subject: [PATCH 14/22] rename UseDatetime expression attribute

---
 js/components/cohortbuilder/CohortExpression.js                 | 2 +-
 .../cohortbuilder/components/CohortExpressionEditor.js          | 2 +-
 .../components/CohortExpressionEditorTemplate.html              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/components/cohortbuilder/CohortExpression.js b/js/components/cohortbuilder/CohortExpression.js
index 631c0d4c6..c9348b19d 100644
--- a/js/components/cohortbuilder/CohortExpression.js
+++ b/js/components/cohortbuilder/CohortExpression.js
@@ -42,7 +42,7 @@ define(function (require, exports) {
 			self.CollapseSettings.EraPad(newValue === 'day' ? self.CollapseSettings.EraPadUnitValue() : 0);
 		})
 
-		self.useDateTime = ko.observable(!!data.useDateTime);
+		self.UseDatetime = ko.observable(!!data.UseDatetime);
 		
 	}
 	return CohortExpression;
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditor.js b/js/components/cohortbuilder/components/CohortExpressionEditor.js
index c724a7719..59051e0c2 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditor.js
+++ b/js/components/cohortbuilder/components/CohortExpressionEditor.js
@@ -39,7 +39,7 @@ define([
     self.expression = params.expression;
     self.options = options;
 
-    self.useDateTime = self.expression().useDateTime;
+    self.useDateTime = self.expression().UseDatetime;
     // self.useDateTime.subscribe(val => self.expression().useDateTime = val);
     self.showCensorWindow = ko.observable(
       self.expression().CensorWindow().StartDate() ||
diff --git a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
index b14599ddd..d888d0814 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
+++ b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
@@ -44,7 +44,7 @@
 		</div>
 		<div>
 			<input name="useDateTime" type="radio" data-bind="checkedValue: false, checked: useDateTime">
-			<span class="expression-editor__options-label" data-bind="text: 'Evaluate cohort start and end dates with only date'"></span>
+			<span class="expression-editor__options-label" data-bind="text: 'Evaluate cohort start and end dates with date only'"></span>
 		</div>
 	</div>
 </div>

From 862fa1e36fc20fe4bfb755c60936cde5cef52e28 Mon Sep 17 00:00:00 2001
From: fedor_glushchenko <fedor_glushchenko@odysseusinc.com>
Date: Thu, 6 Jun 2024 11:23:31 +0300
Subject: [PATCH 15/22] issues-2886: Fix elder gohortdefinition import

---
 js/components/cohortbuilder/InputTypes/DateAdjustment.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/components/cohortbuilder/InputTypes/DateAdjustment.js b/js/components/cohortbuilder/InputTypes/DateAdjustment.js
index f43e38c1c..8fbe4c48f 100644
--- a/js/components/cohortbuilder/InputTypes/DateAdjustment.js
+++ b/js/components/cohortbuilder/InputTypes/DateAdjustment.js
@@ -8,6 +8,7 @@ define(['knockout'], function (ko) {
 		self.StartOffset = ko.observable(data.StartOffset || 0);
 		self.EndWith = ko.observable(data.EndWith || DateAdjustment.END_DATE);
 		self.EndOffset = ko.observable(data.EndOffset || 0);
+	
 	}
 
     DateAdjustment.START_DATE = "START_DATE";

From 07485c2a7eb75011530a738ccd70e85415c534f5 Mon Sep 17 00:00:00 2001
From: fedor_glushchenko <fedor_glushchenko@odysseusinc.com>
Date: Thu, 6 Jun 2024 11:24:41 +0300
Subject: [PATCH 16/22] isseus-2886: Fix elder cohortdefinitions import

---
 js/components/cohortbuilder/InputTypes/Window.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 17f84854f..a7f64ba6d 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -8,14 +8,14 @@ define(['knockout'], function (ko) {
 			Days: ko.observable((data.Start && data.Start.Days) === 0 ? 0 : (data.Start && data.Start.Days) || null),
 			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1),
 			TimeUnit: ko.observable((data.Start && data.Start.TimeUnit) || 'day'),
-			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) === 0 ? 0 : (data.Start && data.Start.TimeUnitValue)|| null)
+			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) === 0 ? 0 : ((data.Start && data.Start.TimeUnitValue) ? data.Start.TimeUnitValue : (data.Start.Days || null)))
 		};
 		
 		self.End = {
 			Days: ko.observable((data.End && data.End.Days) === 0 ? 0 : (data.End && data.End.Days) || null),
 			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1),
 			TimeUnit: ko.observable((data.End && data.End.TimeUnit) ||  'day'),
-			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) === 0 ? 0 : (data.End && data.End.TimeUnitValue) || null)
+			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) === 0 ? 0 : ((data.End && data.End.TimeUnitValue) ? data.End.TimeUnitValue : (data.End.Days || null)))
 		};
 		
 		self.UseIndexEnd = ko.observable(data.UseIndexEnd || false);

From 23546ff3ce319d8fc2752e41dc07432bf0799130 Mon Sep 17 00:00:00 2001
From: fedor_glushchenko <fedor_glushchenko@odysseusinc.com>
Date: Fri, 7 Jun 2024 21:46:21 +0300
Subject: [PATCH 17/22] issues-2886: correct timeUnitValue set

---
 js/components/cohortbuilder/InputTypes/Window.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index a7f64ba6d..4e1f7b664 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -8,14 +8,14 @@ define(['knockout'], function (ko) {
 			Days: ko.observable((data.Start && data.Start.Days) === 0 ? 0 : (data.Start && data.Start.Days) || null),
 			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1),
 			TimeUnit: ko.observable((data.Start && data.Start.TimeUnit) || 'day'),
-			TimeUnitValue: ko.observable((data.Start && data.Start.TimeUnitValue) === 0 ? 0 : ((data.Start && data.Start.TimeUnitValue) ? data.Start.TimeUnitValue : (data.Start.Days || null)))
+			TimeUnitValue: ko.observable(setTimeUnitValue(data.Start))
 		};
 		
 		self.End = {
 			Days: ko.observable((data.End && data.End.Days) === 0 ? 0 : (data.End && data.End.Days) || null),
 			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1),
 			TimeUnit: ko.observable((data.End && data.End.TimeUnit) ||  'day'),
-			TimeUnitValue: ko.observable((data.End && data.End.TimeUnitValue) === 0 ? 0 : ((data.End && data.End.TimeUnitValue) ? data.End.TimeUnitValue : (data.End.Days || null)))
+			TimeUnitValue: ko.observable(setTimeUnitValue(data.End))
 		};
 		
 		self.UseIndexEnd = ko.observable(data.UseIndexEnd || false);
@@ -44,5 +44,17 @@ define(['knockout'], function (ko) {
 		
 	}
 
+	function setTimeUnitValue(value) {
+		if (value) {
+			if (value.TimeUnitValue === 0) {
+				return 0;
+			} else if (value.TimeUnitValue) {
+				return value.TimeUnitValue;
+			} else if (value.Days) {
+				return value.Days;
+			}
+		}
+	}
+
 	return Window;
 });
\ No newline at end of file

From 151f8dc4b3bff87ff1fd2fbf7d34d88e551b4b8c Mon Sep 17 00:00:00 2001
From: oleg-odysseus <oleg.himself@gmail.com>
Date: Thu, 13 Jun 2024 16:37:59 +0200
Subject: [PATCH 18/22] minor fix to avoid having undefined value for TimeUnit
 value on widget load

---
 js/components/cohortbuilder/CohortExpression.js  | 7 ++++++-
 js/components/cohortbuilder/InputTypes/Window.js | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/js/components/cohortbuilder/CohortExpression.js b/js/components/cohortbuilder/CohortExpression.js
index c9348b19d..625de0bbf 100644
--- a/js/components/cohortbuilder/CohortExpression.js
+++ b/js/components/cohortbuilder/CohortExpression.js
@@ -27,7 +27,12 @@ define(function (require, exports) {
 		self.CensoringCriteria = ko.observableArray(data.CensoringCriteria && data.CensoringCriteria.map(function (criteria) {
 			return CriteriaTypes.GetCriteriaFromObject(criteria, self.ConceptSets);
 		}));
-		self.CollapseSettings = {CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ), EraPadUnitValue: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnitValue || 0), EraPadUnit: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnit || 'day')}
+		self.CollapseSettings = {
+			CollapseType: ko.observable(data.CollapseSettings && data.CollapseSettings.CollapseType || "ERA"), 
+			EraPad: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPad || 0 ), 
+			EraPadUnitValue: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnitValue || data.CollapseSettings && data.CollapseSettings.EraPad || 0), 
+			EraPadUnit: ko.observable(data.CollapseSettings && data.CollapseSettings.EraPadUnit || 'day')
+		}
 		self.CensorWindow = ko.observable(new Period(data.CensorWindow));
 
 		self.cdmVersionRange = data.cdmVersionRange || null;
diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 4e1f7b664..24c94e110 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -54,6 +54,7 @@ define(['knockout'], function (ko) {
 				return value.Days;
 			}
 		}
+		return 'All';
 	}
 
 	return Window;

From da3bdc878e302165740cf8649a228150d1b9aee7 Mon Sep 17 00:00:00 2001
From: fedor_glushchenko <fedor_glushchenko@odysseusinc.com>
Date: Thu, 27 Jun 2024 19:57:33 +0300
Subject: [PATCH 19/22] issues-2886: Fix for days setting

---
 .../cohortbuilder/InputTypes/Window.js        | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index 24c94e110..b31c2195c 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -5,14 +5,14 @@ define(['knockout'], function (ko) {
 		data = data || {};
 
 		self.Start = {
-			Days: ko.observable((data.Start && data.Start.Days) === 0 ? 0 : (data.Start && data.Start.Days) || null),
+			Days: ko.observable(setDays(data.Start)),
 			Coeff: ko.observable((data.Start && data.Start.Coeff) === 0 ? 0 : (data.Start && data.Start.Coeff) || -1),
 			TimeUnit: ko.observable((data.Start && data.Start.TimeUnit) || 'day'),
 			TimeUnitValue: ko.observable(setTimeUnitValue(data.Start))
 		};
 		
 		self.End = {
-			Days: ko.observable((data.End && data.End.Days) === 0 ? 0 : (data.End && data.End.Days) || null),
+			Days: ko.observable(setDays(data.End)),
 			Coeff: ko.observable((data.End && data.End.Coeff) === 0 ? 0 : (data.End && data.End.Coeff) || 1),
 			TimeUnit: ko.observable((data.End && data.End.TimeUnit) ||  'day'),
 			TimeUnitValue: ko.observable(setTimeUnitValue(data.End))
@@ -44,14 +44,31 @@ define(['knockout'], function (ko) {
 		
 	}
 
-	function setTimeUnitValue(value) {
-		if (value) {
-			if (value.TimeUnitValue === 0) {
+	function setDays(dateValue) {
+		if (dateValue) {
+			if (dateValue.Days === 0) {
 				return 0;
-			} else if (value.TimeUnitValue) {
-				return value.TimeUnitValue;
-			} else if (value.Days) {
-				return value.Days;
+			} else if (dateValue.Days) {
+				return dateValue.Days;
+			} else if (dateValue.TimeUnitValue === 0) {
+				return 0;
+			}else if (dateValue.TimeUnitValue) {
+				return dateValue.TimeUnitValue;
+			}
+		}
+		return null;
+	}
+
+	function setTimeUnitValue(dateValue) {
+		if (dateValue) {
+			if (dateValue.TimeUnitValue === 0) {
+				return 0;
+			} else if (dateValue.TimeUnitValue) {
+				return dateValue.TimeUnitValue;
+			} else if (dateValue.Days === 0) {
+				return 0;
+			} else if (dateValue.Days) {
+				return dateValue.Days;
 			}
 		}
 		return 'All';

From 6a6aba68edeb89d8f976fdef0cafde6c05d1cb09 Mon Sep 17 00:00:00 2001
From: fedor_glushchenko <fedor_glushchenko@odysseusinc.com>
Date: Fri, 28 Jun 2024 13:55:48 +0300
Subject: [PATCH 20/22] issues-2886: Save error fix

---
 js/components/cohortbuilder/InputTypes/Window.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/components/cohortbuilder/InputTypes/Window.js b/js/components/cohortbuilder/InputTypes/Window.js
index b31c2195c..b9506ed76 100644
--- a/js/components/cohortbuilder/InputTypes/Window.js
+++ b/js/components/cohortbuilder/InputTypes/Window.js
@@ -35,11 +35,11 @@ define(['knockout'], function (ko) {
 
 		self.Start.TimeUnit.subscribe(function (newValue){
 			self.End.TimeUnit(newValue);
-			self.Start.Days(newValue === 'day' ? self.Start.TimeUnitValue() : null);
+			self.Start.Days(newValue === 'day' ? (self.Start.TimeUnitValue() === 'All' ? null : self.Start.TimeUnitValue()) : null);
 		})
 
 		self.End.TimeUnit.subscribe(function (newValue){
-			self.End.Days(newValue === 'day' ? self.End.TimeUnitValue() : null);
+			self.End.Days(newValue === 'day' ? (self.End.TimeUnitValue() === 'All' ? null : self.End.TimeUnitValue()) : null);
 		})
 		
 	}
@@ -52,7 +52,7 @@ define(['knockout'], function (ko) {
 				return dateValue.Days;
 			} else if (dateValue.TimeUnitValue === 0) {
 				return 0;
-			}else if (dateValue.TimeUnitValue) {
+			} else if (dateValue.TimeUnitValue && dateValue.TimeUnitValue !== 'All') {
 				return dateValue.TimeUnitValue;
 			}
 		}
@@ -63,7 +63,7 @@ define(['knockout'], function (ko) {
 		if (dateValue) {
 			if (dateValue.TimeUnitValue === 0) {
 				return 0;
-			} else if (dateValue.TimeUnitValue) {
+			} else if (dateValue.TimeUnitValue && dateValue.TimeUnitValue !== 'All') {
 				return dateValue.TimeUnitValue;
 			} else if (dateValue.Days === 0) {
 				return 0;
@@ -71,7 +71,7 @@ define(['knockout'], function (ko) {
 				return dateValue.Days;
 			}
 		}
-		return 'All';
+		return null;
 	}
 
 	return Window;

From ba37495c2dfeae0db41371d86fea0ce6bd94bf02 Mon Sep 17 00:00:00 2001
From: fedor_glushchenko <fedor_glushchenko@odysseusinc.com>
Date: Mon, 12 Aug 2024 14:53:15 +0300
Subject: [PATCH 21/22] Changed datetime to chackbox

---
 .../components/CohortExpressionEditorTemplate.html          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
index d888d0814..1adf14c7e 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
+++ b/js/components/cohortbuilder/components/CohortExpressionEditorTemplate.html
@@ -39,13 +39,9 @@
 	<div class="panel-heading">Options</div>
 	<div class="panel-body">
 		<div>
-			<input name="useDateTime" type="radio" data-bind="checkedValue: true, checked: useDateTime">
+			<input type="checkbox" data-bind="checked: useDateTime">
 			<span class="expression-editor__options-label" data-bind="text: 'Evaluate cohort start and end dates with date and time'"></span>
 		</div>
-		<div>
-			<input name="useDateTime" type="radio" data-bind="checkedValue: false, checked: useDateTime">
-			<span class="expression-editor__options-label" data-bind="text: 'Evaluate cohort start and end dates with date only'"></span>
-		</div>
 	</div>
 </div>
 

From 9a7f8ac74f5bd62f994c5f8136ebfd801700cbac Mon Sep 17 00:00:00 2001
From: alex-odysseus <alexey.manoylenko@odysseusinc.com>
Date: Mon, 9 Dec 2024 20:20:27 +0100
Subject: [PATCH 22/22] "proposed fix for non-reacting observable" by
 oleg-odysseus

---
 .../cohortbuilder/components/CohortExpressionEditor.js     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/components/cohortbuilder/components/CohortExpressionEditor.js b/js/components/cohortbuilder/components/CohortExpressionEditor.js
index 59051e0c2..0e9c0f094 100644
--- a/js/components/cohortbuilder/components/CohortExpressionEditor.js
+++ b/js/components/cohortbuilder/components/CohortExpressionEditor.js
@@ -39,8 +39,11 @@ define([
     self.expression = params.expression;
     self.options = options;
 
-    self.useDateTime = self.expression().UseDatetime;
-    // self.useDateTime.subscribe(val => self.expression().useDateTime = val);
+    self.useDateTime = ko.observable(self.expression().UseDatetime());
+    self.useDateTime.subscribe(function (newValue) {
+      self.expression().UseDatetime(newValue);
+    });
+
     self.showCensorWindow = ko.observable(
       self.expression().CensorWindow().StartDate() ||
         self.expression().CensorWindow().EndDate()