Skip to content

Feature/bettter external data #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jthrilly merged 4 commits into from
Apr 10, 2019
Merged

Feature/bettter external data #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fa0145
remove entity labels
jthrilly Apr 9, 2019
972ec5b
add json using names rather than UUIDs
jthrilly Apr 9, 2019
240e66c
add csv file and associated namegen
jthrilly Apr 9, 2019
ac60ea9
add mixture of UUIDs and names to previousInterview.json for testing
jthrilly Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 100 additions & 0 deletions assets/previousInterview.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
type,name,nickname,age
person,John,John,71
person,William,William,50
person,James,James,47
person,Charles,Charles,31
person,George,George,46
person,Frank,Frank,25
person,Joseph,Joseph,46
person,Thomas,Thomas,61
person,Henry,Henry,62
person,Robert,Robert,51
person,Edward,Edward,49
person,Harry,Harry,26
person,Walter,Walter,19
person,Arthur,Arthur,49
person,Fred,Fred,21
person,Albert,Albert,49
person,Samuel,Samuel,21
person,David,David,32
person,Louis,Louis,59
person,Joe,Joe,61
person,Charlie,Charlie,32
person,Clarence,Clarence,51
person,Richard,Richard,36
person,Andrew,Andrew,26
person,Daniel,Daniel,74
person,Ernest,Ernest,34
person,Will,Will,46
person,Jesse,Jesse,20
person,Oscar,Oscar,32
person,Lewis,Lewis,43
person,Peter,Peter,24
person,Benjamin,Benjamin,67
person,Frederick,Frederick,49
person,Willie,Willie,21
person,Alfred,Alfred,65
person,Sam,Sam,52
person,Roy,Roy,25
person,Herbert,Herbert,71
person,Jacob,Jacob,24
person,Tom,Tom,35
person,Elmer,Elmer,62
person,Carl,Carl,57
person,Lee,Lee,70
person,Howard,Howard,62
person,Martin,Martin,55
person,Michael,Michael,38
person,Bert,Bert,40
person,Herman,Herman,21
person,Jim,Jim,33
person,Francis,Francis,54
person,Harvey,Harvey,53
person,Earl,Earl,44
person,Eugene,Eugene,51
person,Ralph,Ralph,57
person,Ed,Ed,19
person,Claude,Claude,32
person,Edwin,Edwin,66
person,Ben,Ben,36
person,Charley,Charley,18
person,Paul,Paul,50
person,Edgar,Edgar,30
person,Isaac,Isaac,60
person,Otto,Otto,54
person,Luther,Luther,63
person,Lawrence,Lawrence,32
person,Ira,Ira,41
person,Patrick,Patrick,59
person,Guy,Guy,25
person,Oliver,Oliver,54
person,Theodore,Theodore,69
person,Hugh,Hugh,47
person,Clyde,Clyde,23
person,Alexander,Alexander,53
person,August,August,18
person,Floyd,Floyd,42
person,Homer,Homer,29
person,Jack,Jack,75
person,Leonard,Leonard,36
person,Horace,Horace,58
person,Marion,Marion,64
person,Philip,Philip,27
person,Allen,Allen,25
person,Archie,Archie,50
person,Stephen,Stephen,49
person,Chester,Chester,47
person,Willis,Willis,28
person,Raymond,Raymond,44
person,Rufus,Rufus,55
person,Warren,Warren,55
person,Jessie,Jessie,66
person,Milton,Milton,50
person,Alex,Alex,70
person,Leo,Leo,67
person,Julius,Julius,42
person,Ray,Ray,60
person,Sidney,Sidney,66
person,Bernard,Bernard,64
person,Dan,Dan,29
person,Joshua,Joshua,43
58 changes: 32 additions & 26 deletions assets/previousInterview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,63 @@
{
"nodes": [
{
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466",
"type": "person",
"attributes": {
"6be95f85-c2d9-4daf-9de1-3939418af888": "Anita",
"0ff25001-a2b8-46de-82a9-53143aa00d10": "Li",
"0e75ec18-2cb1-4606-9f18-034d28b07c19": "Annie",
"c5fee926-855d-4419-b5bb-54e89010cea6": 23
"last_name": "Li",
"nickname": "Annie",
"variableNotInRegistry": "tomato",
"age": 23
}
},
{
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466",
"type": "person",
"attributes": {
"6be95f85-c2d9-4daf-9de1-3939418af888": "Barry",
"0ff25001-a2b8-46de-82a9-53143aa00d10": "Smith",
"0e75ec18-2cb1-4606-9f18-034d28b07c19": "Baz",
"c5fee926-855d-4419-b5bb-54e89010cea6": 23
"name": "Barry",
"last_name": "Smith",
"nickname": "Baz",
"variableNotInRegistry": "tomato",
"age": 23
}
},
{
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466",
"attributes": {
"6be95f85-c2d9-4daf-9de1-3939418af888": "Carlito",
"0ff25001-a2b8-46de-82a9-53143aa00d10": "González",
"0e75ec18-2cb1-4606-9f18-034d28b07c19": "Carl",
"c5fee926-855d-4419-b5bb-54e89010cea6": 23
"last_name": "González",
"nickname": "Carl",
"variableNotInRegistry": "tomato",
"age": 23
}
},
{
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466",
"type": "person",
"attributes": {
"6be95f85-c2d9-4daf-9de1-3939418af888": "Dee",
"0ff25001-a2b8-46de-82a9-53143aa00d10": "Zhang",
"0e75ec18-2cb1-4606-9f18-034d28b07c19": "Dee",
"c5fee926-855d-4419-b5bb-54e89010cea6": 23
"name": "Dee",
"last_name": "Zhang",
"nickname": "Dee",
"variableNotInRegistry": "tomato",
"age": 23
}
},
{
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466",
"attributes": {
"6be95f85-c2d9-4daf-9de1-3939418af888": "Eugine",
"0ff25001-a2b8-46de-82a9-53143aa00d10": "Müller",
"0e75ec18-2cb1-4606-9f18-034d28b07c19": "Eu",
"c5fee926-855d-4419-b5bb-54e89010cea6": 23
"name": "Eugine",
"last_name": "Müller",
"nickname": "Eu",
"variableNotInRegistry": "tomato",
"age": 23
}
},
{
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466",
"type": "person",
"attributes": {
"6be95f85-c2d9-4daf-9de1-3939418af888": "Eustace",
"0ff25001-a2b8-46de-82a9-53143aa00d10": "Nguyễn",
"0e75ec18-2cb1-4606-9f18-034d28b07c19": "Eu",
"c5fee926-855d-4419-b5bb-54e89010cea6": 24
"name": "Eustace",
"last_name": "Nguyễn",
"nickname": "Eu",
"variableNotInRegistry": "tomato",
"age": 24
}
}
]
Expand Down
71 changes: 58 additions & 13 deletions protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"node": {
"4aebf73e-95e3-4fd1-95e7-237dcc4a4466": {
"name": "person",
"label": "Person",
"color": "node-color-seq-1",
"displayVariable": "0e75ec18-2cb1-4606-9f18-034d28b07c19",
"iconVariant": "add-a-person",
Expand Down Expand Up @@ -260,7 +259,6 @@
},
"c93af3fe-9f84-4e85-acb5-5b15f30788c7": {
"name": "dummytype",
"label": "Dummy Type",
"color": "node-color-seq-6",
"displayVariable": "2377af3f-3c79-41da-9b0b-6570fb519b93",
"variables": {
Expand Down Expand Up @@ -386,7 +384,6 @@
},
"eda5e3bb-8e1c-4216-9e06-adc0ff6b7f73": {
"name": "venue",
"label": "Venue",
"displayVariable": "1e9ce62c-44c5-484d-9c26-0d20cc7d7238",
"color": "node-color-seq-4",
"iconVariant": "add-a-place",
Expand Down Expand Up @@ -589,7 +586,6 @@
"edge": {
"77199445-9d50-4646-b0bc-6d6b0c0e06bd": {
"name": "friend",
"label": "Friend",
"color": "edge-color-seq-1",
"variables": {
"e343a91f-628d-4175-870c-957beffa0002": {
Expand Down Expand Up @@ -650,7 +646,6 @@
},
"867127d9-086b-403a-a3e7-2c7d32126546": {
"name": "professional",
"label": "Professional",
"color": "edge-color-seq-2",
"variables": {
"d343a91f-628d-4175-870c-957beffa0002": {
Expand All @@ -672,11 +667,16 @@
}
},
"assetManifest": {
"previousInterview": {
"previousInterview-json": {
"source": "previousInterview.json",
"name": "Previous Interview",
"name": "Previous Interview with names not UUIDs",
"type": "network"
},
"previousInterview-csv": {
"source": "previousInterview.csv",
"name": "Previous Interview in CSV format.",
"type": "network"
},
"HIVServices": {
"source": "HIVServices.json",
"name": "HIVServices",
Expand Down Expand Up @@ -747,7 +747,7 @@
{
"id": "namegen1",
"type": "NameGenerator",
"label": "NG Closeness",
"label": "NG with external data",
"form": {
"title": "Add A Person",
"fields": [
Expand Down Expand Up @@ -791,8 +791,8 @@
},
{
"id": "another-unique-id",
"title": "People from your previous visit",
"dataSource": "previousInterview",
"title": "External data not using UUIDs",
"dataSource": "previousInterview-json",
"filter": {
"join": "OR",
"rules": [
Expand Down Expand Up @@ -846,6 +846,51 @@
}
]
},
{
"id": "namegen1a",
"type": "NameGenerator",
"label": "NG CSV File",
"form": {
"title": "Add A Person",
"fields": [
{
"variable": "6be95f85-c2d9-4daf-9de1-3939418af888",
"component": "Text",
"prompt": "What is this person's name?"
},
{
"variable": "0e75ec18-2cb1-4606-9f18-034d28b07c19",
"component": "Text",
"prompt": "What is this person's nickname?"
},
{
"variable": "c5fee926-855d-4419-b5bb-54e89010cea6",
"component": "Number",
"prompt": "What is this person's age?",
"validation": {
"maxValue": 99
}
}
]
},
"subject": {
"entity": "node",
"type": "4aebf73e-95e3-4fd1-95e7-237dcc4a4466"
},
"panels": [
{
"id": "another-unique-id-123",
"title": "External data from CSV",
"dataSource": "previousInterview-csv"
}
],
"prompts": [
{
"id": "2wedwee",
"text": "NameGen with CSV external data"
}
]
},
{
"id": "namegen2",
"type": "NameGenerator",
Expand Down Expand Up @@ -956,7 +1001,7 @@
"b6f2c4b9-e42f-459b-8f59-a11a685f460d": 56,
"ae44b6ba-ad49-4ecf-bf38-b65decfce000": true
},
"dataSource": "previousInterview",
"dataSource": "previousInterview-json",
"cardOptions": {
"displayLabel": "0e75ec18-2cb1-4606-9f18-034d28b07c19",
"additionalProperties": [
Expand Down Expand Up @@ -1189,7 +1234,7 @@
"b6f2c4b9-e42f-459b-8f59-a11a685f460d": 46,
"ae44b6ba-ad49-4ecf-bf38-b65decfce000": true
},
"dataSource": "previousInterview",
"dataSource": "previousInterview-json",
"cardOptions": {
"displayLabel": "0e75ec18-2cb1-4606-9f18-034d28b07c19",
"additionalProperties": [
Expand All @@ -1214,7 +1259,7 @@
"additionalAttributes": {
"94e2dee9-1c25-4b64-b8bb-4946465c3c07": true
},
"dataSource": "previousInterview",
"dataSource": "previousInterview-json",
"cardOptions": {
"displayLabel": "0e75ec18-2cb1-4606-9f18-034d28b07c19",
"additionalProperties": [
Expand Down