unknown 1 주 전
부모
커밋
7c6bcadd3a
4개의 변경된 파일314개의 추가작업 그리고 233개의 파일을 삭제
  1. 245 230
      .obsidian/workspace.json
  2. 42 0
      English/Homework/Homework 7.md
  3. 8 3
      todo/Задачи по направлениям.md
  4. 19 0
      todo/Счета.md

+ 245 - 230
.obsidian/workspace.json

@@ -1,231 +1,246 @@
-{
-  "main": {
-    "id": "702c86104f0a0629",
-    "type": "split",
-    "children": [
-      {
-        "id": "d32e90214846329f",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "a84d1714732840bd",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/Homework/Homework 6.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Homework 6"
-            }
-          },
-          {
-            "id": "081a25b0750dda15",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/Homework/Homework 7.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Homework 7"
-            }
-          },
-          {
-            "id": "a414a339a65d93e2",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "English/words.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "words"
-            }
-          }
-        ],
-        "currentTab": 1
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "6664e9908eeea5a2",
-    "type": "split",
-    "children": [
-      {
-        "id": "97095e32830cbc6f",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "c7584343712d3d31",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {
-                "sortOrder": "alphabetical",
-                "autoReveal": false
-              },
-              "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
-            }
-          },
-          {
-            "id": "e389aabe146b0498",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              },
-              "icon": "lucide-search",
-              "title": "Search"
-            }
-          },
-          {
-            "id": "5f649a68cfee8d78",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Python/SQLite.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "SQLite"
-            }
-          },
-          {
-            "id": "9cc940b45c7a4595",
-            "type": "leaf",
-            "state": {
-              "type": "bookmarks",
-              "state": {},
-              "icon": "lucide-bookmark",
-              "title": "Bookmarks"
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 241.5
-  },
-  "right": {
-    "id": "cf92ccf43e96a53d",
-    "type": "split",
-    "children": [
-      {
-        "id": "4e6c94e5301f3341",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "86c23330f2a84cf8",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "English/Homework/Homework 5.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              },
-              "icon": "links-coming-in",
-              "title": "Backlinks for Homework 5"
-            }
-          },
-          {
-            "id": "06e27be0fe382bd8",
-            "type": "leaf",
-            "state": {
-              "type": "all-properties",
-              "state": {
-                "sortOrder": "frequency",
-                "showSearch": false,
-                "searchQuery": ""
-              },
-              "icon": "lucide-archive",
-              "title": "All properties"
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "left-ribbon": {
-    "hiddenItems": {
-      "switcher:Меню быстрого перехода": false,
-      "graph:Граф": false,
-      "canvas:Создать новый холст": false,
-      "command-palette:Открыть палитру команд": false,
-      "markdown-importer:Импорт Markdown-файлов": false
-    }
-  },
-  "active": "081a25b0750dda15",
-  "lastOpenFiles": [
-    "English/words.md",
-    "English/Homework/Homework 7.md",
-    "English/img/28-8.jpg",
-    "English/img/28-7.jpg",
-    "English/img/28-6.jpg",
-    "English/img/28-5.jpg",
-    "English/img/28-4.jpg",
-    "English/img/28-3.jpg",
-    "English/img/28-2.jpg",
-    "English/img/28-1.jpg",
-    "English/Homework/Homework 6.md",
-    "hardcore web development/11. SQL/Создание таблиц.md",
-    "English/Homework/Homework 5.md",
-    "todo/Задачи по направлениям.md",
-    "Arbiter, artery.md",
-    "ROTEK/Arbiter.md",
-    "ROTEK/allwinner 069 070.md",
-    "ROTEK/Artery testing.md",
-    "Untitled.md",
-    "todo/Разное.md",
-    "common.md",
-    "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
-    "linux/linux common.md",
-    "Python/Архитектура.md",
-    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
-    "linux/server.md",
-    "todo/Счета.md",
-    "todo/Тренировки и занятия.md",
-    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
-    "Комментарии.md",
-    "hardcore web development/11. SQL/Дата и время.md",
-    "hardcore web development/11. SQL/Задание.md",
-    "English/img/24-2.jpg.~tmp",
-    "English/img/24-1.jpg.~tmp",
-    "English/img/24-2.jpg",
-    "English/img/24-1.jpg",
-    "Кодинг.md",
-    "hardcore web development/11. SQL/JOIN",
-    "English/Homework",
-    "English/Texts",
-    "configs/gl_wg.conf",
-    "configs/Текстовый документ.txt",
-    "img/flat",
-    "Python/telegram bot",
-    "English/img/13-5.JPEG.~tmp"
-  ]
+{
+  "main": {
+    "id": "702c86104f0a0629",
+    "type": "split",
+    "children": [
+      {
+        "id": "d32e90214846329f",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "bfc8022f00b1aa06",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "todo/Счета.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Счета"
+            }
+          },
+          {
+            "id": "7a9801a0d4987144",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "todo/Задачи по направлениям.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Задачи по направлениям"
+            }
+          },
+          {
+            "id": "be74bd6d0bbff719",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Python/venv.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "venv"
+            }
+          },
+          {
+            "id": "a414a339a65d93e2",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/words.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "words"
+            }
+          }
+        ],
+        "currentTab": 1
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "6664e9908eeea5a2",
+    "type": "split",
+    "children": [
+      {
+        "id": "97095e32830cbc6f",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "c7584343712d3d31",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical",
+                "autoReveal": false
+              },
+              "icon": "lucide-folder-closed",
+              "title": "Files"
+            }
+          },
+          {
+            "id": "e389aabe146b0498",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              },
+              "icon": "lucide-search",
+              "title": "Search"
+            }
+          },
+          {
+            "id": "5f649a68cfee8d78",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Python/SQLite.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "SQLite"
+            }
+          },
+          {
+            "id": "9cc940b45c7a4595",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {},
+              "icon": "lucide-bookmark",
+              "title": "Bookmarks"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 200
+  },
+  "right": {
+    "id": "cf92ccf43e96a53d",
+    "type": "split",
+    "children": [
+      {
+        "id": "4e6c94e5301f3341",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "86c23330f2a84cf8",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "English/Homework/Homework 5.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-coming-in",
+              "title": "Backlinks for Homework 5"
+            }
+          },
+          {
+            "id": "06e27be0fe382bd8",
+            "type": "leaf",
+            "state": {
+              "type": "all-properties",
+              "state": {
+                "sortOrder": "frequency",
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-archive",
+              "title": "All properties"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "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": "7a9801a0d4987144",
+  "lastOpenFiles": [
+    "todo/Счета.md",
+    "todo/Задачи по направлениям.md",
+    "todo/Разное.md",
+    "todo/Тренировки и занятия.md",
+    "English/Homework/Homework 6.md",
+    "English/Homework/Homework 7.md",
+    "Python/venv.md",
+    "English/words.md",
+    "English/img/28-8.jpg",
+    "English/img/28-7.jpg",
+    "English/img/28-6.jpg",
+    "English/img/28-5.jpg",
+    "English/img/28-4.jpg",
+    "English/img/28-3.jpg",
+    "English/img/28-2.jpg",
+    "English/img/28-1.jpg",
+    "hardcore web development/11. SQL/Создание таблиц.md",
+    "English/Homework/Homework 5.md",
+    "Arbiter, artery.md",
+    "ROTEK/Arbiter.md",
+    "ROTEK/allwinner 069 070.md",
+    "ROTEK/Artery testing.md",
+    "Untitled.md",
+    "common.md",
+    "hardcore web development/11. SQL/JOIN/LEFT и RIGHT OUTER JOIN.md",
+    "linux/linux common.md",
+    "Python/Архитектура.md",
+    "linux/Сценарий. Полная настройка Windows, WSL и инструментов для разработчика.md",
+    "linux/server.md",
+    "hardcore web development/11. SQL/JOIN/INNER JOIN.md",
+    "Комментарии.md",
+    "hardcore web development/11. SQL/Дата и время.md",
+    "hardcore web development/11. SQL/Задание.md",
+    "English/img/24-2.jpg.~tmp",
+    "English/img/24-1.jpg.~tmp",
+    "English/img/24-2.jpg",
+    "English/img/24-1.jpg",
+    "Кодинг.md",
+    "hardcore web development/11. SQL/JOIN",
+    "English/Homework",
+    "English/Texts",
+    "configs/gl_wg.conf",
+    "configs/Текстовый документ.txt",
+    "img/flat",
+    "Python/telegram bot",
+    "English/img/13-5.JPEG.~tmp"
+  ]
 }

+ 42 - 0
English/Homework/Homework 7.md

@@ -27,4 +27,46 @@
 
 ~={green}113 Подчеркни правильный вариант.=~
 1. He has been saving money for a car, but he has not saved yet.
+2. I have been knowing him for many years.
+3. We have done charity work. (благотворительная работа)
+4. My friend has always being careful with money.
+5. They have been helping the poor children for many years.
+6. How long have you been saving for your new mobile phone.
+7. Have you done your homework yet?
+8. My daughter has been learning poems for 2 hours.
+9. How long have you been buying clothes in this shop?
+10. My mother has never won money in a lottery.
+11. Have you ever wanted to win a lot of money?
+12. How many prize has he won?
 
+~={green}114 Составь предложения.=~
+1. Bob has been playing football for 3 years. He has won 7 games.
+2. Paul has been watching video for 5 hours. He has seen 3 films.
+3. Margaret has been washing up for half an hour. She has broken some cups.
+4. My friend has been doing the shopping all the day long. He has bought a lot of things.
+5. I have been making pancakes since morning. I have made 20 pancakes.
+6. Maxim has been trying to lose weight for ages. He has lost ten pounds so far.
+7. Tourists have been looking for a monster in Loch Ness for many years. They haven't seen it yet.
+8. My dad has been reading detective stories since shildhood. He hase already read 200 novels.
+
+~={green}115 Поставь вопросы.=~
+1. Max is a singer. How long has he been singing? How many records has he made?
+2. Jenny is a teacher at school. How long has she been a teacher? How many pupils has she taught?
+3. You know that Matthew has been to the UK several times. How many times has he been to the UK.
+4. Your friend Alex is learning to drive. How long has he been learning to drive?
+5. You meet an old friend you haven't seen for ten years and you ask him. What has he been doing all this time? Where has he been?
+6. They always go to Spain for their holidays. How many times have they gone to Spain.
+7. You want to know if it is still raining. Has it rained yet? (Здесь уточнить на счет rained)
+8. You are swimming, your hair is wet. How long have you been swum?
+9. My granny looks tired. She has been washing up the plates. How many plates has she washed? How long has she been washing?
+
+~={green}117 Поставь правильную форму.=~
+1. I have written the letter. You can send it.
+2. What have you been doing for the last 3 hours?
+3. We have always leaved in this flat.
+4. How long have you been known the truth? (Уточнить на счет know)
+5. I am sorry, we are late. Have you been waiting long?
+6. I think John has forgotten my number. I have been expecting his call for the last two hours.
+7. I am tired. I have been working for ten hours and I haven't finished yet.
+8. He has been shoping since mornig, he has already spent a lot of money.
+9. My mother has asked me about my pocket money a dozen times.

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

@@ -4,6 +4,9 @@
 - [x] Передать показания счетчиков
 - [x] Подкрутить верхнюю челюсть
 - [x] Покрасить змею
+- [x] Оплата счетов за апрель
+- [ ] Запись к ортодонту на конец мая
+- [ ] Навести порядок в таблице оплаты
 <h6>Работа и образование</h6>
 - [ ] Пройти на 100% курс по Python OOP.
 - [ ] Залить старую версию gnu-arm-eabi на сервер
@@ -32,10 +35,12 @@
 
 ---
  <h6>Покупки и траты</h6>
-- [ ] Телефон мне и жене: xiaomi 13 или 14 pro
-- [ ] Планшет Тане
+- [ ] Телефон жене: xiaomi 13 или 14 pro
+- [x] Телефон мне
+- [x] Планшет Тане
 - [ ] Одежда Тане на 4ый класс
-- [ ] Поездки
+- [x] Поездка весной
+- [ ] Поездка летом
 - [ ] Одежда жене
 - [x] Самокат
 ---

+ 19 - 0
todo/Счета.md

@@ -1,4 +1,23 @@
 # 2025
+#### <font color = "MediumSeaGreen">Май</font>
+##### <font color = "#1D8571">Коммунальные услуги</font>
+- [x] Широкая электричество ()
+- [x] Широкая платежка ()
+- [x] Подрезково ()
+- [x] Нина электричество + TKO ()
+
+##### <font color = "#1D8571">Передача показаний с 15-ого числа</font>
+- [ ] Широкая вода. хол , гор 
+- [ ] Широкая электричество: 
+- [ ] Подрезково: хол , гор , эл  (передал только электричества!)
+- [ ] Химки: 471 - , 473 - , 450 - , 402 - , эл -  (передал только электричества!)
+- [ ] Планерная Нина электричество: 15812
+- [ ] Планерная Батя электричество: 
+##### <font color = "#1D8571">Дополнительно</font>
+- [x] Отдать Нине ()
+- [x] Домашний интернет (860)
+- [x] Сотовый телефон ()
+- [ ] Хостинг
 #### <font color = "MediumSeaGreen">Апрель</font>
 ##### <font color = "#1D8571">Коммунальные услуги</font>
 - [x] Широкая электричество ()