ding
This commit is contained in:
Mats van Reenen
parent
db2632afbd
commit
433d18324c
6
TODO.md
6
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
|
||||
|
||||
@ -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"))
|
||||
|
||||
@ -3,11 +3,79 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>EPS10 - <%= file %></title>
|
||||
<title>EPS10 - Logboek Lab <%= lab %></title>
|
||||
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<style>
|
||||
body{
|
||||
background-color: #222;
|
||||
color: #ccc;
|
||||
margin: 0;
|
||||
font-family: 'Roboto', sans-serif;
|
||||
}
|
||||
|
||||
header{
|
||||
background-color: #000;
|
||||
}
|
||||
|
||||
nav ul{
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
nav li{
|
||||
display: inline-block;
|
||||
}
|
||||
nav .current{
|
||||
background-color: #222;
|
||||
}
|
||||
nav a{
|
||||
padding: 5px;
|
||||
}
|
||||
nav a:hover{
|
||||
background-color: #222;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
main{
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
h1,h2,h3{
|
||||
font-family: 'Ubuntu', sans-serif;
|
||||
}
|
||||
th{
|
||||
font-family: 'Ubuntu', sans-serif;
|
||||
}
|
||||
a{
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
a:hover{
|
||||
text-decoration: underline;
|
||||
}
|
||||
img{
|
||||
max-width: 100%;
|
||||
}
|
||||
main{
|
||||
width: 700px;
|
||||
max-width: 100%;
|
||||
margin: auto;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<%- include(file); %>
|
||||
<header>
|
||||
<nav>
|
||||
<ul>
|
||||
<% for(i=1; i<8; i++){ %>
|
||||
<li><a href="/logboek/<%= i %>"<% if(lab == i){%> class="current"<% } %>>Lab <%= i %></a></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
</nav>
|
||||
</header>
|
||||
<main>
|
||||
<%- include('logboek lab ' + lab + '.html'); %>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,4 +0,0 @@
|
||||
img{
|
||||
width: 700px;
|
||||
max-width: 100%;
|
||||
}
|
||||
BIN
img/lab_2_opd_1.2.png
Executable file
BIN
img/lab_2_opd_1.2.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 633 KiB |
BIN
img/lab_2_opd_1.4.png
Executable file
BIN
img/lab_2_opd_1.4.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
img/lab_2_opd_2.3.png
Executable file
BIN
img/lab_2_opd_2.3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 310 KiB |
BIN
img/lab_2_opd_2.4.png
Executable file
BIN
img/lab_2_opd_2.4.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
img/lab_2_opd_2.5.png
Executable file
BIN
img/lab_2_opd_2.5.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
BIN
img/lab_2_opd_2.6.png
Executable file
BIN
img/lab_2_opd_2.6.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
img/lab_2_opd_2.7.png
Executable file
BIN
img/lab_2_opd_2.7.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
@ -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
|
||||
|
||||
|
||||
90
markdown/logboek lab 2.md
Executable file
90
markdown/logboek lab 2.md
Executable file
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user