vault backup: 2023-10-28 05:22:12

Affected files: .obsidian/plugins/periodic-notes/data.json .obsidian/workspace.json Haina/Monthly/2023-10.md Haina/Quarterly/.gitkeep Haina/Templates/M-log.md Haina/Templates/W-log.md Haina/Weekly/2023-W43.md Haina/Weekly/2023-W44.md Haina/Yearly/.gitkeep
2 years ago · 1cd3ec4aad
parent a293e665ea
commit 1cd3ec4aad
9 changed files with 127 additions and 80 deletions
--- a/.obsidian/plugins/periodic-notes/data.json
+++ b/.obsidian/plugins/periodic-notes/data.json
@ -8,7 +8,7 @@
    "enabled": true
  },
  "weekly": {
-    "format": "gggg-[W]ww_MM.DD",
+    "format": "gggg-[W]ww",
    "folder": "Haina/Weekly",
    "template": "Haina/Templates/W-log.md",
    "enabled": true
@ -28,7 +28,7 @@
  "yearly": {
    "format": "",
    "template": "Haina/Templates/M-log.md",
-    "folder": "Haina",
+    "folder": "Haina/Yearly",
    "enabled": true
  }
 }
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@ -6,7 +6,6 @@
      {
        "id": "34d099ad8fb5e5b9",
        "type": "tabs",
-        "dimension": 47.07673568818514,
        "children": [
          {
            "id": "f2160e2bbacf1680",
@ -16,69 +15,62 @@
              "type": "markdown",
              "state": {
                "file": "Haina/Tasks.md",
-                "mode": "preview",
+                "mode": "source",
                "source": false
              },
              "pinned": true
            }
          },
          {
-            "id": "f6e56e83b63dc9d3",
+            "id": "fee66e3524940773",
            "type": "leaf",
            "state": {
              "type": "markdown",
              "state": {
-                "file": "Haina/Weekly/2023-W44_10.30.md",
+                "file": "Haina/Monthly/2023-09.md",
                "mode": "source",
                "source": false
              }
            }
          },
          {
-            "id": "505c406ca0c575f8",
+            "id": "81a1c59322d0325b",
            "type": "leaf",
            "state": {
              "type": "markdown",
              "state": {
-                "file": "Haina/Monthly/2023-09.md",
-                "mode": "preview",
+                "file": "Haina/Monthly/2023-10.md",
+                "mode": "source",
                "source": false
              }
            }
-          }
-        ],
-        "currentTab": 2
-      },
-      {
-        "id": "df07db232ce4913e",
-        "type": "tabs",
-        "dimension": 52.923264311814854,
-        "children": [
+          },
          {
-            "id": "70ac7fa9929305f8",
+            "id": "765538699d77a9f2",
            "type": "leaf",
            "state": {
              "type": "markdown",
              "state": {
-                "file": "Haina/Monthly/2023-10.md",
+                "file": "Haina/Weekly/2023-W44.md",
                "mode": "source",
                "source": false
              }
            }
          },
          {
-            "id": "f4363122431ef04d",
+            "id": "5026d298c7ac4bbb",
            "type": "leaf",
            "state": {
              "type": "markdown",
              "state": {
-                "file": "Haina/项目/SCRM/SCRM.md",
+                "file": "Haina/Weekly/2023-W44.md",
                "mode": "source",
                "source": false
              }
            }
          }
-        ]
+        ],
+        "currentTab": 3
      }
    ],
    "direction": "vertical"
@ -161,7 +153,7 @@
            "state": {
              "type": "outline",
              "state": {
-                "file": "Haina/Monthly/2023-10.md"
+                "file": "Haina/Weekly/2023-W44.md"
              }
            }
          },
@ -171,7 +163,7 @@
            "state": {
              "type": "backlink",
              "state": {
-                "file": "Haina/Monthly/2023-10.md",
+                "file": "Haina/Weekly/2023-W44.md",
                "collapseAll": true,
                "extraContext": false,
                "sortOrder": "alphabetical",
@ -256,37 +248,40 @@
      "periodic-notes:Open today": false
    }
  },
-  "active": "70ac7fa9929305f8",
+  "active": "765538699d77a9f2",
  "lastOpenFiles": [
-    "Haina/Monthly/2023-09.md",
    "Haina/Monthly/2023-10.md",
-    "Haina/Weekly/2023-W44_10.30.md",
-    "Haina/Templates/W-log.md",
-    "Haina/Weekly/2023-W43_10.23.md",
-    "Haina/Daily/2023-10-13.md",
+    "Haina/Monthly/2023-09.md",
+    "Haina/Monthly/Week 44.md",
+    "Haina/Weekly/2023-W44.md",
+    "Haina/Weekly/2023-W44 - 副本.md",
    "Haina/Tasks.md",
-    "Haina/Daily/2023-10-23.md",
+    "Haina/Weekly/2023-W43.md",
+    "Haina/Templates/W-log.md",
+    "Haina/Weekly/2023-W45.md",
+    "Haina/Weekly/2023-W45_11.06.md",
    "Haina/Templates/M-log.md",
+    "Haina/Yearly",
+    "Haina/Quarterly - 副本",
+    "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/Monthly/2023-11.md",
+    "Haina/Daily/2023-09-26.md",
+    "Haina/Daily/2023-10-13.md",
    "Haina/Templates/D-log.md",
    "Haina/Weekly/2023-W42_10.16.md",
-    "Haina/Monthly/2023-12.md",
    "Haina/Templates/Untitled.md",
    "Haina/Monthly/Untitled.md",
-    "Haina/Daily/2023-10-28.md",
-    "Haina/Daily/2023-09-15.md",
-    "Haina/Daily/2023-09-26.md",
-    "Haina/Quarterly/2023-Q4.md",
-    "Haina/Templates/任务 lite.md",
-    "Haina/Templates/任务.md",
    "Haina/Quarterly",
-    "Haina/项目/HT数据分析/文旅局数据统计.md",
    "Haina/Weekly",
    "Haina/新建文件夹",
-    "Haina/分享&培训/有效聆听_10月26日_16_04.md",
-    "Haina/分享&培训/有效沟通.md",
    "Labor union",
    "Haina/atta/Pasted image 20230907134308.png",
    "Haina/atta/Pasted image 20230907134241.png",
@ -297,9 +292,6 @@
    "Haina/atta",
    "Haina/Daily",
    "Haina/index.html",
-    "Haina/favicon.ico",
-    "Haina/项目/SCRM",
-    "Haina/项目/HT数据分析",
    "atta/Pasted image 20230907134308.png",
    "atta/Pasted image 20230907134241.png",
    "atta/Pasted image 20230907134211.png",
--- a/Haina/Monthly/2023-10.md
+++ b/Haina/Monthly/2023-10.md
@ -1,22 +1,24 @@
 ---
 Created: 2023-10-28 Sat
-Updated: 2023-10-28 03:32 Sat
+Updated: 2023-10-28 05:10 Sat
 tags:
  - 月报
-Previous: '[[2023-09]]'
-Next: '[[ 2023-11 ]]'
+---
+
+[[2023]] / [[2023-Q4|Q4]] / ❮ [[2023-09|September]] | October | [[2023-11|November]] ❯ / [[2023-W39|Week 39]] - [[2023-W40|Week 40]] - [[2023-W41|Week 41]] - [[2023-W42|Week 42]] - [[2023-W43|Week 43]] - [[2023-W44|Week 44]]
+
 ---

 ## 重点工作

-1. HT统计分析
+1.

 ## 维护工作

+## 未完成
+
 ## 创新, 突出贡献

 ## 事故

 ---
-
-❮ [[2023-09]] | [[ 2023-11 ]] ❯
--- a/Haina/Quarterly/.gitkeep
+++ b/Haina/Quarterly/.gitkeep
--- a/Haina/Templates/M-log.md
+++ b/Haina/Templates/M-log.md
@ -3,8 +3,37 @@ Created: <% tp.file.creation_date("YYYY-MM-DD ddd") %>
 Updated: 
 tags:
  - 月报
-Previous: '[[<% tp.date.now("YYYY-MM", "P-1M", tp.file.title, "YYYY-MM") %>]]'
-Next: '[[ <% tp.date.now("YYYY-MM", "P+1M", tp.file.title, "YYYY-MM") %> ]]'
+---
+<%*
+let month = moment(tp.file.title);
+
+// # 2023 January
+// tR += '# ' + month.format('YYYY MMMM') + '';
+
+// 2023 / Q1
+tR += '[[' + month.format('YYYY') + ']] / ';
+tR += '[[' + month.format('YYYY-[Q]Q|[Q]Q') + ']] / ';
+
+// ❮ December | January | February ❯
+tR += '❮ [[' + month.subtract(1, 'months').format('YYYY-MM|MMMM') + ']]';
+tR += ' | ' + month.add(1, 'months').format('MMMM') + ' | ';
+tR += '[[' + month.add(1, 'months').format('YYYY-MM|MMMM') + ']] ❯';
+month.subtract(1, 'months');
+tR += ' / ';
+
+// Week 52 - Week 1 - Week 2 - Week 3 - Week 4 - Week 5
+const thisMonth = month.month();
+month.startOf('week');
+do {
+    tR += '[[' + month.format('gggg-[W]ww|[Week] w') + ']]';
+    month.add(1, 'weeks');
+    if (month.month() == thisMonth) {
+        tR += ' - ';
+    }
+} while (month.month() == thisMonth);
+month.subtract(1, 'weeks');
+%>
+
 ---

 ## 重点工作
@ -19,6 +48,3 @@ Next: '[[ <% tp.date.now("YYYY-MM", "P+1M", tp.file.title, "YYYY-MM") %> ]]'

 ## 事故

-
---
-❮ [[<% tp.date.now("YYYY-MM", "P-1M", tp.file.title, "YYYY-MM") %>]] | [[ <% tp.date.now("YYYY-MM", "P+1M", tp.file.title, "YYYY-MM") %> ]] ❯
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@ -3,17 +3,47 @@ Created: <% tp.file.creation_date("YYYY-MM-DD ddd") %>
 Updated: 
 tags:
  - 周报
-Previous: '[[<% tp.date.weekday("gggg-[W]ww_MM.DD", -7, tp.file.title, "gggg-[W]ww_MM.DD") %>]]'
-Next: '[[ <% tp.date.now("gggg-[W]ww_MM.DD", 7, tp.file.title, "gggg-[W]ww_MM.DD") %> ]]'
 ---
+<%*
+let week = moment(tp.file.title);

-> <% tp.date.weekday("YYYY-MM-DD ddd", 1, tp.file.title, "YYYY-[W]ww_MM.DD") %>
+// # 2023 Week 1
+// tR += '# ' + week.format('gggg [Week] w') + '';
+
+// 2023 / Q1 / January
+tR += '[[' + week.format('YYYY') + ']] / ';
+tR += '[[' + week.format('YYYY-[Q]Q|[Q]Q') + ']] / ';
+tR += '[[' + week.format('YYYY-MM|MMMM') + ']]';
+// If the week crosses a month
+// 2022 / Q4 / December - 2023 / Q1 / January
+if (week.format('M') != week.endOf('week').format('M')) {
+    tR += ' - ';
+    tR += '[[' + week.format('YYYY') + ']] / ';
+    tR += '[[' + week.format('YYYY-[Q]Q|[Q]Q') + ']] / ';
+    tR += '[[' + week.format('YYYY-MM|MMMM') + ']]';
+}
+tR += ' / ';
+
+// ❮ Week 52 | Week 1 | Week 2 ❯
+tR += '❮ [[' + week.subtract(1, 'weeks').format('gggg-[W]ww|[Week] w') + ']]';
+tR += ' | ' + week.add(1, 'weeks').format('[Week] w') + ' | ';
+tR += '[[' + week.add(1, 'weeks').format('gggg-[W]ww|[Week] w') + ']] ❯';
+week.subtract(1, 'weeks');
+tR += ' / ';
+
+// Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday
+for (let day = 0; day < 7; day++) {
+    tR += '[[' + week.weekday(day).format('YYYY-MM-DD|dddd') + ']]';
+    if (day < 6) {
+        tR += ' - ';
+    }
+}
+%>
+
+---
 ## 上周工作

 1. <% tp.file.cursor(1) %>

 ## 本周计划
 1. 
-
---
-❮ [[<% tp.date.weekday("gggg-[W]ww_MM.DD", -7, tp.file.title, "gggg-[W]ww_MM.DD") %>]] | [[ <% tp.date.now("gggg-[W]ww_MM.DD", 7, tp.file.title, "gggg-[W]ww_MM.DD") %> ]] ❯
--- a/Haina/Weekly/2023-W43_10.23.md
+++ b/Haina/Weekly/2023-W43_10.23.md
@ -1,10 +1,10 @@
 ---
 Created: 2023-10-28 Sat
-Updated: 2023-10-28 03:27 Sat
+Updated: 2023-10-28 05:02 Sat
 tags:
  - 周报
-Previous: '[[2023-W42_10.16]]'
-Next: '[[ 2023-W44_10.30 ]]'
+Previous: '[[2023-W42]]'
+Next: '[[Haina/Weekly/2023-W43|2023-W43]]'
 ---

 > 2023-10-24 Tue
@ -30,7 +30,3 @@ Next: '[[ 2023-W44_10.30 ]]'
   2. b. 销售进度: 优化
   3. c. 权限管理?
   4. d. 文旅局数据
-
---
-
-❮ [[2023-W42_10.16]] | [[ 2023-W44_10.30 ]] ❯
--- a/Haina/Weekly/2023-W44_10.30.md
+++ b/Haina/Weekly/2023-W44_10.30.md
@ -1,13 +1,15 @@
 ---
 Created: 2023-10-28 Sat
-Updated: 2023-10-28 03:50 Sat
+Updated: 2023-10-28 05:01 Sat
 tags:
  - 周报
-Previous: '[[2023-W43_10.23]]'
-Next: '[[ 2023-W45_11.06 ]]'
+Previous: '[[Haina/Weekly/2023-W43|2023-W43]]'
+Next: '[[ 2023-W45 ]]'
 ---

-> 2023-10-31 Tue
+[[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]]
+
+---

 ## 上周工作

@ -27,12 +29,11 @@ Next: '[[ 2023-W45_11.06 ]]'
   5. 文旅局服务人数数据: 接口文档; 页面50%
   6. 数据核对
      1. 成交率/订单数, 与1.0逻辑不一致
-2. SCRM+IM平台需求, 参考产品: 
-	1. 独立IM渠道+多渠道社媒集成: [umnico](https://umnico.com/)等
-	2. 销售流程管理: twenty, salesforce等
+2. SCRM+IM平台需求, 参考产品:
+   1. 独立IM渠道+多渠道社媒集成: [umnico](https://umnico.com/)等
+   2. 销售流程管理: twenty, salesforce等

 ## 本周计划

---
-
-❮ [[2023-W43_10.23]] | [[ 2023-W45_11.06 ]] ❯
+1. SCRM+IM平台调研
+2. HT统计分析
--- a/Haina/Yearly/.gitkeep
+++ b/Haina/Yearly/.gitkeep