From 50993236caf0219deaf71a366a3d73714c43c049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20TERRIER?= Date: Thu, 5 Dec 2024 14:41:34 +0000 Subject: [PATCH] activate start time column --- custom-recipes/pi-system-retrieve-list/recipe.json | 12 ++++++------ custom-recipes/pi-system-retrieve-list/recipe.py | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/custom-recipes/pi-system-retrieve-list/recipe.json b/custom-recipes/pi-system-retrieve-list/recipe.json index 78f58a7..5d81ee0 100644 --- a/custom-recipes/pi-system-retrieve-list/recipe.json +++ b/custom-recipes/pi-system-retrieve-list/recipe.json @@ -125,8 +125,8 @@ { "name": "use_start_time_column", "label": "Use start time value per row", - "description": "Description here", - "visibilityCondition": "false && (['InterpolatedData', 'RecordedData', 'PlotData', 'EventFrames'].includes(model.data_type))", + "description": "", + "visibilityCondition": "['InterpolatedData', 'RecordedData', 'PlotData', 'EventFrames'].includes(model.data_type)", "type": "BOOLEAN", "defaultValue": false }, @@ -134,7 +134,7 @@ "visibilityCondition": "model.use_start_time_column==true && (['InterpolatedData', 'RecordedData', 'PlotData', 'EventFrames'].includes(model.data_type))", "name": "start_time_column", "label": "Start times' column", - "description": "Optional", + "description": "Column type must be string", "type": "COLUMN", "columnRole": "input_dataset" }, @@ -148,9 +148,9 @@ }, { "name": "use_end_time_column", - "label": "Use start time value per row", + "label": "Use end time value per row", "description": "", - "visibilityCondition": "false && (['InterpolatedData', 'RecordedData', 'PlotData', 'EventFrames'].includes(model.data_type))", + "visibilityCondition": "['InterpolatedData', 'RecordedData', 'PlotData', 'EventFrames'].includes(model.data_type)", "type": "BOOLEAN", "defaultValue": false }, @@ -158,7 +158,7 @@ "visibilityCondition": "model.use_end_time_column==true && (['InterpolatedData', 'RecordedData', 'PlotData', 'EventFrames'].includes(model.data_type))", "name": "end_time_column", "label": "End times' column", - "description": "Optional", + "description": "Column type must be string", "type": "COLUMN", "columnRole": "input_dataset" }, diff --git a/custom-recipes/pi-system-retrieve-list/recipe.py b/custom-recipes/pi-system-retrieve-list/recipe.py index b09c071..66b4412 100644 --- a/custom-recipes/pi-system-retrieve-list/recipe.py +++ b/custom-recipes/pi-system-retrieve-list/recipe.py @@ -82,10 +82,8 @@ # make sure all OSIsoft time string format are evaluated at the same time # rather than at every request, at least for start / end times set in the UI time_not_parsed = False - if not use_start_time_column: - start_time = client.parse_pi_time(start_time) - if not use_end_time_column: - end_time = client.parse_pi_time(end_time) + start_time = client.parse_pi_time(start_time) + end_time = client.parse_pi_time(end_time) sync_time = client.parse_pi_time(sync_time) object_id = input_parameters_row.get(path_column)