diff --git a/package.json b/package.json index 80e94ee..e496564 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "redmine-time-tracking", "description": "Redmine Time Tracking", - "version": "1.6.1", + "version": "1.6.2", "author": { "name": "CrawlerCode", "email": "crawlercode@outlook.de" diff --git a/public/manifest.json b/public/manifest.json index 801dbc3..8662bd8 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Redmine Time Tracking", - "version": "1.6.1", + "version": "1.6.2", "description": "Start-stop timer for Redmine", "icons": { "16": "logo16.png", diff --git a/src/components/issues/IssuesList.tsx b/src/components/issues/IssuesList.tsx index 95fb7ca..6d79a39 100644 --- a/src/components/issues/IssuesList.tsx +++ b/src/components/issues/IssuesList.tsx @@ -156,7 +156,7 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData: ...issuesData, [issue.id]: { ...data, - remember: true, + remembered: true, }, }); }} @@ -174,7 +174,7 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData: ...issuesData, [issue.id]: { ...data, - remembered: true, + pinned: true, }, }); }} diff --git a/src/components/time/TimeEntry.tsx b/src/components/time/TimeEntry.tsx index b17c7b6..d0f82a6 100644 --- a/src/components/time/TimeEntry.tsx +++ b/src/components/time/TimeEntry.tsx @@ -8,7 +8,7 @@ type PropTypes = { }; const TimeEntry = ({ entries, previewHours, maxHours = 24 }: PropTypes) => { - const hours = entries.reduce((sum, entry) => sum + entry.hours, 0); + const sumHours = entries.reduce((sum, entry) => sum + entry.hours, 0); return (
{entries.map((entry) => ( @@ -54,7 +54,7 @@ const TimeEntry = ({ entries, previewHours, maxHours = 24 }: PropTypes) => {
{ return (

{format(date, "EEE")}

-

{hours} h

+

{hours} h

diff --git a/src/components/time/TimeEntryPreview.tsx b/src/components/time/TimeEntryPreview.tsx index 65623d2..e468b72 100644 --- a/src/components/time/TimeEntryPreview.tsx +++ b/src/components/time/TimeEntryPreview.tsx @@ -9,9 +9,16 @@ type PropTypes = { const TimeEntryPreview = ({ date, previewHours }: PropTypes) => { const myTimeEntriesQuery = useMyTimeEntries(date, date); - const maxHours = myTimeEntriesQuery.data.reduce((sum, entry) => sum + entry.hours, 0) + previewHours; + const sumHours = myTimeEntriesQuery.data.reduce((sum, entry) => sum + entry.hours, 0) + previewHours; - return 12 ? maxHours : 12} />; + return ( +
+

{sumHours} h

+
+ 12 ? sumHours : 12} /> +
+
+ ); }; export default TimeEntryPreview; diff --git a/src/pages/IssuesPage.tsx b/src/pages/IssuesPage.tsx index f0db791..25d2cbb 100644 --- a/src/pages/IssuesPage.tsx +++ b/src/pages/IssuesPage.tsx @@ -21,7 +21,7 @@ const IssuesPage = () => { const myIssuesQuery = useMyIssues( Object.keys(issuesData.data) .map((id) => Number(id)) - .filter((id) => issuesData.data[id].remember || issuesData.data[id].active || issuesData.data[id].time > 0), + .filter((id) => issuesData.data[id].remembered || issuesData.data[id].remember || issuesData.data[id].active || issuesData.data[id].time > 0), searching ? search : "" );