+
The following files are going to be processed one after the other. Please check if all options are set as - you wish. - Click "OK" to mark the files for further processing. + you wish. While you are selecting the language you can click on the logos of the service providers for + further information like data storage policy and terms and + conditions.
-+
+ When you click "OK" you agree with the terms and conditions of the selected (third-party) services and the + files are marked for further processing. +
+Please add the files with orange file names again. Otherwise these files will be skipped.
@@ -24,32 +29,131 @@Queue
-
-
-
-
-
+
-
+
+
+
| Language | +Upload | +Speech Recognition | +Manual transcription, Word alignment, Phonetic detail | +||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
+ |
+
+ |
+
+
|
+
+ |
+
| + + | ++ {{serviceProviders['BAS']?.dataStoragePolicy}} + | +
| + + | ++ Terms & + Conditions + | +
| + + | ++ Homepage + | +
| File | diff --git a/src/app/modals/queue-modal/queue-modal.component.ts b/src/app/modals/queue-modal/queue-modal.component.ts index 6365bda..78c6563 100644 --- a/src/app/modals/queue-modal/queue-modal.component.ts +++ b/src/app/modals/queue-modal/queue-modal.component.ts @@ -1,4 +1,12 @@ -import {Component, Input, OnInit, ViewChild} from '@angular/core'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + Input, + OnInit, + ViewChild, + ViewEncapsulation +} from '@angular/core'; import {DomSanitizer} from '@angular/platform-browser'; import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; import {Task, TaskState} from '../../obj/tasks'; @@ -15,7 +23,9 @@ import {OHLanguageObject} from '../../obj/oh-config'; @Component({ selector: 'app-queue-modal', templateUrl: './queue-modal.component.html', - styleUrls: ['./queue-modal.component.css'] + styleUrls: ['./queue-modal.component.css'], + changeDetection: ChangeDetectionStrategy.OnPush, + encapsulation: ViewEncapsulation.None, }) export class QueueModalComponent implements OnInit { @ViewChild('content', {static: true}) content: NgbModal; @@ -29,8 +39,15 @@ export class QueueModalComponent implements OnInit { return AppSettings; } + public serviceProviders = {}; + constructor(private modalService: NgbModal, private sanitizer: DomSanitizer, - private taskService: TaskService, private storage: StorageService) { + private taskService: TaskService, private storage: StorageService, + private cd: ChangeDetectorRef) { + for (let i = 0; i < AppSettings.configuration.api.services.length; i++) { + const provider = AppSettings.configuration.api.services[i]; + this.serviceProviders['' + provider.provider] = provider; + } } ngOnInit() { @@ -62,6 +79,8 @@ export class QueueModalComponent implements OnInit { } this.modalRef.dismiss(); this.onDismiss(); + this.cd.markForCheck(); + this.cd.detectChanges(); } public get orangeCount(): number { @@ -104,6 +123,9 @@ export class QueueModalComponent implements OnInit { language: this.taskService.selectedlanguage.code, asr: this.taskService.selectedlanguage.asr }); + + this.cd.markForCheck(); + this.cd.detectChanges(); } deactivateOperation(operation: Operation, index: number) { @@ -175,6 +197,9 @@ export class QueueModalComponent implements OnInit { } this.updateEnableState(); + + this.cd.markForCheck(); + this.cd.detectChanges(); } public updateEnableState() { diff --git a/src/app/obj/operations/asr-operation.ts b/src/app/obj/operations/asr-operation.ts index f4d51be..948beb6 100644 --- a/src/app/obj/operations/asr-operation.ts +++ b/src/app/obj/operations/asr-operation.ts @@ -61,8 +61,8 @@ export class ASROperation extends Operation { result.enabled = operationObj.enabled; result.webService = operationObj.webService; - if (!(operationObj.serviceProvider === null || operationObj.serviceProvider === undefined)) { - result._providerInformation = AppSettings.getServiceInformation(operationObj.serviceProvider); + if (!(operationObj.serviceProviders === null || operationObj.serviceProviders === undefined)) { + result._providerInformation = AppSettings.getServiceInformation(operationObj.serviceProviders); } else { result._providerInformation = AppSettings.getServiceInformation(operationObj.webService.replace('ASR', '')); console.log(operationObj.webService); diff --git a/src/app/obj/operations/upload-operation.ts b/src/app/obj/operations/upload-operation.ts index 990e4c6..388977b 100644 --- a/src/app/obj/operations/upload-operation.ts +++ b/src/app/obj/operations/upload-operation.ts @@ -3,7 +3,7 @@ import {DomSanitizer, SafeHtml} from '@angular/platform-browser'; import {TimePipe} from '../../shared/time.pipe'; import {FileInfo} from '../fileInfo'; import {Operation} from './operation'; -import {Task, TaskState} from '../tasks/task'; +import {Task, TaskState} from '../tasks'; import * as X2JS from 'x2js'; import {Subject} from 'rxjs'; import {OHLanguageObject} from '../oh-config'; @@ -55,7 +55,7 @@ export class UploadOperation extends Operation { } subj.next({ type: 'progress', - result:
|---|