diff --git a/TODO.md b/TODO.md index 5e7f98c..4037c3b 100755 --- a/TODO.md +++ b/TODO.md @@ -7,4 +7,8 @@ - lab 5 - lab 6 controleeren - lab 7 -- alles exporteren naar html en pdf +- alles exporteren naar pdf + +## done + +- alles exporteren naar html diff --git a/compile.js b/compile.js index 3ee314a..c761603 100755 --- a/compile.js +++ b/compile.js @@ -41,15 +41,12 @@ app.set('view engine', 'ejs'); app.set('views', __dirname + '/html') app.get('/logboek/:lab', function(req, res, next){ - res.render('logboek', { file: 'logboek lab ' + req.params.lab + '.html'}) + res.render('logboek', { lab: req.params.lab}) }) app.use('/img', function(req, res, next){ res.sendFile(__dirname + '/img' + req.path) }) -app.use('/static', function(req, res, next){ - res.sendFile(__dirname + '/html/static' + req.path) -}) app.listen(8080, ()=>console.log("server started")) diff --git a/html/logboek.ejs b/html/logboek.ejs index db1af6b..cc938d8 100755 --- a/html/logboek.ejs +++ b/html/logboek.ejs @@ -3,11 +3,79 @@ - EPS10 - <%= file %> + EPS10 - Logboek Lab <%= lab %> - + - <%- include(file); %> +
+ +
+
+ <%- include('logboek lab ' + lab + '.html'); %> +
\ No newline at end of file diff --git a/html/static/style.css b/html/static/style.css deleted file mode 100755 index 158f840..0000000 --- a/html/static/style.css +++ /dev/null @@ -1,4 +0,0 @@ -img{ - width: 700px; - max-width: 100%; -} \ No newline at end of file diff --git a/img/lab_2_opd_1.2.png b/img/lab_2_opd_1.2.png new file mode 100755 index 0000000..b24b398 Binary files /dev/null and b/img/lab_2_opd_1.2.png differ diff --git a/img/lab_2_opd_1.4.png b/img/lab_2_opd_1.4.png new file mode 100755 index 0000000..bbb776b Binary files /dev/null and b/img/lab_2_opd_1.4.png differ diff --git a/img/lab_2_opd_2.3.png b/img/lab_2_opd_2.3.png new file mode 100755 index 0000000..0a810a7 Binary files /dev/null and b/img/lab_2_opd_2.3.png differ diff --git a/img/lab_2_opd_2.4.png b/img/lab_2_opd_2.4.png new file mode 100755 index 0000000..dc15553 Binary files /dev/null and b/img/lab_2_opd_2.4.png differ diff --git a/img/lab_2_opd_2.5.png b/img/lab_2_opd_2.5.png new file mode 100755 index 0000000..7ac3675 Binary files /dev/null and b/img/lab_2_opd_2.5.png differ diff --git a/img/lab_2_opd_2.6.png b/img/lab_2_opd_2.6.png new file mode 100755 index 0000000..1df08cf Binary files /dev/null and b/img/lab_2_opd_2.6.png differ diff --git a/img/lab_2_opd_2.7.png b/img/lab_2_opd_2.7.png new file mode 100755 index 0000000..56ba458 Binary files /dev/null and b/img/lab_2_opd_2.7.png differ diff --git a/markdown/logboek lab 1.md b/markdown/logboek lab 1.md index c92baeb..727654b 100755 --- a/markdown/logboek lab 1.md +++ b/markdown/logboek lab 1.md @@ -32,7 +32,7 @@ De sterkte van het veld. ### 2.5 -Door meerdere lading boven elkaar te zetten. +Door meerdere lading op elkaar te zetten. ### 2.6 diff --git a/markdown/logboek lab 2.md b/markdown/logboek lab 2.md new file mode 100755 index 0000000..d49d378 --- /dev/null +++ b/markdown/logboek lab 2.md @@ -0,0 +1,90 @@ +# Lab 2: Condensatoren + +## opdracht 1 + +### 1.2 + +![condensator veld lijnen][opd1.2] + +### 1.3 + +| afstand | voltage | +|--------:|-----------:| +| 0 cm | ∞ V | +| 25 cm | 140.3 V | +| 75 cm | 61.0 V | +| 125 cm | 16.6 V | +| 150 cm | 0.0 V | +| 175 cm | -18.7 V | +| 225 cm | -62.1 V | +| 275 cm | -144.1 V | +| 300 cm | -∞ V | + +### 1.4 + +![grafiek][opd1.4] + +### 1.5 + +Bij mij is het grofweg spanning = 0.15*afstand waar afstand in meters is + +### 1.8 + +sinus + +### 1.9 + +uitwendig product + +## opdracht 2 + +### 2.3 + +![circle][opd2.3] + +### 2.4 + +| afstand | volt | +|--------:|---------:| +| 25 cm | −153.6 V | +| 32 cm | −165.7 V | +| 50 cm | −177.4 V | +| 60 cm | −185.0 V | +| 74 cm | −191.6 V | +| 87 cm | −200.6 V | +| 103 cm | −212.0 V | +| 125 cm | −240.7 V | + +### 2.5 + +De blouwe lijn is de formoule (-0.8*x)-135 + +![graph][opd2.5] + +### 2.6 + +| afstand | volt | +|--------:|------:| +| 22 cm | 197 V | +| 50 cm | 60 V | +| 75 cm | 60 V | +| 100 cm | 90 V | +| 125 cm | 200 V | + +![graph][opd2.6] + +### 2.7 + +veel dichterbij dan dit kom ik niet + +0.574x^2 - 8.3x + 345 + +![graph][opd2.7] + +[opd1.2]: /img/lab_2_opd_1.2.png +[opd1.4]: /img/lab_2_opd_1.4.png +[opd2.3]: /img/lab_2_opd_2.3.png +[opd2.4]: /img/lab_2_opd_2.4.png +[opd2.5]: /img/lab_2_opd_2.5.png +[opd2.6]: /img/lab_2_opd_2.6.png +[opd2.7]: /img/lab_2_opd_2.7.png