From aa40b605cd575778d35d2137253480569c4e580c Mon Sep 17 00:00:00 2001 From: Abhinav Gautam Date: Thu, 26 Mar 2020 23:26:24 +0530 Subject: [PATCH 1/2] relation + contracted from bug --- util/parse.js | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/util/parse.js b/util/parse.js index bf0d258..3eb1787 100644 --- a/util/parse.js +++ b/util/parse.js @@ -106,6 +106,17 @@ export const codeToLetter = (code) => { return letters[letterPos - 10] + codeStr.substring(2) } + +export const findRelationship = (relArr, patient) => { + if(relArr.length>0) { + for (let rel of relArr) { + if(rel['with'].indexOf(patient) !== -1) + return rel['link'] + } + } + return false; +} + export const rowsToGraph = rows => { let graph = { nodes: [], @@ -125,12 +136,20 @@ export const rowsToGraph = rows => { graph = dotProp.set(graph, 'nodes', list => [...list, node]) if (row.contractedFrom) { - let edge = { - from: letterToCode(row.contractedFrom), - to: patientCode, + let allContractors = row.contractedFrom.split(','); + for (let contractor of allContractors) { + contractor = contractor.trim(); + let relation = findRelationship(row.relationship,contractor); + contractor = letterToCode(contractor); + let edge = { + from: contractor, + to: patientCode, + } + if(relation) { + edge.label = relation + } + graph = dotProp.set(graph, 'edges', list => [...list, edge]) } - - graph = dotProp.set(graph, 'edges', list => [...list, edge]) } }) return graph From 2c2a178e88a27a3c227968cb68cbfe74a2d71b4a Mon Sep 17 00:00:00 2001 From: Abhinav Gautam Date: Fri, 27 Mar 2020 00:02:14 +0530 Subject: [PATCH 2/2] made edge label font small --- util/parse.js | 1 + 1 file changed, 1 insertion(+) diff --git a/util/parse.js b/util/parse.js index 3eb1787..3c4fff4 100644 --- a/util/parse.js +++ b/util/parse.js @@ -147,6 +147,7 @@ export const rowsToGraph = rows => { } if(relation) { edge.label = relation + edge.font = {size:8} } graph = dotProp.set(graph, 'edges', list => [...list, edge]) }