Ellpeck/ObsidianSimpleTimeTracker
1
0
Fork 0
mirror of https://github.com/Ellpeck/ObsidianSimpleTimeTracker.git synced 2024-11-28 12:08:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:f308679bd2a9474194c50edc8e65676dd8fe5bb4
Branches Tags
Ellpeck:master
Ellpeck:1.0.3
Ellpeck:1.0.2
Ellpeck:1.0.1
Ellpeck:1.0.0
Ellpeck:0.2.2
Ellpeck:0.2.1
Ellpeck:0.2.0
Ellpeck:0.1.8
Ellpeck:0.1.7
Ellpeck:0.1.6
Ellpeck:0.1.5
Ellpeck:0.1.4
Ellpeck:0.1.3
Ellpeck:0.1.2
Ellpeck:0.1.1
Ellpeck:0.1.0
..
compare: Ellpeck:bd7c35e7fb27ff22b58f794c4403c49d4ee3d027
Branches Tags
Ellpeck:master
Ellpeck:1.0.3
Ellpeck:1.0.2
Ellpeck:1.0.1
Ellpeck:1.0.0
Ellpeck:0.2.2
Ellpeck:0.2.1
Ellpeck:0.2.0
Ellpeck:0.1.8
Ellpeck:0.1.7
Ellpeck:0.1.6
Ellpeck:0.1.5
Ellpeck:0.1.4
Ellpeck:0.1.3
Ellpeck:0.1.2
Ellpeck:0.1.1
Ellpeck:0.1.0

No commits in common. "f308679bd2a9474194c50edc8e65676dd8fe5bb4" and "bd7c35e7fb27ff22b58f794c4403c49d4ee3d027" have entirely different histories.
f308679bd2 ... bd7c35e7fb

2 changed files with 37 additions and 21 deletions
Show stats Expand all files Collapse all files

41
src/tracker.ts
View file

@ -319,25 +319,26 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
renderNameAsMarkdown(nameField.label, getFile, component); renderNameAsMarkdown(nameField.label, getFile, component);
let expandButton = new ButtonComponent(nameField.label) if (entry.subEntries?.length) {
.setClass("clickable-icon") let expandButton = new ButtonComponent(nameField.label)
.setClass("simple-time-tracker-expand-button") .setClass("clickable-icon")
.setIcon(`chevron-${entry.collapsed ? 'right' : 'down'}`) .setClass("simple-time-tracker-expand-button")
.setTooltip(entry.collapsed ? "Expand" : "Collapse") .setIcon(`chevron-${entry.collapsed ? 'right' : 'down'}`)
.onClick(async () => { .setTooltip(entry.collapsed ? "Expand" : "Collapse")
if (entry.collapsed) { .onClick(async () => {
delete entry.collapsed; if (entry.collapsed) {
} else { delete entry.collapsed;
entry.collapsed = 1; } else {
} entry.collapsed = 1;
await saveTracker(tracker, this.app, getFile(), getSectionInfo()); }
}); await saveTracker(tracker, this.app, getFile(), getSectionInfo());
if (!entry.subEntries?.length) expandButton.buttonEl.style.visibility = 'hidden'; });
let nameWrapper = nameField.cell.createDiv({cls: "simple-time-tracker-table-expandwrapper"}); let nameWrapper = nameField.cell.createDiv({cls: "simple-time-tracker-table-expandwrapper"});
nameWrapper.style.marginLeft = nameField.label.style.marginLeft; nameWrapper.style.marginLeft = nameField.label.style.marginLeft;
nameField.label.style.marginLeft = null; nameField.label.style.marginLeft = null;
nameWrapper.insertBefore(expandButton.buttonEl, null); nameWrapper.insertBefore(nameField.label, null);
nameWrapper.insertBefore(nameField.label, null); nameWrapper.insertBefore(expandButton.buttonEl, null);
}
let entryButtons = row.createEl("td"); let entryButtons = row.createEl("td");
entryButtons.addClass("simple-time-tracker-table-buttons"); entryButtons.addClass("simple-time-tracker-table-buttons");
@ -357,7 +358,6 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
.onClick(async () => { .onClick(async () => {
if (nameField.editing()) { if (nameField.editing()) {
entry.name = nameField.endEdit(); entry.name = nameField.endEdit();
expandButton.buttonEl.style.display = null;
startField.endEdit(); startField.endEdit();
entry.startTime = startField.getTimestamp(); entry.startTime = startField.getTimestamp();
if (!entryRunning) { if (!entryRunning) {
@ -370,7 +370,6 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
renderNameAsMarkdown(nameField.label, getFile, component); renderNameAsMarkdown(nameField.label, getFile, component);
} else { } else {
nameField.beginEdit(entry.name); nameField.beginEdit(entry.name);
expandButton.buttonEl.style.display = 'none';
// 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
if (!entry.subEntries) { if (!entry.subEntries) {
startField.beginEdit(entry.startTime); startField.beginEdit(entry.startTime);

17
styles.css
View file

@ -79,3 +79,20 @@
.simple-time-tracker-table tr:hover { .simple-time-tracker-table tr:hover {
background-color: var(--background-modifier-hover); background-color: var(--background-modifier-hover);
} }
.simple-time-tracker-table :is(td,th):first-child {
/* HACKY hardcoded 2em to make room for expand/collapse button */
padding-left: 2em;
}
.simple-time-tracker-table-expandwrapper {
position: relative;
}
.simple-time-tracker-expand-button {
position: absolute;
/* HACKY there should be a better way to position this */
left: 0;
top: 50%;
transform: translate(-100%, -50%);
}