Skip to content
Snippets Groups Projects
Commit eb7ebd07 authored by AndiMajore's avatar AndiMajore
Browse files

made eventlistener for tasks also expose quick analysis and connect all tasks

parent 8386f33d
Branches
Tags
No related merge requests found
......@@ -32,7 +32,7 @@
<div class="control">
<div style="display: flex; justify-content: center">
<button
(click)="analysis.startQuickAnalysis(true, 'connect')"
(click)="runQuickAnalysis(true, 'connect')"
[disabled]="analysis.isLaunchingQuick()"
[ngClass]="{
'text-small': drugstoneConfig.smallStyle
......@@ -64,7 +64,7 @@
</div>
<div style="display: flex; justify-content: center">
<button
(click)="analysis.startQuickAnalysis(false, 'connectSelected')"
(click)="runQuickAnalysis(false, 'connectSelected')"
[disabled]="
analysis.getCount() === 0 || analysis.isLaunchingQuick()
"
......
import { Component, OnInit } from '@angular/core';
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {AnalysisService} from 'src/app/services/analysis/analysis.service';
import {DrugstoneConfigService} from 'src/app/services/drugstone-config/drugstone-config.service';
......@@ -8,14 +8,22 @@ import { DrugstoneConfigService } from 'src/app/services/drugstone-config/drugst
styleUrls: ['./quick-drug-target.component.scss']
})
export class QuickDrugTargetComponent implements OnInit {
@Output()
public taskEvent = new EventEmitter<object>();
constructor(
public drugstoneConfig: DrugstoneConfigService,
public analysis: AnalysisService) { }
public analysis: AnalysisService) {
}
public collapseQuickConnect = false;
ngOnInit(): void {
}
public async runQuickAnalysis(isSuper, algorithm) {
const object = await this.analysis.startQuickAnalysis(isSuper, algorithm);
this.taskEvent.emit(object);
}
}
......@@ -32,7 +32,7 @@
<div class="control">
<div style="display: flex; justify-content: center">
<button
(click)="analysis.startQuickAnalysis(true, 'super')"
(click)="runQuickAnalysis(true, 'super')"
[disabled]="analysis.isLaunchingQuick()"
[ngClass]="{
'text-small': drugstoneConfig.smallStyle
......@@ -68,7 +68,7 @@
<div style="display: flex; justify-content: center">
<button
(click)="analysis.startQuickAnalysis(false, 'quick')"
(click)="runQuickAnalysis(false, 'quick')"
[disabled]="
analysis.getCount() === 0 || analysis.isLaunchingQuick()
"
......
import { Component, OnInit } from '@angular/core';
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import { AnalysisService } from 'src/app/services/analysis/analysis.service';
import { DrugstoneConfigService } from 'src/app/services/drugstone-config/drugstone-config.service';
......@@ -8,6 +8,8 @@ import { DrugstoneConfigService } from 'src/app/services/drugstone-config/drugst
styleUrls: ['./quick-drug.component.scss']
})
export class QuickDrugComponent implements OnInit {
@Output()
public taskEvent = new EventEmitter<object>();
constructor(
public drugstoneConfig: DrugstoneConfigService,
......@@ -17,4 +19,9 @@ export class QuickDrugComponent implements OnInit {
ngOnInit(): void {
}
public async runQuickAnalysis(isSuper, algorithm) {
const object = await this.analysis.startQuickAnalysis(isSuper, algorithm);
this.taskEvent.emit(object);
}
}
......@@ -190,9 +190,9 @@
</div>
</div>
<app-quick-drug-target *ngIf="drugstoneConfig.config.showConnectGenes"></app-quick-drug-target>
<app-quick-drug-target *ngIf="drugstoneConfig.config.showConnectGenes" (taskEvent)="emitTaskEvent($event)"></app-quick-drug-target>
<app-quick-drug *ngIf="drugstoneConfig.config.showSimpleAnalysis"></app-quick-drug>
<app-quick-drug *ngIf="drugstoneConfig.config.showSimpleAnalysis" (taskEvent)="emitTaskEvent($event)"></app-quick-drug>
<div
*ngIf="drugstoneConfig.config.showAdvAnalysis"
......
......@@ -274,6 +274,7 @@ export class AnalysisService {
position: 'top-center',
animate: {in: 'fadeIn', out: 'fadeOut'}
});
return { taskId: resp.token, algorithm: algorithm, target: target, params: parameters }
}
async startAnalysis(algorithm, target: 'drug' | 'drug-target', parameters) {
......
......@@ -146,7 +146,7 @@
}
function initTaskEventListener(){
document.getElementsByTagName("network-expander")[0].addEventListener("taskEvent",(event)=>{console.log(event.detail)})
document.getElementsByTagName("drugst-one")[0].addEventListener("taskEvent",(event)=>{console.log(event.detail)})
}
......
......@@ -143,7 +143,7 @@
}
function initTaskEventListener(){
document.getElementsByTagName("network-expander")[0].addEventListener("taskEvent",(event)=>{console.log(event.detail)})
document.getElementsByTagName("drugst-one")[0].addEventListener("taskEvent",(event)=>{console.log(event.detail)})
}
function applyDataset(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment