From ea3af73554cf117d5db8fae0013e741a5eaab073 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Thu, 12 Oct 2023 09:42:00 +0200 Subject: [PATCH] vault backup: 2023-10-12 09:42:00 --- .../obsidian-activity-history/data.json | 4 ++-- .../various-complements/histories.json | 2 +- notes/eko/Úvodní hodina.md | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/notes/.obsidian/plugins/obsidian-activity-history/data.json b/notes/.obsidian/plugins/obsidian-activity-history/data.json index 8879320..3d09b15 100644 --- a/notes/.obsidian/plugins/obsidian-activity-history/data.json +++ b/notes/.obsidian/plugins/obsidian-activity-history/data.json @@ -13,7 +13,7 @@ { "path": "/", "date": "2023-10-12", - "size": 1446886 + "size": 1447287 } ], "activityHistory": [ @@ -1358,7 +1358,7 @@ }, { "date": "2023-10-12", - "value": 833 + "value": 1234 } ] } diff --git a/notes/.obsidian/plugins/various-complements/histories.json b/notes/.obsidian/plugins/various-complements/histories.json index 95ad769..c16cab9 100644 --- a/notes/.obsidian/plugins/various-complements/histories.json +++ b/notes/.obsidian/plugins/various-complements/histories.json @@ -1 +1 @@ -{"\\sphericalangle":{"\\sphericalangle":{"currentFile":{"count":1,"lastUpdated":1694680712479}}},"Logaritmus":{"Logaritmus":{"internalLink":{"count":1,"lastUpdated":1694690308884}}},"zobrazení":{"zobrazení":{"currentFile":{"count":2,"lastUpdated":1694769120832}}},"Druhý pohybový zákon":{"Druhý pohybový zákon":{"internalLink":{"count":1,"lastUpdated":1695281570945}}},"\\sin\\alpha":{"\\sin\\alpha":{"currentFile":{"count":1,"lastUpdated":1695293974762}}},"\\frac{1.33}{\\frac{\\sqrt2}1}":{"\\frac{1.33}{\\frac{\\sqrt2}1}":{"currentFile":{"count":1,"lastUpdated":1695297376494}}},"\\frac{\\sin60\\degree\\cos\\alpha-\\cos60\\degree\\sin\\alpha}{\\sin\\alpha}":{"\\frac{\\sin60\\degree\\cos\\alpha-\\cos60\\degree\\sin\\alpha}{\\sin\\alpha}":{"currentFile":{"count":1,"lastUpdated":1695298838520}}},"individuální":{"individuální":{"currentFile":{"count":2,"lastUpdated":1697092098229}}},"psychická":{"psychická":{"currentFile":{"count":1,"lastUpdated":1697092095287}}}} \ No newline at end of file +{"\\sphericalangle":{"\\sphericalangle":{"currentFile":{"count":1,"lastUpdated":1694680712479}}},"Logaritmus":{"Logaritmus":{"internalLink":{"count":1,"lastUpdated":1694690308884}}},"zobrazení":{"zobrazení":{"currentFile":{"count":2,"lastUpdated":1694769120832}}},"Druhý pohybový zákon":{"Druhý pohybový zákon":{"internalLink":{"count":1,"lastUpdated":1695281570945}}},"\\sin\\alpha":{"\\sin\\alpha":{"currentFile":{"count":1,"lastUpdated":1695293974762}}},"\\frac{1.33}{\\frac{\\sqrt2}1}":{"\\frac{1.33}{\\frac{\\sqrt2}1}":{"currentFile":{"count":1,"lastUpdated":1695297376494}}},"\\frac{\\sin60\\degree\\cos\\alpha-\\cos60\\degree\\sin\\alpha}{\\sin\\alpha}":{"\\frac{\\sin60\\degree\\cos\\alpha-\\cos60\\degree\\sin\\alpha}{\\sin\\alpha}":{"currentFile":{"count":1,"lastUpdated":1695298838520}}},"individuální":{"individuální":{"currentFile":{"count":2,"lastUpdated":1697092098229}}},"psychická":{"psychická":{"currentFile":{"count":1,"lastUpdated":1697092095287}}},"Statky":{"Statky":{"currentFile":{"count":1,"lastUpdated":1697095385570}}},"Politika první republiky":{"Politika první republiky":{"internalLink":{"count":1,"lastUpdated":1697095390438}}},"uspokojuje":{"uspokojuje":{"currentFile":{"count":1,"lastUpdated":1697095392504}}},"Osobnosti":{"Osobnosti":{"internalLink":{"count":1,"lastUpdated":1697096048794}}}} \ No newline at end of file diff --git a/notes/eko/Úvodní hodina.md b/notes/eko/Úvodní hodina.md index c58f91f..d14d19d 100644 --- a/notes/eko/Úvodní hodina.md +++ b/notes/eko/Úvodní hodina.md @@ -1,3 +1,6 @@ +--- +date: 2023-09-29 +--- # Úvodní hodina Má se vše omlouvat když učitel vstoupí do třídy @@ -39,3 +42,22 @@ Zacházení s prostředky (často peníze či majetek) za účelem nějakého c | bezpečnost | sekundární | psychická | kolektivní | | zábava | sekundární | psychická | individuální | | rozmnožování | sekundární | psychická | individuální | + +## Statky a sluzby + +### Statky +uspokojuje potreby + +Hmotne x nehmotne + +Volne x ekonomicke + +Spotreba x pouziti + +### Sluzby +Osobni x vecna + +prubeh x vysledek + +### DÚ +vymyslet 10 statků \ No newline at end of file