From 6db0819264522efcf860e7cf07fd330ea4c4707c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?= Date: Wed, 24 Aug 2022 13:35:31 +0200 Subject: [PATCH 1/3] Remove "value" attributes of finding --- .../pretoxsentences-tabulator.component.ts | 10 +-- src/app/srdomainfinding.ts | 65 +++++++++---------- .../srdomaintemplate-tabulator.component.ts | 10 +-- 3 files changed, 39 insertions(+), 46 deletions(-) diff --git a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts index 43b806c..2c2e8a7 100644 --- a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts +++ b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts @@ -81,13 +81,13 @@ export class PretoxsentencesTabulatorComponent implements OnInit { srenphse: srDomainFinding.srenphse, srobendy: srDomainFinding.srobendy, - srdomain: srDomainFinding.srdomain_value, - srspec: srDomainFinding.srspec_value, + srdomain: srDomainFinding.srdomain, + srspec: srDomainFinding.srspec, - srtstcd: srDomainFinding.srtstcd_value, - srfndg: srDomainFinding.srfndg_value, + srtstcd: srDomainFinding.srtstcd, + srfndg: srDomainFinding.srfndg, srores: srDomainFinding.srores, - srobsv: srDomainFinding.srobsv_value, + srobsv: srDomainFinding.srobsv, srobsq: srDomainFinding.srobsq, srsev: srDomainFinding.srsev, diff --git a/src/app/srdomainfinding.ts b/src/app/srdomainfinding.ts index f8bf3fb..bd8de3d 100644 --- a/src/app/srdomainfinding.ts +++ b/src/app/srdomainfinding.ts @@ -1,40 +1,33 @@ - - export class SRDomainFinding { - studyid:String; - domain:String; - srseq:String; - srrisk:String; - spgrpcd:String; - grplbl:String;; - srgrpdos:String; - srsex:String; - srstdy:String; - srstphse:String; - srobstdy:String; - srendy:String; - srenphse:String; - srobendy:String; - srdomain:String; - srdomain_value:String; - srspec:String; - srspec_value:String; - srtstcd:String; - srtstcd_value:String; - srfndg:String; - srfndg_value:String; - srores:String; - srobsv:String; - srobsv_value:String; - srobsq:String; - srsev:String; - srpcnt:String; - srsigf:String; - srtrtef:String; - srcomnt:String; + studyid: String; + domain: String; + srseq: String; + srrisk: String; + spgrpcd: String; + grplbl: String;; + srgrpdos: String; + srsex: String; + srstdy: String; + srstphse: String; + srobstdy: String; + srendy: String; + srenphse: String; + srobendy: String; + srdomain: String; + srspec: String; + srtstcd: String; + srfndg: String; + srores: String; + srobsv: String; + srobsq: String; + srsev: String; + srpcnt: String; + srsigf: String; + srtrtef: String; + srcomnt: String; //other data - export:String; - srDomainId:number; - findingId:number; + export: String; + srDomainId: number; + findingId: number; status: string; } diff --git a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts index 674dcfa..8f61259 100644 --- a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts +++ b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts @@ -191,13 +191,13 @@ export class SrdomaintemplateTabulatorComponent implements OnInit { srenphse : srDomainFinding.srenphse, srobendy : srDomainFinding.srobendy, - srdomain : srDomainFinding.srdomain_value, - srspec : srDomainFinding.srspec_value, + srdomain : srDomainFinding.srdomain, + srspec : srDomainFinding.srspec, - srtstcd : srDomainFinding.srtstcd_value, - srfndg : srDomainFinding.srfndg_value, + srtstcd : srDomainFinding.srtstcd, + srfndg : srDomainFinding.srfndg, srores : srDomainFinding.srores, - srobsv : srDomainFinding.srobsv_value, + srobsv : srDomainFinding.srobsv, srobsq : srDomainFinding.srobsq, srsev : srDomainFinding.srsev, -- GitLab From 83ec95fb46a6242f18b04a34e0d744d31b7dbdda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?= Date: Mon, 29 Aug 2022 16:25:36 +0200 Subject: [PATCH 2/3] Fix attribute name --- src/app/srdomainfinding.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/srdomainfinding.ts b/src/app/srdomainfinding.ts index bd8de3d..d1bb1b2 100644 --- a/src/app/srdomainfinding.ts +++ b/src/app/srdomainfinding.ts @@ -4,7 +4,7 @@ export class SRDomainFinding { srseq: String; srrisk: String; spgrpcd: String; - grplbl: String;; + srgrpnam: String;; srgrpdos: String; srsex: String; srstdy: String; -- GitLab From bee287f647ca1922425e857a129cc478dbecd049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?= Date: Tue, 30 Aug 2022 17:35:24 +0200 Subject: [PATCH 3/3] Fix srdomain attribute name --- src/app/document-detail/document-detail.component.ts | 2 +- src/app/findingsr.ts | 2 +- .../pretoxsentences-tabulator.component.ts | 2 +- .../srdomaintemplate-tabulator.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts index 635fa35..d1506cf 100644 --- a/src/app/document-detail/document-detail.component.ts +++ b/src/app/document-detail/document-detail.component.ts @@ -299,7 +299,7 @@ export class DocumentDetailComponent implements OnInit { srrisk: srDomainFinding.srrisk, spgrpcd: srDomainFinding.spgrpcd, - grplbl: srDomainFinding.grplbl, + srgrpnam: srDomainFinding.srgrpnam, srgrpdos: srDomainFinding.srgrpdos, srsex: srDomainFinding.srsex, diff --git a/src/app/findingsr.ts b/src/app/findingsr.ts index 98e38e1..240223a 100644 --- a/src/app/findingsr.ts +++ b/src/app/findingsr.ts @@ -9,7 +9,7 @@ export class FindingSR { dose:string; //SPGRPCD --> Sponsor-defined Group Code, group 1 , A group:string; - //GRPLBL --> Sponsor-defined Group Name, "low dose", "mid dose" + //SRGRPNAM --> Sponsor-defined Group Name, "low dose", "mid dose" groupQualifier:string; //SRSEX -- > Sex diff --git a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts index 2c2e8a7..705df76 100644 --- a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts +++ b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts @@ -69,7 +69,7 @@ export class PretoxsentencesTabulatorComponent implements OnInit { srrisk: srDomainFinding.srrisk, spgrpcd: srDomainFinding.spgrpcd, - grplbl: srDomainFinding.grplbl, + srgrpnam: srDomainFinding.srgrpnam, srgrpdos: srDomainFinding.srgrpdos, srsex: srDomainFinding.srsex, diff --git a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts index 8f61259..4178b37 100644 --- a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts +++ b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts @@ -180,7 +180,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit { srrisk : srDomainFinding.srrisk, spgrpcd : srDomainFinding.spgrpcd, - grplbl : srDomainFinding.grplbl, + srgrpnam : srDomainFinding.srgrpnam, srgrpdos : srDomainFinding.srgrpdos, srsex : srDomainFinding.srsex, -- GitLab