From ecada34a6d07f45e16b068fa9c9f4178e835a5b6 Mon Sep 17 00:00:00 2001
From: rouhani <majid.rouhani@ntnu.no>
Date: Tue, 20 Jun 2023 07:13:32 +0200
Subject: [PATCH] upd
---
.../codes/generelt_om_filbehandling.ipynb | 0
lectures/lecture6/notes/slides/lecture-6.md | 16 +++++++++++++
lectures/lectures.json | 24 +++++++++----------
lectures/lectures.md | 22 ++++++++---------
4 files changed, 39 insertions(+), 23 deletions(-)
rename lectures/{lecture5 => lecture4}/notes/codes/generelt_om_filbehandling.ipynb (100%)
create mode 100644 lectures/lecture6/notes/slides/lecture-6.md
diff --git a/lectures/lecture5/notes/codes/generelt_om_filbehandling.ipynb b/lectures/lecture4/notes/codes/generelt_om_filbehandling.ipynb
similarity index 100%
rename from lectures/lecture5/notes/codes/generelt_om_filbehandling.ipynb
rename to lectures/lecture4/notes/codes/generelt_om_filbehandling.ipynb
diff --git a/lectures/lecture6/notes/slides/lecture-6.md b/lectures/lecture6/notes/slides/lecture-6.md
new file mode 100644
index 0000000..60c2e52
--- /dev/null
+++ b/lectures/lecture6/notes/slides/lecture-6.md
@@ -0,0 +1,16 @@
+---
+marp: true
+size: 4:3
+paginate: true
+---
+<!-- https://marpit.marp.app/directives -->
+
+# Leksjon 6
+
+**Læringsutbytte**
+
+* Oppsummering
+
+---
+# Filbehandling
+
diff --git a/lectures/lectures.json b/lectures/lectures.json
index 769de43..b4e0af3 100644
--- a/lectures/lectures.json
+++ b/lectures/lectures.json
@@ -45,31 +45,31 @@
]
}
,{
- "Leksjon 4: Sammensatte datatyper (lister, tupler, set)": [
+ "Leksjon 4: Sammensatte datatyper, Lesing og skriving til filer": [
{"Introduksjon (slides)": {"Introduksjon":"lecture4/notes/slides/lecture-4.pdf"}}
,{
"Sammensatte datatyper": [
{"Lister": {"Generelt om lister": "lecture4/notes/codes/generelt_om_lister.ipynb", "Lister og løkker": "lecture4/notes/codes/lister_og_lokker.ipynb"}}
,{"Tupler":{"Generelt om tupler": "lecture4/notes/codes/lister_og_tupler.ipynb"}}
,{"Set": {"Generelt om set": "lecture4/notes/codes/lister_og_set.ipynb"}}
+ ,{"Filbehandling": {"Generelt om filbehandling":"lecture5/notes/codes/generelt_om_filbehandling.ipynb"}}
]
}
,{"Lab 4": {"Lab-4":"lecture4/lab/lab-4.md"}}
]
- },
- {
- "Leksjon 5: Filbehandling, unntakshåndtering, programmering mot databaser": [
+ }
+ ,{
+ "Leksjon 5: Programmering mot databaser, into til OOP": [
{"Introduksjon (slides)": {"Introduksjon":"lecture5/notes/slides/lecture-5.pdf"}}
- ,{"Filbehandling": {"Generelt om filbehandling":"lecture5/notes/codes/generelt_om_filbehandling.ipynb"}}
,{"Programmering mot databaser":{"Lesing og skriving til database": "lecture5/notes/codes/databaser.ipynb"}}
+ ,{"Object Orientert Programmering": "Introduksjon"}
,{"Lab 5": {"Lab-5":"lecture5/lab/lab-5.md"}}
]
- },
- {
- "Leksjon 6: Introduksjon til objekt orientert programmering": [
- {"Object Orientert Programmering": "Introduksjon"}
- ,{"Lab 6": {"Lab-6":"lecture6/lab/lab-6.md"}}
- ]
- }
+ }
+ ,{
+ "Leksjon 6: Oppsummering": [
+ {"Oppsummering (slides)": {"Oppsummering":"lecture6/notes/slides/lecture-6.pdf"}}
+ ]
+ }
]
}
\ No newline at end of file
diff --git a/lectures/lectures.md b/lectures/lectures.md
index 7629a47..2b86f09 100644
--- a/lectures/lectures.md
+++ b/lectures/lectures.md
@@ -70,7 +70,7 @@
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture3/lab/lab-3.md>Lab-3</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 4: Sammensatte datatyper (lister, tupler, set)</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 4: Sammensatte datatyper, Lesing og skriving til filer</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon (slides)</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture4/notes/slides/lecture-4.pdf>Introduksjon</a></blockquote>
</details>
@@ -85,30 +85,30 @@
<details><summary style="font-size:200%;cursor: pointer;">   Set</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture4/notes/codes/lister_og_set.ipynb>Generelt om set</a></blockquote>
</details>
+<details><summary style="font-size:200%;cursor: pointer;">   Filbehandling</summary>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">    <a target="_blank" href=lecture5/notes/codes/generelt_om_filbehandling.ipynb>Generelt om filbehandling</a></blockquote>
+</details>
</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 4</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture4/lab/lab-4.md>Lab-4</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 5: Filbehandling, unntakshåndtering, programmering mot databaser</summary>
+<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 5: Programmering mot databaser, into til OOP</summary>
<details><summary style="font-size:200%;cursor: pointer;">  Introduksjon (slides)</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/slides/lecture-5.pdf>Introduksjon</a></blockquote>
</details>
-<details><summary style="font-size:200%;cursor: pointer;">  Filbehandling</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/codes/generelt_om_filbehandling.ipynb>Generelt om filbehandling</a></blockquote>
-</details>
<details><summary style="font-size:200%;cursor: pointer;">  Programmering mot databaser</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/codes/databaser.ipynb>Lesing og skriving til database</a></blockquote>
</details>
+<details><summary style="font-size:200%;cursor: pointer;">  Object Orientert Programmering</summary>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   Introduksjon</blockquote>
+</details>
<details><summary style="font-size:200%;cursor: pointer;">  Lab 5</summary>
<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/lab/lab-5.md>Lab-5</a></blockquote>
</details>
</details>
-<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 6: Introduksjon til objekt orientert programmering</summary>
-<details><summary style="font-size:200%;cursor: pointer;">  Object Orientert Programmering</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   Introduksjon</blockquote>
-</details>
-<details><summary style="font-size:200%;cursor: pointer;">  Lab 6</summary>
-<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture6/lab/lab-6.md>Lab-6</a></blockquote>
+<details><summary style="font-size:200%;cursor: pointer;"> Leksjon 6: Oppsummering</summary>
+<details><summary style="font-size:200%;cursor: pointer;">  Oppsummering (slides)</summary>
+<blockquote style="font-size:200%;cursor: pointer;padding: 10px;">   <a target="_blank" href=lecture5/notes/slides/lecture-5.pdf>Oppsummering</a></blockquote>
</details>
</details>
--
GitLab