From 4a5e1189c14f3c8a71e2a2271076ff578c5b5a15 Mon Sep 17 00:00:00 2001
From: Daniel Bosk <dbosk@kth.se>
Date: Tue, 16 Apr 2019 10:18:59 +0200
Subject: [PATCH] Unclutters schedule, adds conclusion

---
 studyguide/Makefile               |   2 +-
 studyguide/contents.tex           |  15 +++--
 studyguide/schedule-deadlines.tex | 106 ++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 studyguide/schedule-deadlines.tex

diff --git a/studyguide/Makefile b/studyguide/Makefile
index bdc4999..b569575 100644
--- a/studyguide/Makefile
+++ b/studyguide/Makefile
@@ -11,7 +11,7 @@ all: studyguide.pdf studyguide-slides.pdf
 
 SRC=		studyguide.tex preamble.tex contents.tex
 SRC+= 		ilo-grading.tex ladok.tex
-SRC+= 		schedule.tex hand-ins.tex late.tex
+SRC+= 		schedule-deadlines.tex hand-ins.tex late.tex
 SRC+= 		studyguide.bib
 SRC+=		${MODULE_FILES}
 
diff --git a/studyguide/contents.tex b/studyguide/contents.tex
index a615594..c1eb9b4 100644
--- a/studyguide/contents.tex
+++ b/studyguide/contents.tex
@@ -91,10 +91,11 @@ \subsection{Schedule}
 In \cref{Schedule} you will find an overview of the schedule for the course.
 The detailed schedule can be found in the University's central scheduling 
 system.
-The details for each session can be found in Section~\ref{CourseContents}.
+An abstract for each session can be found in Section~\ref{CourseContents} and 
+the details in the actual material.
 
 \begin{frame}[allowframebreaks]
-\input{schedule.tex}
+\input{schedule-deadlines.tex}
 \end{frame}
 
 
@@ -176,8 +177,14 @@ \subsection{Trusted computing}%
 \label{trustcomp}
 \input{trustcomp-abstract.tex}
 
-%\subsection{P8 A short study in information security}
-\subsection{P6 Applying security and usability in practice}%
+\subsection{Conclusion}%
+\label{conclusion}
+
+We will finish the course with a summarizing session and then start the 
+project.
+
+%\subsubsection{P8 A short study in information security}
+\subsubsection{P6 Applying security and usability in practice}%
 \label{devel}
 \input{project-abstract.tex}
 } % mode<article>
diff --git a/studyguide/schedule-deadlines.tex b/studyguide/schedule-deadlines.tex
new file mode 100644
index 0000000..f8a29a7
--- /dev/null
+++ b/studyguide/schedule-deadlines.tex
@@ -0,0 +1,106 @@
+\mode<article>{%
+\begin{table}
+}
+	\centering
+  \begin{tabular}{lp{9cm}}
+    \toprule
+    \textbf{Course week}	& \textbf{Work} \\
+    \midrule
+    1
+      & Session: Introduction\\
+      & Seminar: What's up with security?
+        (Section~\ref{security-society-seminar})\\
+      & Session: Foundations
+        (Section~\ref{foundations})\\
+    \midrule
+    2
+      & Lecture: MSB's framework, part I
+        (Section~\ref{msb-framework})\\
+      & Lecture: MSB's framework, part II\\
+      & Lecture: Records management\\
+    \midrule
+\mode<presentation>{%
+  \end{tabular}
+  \begin{tabular}{lp{9cm}}
+}%
+    3
+      & Session: Crypto I
+        (Section~\ref{crypto})\\
+      & Session: Crypto II
+        (Section~\ref{crypto})\\
+      & First grading: M1 (isms), M2 (risk)\\
+    \midrule
+    4
+      & Session: Authentication
+        (Section~\ref{authentication})\\
+      & Seminar: L4 Evaluating and Designing Authentication
+        (Section~\ref{pwdeval})
+        part I\\
+    \midrule
+\mode<presentation>{%
+  \end{tabular}
+  \begin{tabular}{lp{9cm}}
+}%
+    5
+      & Seminar: L4 part II\\
+      & Seminar: L5 Private Communication
+        (Section~\ref{pricomlab})\\
+      & Session: Protocols
+        (Section~\ref{protocols})\\
+    \midrule
+    6
+      & Session: Access control
+        (Section~\ref{ac})\\
+      & Session: Accountability
+        (Section~\ref{accountability})\\
+      & Session: Differential privacy
+        (Section~\ref{diffpriv})\\
+    \midrule
+\mode<presentation>{%
+  \end{tabular}
+  \begin{tabular}{lp{9cm}}
+}%
+    7
+      & Session: Software security
+        (Section~\ref{software})\\
+      & Session: Trusted computing
+        (Section~\ref{trustcomp})\\
+      & Seminar: S3
+        (Section~\ref{risksem})\\
+      & Session: Conclusion
+        (Section~\ref{conclusion})\\
+    \midrule
+    8
+      & Tutoring: P6
+        (Section~\ref{devel})\\
+    \midrule
+    9
+      & Tutoring: P6 (devel)\\
+    \midrule
+    10
+      & Presentation: P6 (devel)\\
+      & Second grading: M1 (isms), M2 (risk)\\
+      & Second seminar: S3 (risk), L4 (pwdeval), L5 (pricomlab)\\
+    \midrule
+\mode<presentation>{%
+  \end{tabular}
+  \begin{tabular}{lp{9cm}}
+}%
+    +3 months
+      & Second presentation: P6 (devel)\\
+      & Final grading: M1 (isms), M2 (risk)\\
+      & Final seminar: S3 (risk), L4 (pwdeval), L5 (pricomlab)\\
+    \midrule
+    +6 months
+      & Final presentation: P6 (devel)\\
+    \bottomrule
+  \end{tabular}
+\mode<article>{%
+  \caption{%
+    A summary of the parts of the course and when they will (or should) be done.
+    The table is adapted to taking this course at half-time pace, \ie 20 hours 
+    per week for 10 weeks.
+  }\label{Schedule}
+\end{table}
+}
+