Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prompt for reporting period #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/executeCql.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExtensionContext, window, workspace, commands, Uri, ProgressLocation, ViewColumn, EventEmitter, extensions, Location, languages, CodeActionKind, TextEditor, TextDocument, Position } from "vscode";
import { ExtensionContext, window, workspace, commands, Uri, ProgressLocation, ViewColumn, EventEmitter, extensions, Location, languages, CodeActionKind, TextEditor, TextDocument, Position, InputBoxOptions } from "vscode";
import { Commands } from "./commands";
import { prepareExecutable, awaitServerConnection } from "./languageServerStarter";
import { LanguageClientOptions, Position as LSPosition, Location as LSLocation, MessageType, TextDocumentPositionParams, ConfigurationRequest, ConfigurationParams, CancellationToken, ExecuteCommandRequest, ExecuteCommandParams } from "vscode-languageclient";
Expand All @@ -13,13 +13,27 @@ import * as fs from "fs";
// NOTE: This is not the intended future state of executing CQL.
// There's a CQL debug server under development that will replace this.
export async function executeCQLFile(uri: Uri): Promise<void> {

const libraryPath: string = uri.fsPath;
if (!fs.existsSync(libraryPath)) {
window.showInformationMessage("No library content found. Please save before executing.");
return;
}

let periodStartInputOptions: InputBoxOptions = {
title: "Reporting Period Start",
placeHolder: "YYYY-MM-DDTHH:MM:SS-08:00"
};
let periodEndInputOptions: InputBoxOptions = {
title: "Reporting Period End",
placeHolder: "YYYY-MM-DDTHH:MM:SS-08:00"
};
const dateTimeRegex = /([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?/gm;
const periodStart = await window.showInputBox(periodStartInputOptions);
const periodEnd = await window.showInputBox(periodEndInputOptions);

const periodStartTest = new RegExp(dateTimeRegex).exec(periodStart);
const periodEndTest = new RegExp(dateTimeRegex).exec(periodEnd);

const libraryPathName = path.basename(libraryPath, '.cql');

// todo: replace with library-uri when it's ready
Expand All @@ -32,12 +46,12 @@ export async function executeCQLFile(uri: Uri): Promise<void> {
const terminologyPath = path.join(projectPath, 'input', 'vocabulary', 'valueset');

// todo: get this working (currently errors with: Index 0 out of bounds for length 0)
// const measurementPeriod = 'Interval[@2019-01-01T00:00:00.0, @2020-01-01T00:00:00.0)';
// const measurementPeriod = 'Interval[@2019-01-01T00:00:00.0, @2020-01-01T00:00:00.0]';
const modelType = "FHIR";
const contextType = 'Patient';
let fhirVersion = "R4";
const optionsPath = path.join(libraryDirectory, 'cql-options.json');
const measurementPeriod = '';
const measurementPeriod = periodStartTest && periodEndTest ? `Interval[@${periodStart}, @${periodEnd}]` : '';
const testPath = path.join(projectPath, 'input', 'tests');
const resultPath = path.join(testPath, 'results');

Expand Down