diff --git a/src/main/webapp/app/clinical/clinical.component.ts b/src/main/webapp/app/clinical/clinical.component.ts
index 4d6d2e7d..14f7c1ac 100644
--- a/src/main/webapp/app/clinical/clinical.component.ts
+++ b/src/main/webapp/app/clinical/clinical.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, Input } from '@angular/core';
import { TrialService } from '../service/trial.service';
import { Clinical } from './clinical.model';
import * as _ from 'lodash';
-import { MainutilService } from '../service/mainutil.service';
+import MainUtil from '../service/mainutil';
@Component({
selector: 'jhi-clinical',
@@ -22,7 +22,7 @@ export class ClinicalComponent implements OnInit {
subToMainMapping = this.trialService.getSubToMainMapping();
mainTypesOptions = this.trialService.getMainTypesOptions();
- constructor(private trialService: TrialService, public mainutilService: MainutilService) { }
+ constructor(private trialService: TrialService) { }
ngOnInit() {
this.trialService.clinicalInputObs.subscribe((message) => {
@@ -33,7 +33,7 @@ export class ClinicalComponent implements OnInit {
});
}
getStyle() {
- return this.trialService.getStyle(this.indent);
+ return MainUtil.getStyle(this.indent);
}
getMessageStyle() {
if (this.validation === true) {
@@ -48,7 +48,7 @@ export class ClinicalComponent implements OnInit {
const ageGroups = this.clinicalInput.age_numerical.split(',');
// Age input cannot only accepts age range groups greater than 2.
if (ageGroups.length === 2) {
- const ageNumber = this.clinicalInput.age_numerical.match(/\d+(\.?\d+)?/g).map(function(v) { return Number(v); });
+ const ageNumber = this.clinicalInput.age_numerical.match(/\d+(\.?\d+)?/g).map((v: string) => Number(v));
// Do no allow age range like '>15, >=30' or '<=60, <40' or '<10, >60' or '>50, <20'
if ((ageGroups[0].includes('>') && ageGroups[1].includes('>')) ||
(ageGroups[0].includes('<') && ageGroups[1].includes('<')) ||
@@ -119,6 +119,6 @@ export class ClinicalComponent implements OnInit {
return this.trialService.getNodeDisplayContent(key, this.unit['clinical']);
}
unCheckRadio(key, event) {
- this.clinicalInput[key] = this.mainutilService.unCheckRadio(this.clinicalInput[key], event.target.value);
+ this.clinicalInput[key] = MainUtil.uncheckRadio(this.clinicalInput[key], event.target.value);
}
}
diff --git a/src/main/webapp/app/clinical/clinical.scss b/src/main/webapp/app/clinical/clinical.scss
index fb5198a9..e02327b0 100644
--- a/src/main/webapp/app/clinical/clinical.scss
+++ b/src/main/webapp/app/clinical/clinical.scss
@@ -19,9 +19,6 @@ label {
width:300px;
}
}
-.editMargin{
- margin-left:-80px;
-}
.ageNumericalMargin{
margin-bottom:10px
}
diff --git a/src/main/webapp/app/drug/drug.component.html b/src/main/webapp/app/drug/drug.component.html
index a766a3be..eebc6a8b 100644
--- a/src/main/webapp/app/drug/drug.component.html
+++ b/src/main/webapp/app/drug/drug.component.html
@@ -1,11 +1,17 @@
-
-
-
- {{item.name}}
- {{'NCIT Code: ' + item.ncit_code}}
-
- {{'Also known as ' + item.synonyms}}
-
-
+
+
+
+
+
+ {{item.name}}
+ {{'NCIT Code: ' + item.ncit_code}}
+
+ {{'Also known as ' + item.synonyms}}
+
+
+
+
diff --git a/src/main/webapp/app/drug/drug.component.ts b/src/main/webapp/app/drug/drug.component.ts
index 27cab020..2416631d 100644
--- a/src/main/webapp/app/drug/drug.component.ts
+++ b/src/main/webapp/app/drug/drug.component.ts
@@ -2,6 +2,8 @@ import { Component, EventEmitter, Input, OnInit } from '@angular/core';
import { TrialService } from '../service/trial.service';
import { Drug, NcitDrug } from '../drug/drug.model';
import { debounceTime, switchMap } from 'rxjs/operators';
+import { Arm } from '../arm/arm.model';
+import MainUtil from '../service/mainutil';
@Component({
selector: 'jhi-drug',
@@ -10,11 +12,11 @@ import { debounceTime, switchMap } from 'rxjs/operators';
})
export class DrugComponent implements OnInit {
- @Input() armInput = {};
+ @Input() armInput: Arm = MainUtil.createArm();
+ @Input() drugGroupIndex = 0;
drugsOptionsLoading = false;
- selectedDrugs: Array
= [];
drugInput = new EventEmitter();
- drugsOptions: Array = [];
+ drugsOptions: Drug[] = [];
constructor(private trialService: TrialService) {
this.drugInput.pipe(
@@ -40,13 +42,12 @@ export class DrugComponent implements OnInit {
}
ngOnInit() {
- this.trialService.armInputObs.subscribe((message) => {
+ this.trialService.armInputObs.subscribe((message: Arm) => {
this.armInput = message;
- this.selectedDrugs = this.armInput['drugs'];
});
}
- saveDrugs() {
- this.armInput['drugs'] = this.selectedDrugs.map((drug: any) => typeof drug === 'string' ? { 'name': drug } : drug);
+ removeDrugGroup() {
+ this.armInput.drugs.splice(this.drugGroupIndex, 1);
}
}
diff --git a/src/main/webapp/app/drug/drug.scss b/src/main/webapp/app/drug/drug.scss
index 9e12db05..1c8187f7 100644
--- a/src/main/webapp/app/drug/drug.scss
+++ b/src/main/webapp/app/drug/drug.scss
@@ -1,6 +1,3 @@
-.drug-select {
- max-width: 813px;
-}
.drug-name {
color: black;
font-size: 15px;
diff --git a/src/main/webapp/app/environments/environment.example.ts b/src/main/webapp/app/environments/environment.example.ts
index 558c1c68..e8d2dc65 100644
--- a/src/main/webapp/app/environments/environment.example.ts
+++ b/src/main/webapp/app/environments/environment.example.ts
@@ -11,4 +11,5 @@ export const environment = {
oncotreeVersion: '', // set for using specific oncotree version. By default, it is "oncotree_latest_stable".
frontEndOnly: true, // set to true if doing frontend development
isPermitted: true, // set to false for building read-only website
+ sentry_dsn: '' // set Sentry dsn for tracking issues
};
diff --git a/src/main/webapp/app/genomic/genomic.component.html b/src/main/webapp/app/genomic/genomic.component.html
index dfe263da..0a477147 100644
--- a/src/main/webapp/app/genomic/genomic.component.html
+++ b/src/main/webapp/app/genomic/genomic.component.html
@@ -9,7 +9,7 @@