Commit adeae297 authored by Maximilian Dolling's avatar Maximilian Dolling

fixed schedule, syllabus and setup

parent c2ff764d
Pipeline #6042 passed with stages
in 1 minute and 32 seconds
......@@ -3,30 +3,33 @@
<h3>Day 1</h3>
<table class="table table-striped">
<tr> <td>Before</td> <td><a href="{{ site.pre_survey }}{{ site.github.project_title }}">Pre-workshop survey</a> </td> </tr>
<tr> <td>09:00</td> <td>Automating Tasks with the Unix Shell</td> </tr>
<tr> <td>10:30</td> <td>Morning break</td> </tr>
<tr> <td>11:00</td> <td>Automating Tasks with the Unix Shell (Continued)</td> </tr>
<tr> <td>12:00</td> <td>Lunch break</td> </tr>
<tr> <td>13:00</td> <td>Building Programs with Python</td> </tr>
<tr> <td>14:30</td> <td>Afternoon break</td> </tr>
<tr> <td>15:00</td> <td>Building Programs with Python (Continued)</td> </tr>
<tr> <td>16:00</td> <td>Wrap-up</td> </tr>
<tr> <td>16:30</td> <td>END</td> </tr>
<tr> <td>09:00</td> <td>Arrival & coffee</td> </tr>
<tr> <td>09:30</td> <td>Welcome & introduction</td> </tr>
<tr> <td>09:45</td> <td>Lightning talks by participants</td> </tr>
<tr> <td>10:30</td> <td>Software set-up</td> </tr>
<tr> <td>11:00</td> <td>Coffee</td> </tr>
<tr> <td>11:30</td> <td>The Unix Shell</td> </tr>
<tr> <td>13:00</td> <td>Lunch</td> </tr>
<tr> <td>14:00</td> <td>Version Control with Git (and Gitlab) 1</td> </tr>
<tr> <td>15:30</td> <td>Coffee</td> </tr>
<tr> <td>16:00</td> <td>Version Control with Git (and Gitlab) 2</td> </tr>
<tr> <td>17:30</td> <td>Wrap-up</td> </tr>
<tr> <td>17:45</td> <td>END</td> </tr>
</table>
</div>
<div class="col-md-6">
<h3>Day 2</h3>
<table class="table table-striped">
<tr> <td>09:00</td> <td>Version Control with Git</td> </tr>
<tr> <td>10:30</td> <td>Morning break</td> </tr>
<tr> <td>11:00</td> <td>Version Control with Git (Continued)</td> </tr>
<tr> <td>12:00</td> <td>Lunch break</td> </tr>
<tr> <td>13:00</td> <td>Managing Data with SQL</td> </tr>
<tr> <td>14:30</td> <td>Afternoon break</td> </tr>
<tr> <td>15:00</td> <td>Managing Data with SQL (Continued)</td> </tr>
<tr> <td>16:00</td> <td>Wrap-up</td> </tr>
<tr> <td>16:30</td> <td><a href="{{ site.post_survey }}{{ site.github.project_title }}" target="_blank">Post-workshop Survey</a></td> </tr>
<tr> <td>16:40</td> <td>END</td> </tr>
<tr> <td>09:00</td> <td>Arrival & coffee</td> </tr>
<tr> <td>09:30</td> <td>R - Introduction and basics</td> </tr>
<tr> <td>11:00</td> <td>Coffee</td> </tr>
<tr> <td>11:30</td> <td>R - Loops and functions</td> </tr>
<tr> <td>13:00</td> <td>Lunch</td> </tr>
<tr> <td>14:00</td> <td>R - Data analysis tidyr</td> </tr>
<tr> <td>15:30</td> <td>Coffee</td> </tr>
<tr> <td>16:00</td> <td>R - Data visualisation with ggplot2</td> </tr>
<tr> <td>17:30</td> <td>Wrap-up and <a href="{{ site.post_survey }}{{ site.github.project_title }}" target="_blank">Post-workshop Survey</a></td> </tr>
<tr> <td>18:00</td> <td>END</td> </tr>
</table>
</div>
</div>
......@@ -78,10 +78,10 @@
<li>Quit command prompt by typing <code>exit</code> then pressing [Enter]</li>
</ol>
</li>
</ol>
<p>This will provide you with both Git and Bash in the Git Bash program.</p>
</article>
......@@ -345,172 +345,6 @@
{% endcomment %}
</div> {% comment %} End of 'Python' section. {% endcomment %}
<div id="r"> {% comment %} Start of 'R' section. {% endcomment %}
<h3>R</h3>
<p>
<a href="https://www.r-project.org">R</a> is a programming language
that is especially powerful for data exploration, visualization, and
statistical analysis. To interact with R, we use
<a href="https://www.rstudio.com/">RStudio</a>.
</p>
<div>
<ul class="nav nav-tabs nav-justified" role="tablist">
<li role="presentation" class="active"><a data-os="windows" href="#rstats-windows" aria-controls="Windows" role="tab" data-toggle="tab">Windows</a></li>
<li role="presentation"><a data-os="macos" href="#rstats-macos" aria-controls="MacOS" role="tab" data-toggle="tab">MacOS</a></li>
<li role="presentation"><a data-os="linux" href="#rstats-linux" aria-controls="Linux" role="tab" data-toggle="tab">Linux</a></li>
</ul>
<div class="tab-content">
<article role="tabpanel" class="tab-pane active" id="rstats-windows">
<a href="https://www.youtube.com/watch?v=q0PjTAylwoU">Video Tutorial</a>
<p>
Install R by downloading and running
<a href="https://cran.r-project.org/bin/windows/base/release.htm">this .exe file</a>
from <a href="https://cran.r-project.org/index.html">CRAN</a>.
Also, please install the
<a href="https://www.rstudio.com/products/rstudio/download/#download">RStudio IDE</a>.
Note that if you have separate user and admin accounts, you should run the
installers as administrator (right-click on .exe file and select "Run as
administrator" instead of double-clicking). Otherwise problems may occur later,
for example when installing R packages.
</p>
</article>
<article role="tabpanel" class="tab-pane active" id="rstats-macos">
<a href="https://www.youtube.com/watch?v=5-ly3kyxwEg">Video Tutorial</a>
<p>
Install R by downloading and running
<a href="https://cran.r-project.org/bin/macosx/R-latest.pkg">this .pkg file</a>
from <a href="https://cran.r-project.org/index.html">CRAN</a>.
Also, please install the
<a href="https://www.rstudio.com/products/rstudio/download/#download">RStudio IDE</a>.
</p>
</article>
<article role="tabpanel" class="tab-pane active" id="rstats-linux">
<p>
You can download the binary files for your distribution
from <a href="https://cran.r-project.org/index.html">CRAN</a>. Or
you can use your package manager (e.g. for Debian/Ubuntu
run <code>sudo apt-get install r-base</code> and for Fedora run
<code>sudo dnf install R</code>). Also, please install the
<a href="https://www.rstudio.com/products/rstudio/download/#download">RStudio IDE</a>.
</p>
</article>
</div>
</div>
</div> {% comment %} End of 'R' section. {% endcomment %}
<div id="sql"> {% comment %} Start of 'SQLite' section. {% endcomment %}
<h3>SQLite</h3>
<p>
SQL is a specialized programming language used with databases. We
use a simple database manager called
<a href="https://www.sqlite.org/">SQLite</a> in our lessons.
</p>
<div>
<ul class="nav nav-tabs nav-justified" role="tablist">
<li role="presentation" class="active"><a data-os="windows" href="#sql-windows" aria-controls="Windows" role="tab" data-toggle="tab">Windows</a></li>
<li role="presentation"><a data-os="macos" href="#sql-macos" aria-controls="MacOS" role="tab" data-toggle="tab">MacOS</a></li>
<li role="presentation"><a data-os="linux" href="#sql-linux" aria-controls="Linux" role="tab" data-toggle="tab">Linux</a></li>
<li role="presentation"><a data-os="Web" href="#sql-web" aria-controls="Linux" role="tab" data-toggle="tab">Web</a></li>
</ul>
<div class="tab-content">
<article role="tabpanel" class="tab-pane active" id="sql-windows">
<p>
<ul>
<li>Run git-bash from the start menu</li>
<li>Copy the following <code>curl {{site.url}}{{site.baseurl}}/getsql.sh | bash</code></li>
<li>Paste it into the window that git bash opened. If you're unsure, ask an instructor for help</li>
<li>You should see something like <code>3.27.2 2019-02-25 16:06:06 ...</code></li>
</ul>
<p>If you want to do this manually, download <a href="https://www.sqlite.org/2019/sqlite-tools-win32-x86-3270200.zip">sqlite3</a>, make a bin directory in the user's home directory, unzip sqlite3, move it into the bin directory, and then add the bin directory to the path.</p>
</p>
</article>
<article role="tabpanel" class="tab-pane active" id="sql-macos">
<p>
SQLite comes pre-installed on macOS.
</p>
</article>
<article role="tabpanel" class="tab-pane active" id="sql-linux">
<p>
SQLite comes pre-installed on Linux.
</p>
</article>
<article role="tabpanel" class="tab-pane active" id="sql-web">
<p>
<ul>
<li>In case of problems: register for an account at <a href="http://pythonanywhere.com/">Python Anywhere</a></li>
<li>Download <a href="http://swcarpentry.github.io/sql-novice-survey/files/survey.db">survey.db</a></li>
<li>Click on files and upload survey.db</li>
<li>Click on dashboard and Choose new console <code>$ bash</code></li>
</ul>
</p>
</article>
</div>
</div>
<p><strong>If you installed Anaconda, it also has a copy of SQLite
<a href="https://github.com/ContinuumIO/anaconda-issues/issues/307">without support to <code>readline</code></a>.
Instructors will provide a workaround for it if needed.</strong></p>
</div> {% comment %} End of 'SQLite' section. {% endcomment %}
<div id="openrefine"> {% comment %} Start of 'OpenRefine' section. {% endcomment %}
<h3>OpenRefine</h3>
<p>
For this lesson you will need <em>OpenRefine</em> and a
web browser. <em>Note:</em> this is a Java program that runs on your machine (not in the cloud).
It runs inside a web browser, but no web connection is needed.
</p>
<div>
<ul class="nav nav-tabs nav-justified" role="tablist">
<li role="presentation" class="active"><a data-os="windows" href="#openrefine-windows" aria-controls="Windows" role="tab" data-toggle="tab">Windows</a></li>
<li role="presentation"><a data-os="macos" href="#openrefine-macos" aria-controls="MacOS" role="tab" data-toggle="tab">MacOS</a></li>
<li role="presentation"><a data-os="linux" href="#openrefine-linux" aria-controls="Linux" role="tab" data-toggle="tab">Linux</a></li>
</ul>
<div class="tab-content">
<article role="tabpanel" class="tab-pane active" id="openrefine-windows">
<p>
Check that you have either the Firefox or the Chrome browser installed and set as your default browser.
<strong>OpenRefine runs in your default browser.</strong>
It will not run correctly in Internet Explorer.
</p>
<p>Download software from <a href="http://openrefine.org/">http://openrefine.org/</a></p>
<p>Create a new directory called OpenRefine.</p>
<p>Unzip the downloaded file into the OpenRefine directory by right-clicking and selecting "Extract ...". </p>
<p>Go to your newly created OpenRefine directory.</p>
<p>Launch OpenRefine by clicking <code>openrefine.exe</code> (this will launch a command prompt window, but you can ignore that - just wait for OpenRefine to open in the browser).</p>
<p>If you are using a different browser, or if OpenRefine does not automatically open for you, point your browser at <a href="http://127.0.0.1:3333/">http://127.0.0.1:3333/</a> or <a href="http://localhost:3333">http://localhost:3333</a> to use the program.</p>
</article>
<article role="tabpanel" class="tab-pane active" id="openrefine-macos">
<p>Check that you have either the Firefox or the Chrome browser installed and set as your default browser. <strong>OpenRefine runs in your default browser.</strong> It may not run correctly in Safari.</p>
<p>Download software from <a href="http://openrefine.org/">http://openrefine.org/</a>.</p>
<p>Create a new directory called OpenRefine.</p>
<p>Unzip the downloaded file into the OpenRefine directory by double-clicking it.</p>
<p>Go to your newly created OpenRefine directory.</p>
<p>Launch OpenRefine by dragging the icon into the Applications folder.</p>
<p>Use <code>Ctrl-click/Open ... </code> to launch it.</p>
<p>If you are using a different browser, or if OpenRefine does not automatically open for you, point your browser at <a href="http://127.0.0.1:3333/">http://127.0.0.1:3333/</a> or <a href="http://localhost:3333">http://localhost:3333</a> to use the program.</p>
</article>
<article role="tabpanel" class="tab-pane active" id="openrefine-linux">
<p>Check that you have either the Firefox or the Chrome browser installed and set as your default browser. <strong>OpenRefine runs in your default browser.</strong></p>
<p>Download software from <a href="http://openrefine.org/">http://openrefine.org/</a>.</p>
<p>Make a directory called OpenRefine.</p>
<p>Unzip the downloaded file into the OpenRefine directory.</p>
<p>Go to your newly created OpenRefine directory.</p>
<p>Launch OpenRefine by entering <code>./refine</code> into the terminal within the OpenRefine directory.</p>
<p>If you are using a different browser, or if OpenRefine does not automatically open for you, point your browser at <a href="http://127.0.0.1:3333/">http://127.0.0.1:3333/</a> or <a href="http://localhost:3333">http://localhost:3333</a> to use the program.</p>
</article>
</div>
</div>
</div> {% comment %} End of 'OpenRefine' section. {% endcomment %}
{% comment %}
<div id="vm">
<h3>Virtual Machine</h3>
......
<div class="row">
<div class="col-md-6">
<div class="col-md-4">
<h3 id="syllabus-shell">The Unix Shell</h3>
<ul>
<li>Files and Directories</li>
......@@ -11,7 +11,7 @@
<li><a href="{{site.swc_pages}}/shell-novice/reference">Reference...</a></li>
</ul>
</div>
<div class="col-md-6">
<div class="col-md-4">
<h3 id="syllabus-python">Programming in Python</h3>
<ul>
<li>Using Libraries</li>
......@@ -24,36 +24,7 @@
<li><a href="{{site.swc_pages}}/python-novice-inflammation/reference">Reference...</a></li>
</ul>
</div>
<!--
<div class="col-md-6">
<h3 id="syllabus-r">Programming in R</h3>
<ul>
<li>Working with Vectors and Data Frames</li>
<li>Reading and Plotting Data</li>
<li>Creating and Using Functions</li>
<li>Loops and Conditionals</li>
<li>Using R from the Command Line</li>
<li><a href="{{site.swc_pages}}/r-novice-inflammation/reference">Reference...</a></li>
</ul>
</div>
-->
<!--
<div class="col-md-6">
<h3 id="syllabus-matlab">Programming in MATLAB</h3>
<ul>
<li>Working with Arrays</li>
<li>Reading and Plotting Data</li>
<li>Creating and Using Functions</li>
<li>Loops and Conditionals</li>
<li>Defensive Programming</li>
<li><a href="{{site.swc_pages}}/matlab-novice-inflammation/reference">Reference...</a></li>
</ul>
</div>
-->
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-4">
<h3 id="syllabus-git">Version Control with Git</h3>
<ul>
<li>Creating a Repository</li>
......@@ -67,29 +38,4 @@
<li><a href="{{site.swc_pages}}/git-novice/reference">Reference...</a></li>
</ul>
</div>
<div class="col-md-6">
<h3 id="syllabus-sql">Managing Data with SQL</h3>
<ul>
<li>Reading and Sorting Data</li>
<li>Filtering with <code>where</code></li>
<li>Calculating New Values on the Fly</li>
<li>Handling Missing Values</li>
<li>Combining Values Using Aggregation</li>
<li>Combining Information From Multiple Tables Using <code>join</code></li>
<li>Creating, Modifying, and Deleting Data</li>
<li>Programming with Databases</li>
<li><a href="{{site.swc_pages}}/sql-novice-survey/reference">Reference...</a></li>
</ul>
</div>
<!--
<div class="col-md-6">
<h3 id="syllabus-r">Open Refine</h3>
<ul>
<li>Introduction to OpenRefine</li>
<li>Importing Data</li>
<li>Basic Functions</li>
<li>Advanced Functions</li>
<li><a href="{{site.lc_pages}}library-openrefine/reference">Reference...</a></li>
</ul>
</div>-->
</div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment