feat: add tag display to Segment (#43)

* feat: add tag display to Segment

* feat: Fragment markdown rework

* feat: Fragment markdown rework

* fixL prettifer remove

* fix: remove prettifer ignore
This commit is contained in:
artel-ksikora 2024-03-18 17:11:11 +02:00 committed by GitHub
parent 48d576aaa2
commit 739e51326f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions

View file

@ -1,4 +1,4 @@
import {moment, App, MarkdownSectionInformation, ButtonComponent, TextComponent, TFile} from "obsidian"; import {moment, App, MarkdownSectionInformation, ButtonComponent, TextComponent, TFile, MarkdownRenderer} from "obsidian";
import {SimpleTimeTrackerSettings} from "./settings"; import {SimpleTimeTrackerSettings} from "./settings";
export interface Tracker { export interface Tracker {
@ -380,6 +380,8 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
row.createEl("td", {text: entry.endTime || entry.subEntries ? formatDuration(getDuration(entry), settings) : ""}); row.createEl("td", {text: entry.endTime || entry.subEntries ? formatDuration(getDuration(entry), settings) : ""});
renderSegments(row, file);
let entryButtons = row.createEl("td"); let entryButtons = row.createEl("td");
entryButtons.addClass("simple-time-tracker-table-buttons"); entryButtons.addClass("simple-time-tracker-table-buttons");
new ButtonComponent(entryButtons) new ButtonComponent(entryButtons)
@ -405,6 +407,8 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
entry.endTime = endField.getTimestamp(); entry.endTime = endField.getTimestamp();
await saveTracker(tracker, this.app, file, getSectionInfo()); await saveTracker(tracker, this.app, file, getSectionInfo());
editButton.setIcon("lucide-pencil"); editButton.setIcon("lucide-pencil");
renderSegments(row, file);
} else { } else {
nameField.beginEdit(entry.name); nameField.beginEdit(entry.name);
// only allow editing start and end times if we don't have sub entries // only allow editing start and end times if we don't have sub entries
@ -430,3 +434,21 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
addEditableTableRow(tracker, sub, table, newSegmentNameBox, trackerRunning, file, getSectionInfo, settings, indent + 1); addEditableTableRow(tracker, sub, table, newSegmentNameBox, trackerRunning, file, getSectionInfo, settings, indent + 1);
} }
} }
/**
* Render Segment as Markdown
* @param row - Html row in table
* @param path - Path to file with time tracker
*/
function renderSegments(row: any, path: string) {
// Get coluumn with Segment
const segment = row.querySelector("td:first-child span");
if (segment) {
const htmlData = segment.innerHTML;
// Render Markdown
// Result `<p>_rendered_html_</p>`
MarkdownRenderer.renderMarkdown(htmlData, segment as HTMLElement, path, this);
// Replace current segment by rendered version
segment.innerHTML = segment.querySelector("p").innerHTML;
}
}

View file

@ -0,0 +1,4 @@
Tested for #tag, *italic*, [link](test2), etc:
```simple-time-tracker
{"entries":[{"name":"`Segment 1`","startTime":"2022-09-27T19:51:18.000Z","endTime":"2022-09-27T19:51:24.000Z"},{"name":"Segment 2","startTime":"2022-09-27T19:51:25.000Z","endTime":"2022-09-27T19:51:26.000Z"},{"name":"#tag Seqment 3 *add* #tag1 text","startTime":null,"endTime":null,"subEntries":[{"name":"Part 1 #tagp1","startTime":"2024-03-17T11:16:00.382Z","endTime":"2024-03-17T11:16:15.966Z","subEntries":null},{"name":"Part 3","startTime":"2024-03-17T11:17:08.000Z","endTime":"2024-03-17T11:17:24.000Z","subEntries":null}]},{"name":"#tag3 Segment 4","startTime":null,"endTime":null,"subEntries":[{"name":"Part 1 #tag4","startTime":"2024-03-17T12:22:04.000Z","endTime":"2024-03-17T12:22:16.000Z","subEntries":null},{"name":"#tag5 Part 2 *italic*","startTime":"2024-03-17T12:22:20.000Z","endTime":"2024-03-17T12:22:24.000Z","subEntries":null}]},{"name":"*italic* Segment 5 #tag6 [test2](test2)","startTime":"2024-03-17T12:40:37.000Z","endTime":"2024-03-17T12:40:45.000Z","subEntries":null}]}
```