From c43ae9e81254ddf4891666b1c5ca5b53377b41ca Mon Sep 17 00:00:00 2001 From: Markus Harrer Date: Thu, 11 Jul 2024 16:58:44 +0200 Subject: [PATCH 1/4] change durations according to time table in #32 --- ...structure-and-chronological-breakdown.adoc | 26 +++++++++---------- docs/01-principles/01-duration-terms.adoc | 2 +- docs/02-analyze/01-duration-terms.adoc | 2 +- docs/03-evaluate/01-duration-terms.adoc | 2 +- docs/05-approaches/01-duration-terms.adoc | 2 +- docs/06-examples/01-duration-terms.adoc | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc b/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc index 693d714..ee1d69a 100644 --- a/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc +++ b/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc @@ -55,32 +55,32 @@ Die Ausgestaltung der Beispiele und Übungen sind in diesem Lehrplan nicht vorge |=== | Content -| Duration (minutes) -| Practice time (minutes) +| Teaching (in minutes) +| Exercises (in minutes) | 1. Foundations -| 105 -| 15 +| 60 +| 20 | 2. Analysis of current situation -| 150 -| 60 +| 240 +| 75 | 3. Estimation of problems and solution approaches +| 120 | 60 -| 30 | 4. Long term improvement planning | 90 | 30 | 5. Typical improvement approaches -| 255 -| 105 +| 180 +| 100 | 6. Improvement examples -| 60 -| 120 +| 30 +| 75 | | @@ -91,8 +91,8 @@ Die Ausgestaltung der Beispiele und Übungen sind in diesem Lehrplan nicht vorge | 360 min (6h) |=== -In this context, “duration” refers to teaching time without exercises. -The time breakdown between theory and exercises is only a recommendation. +In this context, “Teaching” refers to teaching time without exercises. +The time breakdown between teaching and exercises is only a recommendation. The design of the examples and exercises aren't specified in this curriculum. // end::EN[] diff --git a/docs/01-principles/01-duration-terms.adoc b/docs/01-principles/01-duration-terms.adoc index d35c17c..d0f5516 100644 --- a/docs/01-principles/01-duration-terms.adoc +++ b/docs/01-principles/01-duration-terms.adoc @@ -15,7 +15,7 @@ Kernbegriffe rund um Verbesserung und Änderung von Software, technische Pflege // tag::EN[] [width=50%] |=== -| Duration: 105 min | Practice time: 15 min +| Teaching: 60 min | Exercises: 20 min |=== === Terms and concepts diff --git a/docs/02-analyze/01-duration-terms.adoc b/docs/02-analyze/01-duration-terms.adoc index 1793460..60af844 100644 --- a/docs/02-analyze/01-duration-terms.adoc +++ b/docs/02-analyze/01-duration-terms.adoc @@ -13,7 +13,7 @@ Ist-Analyse, Stärken/Schwächen-Analyse, Stakeholder, Problem, Ursache versus S // tag::EN[] [width=50%] |=== -| Duration: 150 min | Practice time: 60 min +| Teaching: 240 min | Exercises: 75 min |=== === Terms and concepts diff --git a/docs/03-evaluate/01-duration-terms.adoc b/docs/03-evaluate/01-duration-terms.adoc index 6de3d11..247aa22 100644 --- a/docs/03-evaluate/01-duration-terms.adoc +++ b/docs/03-evaluate/01-duration-terms.adoc @@ -15,7 +15,7 @@ Intervallschätzung, Gesetz-der-großen-Zahl // tag::EN[] [width=50%] |=== -| Duration: 60 min | Practice time: 30 min +| Teaching: 120 min | Exercises: 60 min |=== === Terms and concepts diff --git a/docs/05-approaches/01-duration-terms.adoc b/docs/05-approaches/01-duration-terms.adoc index c743ce7..777504b 100644 --- a/docs/05-approaches/01-duration-terms.adoc +++ b/docs/05-approaches/01-duration-terms.adoc @@ -16,7 +16,7 @@ Erhöhung der Lesbarkeit und Verständlichkeit;Automatisierung von Prozessen zur // tag::EN[] [width=50%] |=== -| Duration: 255 min | Practice time: 105 min +| Teaching: 180 min | Exercises: 100 min |=== === Terms and concepts diff --git a/docs/06-examples/01-duration-terms.adoc b/docs/06-examples/01-duration-terms.adoc index 5181236..4b94314 100644 --- a/docs/06-examples/01-duration-terms.adoc +++ b/docs/06-examples/01-duration-terms.adoc @@ -19,7 +19,7 @@ Aufgrund der bei realen IT-Systemen oftmals geltenden Geheimhaltungs- oder Vertr // tag::EN[] [width=50%] |=== -| Duration: 60 min | Practice time: 120 min +| Teaching: 30 min | Exercises: 75 min |=== From d3dbc6f97d95871e1e896501b123f6400a1d2788 Mon Sep 17 00:00:00 2001 From: Markus Harrer Date: Fri, 12 Jul 2024 11:37:33 +0200 Subject: [PATCH 2/4] adjust durations in German version --- ...structure-and-chronological-breakdown.adoc | 26 +++++++++---------- docs/01-principles/01-duration-terms.adoc | 2 +- docs/02-analyze/01-duration-terms.adoc | 2 +- docs/03-evaluate/01-duration-terms.adoc | 2 +- docs/04-planning/01-duration-terms.adoc | 2 +- docs/05-approaches/01-duration-terms.adoc | 2 +- docs/06-examples/01-duration-terms.adoc | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc b/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc index ee1d69a..991a9d9 100644 --- a/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc +++ b/docs/00b-basics/02-curriculum-structure-and-chronological-breakdown.adoc @@ -6,19 +6,19 @@ |=== | Inhalt -| Dauer (Minuten) -| Übungszeit (Minuten) +| Lehre (in Minuten) +| Übung (in Minuten) | 1. Grundlegendes -| 105 -| 15 +| 60 +| 20 | 2. Ist-Situation analysieren -| 150 -| 60 +| 240 +| 75 | 3. Probleme und Lösungsansätze schätzen und bewerten -| 60 +| 120 | 30 | 4. Verbesserungen langfristig planen @@ -26,12 +26,12 @@ | 30 | 5. Typische Verbesserungsansätze -| 255 -| 105 +| 280 +| 100 | 6. Beispiele für Verbesserung -| 60 -| 120 +| 30 +| 75 | | @@ -42,8 +42,8 @@ | 360 min (6h) |=== -In diesem Kontext stellt „Dauer“ die Unterrichtszeit ohne Übungszeit dar. -Die Zeitaufteilung zwischen Theorie und Übungen ist lediglich eine Empfehlung. +In diesem Kontext stellt „Lehre“ die Unterrichtszeit ohne Übungszeit dar. +Die Zeitaufteilung zwischen Lehre und Übungen ist lediglich eine Empfehlung. Die Ausgestaltung der Beispiele und Übungen sind in diesem Lehrplan nicht vorgegeben. // end::DE[] diff --git a/docs/01-principles/01-duration-terms.adoc b/docs/01-principles/01-duration-terms.adoc index d0f5516..8aaca8f 100644 --- a/docs/01-principles/01-duration-terms.adoc +++ b/docs/01-principles/01-duration-terms.adoc @@ -1,7 +1,7 @@ // tag::DE[] [width=50%] |=== -| Dauer: 105 Min. | Übungszeit: 15 Min. +| Lehre: 60 Min. | Übung: 20 Min. |=== === Begriffe und Konzepte diff --git a/docs/02-analyze/01-duration-terms.adoc b/docs/02-analyze/01-duration-terms.adoc index 60af844..592b353 100644 --- a/docs/02-analyze/01-duration-terms.adoc +++ b/docs/02-analyze/01-duration-terms.adoc @@ -1,7 +1,7 @@ // tag::DE[] [width=50%] |=== -| Dauer: 150 Min. | Übungszeit: 60 Min. +| Lehre: 240 Min. | Übung: 75 Min. |=== === Begriffe und Konzepte diff --git a/docs/03-evaluate/01-duration-terms.adoc b/docs/03-evaluate/01-duration-terms.adoc index 247aa22..2ac845e 100644 --- a/docs/03-evaluate/01-duration-terms.adoc +++ b/docs/03-evaluate/01-duration-terms.adoc @@ -1,7 +1,7 @@ // tag::DE[] [width=50%] |=== -| Dauer: 60 Min. | Übungszeit: 30 Min. +| Lehre: 120 Min. | Übung: 60 Min. |=== === Begriffe und Konzepte diff --git a/docs/04-planning/01-duration-terms.adoc b/docs/04-planning/01-duration-terms.adoc index f84c619..153c68f 100644 --- a/docs/04-planning/01-duration-terms.adoc +++ b/docs/04-planning/01-duration-terms.adoc @@ -1,7 +1,7 @@ // tag::DE[] [width=50%] |=== -| Dauer: 90 Min. | Übungszeit: 30 Min. +| Lehre: 90 Min. | Übung: 30 Min. |=== === Begriffe und Konzepte diff --git a/docs/05-approaches/01-duration-terms.adoc b/docs/05-approaches/01-duration-terms.adoc index 777504b..7b523ce 100644 --- a/docs/05-approaches/01-duration-terms.adoc +++ b/docs/05-approaches/01-duration-terms.adoc @@ -1,7 +1,7 @@ // tag::DE[] [width=50%] |=== -| Dauer: 255 Min. | Übungszeit: 105 Min. +| Lehre: 180 Min. | Übung: 100 Min. |=== === Begriffe und Konzepte diff --git a/docs/06-examples/01-duration-terms.adoc b/docs/06-examples/01-duration-terms.adoc index 4b94314..bc498b9 100644 --- a/docs/06-examples/01-duration-terms.adoc +++ b/docs/06-examples/01-duration-terms.adoc @@ -1,7 +1,7 @@ // tag::DE[] [width=50%] |=== -| Dauer: 60 Min. | Übungszeit: 120 Min. +| Lehre: 30 Min. | Übung: 75 Min. |=== **Anmerkung**: From 9d4ae009a468b0e8575eaa55507c5ca400d482b2 Mon Sep 17 00:00:00 2001 From: Markus Harrer Date: Fri, 12 Jul 2024 11:38:05 +0200 Subject: [PATCH 3/4] fix wording for exercise --- docs/04-planning/01-duration-terms.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/04-planning/01-duration-terms.adoc b/docs/04-planning/01-duration-terms.adoc index 153c68f..c277a0d 100644 --- a/docs/04-planning/01-duration-terms.adoc +++ b/docs/04-planning/01-duration-terms.adoc @@ -17,7 +17,7 @@ Entwicklung und Kommunikation langfristiger Lösungsstrategien // tag::EN[] [width=50%] |=== -| Duration: 90 min | Practice time: 30 min +| Duration: 90 min | Exercises: 30 min |=== === Terms and concepts From 1d4e939e372d018c2937b7ca7df09bfcef4b742c Mon Sep 17 00:00:00 2001 From: Markus Harrer Date: Fri, 12 Jul 2024 13:49:48 +0200 Subject: [PATCH 4/4] rename to practice --- docs/01-principles/01-duration-terms.adoc | 2 +- docs/02-analyze/01-duration-terms.adoc | 2 +- docs/03-evaluate/01-duration-terms.adoc | 2 +- docs/04-planning/01-duration-terms.adoc | 2 +- docs/05-approaches/01-duration-terms.adoc | 2 +- docs/06-examples/01-duration-terms.adoc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/01-principles/01-duration-terms.adoc b/docs/01-principles/01-duration-terms.adoc index 8aaca8f..d72c2ba 100644 --- a/docs/01-principles/01-duration-terms.adoc +++ b/docs/01-principles/01-duration-terms.adoc @@ -15,7 +15,7 @@ Kernbegriffe rund um Verbesserung und Änderung von Software, technische Pflege // tag::EN[] [width=50%] |=== -| Teaching: 60 min | Exercises: 20 min +| Teaching: 60 min | Practice: 20 min |=== === Terms and concepts diff --git a/docs/02-analyze/01-duration-terms.adoc b/docs/02-analyze/01-duration-terms.adoc index 592b353..454155d 100644 --- a/docs/02-analyze/01-duration-terms.adoc +++ b/docs/02-analyze/01-duration-terms.adoc @@ -13,7 +13,7 @@ Ist-Analyse, Stärken/Schwächen-Analyse, Stakeholder, Problem, Ursache versus S // tag::EN[] [width=50%] |=== -| Teaching: 240 min | Exercises: 75 min +| Teaching: 240 min | Practice: 75 min |=== === Terms and concepts diff --git a/docs/03-evaluate/01-duration-terms.adoc b/docs/03-evaluate/01-duration-terms.adoc index 2ac845e..471afd3 100644 --- a/docs/03-evaluate/01-duration-terms.adoc +++ b/docs/03-evaluate/01-duration-terms.adoc @@ -15,7 +15,7 @@ Intervallschätzung, Gesetz-der-großen-Zahl // tag::EN[] [width=50%] |=== -| Teaching: 120 min | Exercises: 60 min +| Teaching: 120 min | Practice: 60 min |=== === Terms and concepts diff --git a/docs/04-planning/01-duration-terms.adoc b/docs/04-planning/01-duration-terms.adoc index c277a0d..8fb8dac 100644 --- a/docs/04-planning/01-duration-terms.adoc +++ b/docs/04-planning/01-duration-terms.adoc @@ -17,7 +17,7 @@ Entwicklung und Kommunikation langfristiger Lösungsstrategien // tag::EN[] [width=50%] |=== -| Duration: 90 min | Exercises: 30 min +| Duration: 90 min | Practice: 30 min |=== === Terms and concepts diff --git a/docs/05-approaches/01-duration-terms.adoc b/docs/05-approaches/01-duration-terms.adoc index 7b523ce..161744e 100644 --- a/docs/05-approaches/01-duration-terms.adoc +++ b/docs/05-approaches/01-duration-terms.adoc @@ -16,7 +16,7 @@ Erhöhung der Lesbarkeit und Verständlichkeit;Automatisierung von Prozessen zur // tag::EN[] [width=50%] |=== -| Teaching: 180 min | Exercises: 100 min +| Teaching: 180 min | Practice: 100 min |=== === Terms and concepts diff --git a/docs/06-examples/01-duration-terms.adoc b/docs/06-examples/01-duration-terms.adoc index bc498b9..b0d2e7b 100644 --- a/docs/06-examples/01-duration-terms.adoc +++ b/docs/06-examples/01-duration-terms.adoc @@ -19,7 +19,7 @@ Aufgrund der bei realen IT-Systemen oftmals geltenden Geheimhaltungs- oder Vertr // tag::EN[] [width=50%] |=== -| Teaching: 30 min | Exercises: 75 min +| Teaching: 30 min | Practice: 75 min |===