From 7e5ee310885732ef0823d77c1f61e6ba43e2c214 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Mon, 3 Jun 2024 22:54:46 -0700
Subject: [PATCH 01/18] Implement task progress indication to Board view

---
 .../Board/components/Board/CardList.svelte    | 14 ++++++++---
 .../Board/components/Board/boardHelpers.ts    | 24 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index ffa37cbf..c035cee0 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { InternalLink, Checkbox } from "obsidian-svelte";
+  import { InternalLink, Checkbox, Icon } from "obsidian-svelte";
   import {
     isString,
     type DataField,
@@ -19,7 +19,7 @@
     dndzone,
   } from "svelte-dnd-action";
   import { flip } from "svelte/animate";
-  import { getDisplayName } from "./boardHelpers";
+  import { getDisplayName, getTaskProgress } from "./boardHelpers";
   import type {
     DropTrigger,
     OnRecordClick,
@@ -134,13 +134,21 @@
           {/if}
         </div>
         <CardMetadata fields={includeFields} record={item} />
+        {#await getTaskProgress(item.id, $app) then taskProgress}
+        {#if taskProgress}
+        <div class=task-progress-heading>
+          <Icon name="check-circle" />
+          <span>{taskProgress}</span>
+        </div>
+        {/if}
+        {/await}
       </ColorItem>
     </article>
   {/each}
 </div>
 
 <style>
-  div.card-header {
+  div.card-header, div.task-progress-heading {
     display: flex;
     gap: 4px;
     align-items: center;
diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index 8c192fa8..a1225fe3 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -1,3 +1,5 @@
+import type { App } from "obsidian";
+
 export function getDisplayName(recordId: string): string {
   const basename = getBasename(recordId);
   return basename.slice(0, basename.lastIndexOf("."));
@@ -13,3 +15,25 @@ function getBasename(str: string) {
 
   return str.slice(lastSlash + 1);
 }
+
+const CHECKBOX_ITEM_REGEX = /^\s{0,3}-\s{1,4}\[.\]/;
+const COMPLETED_ITEM_REGEX = /^\s{0,3}-\s{1,4}\[\S\]/;
+
+// Look for markdown task lists in the record file content and count completion progress
+export async function getTaskProgress(recordId: string, app: App): Promise<string> {
+  let progress = "";
+
+  const file = app.vault.getFileByPath(recordId);
+  if (file) {
+    const content = await app.vault.read(file);
+    const lines = content.split("\n");
+
+    const totalTasks = lines.map(l => CHECKBOX_ITEM_REGEX.test(l)).filter(Boolean).length;
+    const completedTasks = lines.map(l => COMPLETED_ITEM_REGEX.test(l)).filter(Boolean).length;
+
+    if (totalTasks) {
+      progress = `${completedTasks}/${totalTasks}`;
+    }
+  }
+  return progress;
+}

From ef7b2c242d48b4c9d6f47c0d90b63a9ce9b4f247 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Tue, 4 Jun 2024 11:56:14 -0700
Subject: [PATCH 02/18] Minor regex optimization

---
 src/ui/views/Board/components/Board/boardHelpers.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index a1225fe3..e2cf3e2b 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -26,10 +26,10 @@ export async function getTaskProgress(recordId: string, app: App): Promise<strin
   const file = app.vault.getFileByPath(recordId);
   if (file) {
     const content = await app.vault.read(file);
-    const lines = content.split("\n");
+    const taskLines = content.split("\n").filter(l => CHECKBOX_ITEM_REGEX.test(l));
 
-    const totalTasks = lines.map(l => CHECKBOX_ITEM_REGEX.test(l)).filter(Boolean).length;
-    const completedTasks = lines.map(l => COMPLETED_ITEM_REGEX.test(l)).filter(Boolean).length;
+    const totalTasks = taskLines.length;
+    const completedTasks = taskLines.map(l => COMPLETED_ITEM_REGEX.test(l)).filter(Boolean).length;
 
     if (totalTasks) {
       progress = `${completedTasks}/${totalTasks}`;

From c23a94f59b979d0fc13f418ee783e723d25230dc Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 03:59:30 +0800
Subject: [PATCH 03/18] Satisfy check and apply format

---
 .../Board/components/Board/CardList.svelte      | 17 +++++++++--------
 .../Board/components/Board/boardHelpers.ts      | 13 ++++++++++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 7b130e33..8a9ee4bf 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   // import { Checkbox, InternalLink} from "obsidian-svelte";
-  import { Checkbox } from "obsidian-svelte";
+  import { Checkbox, Icon } from "obsidian-svelte";
   import InternalLink from "src/ui/components/InternalLink.svelte";
   import {
     isString,
@@ -141,12 +141,12 @@
         </div>
         <CardMetadata fields={includeFields} record={item} />
         {#await getTaskProgress(item.id, $app) then taskProgress}
-        {#if taskProgress}
-        <div class=task-progress-heading>
-          <Icon name="check-circle" />
-          <span>{taskProgress}</span>
-        </div>
-        {/if}
+          {#if taskProgress}
+            <div class="task-progress-heading">
+              <Icon name="check-circle" />
+              <span>{taskProgress}</span>
+            </div>
+          {/if}
         {/await}
       </ColorItem>
     </article>
@@ -154,7 +154,8 @@
 </div>
 
 <style>
-  div.card-header, div.task-progress-heading {
+  div.card-header,
+  div.task-progress-heading {
     display: flex;
     gap: 4px;
     align-items: center;
diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index e2cf3e2b..f0b66527 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -20,16 +20,23 @@ const CHECKBOX_ITEM_REGEX = /^\s{0,3}-\s{1,4}\[.\]/;
 const COMPLETED_ITEM_REGEX = /^\s{0,3}-\s{1,4}\[\S\]/;
 
 // Look for markdown task lists in the record file content and count completion progress
-export async function getTaskProgress(recordId: string, app: App): Promise<string> {
+export async function getTaskProgress(
+  recordId: string,
+  app: App
+): Promise<string> {
   let progress = "";
 
   const file = app.vault.getFileByPath(recordId);
   if (file) {
     const content = await app.vault.read(file);
-    const taskLines = content.split("\n").filter(l => CHECKBOX_ITEM_REGEX.test(l));
+    const taskLines = content
+      .split("\n")
+      .filter((l) => CHECKBOX_ITEM_REGEX.test(l));
 
     const totalTasks = taskLines.length;
-    const completedTasks = taskLines.map(l => COMPLETED_ITEM_REGEX.test(l)).filter(Boolean).length;
+    const completedTasks = taskLines
+      .map((l) => COMPLETED_ITEM_REGEX.test(l))
+      .filter(Boolean).length;
 
     if (totalTasks) {
       progress = `${completedTasks}/${totalTasks}`;

From 37476d46610e7ff3d86f720f164cb0be3baeeaa8 Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 04:41:06 +0800
Subject: [PATCH 04/18] Use metadataCache

---
 .../Board/components/Board/boardHelpers.ts    | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index f0b66527..778b0309 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -16,10 +16,6 @@ function getBasename(str: string) {
   return str.slice(lastSlash + 1);
 }
 
-const CHECKBOX_ITEM_REGEX = /^\s{0,3}-\s{1,4}\[.\]/;
-const COMPLETED_ITEM_REGEX = /^\s{0,3}-\s{1,4}\[\S\]/;
-
-// Look for markdown task lists in the record file content and count completion progress
 export async function getTaskProgress(
   recordId: string,
   app: App
@@ -28,19 +24,15 @@ export async function getTaskProgress(
 
   const file = app.vault.getFileByPath(recordId);
   if (file) {
-    const content = await app.vault.read(file);
-    const taskLines = content
-      .split("\n")
-      .filter((l) => CHECKBOX_ITEM_REGEX.test(l));
-
-    const totalTasks = taskLines.length;
-    const completedTasks = taskLines
-      .map((l) => COMPLETED_ITEM_REGEX.test(l))
-      .filter(Boolean).length;
+    const totalTasks = app.metadataCache
+      .getFileCache(file)
+      ?.listItems?.filter((item) => item.task !== undefined);
 
     if (totalTasks) {
-      progress = `${completedTasks}/${totalTasks}`;
+      const completedTasks = totalTasks?.filter((item) => item.task !== " ");
+      progress = `${completedTasks.length}/${totalTasks.length}`;
     }
   }
+
   return progress;
 }

From 597f3543c3bd5ce5475b2e23dd8e3e78a66c8bd6 Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 04:43:06 +0800
Subject: [PATCH 05/18] Update boardHelpers.ts

---
 .../Board/components/Board/boardHelpers.ts      | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index 778b0309..96d87be1 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -22,16 +22,13 @@ export async function getTaskProgress(
 ): Promise<string> {
   let progress = "";
 
-  const file = app.vault.getFileByPath(recordId);
-  if (file) {
-    const totalTasks = app.metadataCache
-      .getFileCache(file)
-      ?.listItems?.filter((item) => item.task !== undefined);
-
-    if (totalTasks) {
-      const completedTasks = totalTasks?.filter((item) => item.task !== " ");
-      progress = `${completedTasks.length}/${totalTasks.length}`;
-    }
+  const totalTasks = app.metadataCache
+    .getCache(recordId)
+    ?.listItems?.filter((item) => item.task !== undefined);
+
+  if (totalTasks) {
+    const completedTasks = totalTasks?.filter((item) => item.task !== " ");
+    progress = `${completedTasks.length}/${totalTasks.length}`;
   }
 
   return progress;

From 89d1c357921084ae2d8480c42715dcf23db05ca8 Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 04:50:24 +0800
Subject: [PATCH 06/18] Use app store and cancel the app as param

---
 src/ui/views/Board/components/Board/CardList.svelte |  2 +-
 src/ui/views/Board/components/Board/boardHelpers.ts | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 8a9ee4bf..ffbaafe3 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -140,7 +140,7 @@
           {/if}
         </div>
         <CardMetadata fields={includeFields} record={item} />
-        {#await getTaskProgress(item.id, $app) then taskProgress}
+        {#await getTaskProgress(item.id) then taskProgress}
           {#if taskProgress}
             <div class="task-progress-heading">
               <Icon name="check-circle" />
diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index 96d87be1..9efa0128 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -1,4 +1,5 @@
-import type { App } from "obsidian";
+import { app } from "src/lib/stores/obsidian";
+import { get } from "svelte/store";
 
 export function getDisplayName(recordId: string): string {
   const basename = getBasename(recordId);
@@ -16,14 +17,11 @@ function getBasename(str: string) {
   return str.slice(lastSlash + 1);
 }
 
-export async function getTaskProgress(
-  recordId: string,
-  app: App
-): Promise<string> {
+export async function getTaskProgress(recordId: string): Promise<string> {
   let progress = "";
 
-  const totalTasks = app.metadataCache
-    .getCache(recordId)
+  const totalTasks = get(app)
+    .metadataCache.getCache(recordId)
     ?.listItems?.filter((item) => item.task !== undefined);
 
   if (totalTasks) {

From f2adc352dc758712580bccb63c96df3b2f8e30d0 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Sun, 9 Jun 2024 00:00:45 -0700
Subject: [PATCH 07/18] Implement task weight via field

---
 src/lib/stores/translations/en.json           |  4 +++
 src/ui/views/Board/BoardView.svelte           |  1 +
 .../views/Board/components/Board/Board.svelte |  2 ++
 .../Board/components/Board/BoardColumn.svelte |  7 +++--
 .../Board/components/Board/CardList.svelte    | 26 ++++++++++++++++---
 .../components/Board/ColumnHeader.svelte      |  1 +
 .../views/Board/settings/BoardSettings.svelte | 22 +++++++++++++---
 src/ui/views/Board/types.ts                   |  1 +
 8 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/lib/stores/translations/en.json b/src/lib/stores/translations/en.json
index 24a70a37..5e2c5a48 100644
--- a/src/lib/stores/translations/en.json
+++ b/src/lib/stores/translations/en.json
@@ -303,6 +303,10 @@
                     "order-sync-field": {
                         "name": "Sync card order with field",
                         "description": "Field to store the position of cards in the board."
+                    },
+                    "weight-field": {
+                        "name": "Task weight field",
+                        "description": "Use the selected field as task weight (defaults to 1 if None)."
                     }
                 },
                 "note": {
diff --git a/src/ui/views/Board/BoardView.svelte b/src/ui/views/Board/BoardView.svelte
index e44a3395..bc07e9d3 100644
--- a/src/ui/views/Board/BoardView.svelte
+++ b/src/ui/views/Board/BoardView.svelte
@@ -435,6 +435,7 @@
     )}
     {columnWidth}
     checkField={fields.find((field) => field.name === config?.checkField)?.name}
+    weightField={fields.find((field) => field.name === config?.weightField)?.name}
     includeFields={fields.filter((field) => includeFields.includes(field.name))}
     customHeader={fields.find((field) => field.name === customHeader)}
     onRecordClick={handleRecordClick}
diff --git a/src/ui/views/Board/components/Board/Board.svelte b/src/ui/views/Board/components/Board/Board.svelte
index d1560b5c..a4d86822 100644
--- a/src/ui/views/Board/components/Board/Board.svelte
+++ b/src/ui/views/Board/components/Board/Board.svelte
@@ -34,6 +34,7 @@
   export let onColumnCollapse: OnColumnCollapse;
   export let onColumnPin: OnColumnPin;
   export let checkField: string | undefined;
+  export let weightField: string | undefined;
   export let includeFields: DataField[];
   export let customHeader: DataField | undefined;
 
@@ -82,6 +83,7 @@
           records={column.records}
           {onRecordClick}
           {checkField}
+          {weightField}
           {onRecordCheck}
           onRecordAdd={() => onRecordAdd(column.id)}
           onDrop={(record, records, trigger) => {
diff --git a/src/ui/views/Board/components/Board/BoardColumn.svelte b/src/ui/views/Board/components/Board/BoardColumn.svelte
index 1fd61901..1d7da8f8 100644
--- a/src/ui/views/Board/components/Board/BoardColumn.svelte
+++ b/src/ui/views/Board/components/Board/BoardColumn.svelte
@@ -19,6 +19,7 @@
   export let readonly: boolean;
   export let richText: boolean;
   export let checkField: string | undefined;
+  export let weightField: string | undefined;
   export let includeFields: DataField[];
   export let customHeader: DataField | undefined;
   export let pinned: boolean;
@@ -40,8 +41,9 @@
   export let onEdit: (editing: boolean) => void;
   $: onEdit(editing);
 
-  $: count = records.length;
-  $: checkedCount = records.filter((r) => r.values[checkField ?? ""]).length;
+  $: count = records.reduce((total, r) => total + (r.values[weightField ?? ""] as number ?? 1), 0);
+  $: checkedCount = records.filter((r) => r.values[checkField ?? ""])
+                           .reduce((total, r) => total + (r.values[weightField ?? ""] as number ?? 1), 0);
 
   function onColumnMenu() {
     const menu = new Menu();
@@ -125,6 +127,7 @@
       {customHeader}
       {onRecordClick}
       {checkField}
+      {weightField}
       {onRecordCheck}
       {onDrop}
       {includeFields}
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index ffbaafe3..107de0fd 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -38,6 +38,9 @@
   export let checkField: string | undefined;
   const checked = (item: DataRecord): boolean =>
     checkField ? (item.values[checkField] as boolean) : false;
+  export let weightField: string | undefined;
+  const taskWeight = (item: DataRecord): number =>
+    weightField ? (item.values[weightField] as number) : 1;
   export let customHeader: DataField | undefined;
   export let boardEditing: boolean;
 
@@ -89,6 +92,7 @@
 >
   {#each items as item (item.id)}
     {@const color = getRecordColor(item)}
+    {@const weight = taskWeight(item)}
 
     <article
       class="projects--board--card"
@@ -140,14 +144,23 @@
           {/if}
         </div>
         <CardMetadata fields={includeFields} record={item} />
-        {#await getTaskProgress(item.id) then taskProgress}
+        <div class=task-indicators>
+          {#await getTaskProgress(item.id) then taskProgress}
           {#if taskProgress}
-            <div class="task-progress-heading">
+            <div class=task-progress>
               <Icon name="check-circle" />
               <span>{taskProgress}</span>
             </div>
           {/if}
-        {/await}
+          {/await}
+
+          {#if weight > 1 }
+          <div class=task-weight>
+            <Icon name="weight" />
+            <span>{weight}</span>
+          </div>
+          {/if}
+        </div>
       </ColorItem>
     </article>
   {/each}
@@ -155,12 +168,17 @@
 
 <style>
   div.card-header,
-  div.task-progress-heading {
+  div.task-indicators,
+  div.task-indicators div {
     display: flex;
     gap: 4px;
     align-items: center;
   }
 
+  div.task-indicators {
+    gap: 10px;
+  }
+
   .checkbox-wrapper {
     display: flex;
     flex-direction: column;
diff --git a/src/ui/views/Board/components/Board/ColumnHeader.svelte b/src/ui/views/Board/components/Board/ColumnHeader.svelte
index b9a53823..750031f0 100644
--- a/src/ui/views/Board/components/Board/ColumnHeader.svelte
+++ b/src/ui/views/Board/components/Board/ColumnHeader.svelte
@@ -10,6 +10,7 @@
   export let count: number;
   export let checkedCount: number;
   export let checkField: string | undefined;
+  export let weightField: string | undefined;
   export let collapse: boolean = false;
   export let richText: boolean = false;
   const sourcePath = getContext<string>("sourcePath") ?? "";
diff --git a/src/ui/views/Board/settings/BoardSettings.svelte b/src/ui/views/Board/settings/BoardSettings.svelte
index efa5fb98..9b74e1c5 100644
--- a/src/ui/views/Board/settings/BoardSettings.svelte
+++ b/src/ui/views/Board/settings/BoardSettings.svelte
@@ -20,9 +20,10 @@
   let columnWidthValue = config.columnWidth ?? null;
 
   $: headerField = config.headerField ?? "";
-
   $: orderSyncField = config.orderSyncField ?? "";
-  $: validOrderSyncFields = getFieldsByType(fields, DataFieldType.Number);
+  $: weightField = config.weightField ?? "";
+
+  $: numberFields = getFieldsByType(fields, DataFieldType.Number);
 
   const updateConfig = <T extends keyof BoardConfig>(
     key: T,
@@ -69,7 +70,7 @@
     >
       <Select
         value={orderSyncField ?? ""}
-        options={validOrderSyncFields.map(fieldToSelectableValue)}
+        options={numberFields.map(fieldToSelectableValue)}
         placeholder={$i18n.t("views.board.fields.none") ?? ""}
         allowEmpty
         on:change={(event) => {
@@ -78,5 +79,20 @@
         }}
       />
     </SettingItem>
+    <SettingItem
+      name={$i18n.t("views.board.settings.weight-field.name")}
+      description={$i18n.t("views.board.settings.weight-field.description")}
+    >
+      <Select
+        value={weightField ?? ""}
+        options={numberFields.map(fieldToSelectableValue)}
+        placeholder={$i18n.t("views.board.fields.none") ?? ""}
+        allowEmpty
+        on:change={(event) => {
+          weightField = event.detail;
+          updateConfig("weightField", weightField);
+        }}
+      />
+    </SettingItem>
   </ModalContent>
 </ModalLayout>
diff --git a/src/ui/views/Board/types.ts b/src/ui/views/Board/types.ts
index 2c33d8e2..90959677 100644
--- a/src/ui/views/Board/types.ts
+++ b/src/ui/views/Board/types.ts
@@ -3,6 +3,7 @@ export interface BoardConfig {
   readonly checkField?: string;
   readonly headerField?: string;
   readonly orderSyncField?: string;
+  readonly weightField?: string;
   readonly columnWidth?: number;
   readonly columns?: ColumnSettings;
   readonly includeFields?: string[];

From 79ddc424e08028e0d3927a54ea58ee24ea329fd5 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Wed, 12 Jun 2024 00:00:26 -0700
Subject: [PATCH 08/18] Implement indicators as a separate component

---
 src/ui/components/Indicator/Indicator.svelte  | 21 +++++++++++++++++++
 src/ui/components/Indicator/index.ts          |  1 +
 .../Board/components/Board/CardList.svelte    | 16 +++++---------
 3 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 src/ui/components/Indicator/Indicator.svelte
 create mode 100644 src/ui/components/Indicator/index.ts

diff --git a/src/ui/components/Indicator/Indicator.svelte b/src/ui/components/Indicator/Indicator.svelte
new file mode 100644
index 00000000..484e4eb8
--- /dev/null
+++ b/src/ui/components/Indicator/Indicator.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+  import { Icon } from "obsidian-svelte";
+
+  export let icon: string = ""
+  export let content: string | number;
+</script>
+
+<div class=task-indicator>
+  <Icon name="{icon}" />
+  {#if content}
+    <span>{content}</span>
+  {/if}
+</div>
+
+<style>
+  div.task-indicator {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+  }
+</style>
\ No newline at end of file
diff --git a/src/ui/components/Indicator/index.ts b/src/ui/components/Indicator/index.ts
new file mode 100644
index 00000000..d1ff3db3
--- /dev/null
+++ b/src/ui/components/Indicator/index.ts
@@ -0,0 +1 @@
+export { default as Indicator } from "./Indicator.svelte";
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 107de0fd..b69a614a 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -29,6 +29,7 @@
     OnRecordCheck,
     OnRecordDrop,
   } from "./types";
+  import { Indicator } from "src/ui/components/Indicator";
 
   export let items: DataRecord[];
   export let onRecordClick: OnRecordClick;
@@ -147,18 +148,12 @@
         <div class=task-indicators>
           {#await getTaskProgress(item.id) then taskProgress}
           {#if taskProgress}
-            <div class=task-progress>
-              <Icon name="check-circle" />
-              <span>{taskProgress}</span>
-            </div>
+            <Indicator icon="check-circle" content={taskProgress} />
           {/if}
           {/await}
 
-          {#if weight > 1 }
-          <div class=task-weight>
-            <Icon name="weight" />
-            <span>{weight}</span>
-          </div>
+          {#if weight > 1}
+            <Indicator icon="weight" content={weight} />
           {/if}
         </div>
       </ColorItem>
@@ -168,8 +163,7 @@
 
 <style>
   div.card-header,
-  div.task-indicators,
-  div.task-indicators div {
+  div.task-indicators {
     display: flex;
     gap: 4px;
     align-items: center;

From 5b68748bab804866133c6c9afd93e668fa22390f Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Thu, 13 Jun 2024 15:01:31 -0700
Subject: [PATCH 09/18] Adjust getTaskProgress: remove unnecesary async and fix
 the 0 task case

---
 src/ui/views/Board/components/Board/CardList.svelte | 3 +--
 src/ui/views/Board/components/Board/boardHelpers.ts | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index b69a614a..ee9cd377 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -94,6 +94,7 @@
   {#each items as item (item.id)}
     {@const color = getRecordColor(item)}
     {@const weight = taskWeight(item)}
+    {@const taskProgress = getTaskProgress(item.id)}
 
     <article
       class="projects--board--card"
@@ -146,11 +147,9 @@
         </div>
         <CardMetadata fields={includeFields} record={item} />
         <div class=task-indicators>
-          {#await getTaskProgress(item.id) then taskProgress}
           {#if taskProgress}
             <Indicator icon="check-circle" content={taskProgress} />
           {/if}
-          {/await}
 
           {#if weight > 1}
             <Indicator icon="weight" content={weight} />
diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index 9efa0128..7663ef54 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -17,14 +17,14 @@ function getBasename(str: string) {
   return str.slice(lastSlash + 1);
 }
 
-export async function getTaskProgress(recordId: string): Promise<string> {
+export function getTaskProgress(recordId: string): string {
   let progress = "";
 
   const totalTasks = get(app)
     .metadataCache.getCache(recordId)
     ?.listItems?.filter((item) => item.task !== undefined);
 
-  if (totalTasks) {
+  if (totalTasks?.length) {
     const completedTasks = totalTasks?.filter((item) => item.task !== " ");
     progress = `${completedTasks.length}/${totalTasks.length}`;
   }

From c48a68801196500338d2eae67f165b8baed04e0a Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Thu, 13 Jun 2024 15:17:53 -0700
Subject: [PATCH 10/18] Adjust Indicator component import

---
 src/ui/components/Indicator/index.ts                | 1 -
 src/ui/views/Board/components/Board/CardList.svelte | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/ui/components/Indicator/index.ts

diff --git a/src/ui/components/Indicator/index.ts b/src/ui/components/Indicator/index.ts
deleted file mode 100644
index d1ff3db3..00000000
--- a/src/ui/components/Indicator/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Indicator } from "./Indicator.svelte";
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index ee9cd377..8e433ba4 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -11,6 +11,7 @@
   import { settings } from "src/lib/stores/settings";
   import CardMetadata from "src/ui/components/CardMetadata/CardMetadata.svelte";
   import ColorItem from "src/ui/components/ColorItem/ColorItem.svelte";
+  import Indicator from "src/ui/components/Indicator/Indicator.svelte";
   import {
     getRecordColorContext,
     handleHoverLink,
@@ -29,7 +30,6 @@
     OnRecordCheck,
     OnRecordDrop,
   } from "./types";
-  import { Indicator } from "src/ui/components/Indicator";
 
   export let items: DataRecord[];
   export let onRecordClick: OnRecordClick;

From f47ddfcc5a0e5f6a6006f9da230d687febe45525 Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 06:20:39 +0800
Subject: [PATCH 11/18] Extract task helpers to avoid breaking jest

---
 jest.config.js                                 |  2 +-
 .../Board/components/Board/CardList.svelte     |  3 ++-
 .../Board/components/Board/boardHelpers.ts     | 18 ------------------
 .../Board/components/Board/taskHelpers.ts      | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 src/ui/views/Board/components/Board/taskHelpers.ts

diff --git a/jest.config.js b/jest.config.js
index 77e3b5a7..e5c564f3 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,4 +1,4 @@
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index ee9cd377..6f548c95 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -22,7 +22,8 @@
     dndzone,
   } from "svelte-dnd-action";
   import { flip } from "svelte/animate";
-  import { getDisplayName, getTaskProgress } from "./boardHelpers";
+  import { getDisplayName } from "./boardHelpers";
+  import { getTaskProgress } from "./taskHelpers";
   import type {
     DropTrigger,
     OnRecordClick,
diff --git a/src/ui/views/Board/components/Board/boardHelpers.ts b/src/ui/views/Board/components/Board/boardHelpers.ts
index 7663ef54..8c192fa8 100644
--- a/src/ui/views/Board/components/Board/boardHelpers.ts
+++ b/src/ui/views/Board/components/Board/boardHelpers.ts
@@ -1,6 +1,3 @@
-import { app } from "src/lib/stores/obsidian";
-import { get } from "svelte/store";
-
 export function getDisplayName(recordId: string): string {
   const basename = getBasename(recordId);
   return basename.slice(0, basename.lastIndexOf("."));
@@ -16,18 +13,3 @@ function getBasename(str: string) {
 
   return str.slice(lastSlash + 1);
 }
-
-export function getTaskProgress(recordId: string): string {
-  let progress = "";
-
-  const totalTasks = get(app)
-    .metadataCache.getCache(recordId)
-    ?.listItems?.filter((item) => item.task !== undefined);
-
-  if (totalTasks?.length) {
-    const completedTasks = totalTasks?.filter((item) => item.task !== " ");
-    progress = `${completedTasks.length}/${totalTasks.length}`;
-  }
-
-  return progress;
-}
diff --git a/src/ui/views/Board/components/Board/taskHelpers.ts b/src/ui/views/Board/components/Board/taskHelpers.ts
new file mode 100644
index 00000000..5af7bfb6
--- /dev/null
+++ b/src/ui/views/Board/components/Board/taskHelpers.ts
@@ -0,0 +1,17 @@
+import { app } from "src/lib/stores/obsidian";
+import { get } from "svelte/store";
+
+export function getTaskProgress(recordId: string): string {
+  let progress = "";
+
+  const totalTasks = get(app)
+    .metadataCache.getCache(recordId)
+    ?.listItems?.filter((item) => item.task !== undefined);
+
+  if (totalTasks?.length) {
+    const completedTasks = totalTasks?.filter((item) => item.task !== " ");
+    progress = `${completedTasks.length}/${totalTasks.length}`;
+  }
+
+  return progress;
+}

From d12cd6594e2aec121ac1d2026056d845ad5120b1 Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 06:31:14 +0800
Subject: [PATCH 12/18] Formatting and satisfy CI check

---
 .../views/Board/components/Board/BoardColumn.svelte | 13 ++++++++++---
 src/ui/views/Board/components/Board/CardList.svelte |  4 ++--
 .../Board/components/Board/ColumnHeader.svelte      |  1 -
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ui/views/Board/components/Board/BoardColumn.svelte b/src/ui/views/Board/components/Board/BoardColumn.svelte
index 1d7da8f8..545ae452 100644
--- a/src/ui/views/Board/components/Board/BoardColumn.svelte
+++ b/src/ui/views/Board/components/Board/BoardColumn.svelte
@@ -41,9 +41,16 @@
   export let onEdit: (editing: boolean) => void;
   $: onEdit(editing);
 
-  $: count = records.reduce((total, r) => total + (r.values[weightField ?? ""] as number ?? 1), 0);
-  $: checkedCount = records.filter((r) => r.values[checkField ?? ""])
-                           .reduce((total, r) => total + (r.values[weightField ?? ""] as number ?? 1), 0);
+  $: count = records.reduce(
+    (total, r) => total + ((r.values[weightField ?? ""] as number) ?? 1),
+    0
+  );
+  $: checkedCount = records
+    .filter((r) => r.values[checkField ?? ""])
+    .reduce(
+      (total, r) => total + ((r.values[weightField ?? ""] as number) ?? 1),
+      0
+    );
 
   function onColumnMenu() {
     const menu = new Menu();
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 3f2873ed..968c8317 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   // import { Checkbox, InternalLink} from "obsidian-svelte";
-  import { Checkbox, Icon } from "obsidian-svelte";
+  import { Checkbox } from "obsidian-svelte";
   import InternalLink from "src/ui/components/InternalLink.svelte";
   import {
     isString,
@@ -147,7 +147,7 @@
           {/if}
         </div>
         <CardMetadata fields={includeFields} record={item} />
-        <div class=task-indicators>
+        <div class="task-indicators">
           {#if taskProgress}
             <Indicator icon="check-circle" content={taskProgress} />
           {/if}
diff --git a/src/ui/views/Board/components/Board/ColumnHeader.svelte b/src/ui/views/Board/components/Board/ColumnHeader.svelte
index 750031f0..b9a53823 100644
--- a/src/ui/views/Board/components/Board/ColumnHeader.svelte
+++ b/src/ui/views/Board/components/Board/ColumnHeader.svelte
@@ -10,7 +10,6 @@
   export let count: number;
   export let checkedCount: number;
   export let checkField: string | undefined;
-  export let weightField: string | undefined;
   export let collapse: boolean = false;
   export let richText: boolean = false;
   const sourcePath = getContext<string>("sourcePath") ?? "";

From 63661999a5bcc327143e820d6ab0c0c2f12065ab Mon Sep 17 00:00:00 2001
From: Acylation <532117255@qq.com>
Date: Fri, 14 Jun 2024 13:14:31 +0800
Subject: [PATCH 13/18] Refactor Indicator and styles

Smaller icon
---
 src/ui/components/Indicator/Indicator.svelte      | 14 +++++---------
 .../views/Board/components/Board/CardList.svelte  | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/ui/components/Indicator/Indicator.svelte b/src/ui/components/Indicator/Indicator.svelte
index 484e4eb8..d2702da2 100644
--- a/src/ui/components/Indicator/Indicator.svelte
+++ b/src/ui/components/Indicator/Indicator.svelte
@@ -1,15 +1,11 @@
 <script lang="ts">
   import { Icon } from "obsidian-svelte";
-
-  export let icon: string = ""
-  export let content: string | number;
+  export let icon: string = "";
 </script>
 
-<div class=task-indicator>
-  <Icon name="{icon}" />
-  {#if content}
-    <span>{content}</span>
-  {/if}
+<div class="task-indicator">
+  <Icon name={icon} size="sm" />
+  <slot />
 </div>
 
 <style>
@@ -18,4 +14,4 @@
     gap: 4px;
     align-items: center;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 968c8317..071e2473 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -149,11 +149,14 @@
         <CardMetadata fields={includeFields} record={item} />
         <div class="task-indicators">
           {#if taskProgress}
-            <Indicator icon="check-circle" content={taskProgress} />
+            <Indicator icon="check-circle">
+              {taskProgress}
+            </Indicator>
           {/if}
-
           {#if weight > 1}
-            <Indicator icon="weight" content={weight} />
+            <Indicator icon="weight">
+              {weight}
+            </Indicator>
           {/if}
         </div>
       </ColorItem>
@@ -162,14 +165,16 @@
 </div>
 
 <style>
-  div.card-header,
-  div.task-indicators {
+  div.card-header {
     display: flex;
     gap: 4px;
     align-items: center;
   }
 
   div.task-indicators {
+    display: flex;
+    gap: 4px;
+    align-items: center;
     gap: 10px;
   }
 

From 463ad200cc49aa6f357cfa0f45dea625fb0347cc Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Sat, 6 Jul 2024 14:44:49 -0700
Subject: [PATCH 14/18] Rename weight to points and add tooltips

---
 src/lib/stores/translations/en.json            | 11 ++++++++---
 src/ui/components/Indicator/Indicator.svelte   |  3 ++-
 src/ui/views/Board/BoardView.svelte            |  2 +-
 .../views/Board/components/Board/Board.svelte  |  4 ++--
 .../Board/components/Board/BoardColumn.svelte  |  9 +++++----
 .../Board/components/Board/CardList.svelte     | 18 ++++++++++--------
 .../Board/components/Board/ColumnHeader.svelte |  4 +++-
 .../views/Board/settings/BoardSettings.svelte  | 12 ++++++------
 src/ui/views/Board/types.ts                    |  2 +-
 9 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/lib/stores/translations/en.json b/src/lib/stores/translations/en.json
index d96a35f0..2252acd2 100644
--- a/src/lib/stores/translations/en.json
+++ b/src/lib/stores/translations/en.json
@@ -293,6 +293,11 @@
                     "check": "Check",
                     "none": "None"
                 },
+                "tooltips": {
+                    "checklist-items": "Checklist items",
+                    "task-points": "Story points",
+                    "checked-total": "Cards checked/total"
+                },
                 "unprioritized": "Unprioritized",
                 "include-fields": "Include fields",
                 "settings": {
@@ -309,9 +314,9 @@
                         "name": "Sync card order with field",
                         "description": "Field to store the position of cards in the board."
                     },
-                    "weight-field": {
-                        "name": "Task weight field",
-                        "description": "Use the selected field as task weight (defaults to 1 if None)."
+                    "points-field": {
+                        "name": "Card story points field",
+                        "description": "Use the selected field as the card story point value."
                     }
                 },
                 "note": {
diff --git a/src/ui/components/Indicator/Indicator.svelte b/src/ui/components/Indicator/Indicator.svelte
index d2702da2..e02c1fa4 100644
--- a/src/ui/components/Indicator/Indicator.svelte
+++ b/src/ui/components/Indicator/Indicator.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { Icon } from "obsidian-svelte";
   export let icon: string = "";
+  export let tooltip: string = "";
 </script>
 
-<div class="task-indicator">
+<div class="task-indicator" aria-label={tooltip}>
   <Icon name={icon} size="sm" />
   <slot />
 </div>
diff --git a/src/ui/views/Board/BoardView.svelte b/src/ui/views/Board/BoardView.svelte
index 5e307057..f0080708 100644
--- a/src/ui/views/Board/BoardView.svelte
+++ b/src/ui/views/Board/BoardView.svelte
@@ -436,7 +436,7 @@
     )}
     {columnWidth}
     checkField={fields.find((field) => field.name === config?.checkField)?.name}
-    weightField={fields.find((field) => field.name === config?.weightField)?.name}
+    pointsField={fields.find((field) => field.name === config?.pointsField)?.name}
     includeFields={fields.filter((field) => includeFields.includes(field.name))}
     customHeader={fields.find((field) => field.name === customHeader)}
     onRecordClick={handleRecordClick}
diff --git a/src/ui/views/Board/components/Board/Board.svelte b/src/ui/views/Board/components/Board/Board.svelte
index a4d86822..e11222a6 100644
--- a/src/ui/views/Board/components/Board/Board.svelte
+++ b/src/ui/views/Board/components/Board/Board.svelte
@@ -34,7 +34,7 @@
   export let onColumnCollapse: OnColumnCollapse;
   export let onColumnPin: OnColumnPin;
   export let checkField: string | undefined;
-  export let weightField: string | undefined;
+  export let pointsField: string | undefined;
   export let includeFields: DataField[];
   export let customHeader: DataField | undefined;
 
@@ -83,7 +83,7 @@
           records={column.records}
           {onRecordClick}
           {checkField}
-          {weightField}
+          {pointsField}
           {onRecordCheck}
           onRecordAdd={() => onRecordAdd(column.id)}
           onDrop={(record, records, trigger) => {
diff --git a/src/ui/views/Board/components/Board/BoardColumn.svelte b/src/ui/views/Board/components/Board/BoardColumn.svelte
index 545ae452..13a21c27 100644
--- a/src/ui/views/Board/components/Board/BoardColumn.svelte
+++ b/src/ui/views/Board/components/Board/BoardColumn.svelte
@@ -19,7 +19,7 @@
   export let readonly: boolean;
   export let richText: boolean;
   export let checkField: string | undefined;
-  export let weightField: string | undefined;
+  export let pointsField: string | undefined;
   export let includeFields: DataField[];
   export let customHeader: DataField | undefined;
   export let pinned: boolean;
@@ -42,13 +42,13 @@
   $: onEdit(editing);
 
   $: count = records.reduce(
-    (total, r) => total + ((r.values[weightField ?? ""] as number) ?? 1),
+    (total, r) => total + ((r.values[pointsField ?? ""] as number) ?? 1),
     0
   );
   $: checkedCount = records
     .filter((r) => r.values[checkField ?? ""])
     .reduce(
-      (total, r) => total + ((r.values[weightField ?? ""] as number) ?? 1),
+      (total, r) => total + ((r.values[pointsField ?? ""] as number) ?? 1),
       0
     );
 
@@ -122,6 +122,7 @@
     {richText}
     {collapse}
     {checkField}
+    {pointsField}
     {onColumnMenu}
     {onColumnRename}
     {onValidate}
@@ -134,7 +135,7 @@
       {customHeader}
       {onRecordClick}
       {checkField}
-      {weightField}
+      {pointsField}
       {onRecordCheck}
       {onDrop}
       {includeFields}
diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 071e2473..5b5ecefb 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -9,6 +9,8 @@
   } from "src/lib/dataframe/dataframe";
   import { app } from "src/lib/stores/obsidian";
   import { settings } from "src/lib/stores/settings";
+  import { i18n } from "src/lib/stores/i18n";
+  import { get } from "svelte/store";
   import CardMetadata from "src/ui/components/CardMetadata/CardMetadata.svelte";
   import ColorItem from "src/ui/components/ColorItem/ColorItem.svelte";
   import Indicator from "src/ui/components/Indicator/Indicator.svelte";
@@ -40,9 +42,9 @@
   export let checkField: string | undefined;
   const checked = (item: DataRecord): boolean =>
     checkField ? (item.values[checkField] as boolean) : false;
-  export let weightField: string | undefined;
-  const taskWeight = (item: DataRecord): number =>
-    weightField ? (item.values[weightField] as number) : 1;
+  export let pointsField: string | undefined;
+  const taskPoints = (item: DataRecord): number =>
+    pointsField ? (item.values[pointsField] as number) : 1;
   export let customHeader: DataField | undefined;
   export let boardEditing: boolean;
 
@@ -94,7 +96,7 @@
 >
   {#each items as item (item.id)}
     {@const color = getRecordColor(item)}
-    {@const weight = taskWeight(item)}
+    {@const taskPoints = taskPoints(item)}
     {@const taskProgress = getTaskProgress(item.id)}
 
     <article
@@ -149,13 +151,13 @@
         <CardMetadata fields={includeFields} record={item} />
         <div class="task-indicators">
           {#if taskProgress}
-            <Indicator icon="check-circle">
+            <Indicator icon="check-square" tooltip={get(i18n).t("views.board.tooltips.checklist-items")}>
               {taskProgress}
             </Indicator>
           {/if}
-          {#if weight > 1}
-            <Indicator icon="weight">
-              {weight}
+          {#if taskPoints > 1}
+            <Indicator icon="weight" tooltip={get(i18n).t("views.board.tooltips.task-points")}>
+              {taskPoints}
             </Indicator>
           {/if}
         </div>
diff --git a/src/ui/views/Board/components/Board/ColumnHeader.svelte b/src/ui/views/Board/components/Board/ColumnHeader.svelte
index b9a53823..b702857b 100644
--- a/src/ui/views/Board/components/Board/ColumnHeader.svelte
+++ b/src/ui/views/Board/components/Board/ColumnHeader.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
   import { MarkdownRenderer, Menu } from "obsidian";
   import { app, view } from "src/lib/stores/obsidian";
+  import { i18n } from "src/lib/stores/i18n";
+  import { get } from "svelte/store";
   import { getContext } from "svelte";
   import { TextInput, IconButton } from "obsidian-svelte";
   import { Flair } from "src/ui/components/Flair";
@@ -127,7 +129,7 @@
   {/if}
   <div>
     {#if collapse || checkField}
-      <Flair variant="primary">
+      <Flair variant="primary" tooltip={get(i18n).t("views.board.tooltips.checked-total")}>
         {checkField ? `${checkedCount}/${count}` : count}
       </Flair>
     {/if}
diff --git a/src/ui/views/Board/settings/BoardSettings.svelte b/src/ui/views/Board/settings/BoardSettings.svelte
index 9b74e1c5..7976b5e8 100644
--- a/src/ui/views/Board/settings/BoardSettings.svelte
+++ b/src/ui/views/Board/settings/BoardSettings.svelte
@@ -21,7 +21,7 @@
 
   $: headerField = config.headerField ?? "";
   $: orderSyncField = config.orderSyncField ?? "";
-  $: weightField = config.weightField ?? "";
+  $: pointsField = config.pointsField ?? "";
 
   $: numberFields = getFieldsByType(fields, DataFieldType.Number);
 
@@ -80,17 +80,17 @@
       />
     </SettingItem>
     <SettingItem
-      name={$i18n.t("views.board.settings.weight-field.name")}
-      description={$i18n.t("views.board.settings.weight-field.description")}
+      name={$i18n.t("views.board.settings.points-field.name")}
+      description={$i18n.t("views.board.settings.points-field.description")}
     >
       <Select
-        value={weightField ?? ""}
+        value={pointsField ?? ""}
         options={numberFields.map(fieldToSelectableValue)}
         placeholder={$i18n.t("views.board.fields.none") ?? ""}
         allowEmpty
         on:change={(event) => {
-          weightField = event.detail;
-          updateConfig("weightField", weightField);
+          pointsField = event.detail;
+          updateConfig("pointsField", pointsField);
         }}
       />
     </SettingItem>
diff --git a/src/ui/views/Board/types.ts b/src/ui/views/Board/types.ts
index 90959677..79cdb047 100644
--- a/src/ui/views/Board/types.ts
+++ b/src/ui/views/Board/types.ts
@@ -3,7 +3,7 @@ export interface BoardConfig {
   readonly checkField?: string;
   readonly headerField?: string;
   readonly orderSyncField?: string;
-  readonly weightField?: string;
+  readonly pointsField?: string;
   readonly columnWidth?: number;
   readonly columns?: ColumnSettings;
   readonly includeFields?: string[];

From 20dee86204318358dbe2f1235ac43ef6e57dbd48 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Sat, 6 Jul 2024 15:25:43 -0700
Subject: [PATCH 15/18] Add story point total in columnHeader

---
 src/lib/stores/translations/en.json                |  3 ++-
 .../Board/components/Board/BoardColumn.svelte      | 14 ++++----------
 .../Board/components/Board/ColumnHeader.svelte     | 11 ++++++++++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/lib/stores/translations/en.json b/src/lib/stores/translations/en.json
index 2252acd2..f98c30ec 100644
--- a/src/lib/stores/translations/en.json
+++ b/src/lib/stores/translations/en.json
@@ -296,7 +296,8 @@
                 "tooltips": {
                     "checklist-items": "Checklist items",
                     "task-points": "Story points",
-                    "checked-total": "Cards checked/total"
+                    "checked-total": "Cards checked/total",
+                    "task-points-total": "Story point total"
                 },
                 "unprioritized": "Unprioritized",
                 "include-fields": "Include fields",
diff --git a/src/ui/views/Board/components/Board/BoardColumn.svelte b/src/ui/views/Board/components/Board/BoardColumn.svelte
index 13a21c27..73c238ac 100644
--- a/src/ui/views/Board/components/Board/BoardColumn.svelte
+++ b/src/ui/views/Board/components/Board/BoardColumn.svelte
@@ -41,16 +41,9 @@
   export let onEdit: (editing: boolean) => void;
   $: onEdit(editing);
 
-  $: count = records.reduce(
-    (total, r) => total + ((r.values[pointsField ?? ""] as number) ?? 1),
-    0
-  );
-  $: checkedCount = records
-    .filter((r) => r.values[checkField ?? ""])
-    .reduce(
-      (total, r) => total + ((r.values[pointsField ?? ""] as number) ?? 1),
-      0
-    );
+  $: count = records.length;
+  $: checkedCount = records.filter((r) => r.values[checkField ?? ""]).length;
+  $: pointsCount = records.map((r) => r.values[pointsField ?? ""] as number).reduce((sum, p) => sum + p, 0);
 
   function onColumnMenu() {
     const menu = new Menu();
@@ -118,6 +111,7 @@
     value={name}
     {count}
     {checkedCount}
+    {pointsCount}
     bind:editing
     {richText}
     {collapse}
diff --git a/src/ui/views/Board/components/Board/ColumnHeader.svelte b/src/ui/views/Board/components/Board/ColumnHeader.svelte
index b702857b..4805b33f 100644
--- a/src/ui/views/Board/components/Board/ColumnHeader.svelte
+++ b/src/ui/views/Board/components/Board/ColumnHeader.svelte
@@ -4,7 +4,7 @@
   import { i18n } from "src/lib/stores/i18n";
   import { get } from "svelte/store";
   import { getContext } from "svelte";
-  import { TextInput, IconButton } from "obsidian-svelte";
+  import { TextInput, IconButton, Icon } from "obsidian-svelte";
   import { Flair } from "src/ui/components/Flair";
   import { handleHoverLink } from "src/ui/views/helpers";
 
@@ -12,6 +12,8 @@
   export let count: number;
   export let checkedCount: number;
   export let checkField: string | undefined;
+  export let pointsCount: number;
+  export let pointsField: string | undefined;
   export let collapse: boolean = false;
   export let richText: boolean = false;
   const sourcePath = getContext<string>("sourcePath") ?? "";
@@ -128,8 +130,15 @@
     </span>
   {/if}
   <div>
+    {#if pointsField && pointsCount}
+      <Flair variant="primary" tooltip={get(i18n).t("views.board.tooltips.task-points-total")}>
+        <Icon name="weight" size="xs" --icon-color="var(--text-color)"/>
+        {pointsCount}
+      </Flair>
+    {/if}
     {#if collapse || checkField}
       <Flair variant="primary" tooltip={get(i18n).t("views.board.tooltips.checked-total")}>
+        <Icon name="wallet-cards" size="xs" --icon-color="var(--text-color)"/>
         {checkField ? `${checkedCount}/${count}` : count}
       </Flair>
     {/if}

From 28e72ae5ae31ba2161e09f2c94bd0b2f0cd78aa7 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Sat, 6 Jul 2024 15:36:34 -0700
Subject: [PATCH 16/18] Rename point fetch function

---
 src/ui/views/Board/components/Board/CardList.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index 5b5ecefb..e4e54ded 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -43,7 +43,7 @@
   const checked = (item: DataRecord): boolean =>
     checkField ? (item.values[checkField] as boolean) : false;
   export let pointsField: string | undefined;
-  const taskPoints = (item: DataRecord): number =>
+  const getTaskPoints = (item: DataRecord): number =>
     pointsField ? (item.values[pointsField] as number) : 1;
   export let customHeader: DataField | undefined;
   export let boardEditing: boolean;
@@ -96,7 +96,7 @@
 >
   {#each items as item (item.id)}
     {@const color = getRecordColor(item)}
-    {@const taskPoints = taskPoints(item)}
+    {@const taskPoints = getTaskPoints(item)}
     {@const taskProgress = getTaskProgress(item.id)}
 
     <article

From aa8fb3d27da9398aa243534bba3fbfc2e3f0773b Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Sun, 7 Jul 2024 16:27:52 -0700
Subject: [PATCH 17/18] Fix absent points case

---
 src/ui/views/Board/components/Board/BoardColumn.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui/views/Board/components/Board/BoardColumn.svelte b/src/ui/views/Board/components/Board/BoardColumn.svelte
index 73c238ac..dc652cf6 100644
--- a/src/ui/views/Board/components/Board/BoardColumn.svelte
+++ b/src/ui/views/Board/components/Board/BoardColumn.svelte
@@ -43,7 +43,9 @@
 
   $: count = records.length;
   $: checkedCount = records.filter((r) => r.values[checkField ?? ""]).length;
-  $: pointsCount = records.map((r) => r.values[pointsField ?? ""] as number).reduce((sum, p) => sum + p, 0);
+  $: pointsCount = records.map((r) => r.values[pointsField ?? ""] as number)
+                          .filter(Number.isFinite)
+                          .reduce((sum, p) => sum + p, 0);
 
   function onColumnMenu() {
     const menu = new Menu();

From f71a97c722c53c2c78b103e6956edf7ec70b2345 Mon Sep 17 00:00:00 2001
From: Phillip Dykman <phil.d324@gmail.com>
Date: Sun, 7 Jul 2024 16:33:27 -0700
Subject: [PATCH 18/18] Fix hiding points if feature isn't used

also show all point values instead of only >1
---
 src/ui/views/Board/components/Board/CardList.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/views/Board/components/Board/CardList.svelte b/src/ui/views/Board/components/Board/CardList.svelte
index e4e54ded..24ac48fc 100644
--- a/src/ui/views/Board/components/Board/CardList.svelte
+++ b/src/ui/views/Board/components/Board/CardList.svelte
@@ -43,8 +43,8 @@
   const checked = (item: DataRecord): boolean =>
     checkField ? (item.values[checkField] as boolean) : false;
   export let pointsField: string | undefined;
-  const getTaskPoints = (item: DataRecord): number =>
-    pointsField ? (item.values[pointsField] as number) : 1;
+  const getTaskPoints = (item: DataRecord) =>
+    pointsField ? (item.values[pointsField] as number) : null;
   export let customHeader: DataField | undefined;
   export let boardEditing: boolean;
 
@@ -155,7 +155,7 @@
               {taskProgress}
             </Indicator>
           {/if}
-          {#if taskPoints > 1}
+          {#if taskPoints}
             <Indicator icon="weight" tooltip={get(i18n).t("views.board.tooltips.task-points")}>
               {taskPoints}
             </Indicator>