tmp

.obsidian/workspace.json

@@ -8,91 +8,63 @@
         "type": "tabs",
         "children": [
           {
-            "id": "3b9c2aa28b97b77e",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Python/common.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "common"
-            }
-          },
-          {
-            "id": "2e7edf8dedc77072",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Django/common.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "common"
-            }
-          },
-          {
-            "id": "58e36532da04f4c5",
+            "id": "11c44f40f9cd4b94",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Django/SQL.md",
+                "file": "Python/jinja.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "SQL"
+              "title": "jinja"
             }
           },
           {
-            "id": "1d3f0d8a6b69e623",
+            "id": "7c1113f5581935a3",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Python/SQLite.md",
+                "file": "todo/Задачи по направлениям.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "SQLite"
+              "title": "Задачи по направлениям"
             }
           },
           {
-            "id": "11c44f40f9cd4b94",
+            "id": "faca0661d771fb45",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "todo/Задачи по направлениям.md",
+                "file": "todo/Счета.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Задачи по направлениям"
+              "title": "Счета"
             }
           },
           {
-            "id": "f33532693e51905e",
+            "id": "a0ac2e82da2f09db",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Python/venv.md",
+                "file": "English/Text 0.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "venv"
+              "title": "Text 0"
             }
           }
         ],
-        "currentTab": 3
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -114,7 +86,7 @@
                 "sortOrder": "alphabetical"
               },
               "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
+              "title": "Files"
             }
           },
           {
@@ -200,20 +172,33 @@
   },
   "left-ribbon": {
     "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false
+      "switcher:Open quick switcher": false,
+      "graph:Open graph view": false,
+      "canvas:Create new canvas": false,
+      "command-palette:Open command palette": false,
+      "markdown-importer:Open format converter": false
     }
   },
-  "active": "1d3f0d8a6b69e623",
+  "active": "faca0661d771fb45",
   "lastOpenFiles": [
-    "Django/SQL.md",
-    "Python/SQLite.md",
     "todo/Задачи по направлениям.md",
-    "Django/common.md",
+    "English/Text 0.md",
+    "English/Homework.md",
+    "English/img/5-3.jpg.~tmp",
+    "English/img/5-4.jpg",
+    "English/img/5-3.jpg",
+    "English/img/5-2.jpg",
+    "English/img/5-1.jpg",
+    "English/5-4.jpg",
+    "English/5-3.jpg",
+    "English/5-2.jpg",
+    "English/5-1.jpg",
+    "English/Text 5.md",
+    "English/Text 4.md",
     "Python/jinja.md",
+    "Python/SQLite.md",
+    "Django/SQL.md",
+    "Django/common.md",
     "Python/common.md",
     "Python/jinja",
     "proGit.md",
@@ -224,36 +209,22 @@
     "linux/alacritty.md",
     "English/img/4-4.JPEG",
     "English/img/4-3.JPEG",
-    "English/img/4-2.JPEG",
-    "English/img/4-1.JPEG",
-    "English/img/dialogue/11.JPEG",
-    "English/img/dialogue/10.JPEG",
     "Python/function основное.md",
     "Python/Docstring. Аннотации..md",
     "Python/Архитектура.md",
     "Greenstar/ethernet stm32.md",
     "Greenstar/stm32l476VG-usb спектрометр.md",
     "Golang/common.md",
-    "English/Text 4.md",
-    "English/img/dialogue/8.JPEG",
-    "English/img/dialogue/9.JPEG",
-    "English/img/dialogue/4.jpg",
-    "English/img/dialogue/Dialogue_4.jpg",
     "English/img/dialogue",
     "English/img/Новая папка",
-    "English/Homework.md",
-    "English/Women in Japan.md",
     "English/Text 1.md",
     "English/Text 2.md",
     "English/Text 3.md",
     "English/img/words",
-    "ROTEK/universal IO/universal IO.md",
-    "ROTEK/universal IO/Test HV.md",
     "configs/tab_wg.conf",
     "configs/tab_wg.conf.txt",
     "configs/phone_wg.conf",
     "configs/phone_wg.conf.txt",
-    "configs/wg0_new.conf",
-    "configs/wg0_new.conf.txt"
+    "configs/wg0_new.conf"
   ]
 }

English/Homework.md

@@ -26,19 +26,12 @@
 3. They were walking in the park when it began to rain.
 4. I was making a snowman while they were skating.
 5. She was speaking with the teacher when I came up to her.
-<<<<<<< HEAD:English/Homework.md
 6. We were cleaning the rooms while mum was cooking.
 7. Nick was playing the guitar while Kate was writing a letter.
 8. My brother was watching TV when Sam knocked.
-=======
-6. We were cleaning the rooms while mum cooked.
-7. Nick was playing the guitar while Kate wrote a letter.
-8. My brother was watching TV when Sam knocked.
 
 ~={green}231 Presetn Perfect, Present Continuous, Present Simple, Past Simple.=~
 1. What are you doing here at such a late hour? Are you writing your composition? - No, I have written already. I am working at my report. And when did you write your composition? I finished it two days ago.
 2. I say, Tom, let's have dinner. - No, thank you, I have already had dinner.
 3. What is the wather like? Is it stiil rainnig? No it has stopped raining.
 4. Please give me a pencil, I lost mine.
-5. 
->>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36:English/Homework.md

English/Text 5.md

@@ -0,0 +1,2 @@
+DO YOU ENJOY EATING BREAKFAST?
+When was the last time you had a proper breakfast befor you went to work or school in the morning? Probably it was a long tim ago. Most people do not have time to eat breakfast. And many people do not want to eat breakfast as soon as they get up. Perhaps an hour later, they are starving. But by then they are at school or work and there is no time to stop and eat anything until lunchtime. However, if you could eat a decent breakfast, you would probably be able to do your work much better. This is especially true of schoolchildren because their brains are still developing. If children do not eat well, their brains will not function as well as they should. Their school work will be less effecrive. Children need iron, for example. Iron is found in bread and in many breakfast cereals and it helps concentration. Research shows that if children do not eat the right kind of food, or if they do not eat breakfast, they can have problems at school. Research supports the view that shool breakfasts help schoolchildren perform better at school. One study by Michael Murphy, a psychologist at Massaschusetts General Hospital in Boston, USA, studied breakfast programmes at three schools. Dr Murphy and his colleagues found that the children who had the breakfasts provided by the school generally did better at school, particularly in Maths, than the children who had no breakfast. In one school, scores in Maths tests rose by 16 %. In another school there was a 10 % increase in Maths and behaved better than before, they were generally happier and more hard-working. Studies have shown that it is not difficult to organise school breakfasts. The breakfasts help everybody, it seems: parents, teachers and the children themselves. The children's favourite breakfasts are toast and jam, and cereals such as cornflakes. The most important thing of all is that children are happier, healthier and learn more.

Python/SQLite.md

@@ -1,11 +1,72 @@
-Свойство:
+~={yellow}Свойство:=~
 - Один пишет, многие читают.
 https://sqlitestudio.pl/
 https://sqlitebrowser.org
 
-Типы:
+~={yellow}Типы:=~
 - NULL - значение NULL
 - INTEGER - целочисленный тип (занимает от 1 до 8 байт)
 - REAL - вещественный тип (8 байт в формате IEEE)
 - TEXT - строковый тип (в кодировке данных базы, обычно UTF-8)
 - BLOB (двоичные данные, хранятся "как есть", например, для небольших изображений)
+
+~={yellow}Команды=~
+- INSERT - добавление записи в таблицу
+- SELECT - выборка данных из таблиц (в том числе и при создании свободной выборки из нескольких таблиц)
+```sql
+INSERT INTO <table_name> (<column_name1>,<column_name2>, ...) VALUES (<value1>, <value2>, ...) 
+
+INSERT INTO <table_name> VALUES (<value1>, <value2>, ...)
+
+
+SELECT col1, col2, ... FROM <table_name>
+SELECT name, old, score FROM users
+SELECT * FROM users
+
+# По критерию
+SELECT col1, col2, ... FROM <table_name> WHERE <условие>
+```
+
+~={yellow}Операторы=~
+```sql
+= или ==, >, <, >=, <=, !=, BETWEEN
+
+SELECT * FROM users WHERE score BETWEEN 500 AND 1000
+
+SELECT * FROM users WHERE score == 200
+```
+
+~={yellow}Условия=~
+```sql
+AND - условное И
+OR условное ИЛИ
+NOT - условное НЕ
+IN - вхождение во множество значений
+NOT IN - не вхождение во множество значений
+
+SELECT * FROM users WHERE old > 20 AND score < 1000
+
+SELECT * FROM users WHERE old IN(19, 32) AND score < 1000
+
+SELECT * FROM users WHERE old IN(19, 32) AND score <= 1000 OR sex = 1 ORDER BY old DESC
+
+
+```
+~={yellow}Сортировка и ограничения (это все в SELECT)=~
+```sql
+# Если указать после запроса, то будет сортировка по убыванию
+ORDER BY old DESC 
+
+# Если указать после запроса, то будет сортировка по возрастанию
+ORDER BY old ASC
+
+# Вывести только N записей
+LIMIT 2
+
+# Вывести только 2 записи, но пропустить первые 5
+LIMIT 2 OFFSET 5
+
+# Тоже самое
+LIMIT 5, 2
+
+```

Python/jinja.md

@@ -6,3 +6,11 @@ https://pypi.org/project/Jinja2/
 `{{}}` - выражение для вставки конструкций Python в шаблон
 `{##}` - блок комментариев
 `##` - строковый комментарий
+
+Теги
+
+```
+{% for athlete in athlete_list %}
+	{{ athlete.name }}
+{% endfor %}
+```

todo/Задачи по направлениям.md

@@ -2,6 +2,7 @@
 - [x] Оплатить счета
 - [x] Подкрутить пластины
 - [ ] Запись к ортодонту
+- [ ] Передать показания счетчиков
 <h6>Работа и образование</h6>
 - [ ] Пройти на 100% курс по Python OOP.
 - [ ] Пройти раздел 6.3 до 18 января в Python Function
@@ -9,7 +10,8 @@
 - [x] Пройти разделы 1.8 до 18 января в курсе Kind Django
 - [x] Проработать серию видео по Jinja2
 - [x] Разобраться с venv 
-- [ ] Пройти весь раздел 2 в Django KInd
+- [ ] Пройти весь раздел 2 - Шаблоны в Django KInd
+- [ ] Пройти весь раздел 3 - SQL в Django KInd
 - [ ] Проработать серию видео по SQLite
 - [ ] Что будет если установлена другая версия Python?
 <h6>Финансы:</h6>
@@ -17,7 +19,7 @@
 <h6>Бытовые:</h6>
 - [x] Купить зимнюю куртку
 - [ ] Починить санки
-- [ ] Забрать бустер из Озона
+- [x] Забрать бустер из Озона
 <h6>Здоровье:</h6>
 - [x] ~={red}Зубы=~. Записаться к осмотр к стоматологу (Екатерина +7 926 973-07-49 сказать, что муж племянницы дондурмы. Метро Фрунзенская)
 - [x] ~={red}Зубы=~. В воскресенье 19 января в 16-00 на прием. Проезд Шокальского дом 29.корп2 вход со двора.