From aa8a343c3e4a4b3a2d58a336766f8a62bdc3251a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Fri, 23 Sep 2022 10:41:24 +0200
Subject: [PATCH 1/5] Add section select box

---
 src/app/app.module.ts                         |  6 +-
 .../document-detail.component.html            | 63 +++++++++++--------
 .../document-detail.component.ts              |  2 +
 3 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b5da66d..d312301 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,7 +21,7 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { LogoutComponent } from './logout/logout.component';
 import { HistoryTrackingComponent } from './history-tracking/history-tracking.component';
-import { MatProgressSpinnerModule, MatProgressBarModule, MatDialogModule } from '@angular/material'
+import { MatProgressSpinnerModule, MatProgressBarModule, MatDialogModule, MatSelectModule, MatOptionModule } from '@angular/material'
 import { OAuthModule } from "angular-oauth2-oidc";
 import { UploadFilesComponent } from './upload-files/upload-files.component';
 import { authConfigFactory } from './auth-config-factory';
@@ -67,7 +67,9 @@ import { DeleteReportDialog } from './delete-report-dialog/delete-report-dialog.
     MatProgressSpinnerModule,
     MatProgressBarModule,
     OAuthModule.forRoot(),
-    MatDialogModule
+    MatDialogModule,
+    MatSelectModule,
+    MatOptionModule
     /*OAuthModule.forRoot({
       resourceServer: {
         //allowedUrls: [environment.apiUrl],
diff --git a/src/app/document-detail/document-detail.component.html b/src/app/document-detail/document-detail.component.html
index d117238..a1de795 100644
--- a/src/app/document-detail/document-detail.component.html
+++ b/src/app/document-detail/document-detail.component.html
@@ -17,14 +17,15 @@
           <h4>{{report.name}}</h4>
         </div>
         <div class="send-to-srdomain-button">
-          <button type="button" class="btn btn-outline-primary text-nowrap" [disabled]="report.status != 'FINISHED'" (click)="sendToSRDomain()">Send to
+          <button type="button" class="btn btn-outline-primary text-nowrap" [disabled]="report.status != 'FINISHED'"
+            (click)="sendToSRDomain()">Send to
             SR-Domain</button>
         </div>
         <div class="btn-group">
           <button class="status-button" type="button" [disabled]="report.status == 'CLOSED'" [ngClass]="{'btn-warning': report.status === 'DRAFT',
-                        'btn-primary' : report.status === 'IN_PROGRESS',
-                        'btn-success' : report.status === 'FINISHED', 'btn-closed' : report.status === 'CLOSED'}" class="btn dropdown-toggle"
-            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                       'btn-primary' : report.status === 'IN_PROGRESS',
+                        'btn-success' : report.status === 'FINISHED', 'btn-closed' : report.status === 'CLOSED'}"
+            class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             {{report.status}}
           </button>
           <div class="dropdown-menu">
@@ -37,28 +38,38 @@
       </div>
     </div>
     <div class="w3-container">
-      <a class="collapse-button" href="#data2" data-toggle="collapse">
-        <i class="fa fa-angle-down" title="Minimize Evidence"></i>
-      </a>
-      <!-- <a (click)="clear()" style="text-decoration:none;cursor: pointer;">
-          <i class="fa fa-eraser"  style="color:black;padding: 10px 30px; font-size: 2rem;" title="Clear Evidence"></i>
-        </a> -->
-      <!-- <a title="Export Findings" (click)="exportDocument" download="download.json">
-          <i class="fa fa-file-export" style="color:black;padding: 10px 30px; font-size: 2rem;"></i>
-        </a> -->
-      <a class="get-evidence-button" (click)="getAllEvidence()">
-        <i class="fa fa-eye" title="Show All Evidence"> </i>
-      </a>
-      <a class="find-doc-button" (click)="findDocumentText()">
-        <i class="fa fa-file-text" title="Show Plain Text">
-        </i>
-      </a>
-      <a class="export-document-button" (click)="exportDocument()">
-        <i class="fa fa-download" title="Export Findings"> </i>
-      </a>
-      <a class="get-history-button" routerLink="./tracking">
-        <i class="fa fa-history" title="History changes"> </i>
-      </a>
+      <div class="main-buttons">
+        <a class="collapse-button" href="#data2" data-toggle="collapse">
+          <i class="fa fa-angle-down" title="Minimize Evidence"></i>
+        </a>
+        <!-- <a (click)="clear()" style="text-decoration:none;cursor: pointer;">
+            <i class="fa fa-eraser"  style="color:black;padding: 10px 30px; font-size: 2rem;" title="Clear Evidence"></i>
+          </a> -->
+        <!-- <a title="Export Findings" (click)="exportDocument" download="download.json">
+            <i class="fa fa-file-export" style="color:black;padding: 10px 30px; font-size: 2rem;"></i>
+          </a> -->
+        <a class="get-evidence-button" (click)="getAllEvidence()">
+          <i class="fa fa-eye" title="Show All Evidence"> </i>
+        </a>
+        <a class="find-doc-button" (click)="findDocumentText()">
+          <i class="fa fa-file-text" title="Show Plain Text">
+          </i>
+        </a>
+        <a class="export-document-button" (click)="exportDocument()">
+          <i class="fa fa-download" title="Export Findings"> </i>
+        </a>
+        <a class="get-history-button" routerLink="./tracking">
+          <i class="fa fa-history" title="History changes"> </i>
+        </a>
+        <mat-form-field>
+          <mat-select [(value)]="currentSection">
+            <mat-option value="all">All</mat-option>
+            <mat-option *ngFor="let section of report.sections" [value]="section.name">
+              {{section.name}}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
       <div id="data2">
         <div id="loadingDiv"></div>
         <div id="data1" data-ng-init="clear()">
diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts
index 777d8bc..2b0d855 100644
--- a/src/app/document-detail/document-detail.component.ts
+++ b/src/app/document-detail/document-detail.component.ts
@@ -62,6 +62,8 @@ export class DocumentDetailComponent implements OnInit {
 
   addFindingEnabled: boolean;
 
+  currentSection = "all";
+
   data: SafeHtml;
 
   docData: string;
-- 
GitLab


From 2a30872cc3f5f043c059ce36b5fae2e2a60ff3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Tue, 27 Sep 2022 17:07:36 +0200
Subject: [PATCH 2/5] Add select box with sections

---
 .../document-detail.component.html            |   6 +-
 .../document-detail.component.ts              | 170 ++++++++++--------
 .../pretoxsentences-tabulator.component.ts    |  33 ++--
 src/app/services/event.service.ts             |   2 +
 src/app/services/report.service.ts            |   2 +-
 .../srdomaintemplate-tabulator.component.ts   |  37 ++--
 6 files changed, 139 insertions(+), 111 deletions(-)

diff --git a/src/app/document-detail/document-detail.component.html b/src/app/document-detail/document-detail.component.html
index a1de795..b40b2e5 100644
--- a/src/app/document-detail/document-detail.component.html
+++ b/src/app/document-detail/document-detail.component.html
@@ -14,7 +14,7 @@
     <div class="card">
       <div class="card-header">
         <div class="document-name">
-          <h4>{{report.name}}</h4>
+          <h4>{{report.fileName}}</h4>
         </div>
         <div class="send-to-srdomain-button">
           <button type="button" class="btn btn-outline-primary text-nowrap" [disabled]="report.status != 'FINISHED'"
@@ -62,9 +62,9 @@
           <i class="fa fa-history" title="History changes"> </i>
         </a>
         <mat-form-field>
-          <mat-select [(value)]="currentSection">
+          <mat-select [(value)]="currentSection" name="section" (selectionChange)="onSectionChange(currentSection)">
             <mat-option value="all">All</mat-option>
-            <mat-option *ngFor="let section of report.sections" [value]="section.name">
+            <mat-option *ngFor="let section of sections" [value]="section">
               {{section.name}}
             </mat-option>
           </mat-select>
diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts
index 2b0d855..9593da1 100644
--- a/src/app/document-detail/document-detail.component.ts
+++ b/src/app/document-detail/document-detail.component.ts
@@ -14,6 +14,7 @@ import { Router } from '@angular/router';
 import { CdisSendCtService } from '../services/cdis-send-ct.service';
 import { Status } from '../model/srdomainfindingstatus';
 import { Report } from '../model/report';
+import { Section } from '../model/section';
 
 //brat
 declare var head: any;
@@ -62,7 +63,9 @@ export class DocumentDetailComponent implements OnInit {
 
   addFindingEnabled: boolean;
 
-  currentSection = "all";
+  currentSection: any = "all";
+
+  sections: Section[];
 
   data: SafeHtml;
 
@@ -196,7 +199,7 @@ export class DocumentDetailComponent implements OnInit {
     this.router.events.subscribe((res) => {
       this.activeLinkIndex = this.navLinks.indexOf(this.navLinks.find(tab => tab.link === '.' + this.router.url));
     });
-    this.getDocument();
+    this.getReport();
     this.findSRDomainComboValues();
   }
 
@@ -208,87 +211,98 @@ export class DocumentDetailComponent implements OnInit {
     this.cdiscSendCTService.findStudyDomainList();
   }
 
-  getDocument(): void {
-    const id = this.route.snapshot.paramMap.get('id');
-    this.reportService.getReport(id)
-      .subscribe(report => {
-        this.report = report;
-        this.setNextStatus(this.report.status);
-        var data_relevant_sentences = [];
-        var srDomainFindingsGlobal = [];
-        report.sections.forEach(section => {
-          section.annotations.relevantSentences.forEach(annotation => {
-            var findings = [];
-            annotation.findings.forEach(find => {
-              var srDomainFindings = [];
-              find.srDomainFindings.forEach(srDomainFinding => {
-                const currentFinding = ({
-                  studyid: srDomainFinding.studyid,
-                  domain: srDomainFinding.domain,
-                  srseq: srDomainFinding.srseq,
-                  srrisk: srDomainFinding.srrisk,
-
-                  spgrpcd: srDomainFinding.spgrpcd,
-                  srgrpnam: srDomainFinding.srgrpnam,
-                  srgrpdos: srDomainFinding.srgrpdos,
-                  srsex: srDomainFinding.srsex,
-
-                  srstdy: srDomainFinding.srstdy,
-                  srstphse: srDomainFinding.srstphse,
-                  srobstdy: srDomainFinding.srobstdy,
-                  srendy: srDomainFinding.srendy,
-
-                  srenphse: srDomainFinding.srenphse,
-                  srobendy: srDomainFinding.srobendy,
-                  srdomain: srDomainFinding.srdomain,
-                  srspec: srDomainFinding.srspec,
-
-                  srtstcd: srDomainFinding.srtstcd,
-                  srfndg: srDomainFinding.srfndg,
-                  srores: srDomainFinding.srores,
-                  srobsv: srDomainFinding.srobsv,
-
-                  srobsq: srDomainFinding.srobsq,
-                  srsev: srDomainFinding.srsev,
-                  srpcnt: srDomainFinding.srpcnt,
-                  srsigf: srDomainFinding.srsigf,
-
-                  srtrtef: srDomainFinding.srpcnt,
-                  srcomnt: srDomainFinding.srsigf,
-
-                  export: srDomainFinding.export,
-                  srDomainId: srDomainFinding.srDomainId,
-                  findingId: srDomainFinding.findingId,
-                  status: srDomainFinding.status,
-                  section: section.name,
-                  documentId: section.annotations.documentId
-                });
-
-                findings.push(currentFinding);
-                srDomainFindings.push(currentFinding);
-              });
-
-              srDomainFindingsGlobal = srDomainFindingsGlobal.concat(srDomainFindings);
-            });
-
-            data_relevant_sentences.push({
-              id: annotation.id,
-              text: annotation.text,
-              findings: findings,
+  loadReport(report) {
+    this.report = report;
+    this.setNextStatus(this.report.status);
+    var data_relevant_sentences = [];
+    var srDomainFindingsGlobal = [];
+    report.sections.forEach(section => {
+      section.annotations.relevantSentences.forEach(annotation => {
+        var findings = [];
+        annotation.findings.forEach(find => {
+          var srDomainFindings = [];
+          find.srDomainFindings.forEach(srDomainFinding => {
+            const currentFinding = ({
+              studyid: srDomainFinding.studyid,
+              domain: srDomainFinding.domain,
+              srseq: srDomainFinding.srseq,
+              srrisk: srDomainFinding.srrisk,
+
+              spgrpcd: srDomainFinding.spgrpcd,
+              srgrpnam: srDomainFinding.srgrpnam,
+              srgrpdos: srDomainFinding.srgrpdos,
+              srsex: srDomainFinding.srsex,
+
+              srstdy: srDomainFinding.srstdy,
+              srstphse: srDomainFinding.srstphse,
+              srobstdy: srDomainFinding.srobstdy,
+              srendy: srDomainFinding.srendy,
+
+              srenphse: srDomainFinding.srenphse,
+              srobendy: srDomainFinding.srobendy,
+              srdomain: srDomainFinding.srdomain,
+              srspec: srDomainFinding.srspec,
+
+              srtstcd: srDomainFinding.srtstcd,
+              srfndg: srDomainFinding.srfndg,
+              srores: srDomainFinding.srores,
+              srobsv: srDomainFinding.srobsv,
+
+              srobsq: srDomainFinding.srobsq,
+              srsev: srDomainFinding.srsev,
+              srpcnt: srDomainFinding.srpcnt,
+              srsigf: srDomainFinding.srsigf,
+
+              srtrtef: srDomainFinding.srpcnt,
+              srcomnt: srDomainFinding.srsigf,
+
+              export: srDomainFinding.export,
+              srDomainId: srDomainFinding.srDomainId,
+              findingId: srDomainFinding.findingId,
+              status: srDomainFinding.status,
+              section: section.name,
               documentId: section.annotations.documentId
             });
+
+            findings.push(currentFinding);
+            srDomainFindings.push(currentFinding);
           });
 
-          if (section.annotations.srdomainfindings) {
-            section.annotations.srdomainfindings.forEach(newFinding => {
-              srDomainFindingsGlobal.push(newFinding);
-            });
-          }
+          srDomainFindingsGlobal = srDomainFindingsGlobal.concat(srDomainFindings);
         });
 
-        this.tableDataPretoxSentences = data_relevant_sentences;
-        this.tableDataSRDomainTemplate = srDomainFindingsGlobal;
+        data_relevant_sentences.push({
+          id: annotation.id,
+          text: annotation.text,
+          findings: findings,
+          documentId: section.annotations.documentId
+        });
       });
+
+      if (section.annotations.srdomainfindings) {
+        section.annotations.srdomainfindings.forEach(newFinding => {
+          srDomainFindingsGlobal.push(newFinding);
+        });
+      }
+    });
+
+    this.tableDataPretoxSentences = data_relevant_sentences;
+    this.tableDataSRDomainTemplate = srDomainFindingsGlobal;
+    this.eventService.changeSectionEvent.emit(this);
+  }
+
+  getReport(): void {
+    const id = this.route.snapshot.paramMap.get('id');
+    if (this.currentSection && this.currentSection.name) {
+      this.reportService.findReportSection(id, this.currentSection.id)
+        .subscribe(report => this.loadReport(report));
+    } else {
+      this.reportService.getReport(id)
+        .subscribe(report => {
+          this.loadReport(report);
+          this.sections = report.sections;
+        });
+    }
   }
 
   rowClickSentenceEvidence(dataRow: any): void {
@@ -536,6 +550,10 @@ export class DocumentDetailComponent implements OnInit {
     }
   }
 
+  onSectionChange() {
+    this.getReport();
+  }
+
   goBack(): void {
     this.location.back();
   }
diff --git a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts
index 2186e5c..ef54fca 100644
--- a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts
+++ b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts
@@ -1,10 +1,10 @@
-import { Component, Input, OnChanges, SimpleChanges, OnInit, EventEmitter, Output } from '@angular/core';
+import { Component, Input, SimpleChanges, OnInit, EventEmitter, Output } from '@angular/core';
+import { Subscription } from 'rxjs';
 import { TabulatorFull as Tabulator } from 'tabulator-tables';
 
 
-import { ActivatedRoute } from '@angular/router';
-import { DocumentService } from '../services/document.service';
 import { Document } from '../model/document';
+import { EventService } from '../services/event.service';
 
 @Component({
   selector: 'app-pretoxsentences-tabulator',
@@ -13,15 +13,11 @@ import { Document } from '../model/document';
 })
 export class PretoxsentencesTabulatorComponent implements OnInit {
 
-  //@Input() tableData: any[] = [];
-  //@Input() columnNames: any[] = [];
-
   tableData: any[] = [];
-  sentence_data: any[] = [];
+  changeSectionEvent: Subscription;
+
   @Input() document: Document;
   @Input() height = '100%';
-  //@Input() height = '600px';
-  // list properties you want to set per implementation here...
 
   @Output() rowClickEvent = new EventEmitter();
   @Output() rowClickExportSRDomainEvent = new EventEmitter();
@@ -31,20 +27,25 @@ export class PretoxsentencesTabulatorComponent implements OnInit {
 
   tab = document.createElement('div');
 
-  constructor(private route: ActivatedRoute, private documentService: DocumentService) {
+  constructor(private eventService: EventService) {
   }
 
   ngOnInit(): void {
-    this.tableData = this.sentence_data;
-    this.drawTable(this);
+    this.changeSectionEvent = this.eventService.changeSectionEvent.subscribe((parentComponent) => {
+      this.loadData(parentComponent);
+    });
+  }
+
+  activation(parentComponent) {
+    this.loadData(parentComponent);
   }
 
-  activation(parentComponent){
-    this.document = parentComponent.document;
-    this.sentence_data = parentComponent.tableDataPretoxSentences;
+  ngOnDestroy() {
+    this.changeSectionEvent.unsubscribe();
   }
 
-  ngOnChanges(changes: SimpleChanges): void {
+  loadData(parentComponent) {
+    this.tableData = parentComponent.tableDataPretoxSentences;
     this.drawTable(this);
   }
 
diff --git a/src/app/services/event.service.ts b/src/app/services/event.service.ts
index 4b80dd0..9d2dbf8 100644
--- a/src/app/services/event.service.ts
+++ b/src/app/services/event.service.ts
@@ -7,5 +7,7 @@ export class EventService {
 
     addFindingEvent: EventEmitter<any> = new EventEmitter();
 
+    changeSectionEvent: EventEmitter<any> = new EventEmitter();
+
     constructor() { }
 }
\ No newline at end of file
diff --git a/src/app/services/report.service.ts b/src/app/services/report.service.ts
index 24a1de9..55db43b 100644
--- a/src/app/services/report.service.ts
+++ b/src/app/services/report.service.ts
@@ -31,7 +31,7 @@ export class ReportService {
     return this.http.get<Report>(url);
   }
 
-  findReportSection(reportId:string, sectionId: string): Observable<Report> {
+  findReportSection(reportId:string, sectionId: number): Observable<Report> {
     const url = `${this.reportsUrl}${reportId}/section/${sectionId}`;
     return this.http.get<Report>(url);
   }
diff --git a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
index f92d891..f5959d8 100644
--- a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
+++ b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
@@ -1,13 +1,12 @@
 import { Component, Input, OnInit, EventEmitter, Output } from '@angular/core';
 import { TabulatorFull as Tabulator } from 'tabulator-tables';
 import { CdisSendCtService } from '../services/cdis-send-ct.service';
-import { ActivatedRoute } from '@angular/router';
-import { DocumentService } from '../services/document.service';
-import { Document } from '../model/document';
 import { cloneDeep } from 'lodash';
 import { EventService } from '../services/event.service';
 import { Status } from '../model/srdomainfindingstatus';
 import { SRDomainFinding } from '../model/srdomainfinding';
+import { Report } from '../model/report';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-srdomaintemplate-tabulator',
@@ -19,9 +18,9 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
   tableData: any[] = [];
   table: Tabulator;
   originalData: any[] = [];
-  finding_data: any[] = [];
-  @Input() document: Document;
+  changeSectionEvent: Subscription;
 
+  @Input() report: Report;
   @Input() height = '100%';
 
   @Output() rowClickEventSRDomainTemplateEvidence = new EventEmitter();
@@ -33,7 +32,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
 
   tab = document.createElement('div');
 
-  constructor(private route: ActivatedRoute, private documentService: DocumentService, private cdiscSendCTService: CdisSendCtService, private eventService: EventService) { }
+  constructor(private cdiscSendCTService: CdisSendCtService, private eventService: EventService) { }
 
   ellipsisFormatter(cell, formatterParams, onRendered) {
     onRendered(function () {
@@ -45,23 +44,31 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
   };
 
   ngOnInit(): void {
-    this.tableData = this.finding_data;
-    this.originalData = cloneDeep(this.finding_data);
-    this.drawTable(this);
-    this.enableAddFindingEvent.emit(true);
     this.eventService.addFindingEvent.subscribe(() => {
       this.addFinding();
     });
+
+    this.changeSectionEvent = this.eventService.changeSectionEvent.subscribe((parentComponent) => {
+      this.loadData(parentComponent);
+    });
   }
 
   ngOnDestroy() {
     this.enableAddFindingEvent.emit(false);
+    this.changeSectionEvent.unsubscribe();
   }
 
-  activation(parentComponent){
-    this.document = parentComponent.document;
-    this.finding_data= parentComponent.tableDataSRDomainTemplate;
-  } 
+  activation(parentComponent) {
+    this.loadData(parentComponent);
+  }
+
+  loadData(parentComponent) {
+    this.report = parentComponent.report;
+    this.tableData = parentComponent.tableDataSRDomainTemplate;
+    this.originalData = cloneDeep(parentComponent.tableDataSRDomainTemplate);
+    this.enableAddFindingEvent.emit(true);
+    this.drawTable(this);
+  }
 
   editCheck(cell) {
     return cell.getRow().getData().inEdition == true;
@@ -181,7 +188,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
   addFinding() {
     const findingId = this.table.getDataCount() + 1;
     const newFinding = new SRDomainFinding();
-    newFinding.studyid = this.document.name;
+    newFinding.studyid = this.report.fileName;
     newFinding.srDomainId = findingId;
     newFinding.findingId = findingId;
     newFinding.status = Status.ADDED;
-- 
GitLab


From e30b709d3b9c11eda9ecc259ca3ed074e16c1579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Wed, 28 Sep 2022 11:13:51 +0200
Subject: [PATCH 3/5] Minor fixes

---
 src/app/model/srdomainfinding.ts              |  1 +
 .../srdomaintemplate-tabulator.component.ts   | 30 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/app/model/srdomainfinding.ts b/src/app/model/srdomainfinding.ts
index d1bb1b2..7f6dfeb 100644
--- a/src/app/model/srdomainfinding.ts
+++ b/src/app/model/srdomainfinding.ts
@@ -1,6 +1,7 @@
 export class SRDomainFinding {
 	studyid: String;
 	domain: String;
+	section: String;
 	srseq: String;
 	srrisk: String;
 	spgrpcd: String;
diff --git a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
index f5959d8..ea09b19 100644
--- a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
+++ b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
@@ -7,6 +7,7 @@ import { Status } from '../model/srdomainfindingstatus';
 import { SRDomainFinding } from '../model/srdomainfinding';
 import { Report } from '../model/report';
 import { Subscription } from 'rxjs';
+import { Section } from '../model/section';
 
 @Component({
   selector: 'app-srdomaintemplate-tabulator',
@@ -15,6 +16,7 @@ import { Subscription } from 'rxjs';
 })
 export class SrdomaintemplateTabulatorComponent implements OnInit {
 
+  currentSection: string;
   tableData: any[] = [];
   table: Tabulator;
   originalData: any[] = [];
@@ -44,12 +46,13 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
   };
 
   ngOnInit(): void {
+    this.enableAddFindingEvent.emit(true);
     this.eventService.addFindingEvent.subscribe(() => {
       this.addFinding();
     });
 
     this.changeSectionEvent = this.eventService.changeSectionEvent.subscribe((parentComponent) => {
-      this.loadData(parentComponent);
+      this.loadData(parentComponent, true);
     });
   }
 
@@ -59,15 +62,19 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
   }
 
   activation(parentComponent) {
-    this.loadData(parentComponent);
+    this.loadData(parentComponent, false);
   }
 
-  loadData(parentComponent) {
+  loadData(parentComponent, update) {
+    this.currentSection = parentComponent.currentSection && parentComponent.currentSection.name;
     this.report = parentComponent.report;
     this.tableData = parentComponent.tableDataSRDomainTemplate;
     this.originalData = cloneDeep(parentComponent.tableDataSRDomainTemplate);
-    this.enableAddFindingEvent.emit(true);
-    this.drawTable(this);
+    if (update) {
+      this.table.setData(this.tableData);
+    } else {
+      this.drawTable(this);
+    }
   }
 
   editCheck(cell) {
@@ -188,10 +195,11 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
   addFinding() {
     const findingId = this.table.getDataCount() + 1;
     const newFinding = new SRDomainFinding();
-    newFinding.studyid = this.report.fileName;
+    newFinding.studyid = this.report.id + "_" + this.report.fileName;
     newFinding.srDomainId = findingId;
     newFinding.findingId = findingId;
     newFinding.status = Status.ADDED;
+    newFinding.section = this.currentSection;
 
     this.tableData.push(newFinding);
     this.table.addRow(newFinding);
@@ -297,10 +305,10 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
             var row = cell.getRow();
             var data = row.getData();
             if (data.inEdition == false || data.inEdition == undefined) {
-              if (pretoxSRDomainTemplateTab.document.findingInEdition == undefined ||
-                pretoxSRDomainTemplateTab.document.findingInEdition == -1) {
+              if (pretoxSRDomainTemplateTab.report.findingInEdition == undefined ||
+                pretoxSRDomainTemplateTab.report.findingInEdition == -1) {
                 data.inEdition = true;
-                pretoxSRDomainTemplateTab.document.findingInEdition = 1;
+                pretoxSRDomainTemplateTab.report.findingInEdition = 1;
                 pretoxSRDomainTemplateTab.enableAddFindingEvent.emit(false);
                 row.getCell('ed2').getElement().innerHTML = '<div class="save-finding"> <i class="fa-solid fa-floppy-disk" title="Save Finding" aria-hidden="true"> </i> </div>';
                 cell.getElement().innerHTML = '<div class="cancel-edition"> <i class="fa-solid fa-pencil" title="Cancel Edition"> </i> </div>';
@@ -311,7 +319,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
               }
             } else if (data.inEdition == true) {
               data.inEdition = false;
-              pretoxSRDomainTemplateTab.document.findingInEdition = -1;
+              pretoxSRDomainTemplateTab.report.findingInEdition = -1;
               pretoxSRDomainTemplateTab.enableAddFindingEvent.emit(true);
               row.getCell('ed2').getElement().innerHTML = '';
               cell.getElement().innerHTML = '<div class="enable-edition"> <i class="fa-solid fa-pencil" title="Enable Edition" aria-hidden="true"> </i> </div>';
@@ -332,7 +340,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
             var data = cell.getRow().getData();
             if (data.inEdition == true) {
               data.inEdition = false;
-              pretoxSRDomainTemplateTab.document.findingInEdition = -1;
+              pretoxSRDomainTemplateTab.report.findingInEdition = -1;
               pretoxSRDomainTemplateTab.enableAddFindingEvent.emit(true);
               row.getElement().className = "tabulator-row";
               row.getCells().forEach(rowCell => {
-- 
GitLab


From 33d185d3a180641c174dc74028d9736d16339d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Wed, 28 Sep 2022 11:54:41 +0200
Subject: [PATCH 4/5] Load sentence evidence of selected section

---
 .../document-detail.component.ts              | 59 ++++++++++++-------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts
index 9593da1..39f6abf 100644
--- a/src/app/document-detail/document-detail.component.ts
+++ b/src/app/document-detail/document-detail.component.ts
@@ -295,12 +295,16 @@ export class DocumentDetailComponent implements OnInit {
     const id = this.route.snapshot.paramMap.get('id');
     if (this.currentSection && this.currentSection.name) {
       this.reportService.findReportSection(id, this.currentSection.id)
-        .subscribe(report => this.loadReport(report));
+        .subscribe(report => {
+          this.loadReport(report);
+          this.getSentencesEvidence(this.currentSection);
+        });
     } else {
       this.reportService.getReport(id)
         .subscribe(report => {
           this.loadReport(report);
           this.sections = report.sections;
+          this.getSentencesEvidence(this.currentSection);
         });
     }
   }
@@ -381,6 +385,26 @@ export class DocumentDetailComponent implements OnInit {
       });
   }
 
+  loadEvidence(text) {
+    this.docData = text;
+    document.getElementById('data2').className = 'collapse show';
+    document.getElementById('data1').innerHTML = '';
+    document.getElementById('data1').className = '';
+    document.getElementById('loadingDiv').className = 'loader';
+    var j = JSON.parse(this.docData);
+    this.loadBratVisualizer();
+    head.ready(function () {
+      const dispatcher = Util.embed('data1', DocumentDetailComponent.collData, j, DocumentDetailComponent.webFontURLs);
+      dispatcher.on('displaySpanComment', displaySpanComment);
+      dispatcher.on('hideComment', hideComment);
+      document.getElementById('data2').className = 'FixedHeightContainer';
+      document.getElementById('data1').className = 'brat_div';
+      setTimeout(() => {
+        document.getElementById('loadingDiv').className = '';
+      }, 1000);
+    });
+  }
+
   getAllEvidence() {
     //const id = +this.route.snapshot.paramMap.get('id');
     const id = this.report.id;
@@ -402,29 +426,20 @@ export class DocumentDetailComponent implements OnInit {
       });
   }
 
-  getSentencesEvidence() {
+  getSentencesEvidence(section) {
     //const id = +this.route.snapshot.paramMap.get('id');
     const id = this.report.id;
-    this.reportService.getSentencesEvidence(id)
-      .subscribe(text => {
-        this.docData = text;
-        document.getElementById('data2').className = 'collapse show';
-        document.getElementById('data1').innerHTML = '';
-        document.getElementById('data1').className = '';
-        document.getElementById('loadingDiv').className = 'loader';
-        var j = JSON.parse(this.docData);
-        this.loadBratVisualizer();
-        head.ready(function () {
-          const dispatcher = Util.embed('data1', DocumentDetailComponent.collData, j, DocumentDetailComponent.webFontURLs);
-          dispatcher.on('displaySpanComment', displaySpanComment);
-          dispatcher.on('hideComment', hideComment);
-          document.getElementById('data2').className = 'FixedHeightContainer';
-          document.getElementById('data1').className = 'brat_div';
-          setTimeout(() => {
-            document.getElementById('loadingDiv').className = '';
-          }, 4000);
+    if (section == undefined || section == "all") {
+      this.reportService.getSentencesEvidence(id)
+        .subscribe(text => {
+          this.loadEvidence(text);
         });
-      });
+    } else {
+      this.reportService.getSectionSentencesEvidence(id, section.id)
+        .subscribe(text => {
+          this.loadEvidence(text);
+        });
+    }
   }
 
   setExportSRDomain(data) {
@@ -503,7 +518,7 @@ export class DocumentDetailComponent implements OnInit {
     componentReference.activation(this);
 
     if (componentReference.rowClickEvent != undefined) {
-      this.getSentencesEvidence();
+      //this.getSentencesEvidence();
       componentReference.rowClickEvent.subscribe((data) => {
         this.rowClickSentenceEvidence(data);
       })
-- 
GitLab


From 6f0a30a49b73775c6aa7a8e6a030d7b7113a44b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Wed, 28 Sep 2022 12:15:18 +0200
Subject: [PATCH 5/5] Load finding evidence of selected section

---
 .../document-detail.component.ts              | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts
index 39f6abf..d677821 100644
--- a/src/app/document-detail/document-detail.component.ts
+++ b/src/app/document-detail/document-detail.component.ts
@@ -297,14 +297,14 @@ export class DocumentDetailComponent implements OnInit {
       this.reportService.findReportSection(id, this.currentSection.id)
         .subscribe(report => {
           this.loadReport(report);
-          this.getSentencesEvidence(this.currentSection);
+          this.getSentencesEvidence();
         });
     } else {
       this.reportService.getReport(id)
         .subscribe(report => {
           this.loadReport(report);
           this.sections = report.sections;
-          this.getSentencesEvidence(this.currentSection);
+          this.getSentencesEvidence();
         });
     }
   }
@@ -406,36 +406,30 @@ export class DocumentDetailComponent implements OnInit {
   }
 
   getAllEvidence() {
-    //const id = +this.route.snapshot.paramMap.get('id');
     const id = this.report.id;
-    this.reportService.getAllEvidence(id)
-      .subscribe(text => {
-        this.docData = text;
-        document.getElementById('data2').className = 'collapse show';
-        document.getElementById('data1').innerHTML = '';
-        document.getElementById('data1').className = '';
-        var j = JSON.parse(this.docData);
-        head.ready(function () {
-          const dispatcher = Util.embed('data1', DocumentDetailComponent.collData, j, DocumentDetailComponent.webFontURLs);
-          //dispatcher.on('displaySpanComment', displaySpanComment);
-          //dispatcher.on('hideComment', hideComment);
-          // setTimeout(() => {
-          //   document.getElementById('loadingDiv').className = '';
-          // }, 4000);
+    if (this.currentSection == undefined || this.currentSection == "all") {
+      this.reportService.getAllEvidence(id)
+        .subscribe(text => {
+          this.loadEvidence(text)
         });
-      });
+    } else {
+      this.reportService.getSectionEvidence(id, this.currentSection.id)
+        .subscribe(text => {
+          this.loadEvidence(text)
+        });
+    }
   }
 
-  getSentencesEvidence(section) {
+  getSentencesEvidence() {
     //const id = +this.route.snapshot.paramMap.get('id');
     const id = this.report.id;
-    if (section == undefined || section == "all") {
+    if (this.currentSection == undefined || this.currentSection == "all") {
       this.reportService.getSentencesEvidence(id)
         .subscribe(text => {
           this.loadEvidence(text);
         });
     } else {
-      this.reportService.getSectionSentencesEvidence(id, section.id)
+      this.reportService.getSectionSentencesEvidence(id, this.currentSection.id)
         .subscribe(text => {
           this.loadEvidence(text);
         });
@@ -518,7 +512,7 @@ export class DocumentDetailComponent implements OnInit {
     componentReference.activation(this);
 
     if (componentReference.rowClickEvent != undefined) {
-      //this.getSentencesEvidence();
+      this.getSentencesEvidence();
       componentReference.rowClickEvent.subscribe((data) => {
         this.rowClickSentenceEvidence(data);
       })
-- 
GitLab