From ca4139a6c1dab66c628892226a5ca298f5d264e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Mon, 29 Aug 2022 17:21:31 +0200
Subject: [PATCH 1/4] Disable send to srdomain if curation not finished

---
 src/app/document-detail/document-detail.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/document-detail/document-detail.component.html b/src/app/document-detail/document-detail.component.html
index 36cd4c9..f4d21c3 100644
--- a/src/app/document-detail/document-detail.component.html
+++ b/src/app/document-detail/document-detail.component.html
@@ -17,7 +17,7 @@
           <div style="float:left;width:75%"> <h4>{{document.name}}</h4></div>
          
           <div style="float:left;width:15%"> 
-            <button type="button" class="btn btn-outline-primary text-nowrap"   (click)="sendToSRDomain()">Send to SR-Domain</button>
+            <button type="button" class="btn btn-outline-primary text-nowrap" [disabled]="document.status != 'FINISHED'" (click)="sendToSRDomain()">Send to SR-Domain</button>
           </div>
           <div class="btn-group" style="float:left;width:10%;">
               <button  type="button" 
-- 
GitLab


From f562445c47b39142b00bce54e6298c8b6eb2e658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Tue, 6 Sep 2022 11:21:59 +0200
Subject: [PATCH 2/4] Fix null variable error

---
 src/app/document-detail/document-detail.component.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts
index aadab3b..cc9f082 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;
-- 
GitLab


From 8d34c1ccdff51ddc498036f7d2e56908d09341f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Wed, 7 Sep 2022 10:21:36 +0200
Subject: [PATCH 3/4] Get SRDomain document from pretox api

---
 src/app/model/srdomaindocument.ts    | 11 +++++++++++
 src/app/services/document.service.ts |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/app/model/srdomaindocument.ts

diff --git a/src/app/model/srdomaindocument.ts b/src/app/model/srdomaindocument.ts
new file mode 100644
index 0000000..4850ae8
--- /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 422a521..b103740 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,7 +202,7 @@ export class DocumentService {
   sendToSRDomain(id: number): any {
     //call to get srdomain 
     const url_2 = `${this.documentsUrl}srdomain/${id}`;
-    this.http.get<Document>(url_2).subscribe({
+    this.http.get<SRDomainDocument>(url_2).subscribe({
       next: doc => {
         //alert(doc);
         const url = `${this.apiSRDomainURL}`;
-- 
GitLab


From db0ebcb0256b6d62d7387e03ed2a5265963fc0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Wed, 7 Sep 2022 11:05:35 +0200
Subject: [PATCH 4/4] Set document as closed after sent to SRdomain

---
 src/app/document-detail/document-detail.component.css  | 6 +++++-
 src/app/document-detail/document-detail.component.html | 4 ++--
 src/app/services/document.service.ts                   | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/document-detail/document-detail.component.css b/src/app/document-detail/document-detail.component.css
index 48228ed..9ab6f68 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 6249352..ef5ab05 100644
--- a/src/app/document-detail/document-detail.component.html
+++ b/src/app/document-detail/document-detail.component.html
@@ -21,9 +21,9 @@
             SR-Domain</button>
         </div>
         <div class="btn-group">
-          <button class="status-button" type="button" [ngClass]="{'btn-warning': document.status === 'DRAFT',
+          <button class="status-button" type="button" [disabled]="document.status == 'CLOSED'" [ngClass]="{'btn-warning': document.status === 'DRAFT',
                         'btn-primary' : document.status === 'IN_PROGRESS',
-                        'btn-success' : document.status === 'FINISHED'}" class="btn dropdown-toggle"
+                        'btn-success' : document.status === 'FINISHED', 'btn-closed' : document.status === 'CLOSED'}" class="btn dropdown-toggle"
             data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             {{document.status}}
           </button>
diff --git a/src/app/services/document.service.ts b/src/app/services/document.service.ts
index b103740..be6c14e 100644
--- a/src/app/services/document.service.ts
+++ b/src/app/services/document.service.ts
@@ -208,7 +208,9 @@ export class DocumentService {
         const url = `${this.apiSRDomainURL}`;
         return this.http.post<any>(url, doc).subscribe({
           next: data => {
-            alert(data);
+            this.moveDocument(id, "CLOSED").subscribe({
+              _: alert("Sent to srdomain")
+            });
           },
           error: error => {
             //this.errorMessage = error.message;
-- 
GitLab