diff --git a/src/app/document-detail/document-detail.component.html b/src/app/document-detail/document-detail.component.html index ef5ab05155aeeb0ce9b23d3f958b69c2d9d8c792..d1172384c8825ea62ba859c39661ae2ab9753da8 100644 --- a/src/app/document-detail/document-detail.component.html +++ b/src/app/document-detail/document-detail.component.html @@ -10,22 +10,22 @@ -
+
-

{{document.name}}

+

{{report.name}}

-
-
{ this.docData = text; document.getElementById('data2').className = 'collapse show'; @@ -363,7 +345,7 @@ export class DocumentDetailComponent implements OnInit { } findDocumentText(): void { - this.documentService.findDocumentText(this.document.documentId) + this.documentService.findDocumentText(this.report.id) .subscribe(text => { this.docData = text; document.getElementById('data2').className = 'collapse show'; @@ -383,7 +365,8 @@ export class DocumentDetailComponent implements OnInit { } getAllEvidence() { - const id = +this.route.snapshot.paramMap.get('id'); + //const id = +this.route.snapshot.paramMap.get('id'); + const id = this.report.id; this.documentService.getAllEvidence(id) .subscribe(text => { this.docData = text; @@ -403,7 +386,8 @@ export class DocumentDetailComponent implements OnInit { } getSentencesEvidence() { - const id = +this.route.snapshot.paramMap.get('id'); + //const id = +this.route.snapshot.paramMap.get('id'); + const id = this.report.id; this.documentService.getSentencesEvidence(id) .subscribe(text => { this.docData = text; @@ -501,12 +485,6 @@ export class DocumentDetailComponent implements OnInit { onActivate(componentReference) { componentReference.activation(this); - if (componentReference.rowClickEventFinding != undefined) { - componentReference.rowClickEventFinding.subscribe((data) => { - this.rowClickFindingEvidence(data); - }) - } - if (componentReference.rowClickEvent != undefined) { this.getSentencesEvidence(); componentReference.rowClickEvent.subscribe((data) => { diff --git a/src/app/model/report.ts b/src/app/model/report.ts index 439941829a58fb69e9cd25d8966f3e3c5541f050..bf18dd0d752f9ed3bc3564cc51fd3a3e3e1bb6f8 100644 --- a/src/app/model/report.ts +++ b/src/app/model/report.ts @@ -1,3 +1,5 @@ +import { Section } from "./section"; + export class Report { id:number; uploadDate:string; @@ -7,4 +9,6 @@ export class Report { gridFSId:number; status:string; runWF:boolean=false; + hasSections:boolean; + sections:Section[]; } diff --git a/src/app/model/section.ts b/src/app/model/section.ts new file mode 100644 index 0000000000000000000000000000000000000000..d4c877a73671cf5228113d08149f8b95a75a604c --- /dev/null +++ b/src/app/model/section.ts @@ -0,0 +1,10 @@ +import {Document} from './document'; + +export class Section { + id:number; + name:string; + text:string; + processDate:string; + fileName:string; + annotations:Document; +} diff --git a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts index 5e053ba7117c618d06897038f51e7621f4ddc2b0..9670b67854db57328a5f171decd3a16c217884ed 100644 --- a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts +++ b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts @@ -24,7 +24,6 @@ export class PretoxsentencesTabulatorComponent implements OnInit { // list properties you want to set per implementation here... @Output() rowClickEvent = new EventEmitter(); - @Output() rowClickEventFinding = new EventEmitter(); @Output() rowClickExportSRDomainEvent = new EventEmitter(); @Output() rowClickSRFindingValidationEvent = new EventEmitter(); @Output() rowClickEventSRDomainTemplateEvidence = new EventEmitter(); @@ -43,7 +42,7 @@ export class PretoxsentencesTabulatorComponent implements OnInit { activation(parentComponent){ this.document = parentComponent.document; this.sentence_data = parentComponent.tableDataPretoxSentences; - } + } ngOnChanges(changes: SimpleChanges): void { this.drawTable(this); @@ -94,17 +93,17 @@ export class PretoxsentencesTabulatorComponent implements OnInit { }, { title: '', width: 5, field: 'id', - cellClick: function (e, cell) { + /*cellClick: function (e, cell) { cell.getRow().getElement().style.border = "1px solid black"; pretoxSentencesTab.rowClickEvent.emit(cell.getData()); - } + }*/ }, { title: 'Toxicological relevant phrase', field: 'text', headerSort: false, - cellClick: function (e, cell) { + /*cellClick: function (e, cell) { cell.getRow().getElement().style.border = "1px solid black"; - pretoxSentencesTab.rowClickEvent.emit(cell.getData()); - } + pretoxSentencesTab.rowClickEvent.emit(cell.getData()); + }*/ }], rowFormatter: function (row) { //create and style holder elements diff --git a/src/app/reports/reports.component.css b/src/app/reports/reports.component.css index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3a55c77f6fa56a9e4c09951f3d8a68e3318ad5ee 100644 --- a/src/app/reports/reports.component.css +++ b/src/app/reports/reports.component.css @@ -0,0 +1,3 @@ +.run-wf .btn.btn-outline-primary.text-nowrap { + margin-bottom: 10px; +} \ No newline at end of file diff --git a/src/app/reports/reports.component.html b/src/app/reports/reports.component.html index 3cff46082993fb100882564e07c50109a1f9a093..8c6d8ead4ca33cfea5e1c41219703988ac0c16d9 100644 --- a/src/app/reports/reports.component.html +++ b/src/app/reports/reports.component.html @@ -1,39 +1,25 @@
-

- - -

-
-
- -
-
Messages: No document will be processed until all the errors were solved.
-
    -
  • - {{ m }} -
    • -
-
- -
-
The following reports were uploaded. You can run the workflow from here or you can see your reports in the Reports panel.
-
- -
-
    -
  • - {{ m.fileName }} -
    • -
- -
-
- {{message}} -
-
+

+ + +

+
+
+
+
- - \ No newline at end of file +
+
Messages: No document will be processed until all the errors are solved.
+
    +
  • + {{ m }} +
    • +
+
+ +
+ {{message}} +
+
+
\ No newline at end of file diff --git a/src/app/reports/reports.component.ts b/src/app/reports/reports.component.ts index bb58d2aeef093a90b8dfea8379c8a31a275416ad..d4e028e724adf2ad0e89a7d53b58086a6c179d92 100644 --- a/src/app/reports/reports.component.ts +++ b/src/app/reports/reports.component.ts @@ -21,6 +21,7 @@ export class ReportsComponent implements OnInit { message = ''; messages = []; validation_errors = []; + reportsWfToRun = []; tableData: any[] = []; @Input() report: Report; @@ -54,7 +55,9 @@ export class ReportsComponent implements OnInit { fileName: report.fileName, uploadDate: report.uploadDate, status: report.status, - gridfsId: report.gridFSId + gridfsId: report.gridFSId, + hasSections: report.hasSections, + sections: report.sections }); }); @@ -104,8 +107,12 @@ export class ReportsComponent implements OnInit { } - openDocument(documentId) { - this.router.navigate(['/find/' + documentId]); + openAnnotations(data) { + if (data.hasSections) { + this.router.navigate(['/find/' + data.id]); + } else { + alert("There is no sections in this report"); + } } openLegacyReport(gridFSId) { @@ -133,14 +140,16 @@ export class ReportsComponent implements OnInit { paginationSizeSelector: [10, 20, 40], columns: [ { - title: '', width: 5, hozAlign: 'center', headerSort: false, cssClass: "run-wf-checkbox", + title: '', width: 50, hozAlign: 'center', headerSort: false, cssClass: "run-wf-checkbox", cellClick: function (e, cell) { var data = cell.getRow().getData(); - if (data.status == 'READY') { + if (data.status == 'WORKFLOW_READY') { if (data.runWF) { cell.getElement().innerHTML = ' '; + documentTab.reportsWfToRun.splice(documentTab.reportsWfToRun.indexOf(data.id), 1); } else { cell.getElement().innerHTML = ' '; + documentTab.reportsWfToRun.push(data.id); } data.runWF = !data.runWF; @@ -148,18 +157,37 @@ export class ReportsComponent implements OnInit { }, formatter: function (cell, formatterParams, onRendered) { var data = cell.getRow().getData(); - if (data.status == 'READY') { + if (data.status == 'WORKFLOW_READY') { if (data.runWF) { return ' '; } else { return ' '; } } + }, + titleFormatter: function() { + return '
'; } }, { title: 'Name', field: 'fileName', headerSort: true, headerFilter: true }, { title: 'Upload Date', field: 'uploadDate', headerSort: true, headerFilter: true }, { title: 'Status', field: 'status', headerSort: true, headerFilter: true }, + { + title: '', width: 5, hozAlign: 'center', headerSort: false, + cellClick: function (e, cell) { + if (cell.getRow().getData().status == "WORKFLOW_COMPLETED") { + var data = cell.getRow().getData(); + documentTab.openAnnotations(data); + } + }, + formatter: function (cell, formatterParams, onRendered) { + if (cell.getRow().getData().status == "WORKFLOW_COMPLETED") { + return '
'; + } else { + return '
'; + } + } + }, { title: '', width: 5, hozAlign: 'center', headerSort: false, cssClass: "download-report-button", cellClick: function (e, cell) { @@ -172,7 +200,7 @@ export class ReportsComponent implements OnInit { { title: '', width: 5, hozAlign: 'center', headerSort: false, cssClass: "delete-report-button", cellClick: function (e, cell) { - + var data = cell.getRow().getData(); documentTab.openDialog(data.id); } diff --git a/src/app/services/document.service.ts b/src/app/services/document.service.ts index be6c14e4d10d79527ea9db4ed9733390238aaf83..ee7ede363fc6a8496ce1fc699c2464a20d11517a 100644 --- a/src/app/services/document.service.ts +++ b/src/app/services/document.service.ts @@ -41,13 +41,16 @@ export class DocumentService { ); } + /** GET report by id. Will 404 if id not found */ + getReport(id: string): Observable { + const url = `${this.reportsUrl}${id}`; + return this.http.get(url); + } + /** GET document by id. Will 404 if id not found */ getDocument(id: number): Observable { const url = `${this.documentsUrl}${id}`; - return this.http.get(url).pipe( - tap(_ => this.log(`fetched document id=${id}`)), - catchError(this.handleError(`getDocument id=${id}`)) - ); + return this.http.get(url); } /** GET document by id. Will 404 if id not found */ @@ -182,7 +185,7 @@ export class DocumentService { /** GET Snipped of finding selected */ findingSelected(id: number, finding: Finding): Observable { - const url = `${this.documentsUrl}${id}/evidence/finding/${finding.findingId}`; + const url = `${this.reportsUrl}${id}/evidence/finding/${finding.findingId}`; return this.http.get(url, { responseType: 'text' }).pipe( tap(_ => this.log(`fetched finding id=${finding.findingId}`)), catchError(this.handleError(`getFinding id=${finding.findingId}`)) @@ -191,7 +194,7 @@ export class DocumentService { /** GET Snipped of the full text with no annotations */ findDocumentText(id: number): Observable { - const url = `${this.documentsUrl}${id}/text/`; + const url = `${this.reportsUrl}${id}/text/`; return this.http.get(url, { responseType: 'text' }).pipe( tap(_ => this.log(`fetched text id=${id}`)), catchError(this.handleError(`getText id=${id}`)) @@ -200,7 +203,7 @@ export class DocumentService { /** Get SRDomain format and send to srdomain api */ sendToSRDomain(id: number): any { - //call to get srdomain + //call to get srdomain const url_2 = `${this.documentsUrl}srdomain/${id}`; this.http.get(url_2).subscribe({ next: doc => { @@ -240,7 +243,7 @@ export class DocumentService { /** GET Snipped of all finding evidence */ getAllEvidence(id: number): Observable { - const url = `${this.documentsUrl}${id}/evidence/findings`; + const url = `${this.reportsUrl}${id}/evidence/findings`; return this.http.get(url, { responseType: 'text' }).pipe( tap(_ => this.log(`fetched all evidence id=${id}`)), catchError(this.handleError(`getFindings id=${id}`)) @@ -258,7 +261,7 @@ export class DocumentService { /** GET Snipped of sentences evidence */ getSentencesEvidence(id: number): Observable { - const url = `${this.documentsUrl}${id}/evidence/sentences`; + const url = `${this.reportsUrl}${id}/evidence/sentences`; return this.http.get(url, { responseType: 'text' }).pipe( tap(_ => this.log(`fetched all sentences evidence id=${id}`)), catchError(this.handleError(`getSentencesEvidence id=${id}`)) @@ -266,8 +269,7 @@ export class DocumentService { } pretoxSentenceSelected(id: number, pretoxSentence: Annotation): Observable { - const url = `${this.documentsUrl}${id}/evidence/sentence/${pretoxSentence.id}`; - //const url = `${this.documentsUrl}/${id}/sentence/1`; + const url = `${this.reportsUrl}${id}/evidence/sentence/${pretoxSentence.id}`; return this.http.get(url, { responseType: 'text' }).pipe( tap(_ => this.log(`fetched pretox sentence id=${pretoxSentence.id}`)), catchError(this.handleError(`getPretoxSentence id=${pretoxSentence.id}`)) diff --git a/src/tabulator.css b/src/tabulator.css index 9a4af5b90b8d2cfc10849d94a434c4d8242c1882..0ae97ac776025a09ecee56fe5c208f3ecf821828 100644 --- a/src/tabulator.css +++ b/src/tabulator.css @@ -1,9 +1,10 @@ -.tabulator-cell.run-wf-checkbox { +.tabulator-cell.run-wf-checkbox .fa-solid.fa-square-check { + color: blue; cursor: pointer; } -.tabulator-cell.run-wf-checkbox .fa-solid.fa-square-check { - color: green; +.tabulator-cell.run-wf-checkbox .fa-regular.fa-square { + cursor: pointer; } .tabulator-cell.download-report-button .fa-solid.fa-file-pdf { @@ -84,6 +85,16 @@ cursor: pointer; } +.tabulator-cell .start-curation .fa.fa-pencil { + color: blue; + cursor: pointer; +} + +.tabulator-cell .start-curation-disabled .fa.fa-pencil { + color: grey; + cursor: default; +} + .tabulator-cell.editable-cell { cursor: pointer; background-color: #ffcc66; @@ -101,3 +112,8 @@ border: 1px solid black; } +.tabulator .tabulator-header .tabulator-headers .tabulator-col.run-wf-checkbox { + display: inline-flex; + align-items: center; + font-size: 20px; +}