unknown 2 недель назад
Родитель
Сommit
f5c4b4137d

+ 21 - 21
.obsidian/workspace.json

@@ -22,17 +22,17 @@
             }
           },
           {
-            "id": "51931cca7cde6660",
+            "id": "b3725af2a556955e",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "hardcore web development/11. SQL/Дата и время.md",
+                "file": "English/Homework 4.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Дата и время"
+              "title": "Homework 4"
             }
           },
           {
@@ -87,7 +87,7 @@
                 "autoReveal": false
               },
               "icon": "lucide-folder-closed",
-              "title": "Файловый менеджер"
+              "title": "Files"
             }
           },
           {
@@ -187,15 +187,25 @@
   },
   "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": "51931cca7cde6660",
+  "active": "c7584343712d3d31",
   "lastOpenFiles": [
+    "English/Homework 3.md",
+    "English/Homework 4.md",
+    "todo/Задачи по направлениям.md",
+    "todo/Тренировки и занятия.md",
+    "hardcore web development/11. SQL/Дата и время.md",
+    "hardcore web development/11. SQL/Сортировка данных.md",
+    "hardcore web development/11. SQL/Типы данных.md",
+    "linux/server.md",
+    "configs/gl_wg.conf",
+    "configs/Текстовый документ.txt",
     "English/img/20-13.JPEG",
     "English/img/20-12.JPEG",
     "English/img/20-11.JPEG",
@@ -206,20 +216,14 @@
     "English/img/20-6.JPEG",
     "English/img/20-5.JPEG",
     "English/img/20-4.JPEG",
-    "English/img/20-3.JPEG",
     "hardcore web development/11. SQL/Создание таблиц.md",
-    "hardcore web development/11. SQL/Дата и время.md",
     "hardcore web development/11. SQL/Задание.md",
-    "hardcore web development/11. SQL/Сортировка данных.md",
-    "hardcore web development/11. SQL/Типы данных.md",
     "hardcore web development/11. SQL/SQL настройка.md",
     "English/homework 2.md",
     "English/Homework.md",
-    "English/Homework 3.md",
     "English/Text 7.md",
     "todo/Разное.md",
     "todo/Счета.md",
-    "todo/Задачи по направлениям.md",
     "ROTEK/universal IO/universal IO.md",
     "hardcore web development/11. SQL/NULL, coalecse.md",
     "English/words.md",
@@ -231,16 +235,12 @@
     "proGit.md",
     "Комментарии.md",
     "ROTEK/BT_6714.md",
-    "todo/Тренировки и занятия.md",
     "English/Text 6.md",
-    "link.md",
     "English/img/13-5.JPEG.~tmp",
     "English/img/13-4.JPEG.~tmp",
     "docs/sniffers_texto.pdf",
     "English/img/9-4.jpg.~tmp",
     "English/img/9-9.jpg.~tmp",
-    "English/img/9-8.jpg.~tmp",
-    "English/img/9-7.jpg.~tmp",
-    "English/img/9-6.jpg.~tmp"
+    "English/img/9-8.jpg.~tmp"
   ]
 }

+ 37 - 0
English/Homework 4.md

@@ -0,0 +1,37 @@
+~={green}20 Переведи=~
+1. My brother is as strong, as I am. Мой брат такой же сильный, как и я.
+2. It is not so cold today as yesterday. Не так холодно как вчера.
+3. The Caspian Sea is almost 3 times as large as Lake Superior. Каспийское море почти в три раза больше озера Верхнее.
+4. Ben Nevis is not so high as mount Everest. Бен-Невис не такая высокая как Эверест.
+5. The Berezina is almost 10 times shorter than the Amazon. Березина почти в 10 раз короче чем Амазонка 
+6. Brazil is not so big as Canada. Бразилия не такая большая как Канада.
+7. My friend lives in the same street as his granny. Мой друг живет на той же улице, что и его бабушка.
+8. Tennis is as popular as football in Great Britain. Теннис такой же популярный как и футбол в Великобритании. 
+
+~={green}21 Поставь as .. as или not so .. as.=~
+1. My friend is as clever as his brother.
+2. The film isn't so interesting as the book.
+3. The clouds are as white as snow.
+4. It took her 3 times as long as she expected.
+5. The traffic is not so heavy in this street as in the center.
+6. This room is twise as little as that one.
+7. He isn't so brave as a lion.
+8. London is several times as large as our Minsk.
+9. I am sorry. I am late. I got here as fast as I could.
+10. Cheese is there times as expensive as it was a few years ago.
+
+~={green}22 Подчеркни правильный вариант.=~
+1. My mother is not so old as my father.
+2. This way is as short as that.
+3. His songs aren't so popular as the Beatles' songs.
+4. Is Paris as old as London?
+5. His dog is as friendly as your dog.
+6. Life in big cities isn't so calm (спокойная) as the country.
+7. My flat isn't so cosy (уютная) as yours.
+8. Kate is not so lazy as her brother.
+9. A lot of rivers in the world are as length as the Volga.
+10. The Severn (река) is not so important as the Thames.
+
+23 Сравни (вставь), используя as.. as/ not so .. as.
+1. This book, the film, exciting. The film is not so exciting as the book.
+2. 

+ 13 - 0
configs/gl_wg.conf

@@ -0,0 +1,13 @@
+[Interface]
+PrivateKey = 6NILOsfPS9QWVftdyl7KgIm50UxgAXlJYAU7IwIq+mg=
+Address = 10.0.0.10/32
+DNS = 8.8.8.8
+Jc = 4
+Jmin = 2
+Jmax = 10
+
+[Peer]
+PublicKey = qFZSkOW6PEiFSiuIdrs2JRml9P4O32HoYkQHdi21yj4=
+Endpoint = 94.232.244.161:51841
+AllowedIPs = 0.0.0.0/0
+PersistentKeepalive = 20

+ 43 - 1
hardcore web development/11. SQL/Дата и время.md

@@ -40,4 +40,46 @@ order by log_id;
 select * from log
 where created_at >= current_date - interval '7 days'
 order by created_at;
-```
+```
+
+Удалить данные из таблицы, добавленные более чем 30 дней назад.
+
+```sql
+delete from log
+where created_at < current_date - interval '30 days';
+```
+
+Работа с интервалами. Прибавить месяц.
+
+```sql
+select '2024-01-31'::date + '1 month'::interval;
+```
+
+Форматированный вывод timestamp
+```sql
+select
+    to_char(start, 'DD.MM.YYYY') start,
+    to_char(finish, 'DD.MM.YYYY') finish,
+    extract(days from finish - start) delta_in_days
+from records
+order by start, finish;
+```
+
+Примем использования age() - вывод дельты
+```sql
+select
+    to_char(start, 'DD.MM.YYYY') start,
+    to_char(finish, 'DD.MM.YYYY') finish,
+    age(finish, start) delta
+from records
+order by start, finish;
+```
+
+Еще один пример выборки по дате
+```sql
+select email
+from employees
+where extract('month' from birthday)=4
+order by email;
+```
+

+ 7 - 0
hardcore web development/11. SQL/Типы данных.md

@@ -1,4 +1,11 @@
 
+Функции
+
+```sql
+pg_typeof(value) - возвращает тип данных value
+```
+
+
 ~={yellow}Символьные типы данных=~
 
 

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

@@ -1,5 +1,5 @@
 <h6>Срочные дела</h6>
-- [ ] Разобраться со счетчиком горячей воды в Подреcково
+- [ ] Разобраться со счетчиком горячей воды в Подрезково
 - [x] Записаться к ортодонту (звонить завтра 25.03.25)
 - [x] Передать показания счетчиков
 <h6>Работа и образование</h6>
@@ -12,6 +12,7 @@
 - [ ] Пройти первый раздел по SQL в хардкоре
 <h6>Финансы:</h6>
 - [ ] Разобраться с налоговым вычетом по квартире (жена).
+- [ ] Разобраться со вкладом 15-16 апреля
 <h6>Бытовые:</h6>
 - [ ] Подобрать новые телефоны
 - [ ] Починить пороги
@@ -31,6 +32,7 @@
 - [ ] Одежда Тане на 4ый класс
 - [ ] Поездки
 - [ ] Одежда жене
+- [ ] Самокат
 ---
 <h6>Срочные задачи:</h6>
 - [ ] Забрать документы на счетчик в Подрезково

+ 22 - 0
todo/Тренировки и занятия.md

@@ -1,3 +1,25 @@
+#### <font color = "MediumSeaGreen">Апрель 2025</font>
+```dataviewjs
+renderHabitCalendar(this.container, dv, {
+  year: 2025,
+  month: 4,
+  format: 'html',   // set the format to html
+  data: [
+{
+    date: '2025-04-01',
+    content: '💪',
+},  
+{
+    date: '2025-04-02',
+    content: '🦵',
+},
+{
+    date: '2025-04-04',
+    content: '🦵$23000',
+},
+  ]
+})
+```
 #### <font color = "MediumSeaGreen">Март 2025</font>
 ```dataviewjs
 renderHabitCalendar(this.container, dv, {