Differences

This shows you the differences between two versions of the page.

--- kurs_prog1 [2019-12-06 15:15]
Daniel Viström
+++ kurs_prog1 [2023-08-24 08:53] (current)
Daniel Viström
@@ Line 1: / Line 1: @@
 ====== Programmering 1 ======
-Kursinformation från Skolverket: [[https://www.skolverket.se/undervisning/gymnasieskolan/laroplan-program-och-amnen-i-gymnasieskolan/gymnasieprogrammen/amne?url=1530314731%2Fsyllabuscw%2Fjsp%2Fsubject.htm%3FsubjectCode%3DPRR%26lang%3Dsv%26tos%3Dgy%26p%3Dp&sv.url=12.5dfee44715d35a5cdfa92a3|Programmering 1]]\\ \\
+Kursinformation från Skolverket: [[https://www.skolverket.se/undervisning/gymnasieskolan/laroplan-program-och-amnen-i-gymnasieskolan/gymnasieprogrammen/amne?url=-996270488%2Fsyllabuscw%2Fjsp%2Fsubject.htm%3FsubjectCode%3DPRR%26version%3D4%26tos%3Dgy&sv.url=12.5dfee44715d35a5cdfa92a3|Programmering 1]]\\ \\
 [[http://www.php.net/manual/en/| php.net]] - Bra sida för att läsa om PHP.\\
@@ Line 14: / Line 14: @@
   - [[prog1_03]]\\ //[[dvprog_03]]// \\
   - [[prog1_01]]\\ //[[dvprog_04]]//
-  - [[prog1_04]]\\ //[[dvprog_05]]// \\ //[[dvprog_06]]// \\ //[[dvprog_06_2]]//
+  - [[prog1_04]]\\ //[[dvprog_05]]// \\ //[[dvprog_06]]//\\ //[[dvprog_06_2]]//
   - [[prog1_05]]\\ //[[dvprog_07]]// \\ //[[dvprog_08]]//
+  - [[prog1_07]]\\ //[[dvprog_17]]// \\ //[[dvprog_20]]//
   - [[prog1_06]]\\ //[[dvprog_09]]// \\ //[[dvprog15]]// \\ //[[dvprog_10]]//
-  - [[prog1_07]]\\ //[[dvprog_17]]//
   - [[prog1_08]]\\ //[[dvprog_11]]// \\ //[[dvprog_12]] //
-  - [[prog1_09]]\\ //[[dvprog_16]]//
+  - [[prog1_09]]\\ //[[dvprog_16]]// \\ //[[dvprog_19]]//
   - [[prog1_11]]\\ //[[dvprog_13]]//
   - [[prog1_12]]\\ //[[dvprog_14]]// \\
   - [[prog1_17]]\\
   - [[prog1_18]]\\
-  - [[dvprog_18]]\\
+  - [[dvprog_18]]\\ \\
+  - [[dvprog_21]]\\
+<php>
+/*
 Anders sidor \\
 //[[amprog_01]]//\\
@@ Line 37: / Line 39: @@
 //[[amprog_08]]// \\ //[[amprog_09]]// \\
 //[[amprog_10]]// \\
+*/
+</php>