diff --git a/src/app/document-detail/document-detail.component.css b/src/app/document-detail/document-detail.component.css index 48228edf578c63d3eea562f761b04a5a005dfde3..9ab6f682397c805234f3e009a32167b5ae2bacdc 100644 --- a/src/app/document-detail/document-detail.component.css +++ b/src/app/document-detail/document-detail.component.css @@ -106,4 +106,8 @@ position: absolute; bottom: 100; left: 0; -} \ No newline at end of file +} + +.btn-group button.btn.dropdown-toggle.btn-closed { + background-color: grey; +} diff --git a/src/app/document-detail/document-detail.component.html b/src/app/document-detail/document-detail.component.html index 6387446d22243ac617d8b18355d443927a9c40e5..ef5ab05155aeeb0ce9b23d3f958b69c2d9d8c792 100644 --- a/src/app/document-detail/document-detail.component.html +++ b/src/app/document-detail/document-detail.component.html @@ -17,13 +17,13 @@

{{document.name}}

-
- diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts index aadab3bc2af0e6d13c2a5dc6c19df550649c7382..cc9f082b9ab41009c7f44f8b68fbdfa8ab065389 100644 --- a/src/app/document-detail/document-detail.component.ts +++ b/src/app/document-detail/document-detail.component.ts @@ -289,9 +289,11 @@ export class DocumentDetailComponent implements OnInit { }); }); - this.document.srdomainfindings.forEach(newFinding => { - srDomainFindingsGlobal.push(newFinding); - }); + if (this.document.srdomainfindings) { + this.document.srdomainfindings.forEach(newFinding => { + srDomainFindingsGlobal.push(newFinding); + }); + } this.tableDataPretoxSentences = data_relevant_sentences; this.tableDataSRDomainTemplate = srDomainFindingsGlobal; diff --git a/src/app/model/srdomaindocument.ts b/src/app/model/srdomaindocument.ts new file mode 100644 index 0000000000000000000000000000000000000000..4850ae8ff7429b861ca979789029ab7328917edf --- /dev/null +++ b/src/app/model/srdomaindocument.ts @@ -0,0 +1,11 @@ +import {SRDomainFinding} from './srdomainfinding'; +export class SRDomainDocument { + documentId: number; + name: string; + fileName: string; + processDate: string; + status: string; + recordState: string; + srdomainfindings: SRDomainFinding[]; + pretoxDocumentId: number; +} diff --git a/src/app/services/document.service.ts b/src/app/services/document.service.ts index 422a521fca89b47da5ed7bd91e346ad6809cdc86..be6c14e4d10d79527ea9db4ed9733390238aaf83 100644 --- a/src/app/services/document.service.ts +++ b/src/app/services/document.service.ts @@ -11,6 +11,7 @@ import { environment } from '../../environments/environment'; import { DocumentTracking } from '../model/document-tracking'; import { FindingSR } from '../model/findingsr'; import { SRDomainFinding } from '../model/srdomainfinding'; +import { SRDomainDocument } from '../model/srdomaindocument'; const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' }) }; @@ -201,13 +202,15 @@ export class DocumentService { sendToSRDomain(id: number): any { //call to get srdomain const url_2 = `${this.documentsUrl}srdomain/${id}`; - this.http.get(url_2).subscribe({ + this.http.get(url_2).subscribe({ next: doc => { //alert(doc); const url = `${this.apiSRDomainURL}`; return this.http.post(url, doc).subscribe({ next: data => { - alert(data); + this.moveDocument(id, "CLOSED").subscribe({ + _: alert("Sent to srdomain") + }); }, error: error => { //this.errorMessage = error.message;