Merge pull request #6 from ttngu207/master

cleanup + formatting + adding `part` table for ephys

Author: shenshan

00-ConnectingToDatabase.ipynb

@@ -108,7 +108,7 @@
    "source": [
     "For this workshop, some of the configuration values are pre-filled (e.g. `database.host` already points to the workshop database). Let's complete the configuration by specifying the username and password.\n",
     "\n",
-    "Go ahead and open up the email you received when you signed up for the workshop. The email should contain your username (should be the same as your GitHub account username) and a randomly generated password. If you need the email to be resent, simply visit and signup again at https://datajoint.io/workshop."
+    "Go ahead and enter the username and password of your [datajoint.io](https://datajoint.io) account below."
    ]
   },
   {
@@ -241,7 +241,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "When you signed up for the workshop at https://datajoint.io/workshop, you received a default, randomly generated password to connect to the database. It is recommended that you change this to something that you can remember better. You can do so easily using `dj.set_password` function."
+    "The username and password used to connect to this tutorial database is that of your ***datajoint.io*** account, you can change this password on the [datajoint.io](https://datajoint.io) website. \n",
+    "\n",
+    "You can also directly change this database connection password using the `dj.set_password()` method. This is particularly useful if you are using DataJoint outside of this tutorial, where your ***datajoint.io*** credentials are not used for database connection."
    ]
   },
   {
@@ -327,7 +329,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.0"
   }
  },
  "nbformat": 4,

01-Getting started with DataJoint - Completed.ipynb

@@ -1749,7 +1749,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Querying data"
+    "# Querying data from a single table"
    ]
   },
   {
@@ -1767,7 +1767,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Restricting by attribute value"
+    "## Restrictions (`&`) - filter data with certain conditions"
    ]
   },
   {
@@ -3117,7 +3117,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Negative restriction - with the `-` operator"
+    "## Negative restriction (`-`) - filter out data"
    ]
   },
   {
@@ -3464,85 +3464,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Deleting entries"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Now we have a good idea on how to restrict table entries, this is a good time to introduce how to **delete** entries from a table."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "To delete a specific entry, you restrict the table down to the target entry, and call `delete` method."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 45,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "About to delete:\n",
-      "`test_`.`mouse`: 1 items\n",
-      "Proceed? [yes, No]: yes\n",
-      "Committed.\n"
-     ]
-    }
-   ],
-   "source": [
-    "(Mouse & 'mouse_id = 100').delete()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Calling `delete` method on an *unrestricted* table will attempt to delete the whole table!"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 46,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "About to delete:\n",
-      "`test_`.`session`: 3 items\n",
-      "`test_`.`mouse`: 11 items\n",
-      "Proceed? [yes, No]: No\n",
-      "Cancelled deletes.\n"
-     ]
-    }
-   ],
-   "source": [
-    "Mouse.delete()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Notice that when you try to delete all `Mouse`, `delete` also warned that `Session` entries will get deleted! \n",
-    "\n",
-    "DataJoint understands and keeps track of dependencies such that **no dependent entries will be left orphaned**. The `delete` operations automatically **cascades down** the dependency to ensure data integrity. We will revisit this point in the next session."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Joining tables"
+    "## Join (`*`) - gather information from different tables"
    ]
   },
   {
@@ -3950,7 +3872,13 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Projection .proj(): focus on attributes of interest\n",
+    "## Projection (`.proj()`) - focus on attributes of interest"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
     "Beside restriction (`&`) and join (`*`) operations, DataJoint offers another type of operation: projection (`.proj()`). Projection is used to select attributes (columns) from a table, to rename them, or to create new calculated attributes. "
    ]
   },
@@ -4453,7 +4381,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Fetch query results"
+    "# Fetch query results"
    ]
   },
   {
@@ -4755,6 +4683,84 @@
     "(Mouse * Session & {'session_date': '2017-05-15'}).fetch1('KEY')  # \"fetch1()\" because we know there's only one"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Deletion (`.delete()`) - deleting entries and their dependencies"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Now we have a good idea on how to restrict table entries, this is a good time to introduce how to **delete** entries from a table."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "To delete a specific entry, you restrict the table down to the target entry, and call `delete` method."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 45,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "About to delete:\n",
+      "`test_`.`mouse`: 1 items\n",
+      "Proceed? [yes, No]: yes\n",
+      "Committed.\n"
+     ]
+    }
+   ],
+   "source": [
+    "(Mouse & 'mouse_id = 100').delete()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Calling `delete` method on an *unrestricted* table will attempt to delete the whole table!"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 46,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "About to delete:\n",
+      "`test_`.`session`: 3 items\n",
+      "`test_`.`mouse`: 11 items\n",
+      "Proceed? [yes, No]: No\n",
+      "Cancelled deletes.\n"
+     ]
+    }
+   ],
+   "source": [
+    "Mouse.delete()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Notice that when you try to delete all `Mouse`, `delete` also warned that `Session` entries will get deleted! \n",
+    "\n",
+    "DataJoint understands and keeps track of dependencies such that **no dependent entries will be left orphaned**. The `delete` operations automatically **cascades down** the dependency to ensure data integrity. We will revisit this point in the next session."
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},