Merge pull request #1 from CDLUC3/briri-patch-1

updates to Single DMP Notebook logic
datacite · Oct 26, 2020 · 3f7b78a · 3f7b78a
2 parents 5d8ffed + b452bd6
commit 3f7b78a
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/dmp/user-story-single-dmp-connections.ipynb b/dmp/user-story-single-dmp-connections.ipynb
@@ -166,11 +166,6 @@
     "          }\n",
     "        }\n",
     "      }\n",
-    "    hostingInstitution: contributors(contributorType: \"HostingInstitution\") {\n",
-    "      id\n",
-    "      name\n",
-    "      contributorType\n",
-    "    }\n",
     "    producer: contributors(contributorType: \"Producer\") {\n",
     "      id\n",
     "      name\n",
@@ -189,15 +184,24 @@
     "        name\n",
     "      }\n",
     "    } \n",
-    "    contributors {\n",
+    "    pis: contributors(contributorType: \"ProjectLeader\") {\n",
     "      id\n",
     "      name\n",
-    "      type\n",
+    "      contributorType\n",
     "      affiliation{\n",
     "        id\n",
     "        name\n",
     "      }\n",
-    "    }     \n",
+    "    }\n",
+    "    curators: contributors(contributorType: \"DataCurator\") {\n",
+    "      id\n",
+    "      name\n",
+    "      contributorType\n",
+    "      affiliation{\n",
+    "        id\n",
+    "        name\n",
+    "      }\n",
+    "    }\n",
     "  }\n",
     "}\n",
     "\"\"\")"
@@ -379,8 +383,8 @@
     "\n",
     "datasets = create_node(extract_titles(data[\"datasets\"][\"nodes\"]),2)\n",
     "references = create_node(extract_titles(data[\"publications\"][\"nodes\"]),6)\n",
-    "orgs = create_node(data[\"hostingInstitution\"]+data[\"producer\"],4)\n",
-    "people = create_node(filter_people(data[\"creators\"] + data[\"contributors\"]),5)\n",
+    "orgs = create_node(data[\"producer\"],4)\n",
+    "people = create_node(filter_people(data[\"creators\"] + data[\"pis\"] + data[\"curators\"]),5)\n",
     "dmp_title = str('\"' + data[\"name\"][0][\"title\"] + '\"')  \n",
     "funders = create_node(data[\"fundingReferences\"],3)\n",
     "id = data[\"id\"]\n",
@@ -554,7 +558,7 @@
     "          \"fontSize\": {\"value\": 12},\n",
     "          \"baseline\": {\"value\": \"middle\"},\n",
     "          \"tooltip\": {\"signal\": \n",
-    "          \"{'Identifier': datum.tooltip, 'Affiliation': datum.affiliation, 'Contribution': datum.contributorType}\"}\n",
+    "          \"{'Identifier': datum.tooltip, 'Affiliation': datum.affiliation, 'Contribution': datum.contributorType, 'Award': datum.award}\"}\n",
     "        },\n",
     "        \"update\": {\n",
     "          \"x\": {\"field\": \"x\"},\n",
@@ -980,8 +984,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "A series of sliders and option are included to interact with the visulisation is displayed. One ca nremove the labels, rotate the nodes, zoom in/out, and adjust the layout."
+    "A series of sliders and option are included to interact with the visulisation is displayed. One can remove the labels, rotate the nodes, zoom in/out, and adjust the layout."
    ]
   }
  ]
-}
+}