Skip to content

Commit 291d688

Browse files
committed
fix: Fixed remember and pin action
- Fixed remember and pin action - Added time entry preview sum hours - Bump version to 1.6.2
1 parent 14480da commit 291d688

File tree

7 files changed

+17
-10
lines changed

7 files changed

+17
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "redmine-time-tracking",
33
"description": "Redmine Time Tracking",
4-
"version": "1.6.1",
4+
"version": "1.6.2",
55
"author": {
66
"name": "CrawlerCode",
77
"email": "[email protected]"

public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 3,
33
"name": "Redmine Time Tracking",
4-
"version": "1.6.1",
4+
"version": "1.6.2",
55
"description": "Start-stop timer for Redmine",
66
"icons": {
77
"16": "logo16.png",

src/components/issues/IssuesList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData:
156156
...issuesData,
157157
[issue.id]: {
158158
...data,
159-
remember: true,
159+
remembered: true,
160160
},
161161
});
162162
}}
@@ -174,7 +174,7 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData:
174174
...issuesData,
175175
[issue.id]: {
176176
...data,
177-
remembered: true,
177+
pinned: true,
178178
},
179179
});
180180
}}

src/components/time/TimeEntry.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type PropTypes = {
88
};
99

1010
const TimeEntry = ({ entries, previewHours, maxHours = 24 }: PropTypes) => {
11-
const hours = entries.reduce((sum, entry) => sum + entry.hours, 0);
11+
const sumHours = entries.reduce((sum, entry) => sum + entry.hours, 0);
1212
return (
1313
<div className="flex gap-x-0.5 items-center">
1414
{entries.map((entry) => (
@@ -54,7 +54,7 @@ const TimeEntry = ({ entries, previewHours, maxHours = 24 }: PropTypes) => {
5454
<div
5555
className="h-3 bg-gray-400/40 dark:bg-gray-700/40 rounded"
5656
style={{
57-
width: `${((maxHours - hours - (previewHours ?? 0)) / maxHours) * 100}%`,
57+
width: `${((maxHours - sumHours - (previewHours ?? 0)) / maxHours) * 100}%`,
5858
backgroundSize: "1rem 1rem",
5959
backgroundImage: "linear-gradient(45deg,rgba(255,255,255,.05) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.05) 50%,rgba(255,255,255,.05) 75%,transparent 75%,transparent)",
6060
}}

src/components/time/TimeEntryList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const TimeEntryList = ({ entries }: PropTypes) => {
7979
return (
8080
<div className="grid grid-cols-10 items-center gap-x-1">
8181
<h4 className="col-span-1 text-sm">{format(date, "EEE")}</h4>
82-
<h3 className="col-span-2 text-sm text-end font-semibold truncate">{hours} h</h3>
82+
<h3 className="col-span-2 text-sm text-end font-semibold truncate text-clip">{hours} h</h3>
8383
<div className="col-span-7">
8484
<TimeEntry entries={groupEntries} maxHours={maxHours} />
8585
</div>

src/components/time/TimeEntryPreview.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ type PropTypes = {
99
const TimeEntryPreview = ({ date, previewHours }: PropTypes) => {
1010
const myTimeEntriesQuery = useMyTimeEntries(date, date);
1111

12-
const maxHours = myTimeEntriesQuery.data.reduce((sum, entry) => sum + entry.hours, 0) + previewHours;
12+
const sumHours = myTimeEntriesQuery.data.reduce((sum, entry) => sum + entry.hours, 0) + previewHours;
1313

14-
return <TimeEntry entries={myTimeEntriesQuery.data} previewHours={previewHours} maxHours={maxHours > 12 ? maxHours : 12} />;
14+
return (
15+
<div className="grid grid-cols-6 items-center gap-x-1">
16+
<h3 className="col-span-1 text-sm font-semibold truncate text-clip">{sumHours} h</h3>
17+
<div className="col-span-5">
18+
<TimeEntry entries={myTimeEntriesQuery.data} previewHours={previewHours} maxHours={sumHours > 12 ? sumHours : 12} />
19+
</div>
20+
</div>
21+
);
1522
};
1623

1724
export default TimeEntryPreview;

src/pages/IssuesPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const IssuesPage = () => {
2121
const myIssuesQuery = useMyIssues(
2222
Object.keys(issuesData.data)
2323
.map((id) => Number(id))
24-
.filter((id) => issuesData.data[id].remember || issuesData.data[id].active || issuesData.data[id].time > 0),
24+
.filter((id) => issuesData.data[id].remembered || issuesData.data[id].remember || issuesData.data[id].active || issuesData.data[id].time > 0),
2525
searching ? search : ""
2626
);
2727

0 commit comments

Comments
 (0)