diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue index 67177f1d..035917eb 100644 --- a/src/views/trials/trials-panel/reading/ad-review/index.vue +++ b/src/views/trials/trials-panel/reading/ad-review/index.vue @@ -729,7 +729,7 @@ export default { this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${ this.trialId }&subjectCode=${this.subjectCode}&subjectId=${ @@ -766,7 +766,7 @@ export default { this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${ this.trialId }&subjectCode=${this.subjectCode}&subjectId=${ @@ -801,7 +801,7 @@ export default { this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${ this.trialId }&subjectCode=${this.subjectCode}&subjectId=${ diff --git a/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue b/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue index 34ad98b5..916038da 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue @@ -302,7 +302,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue index 42c3b6e2..8fd3f16b 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue @@ -358,7 +358,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue index 3810ff6c..d72d689c 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue @@ -362,7 +362,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue index 38de054a..24c3babb 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue @@ -349,7 +349,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue index d0312c6f..810b7a55 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue @@ -355,7 +355,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue index 38de054a..24c3babb 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue @@ -349,7 +349,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue index 8a9d127b..473bb5b0 100644 --- a/src/views/trials/trials-panel/reading/global-review/index.vue +++ b/src/views/trials/trials-panel/reading/global-review/index.vue @@ -471,7 +471,7 @@ export default { readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue index 023c4d5b..b524b547 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue @@ -328,7 +328,7 @@ export default { var trialReadingCriterionId = this.rowData.TrialReadingCriterionId; var path = ""; - if (readingTool === 0 || row.ReadingTool === 2) { + if (readingTool === 0 || readingTool === 2) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${ this.rowData.SubjectCode }&subjectId=${ @@ -355,7 +355,7 @@ export default { var trialReadingCriterionId = this.rowData.TrialReadingCriterionId; var path = ""; - if (readingTool === 0 || row.ReadingTool === 2) { + if (readingTool === 0 || readingTool === 2) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${ this.rowData.SubjectCode }&subjectId=${this.rowData.SubjectId}&visitTaskId=${ diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue index 5fabda2e..01ee9a75 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue @@ -320,7 +320,7 @@ export default { var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder var trialReadingCriterionId = this.rowData.TrialReadingCriterionId var path = '' - if (readingTool === 0 || row.ReadingTool === 2) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue index 55572798..fc9c4af4 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue @@ -201,7 +201,7 @@ export default { var trialReadingCriterionId = this.rowData.TrialReadingCriterionId var path = '' - if (readingTool === 0 || row.ReadingTool === 2) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue index c857d0f7..b1c0359e 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue @@ -178,7 +178,7 @@ export default { var trialReadingCriterionId = this.rowData.TrialReadingCriterionId var path = '' - if (readingTool === 0 || row.ReadingTool === 2) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue index 0f64023b..621824f6 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue @@ -787,7 +787,7 @@ export default { var trialReadingCriterionId = row.TrialReadingCriterionId var path = '' - if (readingTool === 0 || row.ReadingTool === 2) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}` diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue index 262634e5..68c7d7a9 100644 --- a/src/views/trials/trials-panel/reading/oncology-review/index.vue +++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue @@ -550,7 +550,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' - if (readingTool === 0) { + if (readingTool === 0 || readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` diff --git a/src/views/trials/trials-panel/reading/reading-page/index.vue b/src/views/trials/trials-panel/reading/reading-page/index.vue index dc46ae43..1e3b2f88 100644 --- a/src/views/trials/trials-panel/reading/reading-page/index.vue +++ b/src/views/trials/trials-panel/reading/reading-page/index.vue @@ -32,7 +32,7 @@ export default { var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var criterionType = this.$router.currentRoute.query.criterionType var path = '' - if (this.readingTool === 0) { + if (this.readingTool === 0 || this.readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${this.readingTool}&TokenKey=${this.token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${this.readingTool}&TokenKey=${this.token}` diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue index 39aa3c8e..a9cbff5b 100644 --- a/src/views/trials/trials-panel/reading/reading-task/index.vue +++ b/src/views/trials/trials-panel/reading/reading-task/index.vue @@ -468,7 +468,7 @@ export default { ) var token = getToken() var path = '' - if (this.readingTool === 0) { + if (this.readingTool === 0 || this.readingTool === 2 ) { path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`