diff --git a/.obsidian/command-palette.json b/.obsidian/command-palette.json index 1cb7735..aafa7d8 100644 --- a/.obsidian/command-palette.json +++ b/.obsidian/command-palette.json @@ -6,9 +6,6 @@ "editor:attach-file", "editor:insert-link", "obsidian-git:push", - "obsidian-git:backup-and-close", - "periodic-notes:next-weekly-note", - "periodic-notes:next-monthly-note", - "periodic-notes:prev-monthly-note" + "obsidian-git:backup-and-close" ] } \ No newline at end of file diff --git a/.obsidian/plugins/periodic-notes/data.json b/.obsidian/plugins/periodic-notes/data.json index 2119de7..2747235 100644 --- a/.obsidian/plugins/periodic-notes/data.json +++ b/.obsidian/plugins/periodic-notes/data.json @@ -21,13 +21,13 @@ }, "quarterly": { "format": "", - "template": "Haina/Templates/M-log.md", + "template": "Haina/Templates/Q-log.md", "folder": "Haina/Quarterly", "enabled": true }, "yearly": { "format": "", - "template": "Haina/Templates/M-log.md", + "template": "Haina/Templates/Y-log.md", "folder": "Haina/Yearly", "enabled": true } diff --git a/.obsidian/plugins/templater-obsidian/data.json b/.obsidian/plugins/templater-obsidian/data.json index dac36b4..cb05cbc 100644 --- a/.obsidian/plugins/templater-obsidian/data.json +++ b/.obsidian/plugins/templater-obsidian/data.json @@ -28,7 +28,11 @@ }, { "folder": "Haina/Quarterly", - "template": "Haina/Templates/M-log.md" + "template": "Haina/Templates/Q-log.md" + }, + { + "folder": "Haina/Yearly", + "template": "Haina/Templates/Y-log.md" } ], "syntax_highlighting": true, diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index ef2bad5..182e9c5 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -4,61 +4,11 @@ "type": "split", "children": [ { - "id": "34d099ad8fb5e5b9", + "id": "db015b9aae402ee5", "type": "tabs", "children": [ { - "id": "f2160e2bbacf1680", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Haina/Tasks.md", - "mode": "source", - "source": false - }, - "pinned": true - } - }, - { - "id": "fee66e3524940773", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Haina/Monthly/2023-09.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "81a1c59322d0325b", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Haina/Monthly/2023-10.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "765538699d77a9f2", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Haina/Weekly/2023-W43.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "5026d298c7ac4bbb", + "id": "72e6238d01ce3178", "type": "leaf", "state": { "type": "markdown", @@ -69,8 +19,7 @@ } } } - ], - "currentTab": 3 + ] } ], "direction": "vertical" @@ -145,7 +94,7 @@ { "id": "d9d38115cfe2d18f", "type": "tabs", - "dimension": 24.521531100478466, + "dimension": 24.519230769230766, "children": [ { "id": "10d9387b227d46e7", @@ -153,7 +102,7 @@ "state": { "type": "outline", "state": { - "file": "Haina/Weekly/2023-W43.md" + "file": "Haina/Weekly/2023-W44.md" } } }, @@ -163,7 +112,7 @@ "state": { "type": "backlink", "state": { - "file": "Haina/Weekly/2023-W43.md", + "file": "Haina/Weekly/2023-W44.md", "collapseAll": true, "extraContext": false, "sortOrder": "alphabetical", @@ -179,7 +128,7 @@ { "id": "dc29c441166ca3aa", "type": "tabs", - "dimension": 40.78947368421052, + "dimension": 35.67307692307693, "children": [ { "id": "096b5bbba0f2c0d4", @@ -194,7 +143,7 @@ { "id": "9a8ed0fe1b835302", "type": "tabs", - "dimension": 34.688995215311, + "dimension": 39.80769230769231, "children": [ { "id": "57e3139825373ef9", @@ -229,7 +178,7 @@ } ], "direction": "horizontal", - "width": 220.5 + "width": 240.5 }, "left-ribbon": { "hiddenItems": { @@ -248,50 +197,50 @@ "periodic-notes:Open today": false } }, - "active": "765538699d77a9f2", + "active": "5801f06d531416f4", "lastOpenFiles": [ + "Haina/Daily/2023-10-23.md", + "Haina/Templates/D-log.md", + "Haina/Daily/2023-10-31.md", + "Haina/Daily/2023-11-01.md", + "Haina/Daily/2023-11-03.md", + "Haina/Daily/2023-11-02.md", "Haina/Weekly/2023-W44.md", - "Haina/Weekly/2023-W43.md", "Haina/Monthly/2023-10.md", - "Haina/Weekly/2023-W45.md", "Haina/Monthly/2023-09.md", - "Haina/Monthly/Week 44.md", - "Haina/Weekly/2023-W44 - 副本.md", - "Haina/Tasks.md", - "Haina/Templates/W-log.md", - "Haina/Weekly/2023-W45_11.06.md", - "Haina/Templates/M-log.md", - "Haina/Yearly", - "Haina/Quarterly - 副本", + "Haina/Weekly/2023-W45.md", + "Haina/Logs/2023-W46.md", + "Haina/Logs/2023-W45.md", + "Haina/Weekly/2023-W43.md", + "Haina/Weekly", "Haina/Quarterly", - "Haina/Monthly/2023-W45_11.06.md", - "Haina/Monthly/2023-11.md", - "Haina/Monthly/2023-W42_10.16.md", "Haina/Monthly/2023-08.md", - "Haina/Monthly/2023-Q4.md", - "Haina/Monthly/2023-12.md", - "Haina/Monthly/2023-W44.md", - "Haina/Daily/2023-10-23.md", - "Haina/项目/SCRM/SCRM.md", - "Haina/Daily/2023-09-26.md", + "Haina/Monthly", "Haina/Daily/2023-10-13.md", - "Haina/Templates/D-log.md", - "Haina/Weekly/2023-W42_10.16.md", - "Haina/Templates/Untitled.md", - "Haina/Monthly/Untitled.md", - "Haina/Quarterly", - "Haina/Weekly", - "Haina/新建文件夹", - "Labor union", + "Haina/Daily/2023-09-26.md", + "Haina/Daily/2023-09-15.md", + "Haina/Daily", + "Haina/Yearly", + "Haina/Logs/Daily/2023-10-23.md", + "Haina/Logs/Daily/2023-10-13.md", + "Haina/Logs/Daily/2023-09-26.md", + "Haina/Logs/Daily/2023-09-15.md", + "Haina/Logs/Daily", + "Haina/Logs/Weekly/2023-W44.md", + "Haina/Logs/Weekly/2023-W43.md", + "Haina/Logs/Weekly", + "Haina/Logs/2023-W44.md", + "Haina/Logs/2023-10-23.md", + "Haina/Logs/Weekly1", + "Haina/Logs/2023-W43.md", + "Haina/Logs/Daily1", + "Haina/Logs/Quarterly", "Haina/atta/Pasted image 20230907134308.png", "Haina/atta/Pasted image 20230907134241.png", "Haina/atta/Pasted image 20230907134211.png", "Haina/atta/Pasted image 20230907134109.png", "Haina/atta/Pasted image 20230907134151.png", "Haina/atta/1280X1280.JPEG", - "Haina/atta", - "Haina/Daily", - "Haina/index.html", "atta/Pasted image 20230907134308.png", "atta/Pasted image 20230907134241.png", "atta/Pasted image 20230907134211.png", diff --git a/Haina/Templates/D-log.md b/Haina/Templates/D-log.md index 13ffa1f..b93530e 100644 --- a/Haina/Templates/D-log.md +++ b/Haina/Templates/D-log.md @@ -4,6 +4,27 @@ Updated: tags: - 日报 --- +<%* +let today = moment(tp.file.title); + +// # 2023/01/01 - Sunday +// tR += '# ' + today.format('YYYY/MM/DD - dddd') + '\n'; + +// 2023 / Q1 / January / Week 1 +tR += '[[' + today.format('YYYY') + ']] / '; +tR += '[[' + today.format('YYYY-[Q]Q') + '|' + today.format('[Q]Q') + ']] / '; +tR += '[[' + today.format('YYYY-MM') + '|' + today.format('MMMM') + ']] / '; +tR += '[[' + today.format('gggg-[W]ww') + '|' + today.format('[Week] w') + ']]'; +tR += ' / '; + +// ❮ 2022-12-31 | 2023-01-01 | 2023-01-02 ❯ +tR += '❮ [[' + today.subtract(1, 'days').format('YYYY-MM-DD') + ']]'; +tR += ' | ' + today.add(1, 'days').format('YYYY-MM-DD dddd') + ' | '; +tR += '[[' + today.add(1, 'days').format('YYYY-MM-DD') + ']] ❯'; +today.subtract(1, 'days'); +%> + +--- <% tp.file.cursor(1) %> diff --git a/Haina/Templates/Q-log.md b/Haina/Templates/Q-log.md new file mode 100644 index 0000000..a323929 --- /dev/null +++ b/Haina/Templates/Q-log.md @@ -0,0 +1,38 @@ +--- +Created: <% tp.file.creation_date("YYYY-MM-DD ddd") %> +Updated: +tags: + - "#总结" + - "#季度" +--- +<%* +let quarter = moment(tp.file.title, 'YYYY-[Q]Q'); +// 2023 +tR += '[[' + quarter.format('YYYY') + ']]' + ' / '; + +// ❮ Q4 | Q1 | Q2 ❯ +tR += '❮ [[' + quarter.subtract(1, 'quarters').format('YYYY-[Q]Q|[Q]Q') + ']]'; +tR += ' | ' + quarter.add(1, 'quarters').format('[Q]Q') + ' | '; +tR += '[[' + quarter.add(1, 'quarters').format('YYYY-[Q]Q|[Q]Q') + ']] ❯ / '; +quarter.subtract(1, 'quarters'); + +// January - February - March +tR += '[[' + quarter.format('YYYY-MM|MMMM') + ']] - '; +tR += '[[' + quarter.add(1, 'months').format('YYYY-MM|MMMM') + ']] - '; +tR += '[[' + quarter.add(1, 'months').format('YYYY-MM|MMMM') + ']]'; +%> + +--- + +## 重点工作 + +1. <% tp.file.cursor(1) %> + +## 维护工作 + +## 未完成 + +## 创新, 突出贡献 + +## 事故 + diff --git a/Haina/Templates/Y-log.md b/Haina/Templates/Y-log.md new file mode 100644 index 0000000..39bf9b9 --- /dev/null +++ b/Haina/Templates/Y-log.md @@ -0,0 +1,36 @@ +--- +Created: <% tp.file.creation_date("YYYY-MM-DD ddd") %> +Updated: +tags: + - 总结 + - "#年度" +--- +<%* +let year = moment(tp.file.title); +// ❮ 2022 | 2023 | 2024 ❯ +tR += '❮ [[' + year.subtract(1, 'years').format('YYYY') + ']]'; +tR += ' | ' + year.add(1, 'years').format('YYYY') + ' | '; +tR += '[[' + year.add(1, 'years').format('YYYY') + ']] ❯'; +year.subtract(1, 'years'); +tR += ' / '; + +// Q1 - Q2 - Q3 - Q4 +tR += '[[' + year.format('YYYY-[Q]Q|[Q]Q') + ']] - '; +tR += '[[' + year.add(1, 'quarters').format('YYYY-[Q]Q|[Q]Q') + ']] - '; +tR += '[[' + year.add(1, 'quarters').format('YYYY-[Q]Q|[Q]Q') + ']] - '; +tR += '[[' + year.add(1, 'quarters').format('YYYY-[Q]Q|[Q]Q') + ']]'; +%> + +--- +## 重点工作 + +1. <% tp.file.cursor(1) %> + +## 维护工作 + +## 未完成 + +## 创新, 突出贡献 + +## 事故 + diff --git a/Haina/Weekly/2023-W44.md b/Haina/Weekly/2023-W44.md index c395ea6..19a2e4c 100644 --- a/Haina/Weekly/2023-W44.md +++ b/Haina/Weekly/2023-W44.md @@ -5,7 +5,7 @@ tags: - 周报 --- -[[2023]] / [[2023-Q4|Q4]] / [[2023-10|October]] - [[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W43|Week 43]] | Week 44 | [[2023-W45|Week 45]] ❯ / [[2023-10-30|Monday]] - [[2023-10-31|Tuesday]] - [[2023-11-01|Wednesday]] - [[2023-11-02|Thursday]] - [[2023-11-03|Friday]] - [[2023-11-04|Saturday]] - [[2023-11-05|Sunday]] +[[2023]] / [[2023-Q4|Q4]] / [[2023-10|October]] - [[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W43|Week 43]] | Week 44 | [[2023-W45|Week 45]] ❯ / [[2023-10-30|Monday]] - [[Haina/Daily/2023-10-31|Tuesday]] - [[2023-11-01|Wednesday]] - [[2023-11-02|Thursday]] - [[2023-11-03|Friday]] - [[2023-11-04|Saturday]] - [[2023-11-05|Sunday]] --- diff --git a/Labor union/README.md b/Labor union/README.md index 1148111..a5b78c9 100644 --- a/Labor union/README.md +++ b/Labor union/README.md @@ -3,13 +3,13 @@ Created: 2023-10-27 Fri Updated: 2023-10-27 23:54 Fri --- -活动管理 -报名管理 -问卷调查 -考勤管理，打卡请假 -毕业证书管理 -课程评价 -文章公告 +- 活动管理 +- 报名管理 +- 问卷调查 +- 考勤管理，打卡请假 +- 毕业证书管理 +- 课程评价 +- 文章公告 - 技协平台对接，题库，考试，数据维护等