Skip to content

Commit

Permalink
Update to use the cqf-ruler
Browse files Browse the repository at this point in the history
  • Loading branch information
JPercival committed Oct 14, 2020
1 parent b93b6b6 commit ffdef36
Show file tree
Hide file tree
Showing 7 changed files with 3,760 additions and 2,975 deletions.
6,652 changes: 3,696 additions & 2,956 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,30 @@
"@angular/platform-browser-dynamic": "~8.2.13",
"@angular/router": "~8.2.13",
"@types/codemirror": "0.0.80",
"core-js": "^3.4.1",
"core-js": "^3.6.5",
"material-design-icons": "^3.0.1",
"rxjs": "~6.4.0",
"tslib": "^1.10.0",
"tslib": "^1.13.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.18",
"@angular/cli": "~8.3.18",
"@angular-devkit/build-angular": "^0.803.29",
"@angular/cli": "^8.3.29",
"@angular/compiler-cli": "~8.2.13",
"@angular/language-service": "~8.2.13",
"@types/node": "~8.9.4",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "^5.0.0",
"codemirror": "^5.49.2",
"@types/node": "~8.9.4",
"codelyzer": "^5.2.2",
"codemirror": "^5.56.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "~5.4.0",
"karma-jasmine-html-reporter": "^1.5.4",
"protractor": "^5.4.4",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
"typescript": "~3.5.3"
Expand Down
39 changes: 35 additions & 4 deletions src/app/components/config/config.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,20 @@
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="group" fxLayout fxLayoutAlign="center start" *ngIf="isParametersOpen">
<div class="title" fxLayout fxLayoutAlign="start center" fxFlex="33.33%">
<div>Patient Id</div>
<span matTooltip="Patient context"><i class="material-icons icon">info</i></span>
</div>
<div class="items" fxFlex>
<div class="item">
<mat-form-field>
<i matPrefix matTooltip="Id" class="material-icons icon">assignment_ind</i>
<input #patientId type="text" matInput [(ngModel)]="config.patientId" placeholder="Patient Id" aria-label="Patient Id">
</mat-form-field>
</div>
</div>
</div>
<div class="group" fxLayout fxLayoutAlign="center start" *ngIf="isParametersOpen">
<div class="title" fxLayout fxLayoutAlign="start center" fxFlex="33.33%">
<div>Source Data</div>
Expand Down Expand Up @@ -130,14 +144,31 @@
</div>
<div class="group" fxLayout fxLayoutAlign="center start" *ngIf="isParametersOpen">
<div class="title" fxLayout fxLayoutAlign="start center" fxFlex="33.33%">
<div>Patient Id</div>
<span matTooltip="Patient context"><i class="material-icons icon">info</i></span>
<div>Library Repository</div>
<span matTooltip="Library repository for included libraries"><i class="material-icons icon">info</i></span>
</div>
<div class="items" fxFlex>
<div class="item">
<mat-form-field>
<i matPrefix matTooltip="Id" class="material-icons icon">assignment_ind</i>
<input #patientId type="text" matInput [(ngModel)]="config.patientId" placeholder="Patient Id" aria-label="Patient Id">
<i matPrefix matTooltip="URI" class="material-icons icon">link</i>
<input #librarySourceUrl type="text" matInput [(ngModel)]="config.librarySourceUri" [matAutocomplete]="librarySourceUrlAuto" placeholder="Library Repository URL" aria-label="Library Repository URL">
</mat-form-field>
<mat-autocomplete #librarySourceUrlAuto="matAutocomplete">
<mat-option *ngFor="let option of librarySourceUrlOptions" [value]="option">
{{ option }}
</mat-option>
</mat-autocomplete>
</div>
<div class="item">
<mat-form-field>
<i matPrefix matTooltip="Username" class="material-icons icon">person</i>
<input type="text" matInput [(ngModel)]="config.librarySourceUsername" placeholder="Library Repository Username" aria-label="Library Repository Username">
</mat-form-field>
</div>
<div class="item">
<mat-form-field>
<i matPrefix matTooltip="Password" class="material-icons icon">vpn_key</i>
<input type="password" matInput [(ngModel)]="config.librarySourcePassword" placeholder="Library Repository Password" aria-label="Library Repository Password">
</mat-form-field>
</div>
</div>
Expand Down
13 changes: 10 additions & 3 deletions src/app/components/config/config.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export class ConfigComponent {
// TODO: Move to environmental config
engineUrlOptions = [
'https://cql.dataphoria.org/cql/evaluate',
'https://google.com/cql/engine'
];

// fhirUrlOptions = [
Expand All @@ -33,15 +32,23 @@ export class ConfigComponent {
// ];

terminologyUrlOptions = [
'https://measure.eval.kanvix.com/cqf-ruler-dstu3/fhir',
'https://cql-sandbox.alphora.com/cqf-ruler-r4/fhir',
'https://test.fhir.org/r2',
'https://test.fhir.org/r3',
'https://test.fhir.org/r4',
'https://sandbox.hspconsortium.org'
];

dataSourceUrlOptions = [
'https://measure.eval.kanvix.com/cqf-ruler-dstu3/fhir',
'https://cql-sandbox.alphora.com/cqf-ruler-r4/fhir',
'https://test.fhir.org/r2',
'https://test.fhir.org/r3',
'https://test.fhir.org/r4',
'https://sandbox.hspconsortium.org'
];

libraryUrlOptions = [
'https://cql-sandbox.alphora.com/cqf-ruler-r4/fhir',
'http:https://test.fhir.org/r2',
'https://test.fhir.org/r3',
'https://test.fhir.org/r4',
Expand Down
6 changes: 6 additions & 0 deletions src/app/components/config/config.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ export interface IConfiguration {
dataSourceUri?: string; // dataSource endpoint
dataSourceUsername?: string; // dataSource username
dataSourcePassword?: string; // dataSource password
librarySourceUri?: string; // dataSource endpoint
librarySourceUsername?: string; // dataSource username
librarySourcePassword?: string; // dataSource password
patientId?: string; // Id of patient in context
}

Expand All @@ -27,5 +30,8 @@ export class Configuration implements IConfiguration {
dataSourceUri = environment.dataSourceUri;
dataSourceUsername: string;
dataSourcePassword: string;
librarySourceUri = environment.librarySourceUri;
librarySourceUsername: string;
librarySourcePassword: string;
patientId: string;
}
2 changes: 1 addition & 1 deletion src/app/components/menu/menu.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class MenuComponent {

openDialog() {
const dialogRef = this.dialog.open(ConfigComponent, {
height: '615px',
height: '750px',
width: '775px'
});

Expand Down
5 changes: 3 additions & 2 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
export const environment = {
production: false,
engineUri: 'https://cql.dataphoria.org/cql/evaluate',
terminologyUri: 'https://measure.eval.kanvix.com/cqf-ruler-dstu3/fhir',
dataSourceUri: 'https://measure.eval.kanvix.com/cqf-ruler-dstu3/fhir'
terminologyUri: 'https://cql-sandbox.alphora.com/cqf-ruler-r4/fhir',
dataSourceUri: 'https://cql-sandbox.alphora.com/cqf-ruler-r4/fhir',
librarySourceUri: 'https://cql-sandbox.alphora.com/cqf-ruler-r4/fhir'
};

0 comments on commit ffdef36

Please sign in to comment.