diff --git a/docs/getting-started/my-page/README.md b/docs/getting-started/my-page/README.md index 202c1f8c44a..6517935c540 100644 --- a/docs/getting-started/my-page/README.md +++ b/docs/getting-started/my-page/README.md @@ -86,7 +86,7 @@ To delete a widget from the dashboard, click on the three dots in the upper righ > [!NOTE] > -> Please note that this widget will be deprecated in an upcoming release. Instead of using it, we recommend logging time via [My time tracking module](../../user-guide/my-time-tracking/). +> Please note that this widget will be deprecated in an upcoming release. Instead of using it, we recommend logging time via [My time tracking module](../../user-guide/time-and-costs/my-time-tracking/). To track spent time, [add the **My spent time** widget](#add-widgets) in the My page. diff --git a/docs/release-notes/16-0-0/README.md b/docs/release-notes/16-0-0/README.md index 419345e5d55..f9113975a83 100644 --- a/docs/release-notes/16-0-0/README.md +++ b/docs/release-notes/16-0-0/README.md @@ -77,7 +77,7 @@ Get an [introduction in the user guide](../../user-guide/work-packages/automatic ## Separate time tracking module with calendar view -OpenProject 16.0 offers a separate time tracking module with a calendar view. It is accessible from the global view and listed in the left side bar navigation called [My time tracking](../../user-guide/my-time-tracking/). There, users can view and edit their logged time with start and end times. The user can switch between daily, weekly, work week and monthly views and also log new time entries directly by clicking in the calendar. +OpenProject 16.0 offers a separate time tracking module with a calendar view. It is accessible from the global view and listed in the left side bar navigation called [My time tracking](../../user-guide/time-and-costs/my-time-tracking/). There, users can view and edit their logged time with start and end times. Users can switch between daily, weekly, work week and monthly views and also log new time entries directly by clicking in the calendar. Each day shows the sum of the tracked time, and in the weekly and monthly views, the total tracked time is displayed in the lower right corner. @@ -85,7 +85,7 @@ Each day shows the sum of the tracked time, and in the weekly and monthly views, Please note that this module has to be activated by an administrator first. Navigate to *Administration → Time and costs → Defaults* and check the box next to 'Allow exact time tracking' to enable tracking start and finish dates. If 'Allow exact time tracking' is enabled, the calendar becomes the default view for the My time tracking module. If 'Require exact times' is checked, users must provide both start and end times when logging time. Otherwise, the list view remains the default. In the calendar view, all entries are then displayed at the top of the respective day column. -Learn more about My time tracking module in [this user guide](../../user-guide/my-time-tracking/) and [this blog article](https://www.openproject.org/blog/time-tracking-module/). +Learn more about My time tracking module in [this user guide](../../user-guide/time-and-costs/my-time-tracking/) and [this blog article](https://www.openproject.org/blog/time-tracking-module/). ### Time entries with legally required mandatory fields: start time and finish time diff --git a/docs/user-guide/README.md b/docs/user-guide/README.md index 919c4e115df..b11dc3c345a 100644 --- a/docs/user-guide/README.md +++ b/docs/user-guide/README.md @@ -44,7 +44,7 @@ Please choose the module or feature you want to learn more about. | [GitLab](../system-admin-guide/integrations/gitlab-integration/) | How to manage the GitLab integration. | | [Meetings](meetings) | How to manage meetings to create and share meeting agenda and meeting outcomes. | | [Members](members) | How to manage Members in a project. | -| [My time tracking](my-time-tracking) | How to manage personal time entries in list and calendar views. | +| [My time tracking](./time-and-costs/my-time-tracking) | How to manage personal time entries in list and calendar views. | | [News](news) | How to create and manage News for your projects. | | [Nextcloud integration](./file-management/nextcloud-integration) | How to link and use Nextcloud files and folders in OpenProject. | | [OneDrive/SharePoint integration](./file-management/one-drive-integration) | How to link and use SharePoint files and folders in OpenProject. | diff --git a/docs/user-guide/my-time-tracking/openproject-my-time-tracking-page1.gif b/docs/user-guide/my-time-tracking/openproject-my-time-tracking-page1.gif deleted file mode 100644 index c713ef872a7..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject-my-time-tracking-page1.gif and /dev/null differ diff --git a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_calendar_tab_total_sums.png b/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_calendar_tab_total_sums.png deleted file mode 100644 index 197d1a17188..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_calendar_tab_total_sums.png and /dev/null differ diff --git a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_filters_explained.png b/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_filters_explained.png deleted file mode 100644 index 985322302f6..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_filters_explained.png and /dev/null differ diff --git a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_edit_icon.png b/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_edit_icon.png deleted file mode 100644 index 1994694ee11..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_edit_icon.png and /dev/null differ diff --git a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_overview.png b/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_overview.png deleted file mode 100644 index 0dbeefdeb08..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_overview.png and /dev/null differ diff --git a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_logging_modal.png b/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_logging_modal.png deleted file mode 100644 index cbe5b185a6b..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_logging_modal.png and /dev/null differ diff --git a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_overview.png b/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_overview.png deleted file mode 100644 index 81cf1000379..00000000000 Binary files a/docs/user-guide/my-time-tracking/openproject_user_guide_my_time_tracking_module_overview.png and /dev/null differ diff --git a/docs/user-guide/time-and-costs/README.md b/docs/user-guide/time-and-costs/README.md index a75336587be..5a95b0c5446 100644 --- a/docs/user-guide/time-and-costs/README.md +++ b/docs/user-guide/time-and-costs/README.md @@ -3,7 +3,7 @@ sidebar_navigation: title: Time and costs priority: 790 description: Time tracking and cost reporting in OpenProject. -keywords: Time tracking, cost reporting +keywords: Time tracking, cost tracking, cost reporting --- # Time tracking and cost reporting @@ -16,6 +16,7 @@ Create budgets, log time and costs on specific work packages and create time and |--------------------------------------|:--------------------------------------------| | [Progress tracking](progress-tracking)| How to track progress for work packages | | [Time tracking](time-tracking) | How to log time to work packages. | +| [My time tracking module](my-time-tracking) | How to log time in my tracking module | | [Cost tracking](cost-tracking) | How to track unit costs spent in a project. | | [Time and cost reporting](reporting) | How to create time and cost reports. | diff --git a/docs/user-guide/my-time-tracking/README.md b/docs/user-guide/time-and-costs/my-time-tracking/README.md similarity index 87% rename from docs/user-guide/my-time-tracking/README.md rename to docs/user-guide/time-and-costs/my-time-tracking/README.md index 5c6a3d0ca0a..bf7e76ada67 100644 --- a/docs/user-guide/my-time-tracking/README.md +++ b/docs/user-guide/time-and-costs/my-time-tracking/README.md @@ -35,7 +35,7 @@ The *My time tracking* module offers a clear overview of your personal time entr ### Calendar view -The *Calendar* view opens by default if start and finish times for time entries have been enabled in [System Administration](../../system-admin-guide/time-and-costs). You can adjust the zoom level using the dropdown menu, with options for **Day**, **Work week**, **Week**, or **Month**. +The *Calendar* view opens by default if start and finish times for time entries have been enabled in [System Administration](../../../system-admin-guide/time-and-costs). You can adjust the zoom level using the dropdown menu, with options for **Day**, **Work week**, **Week**, or **Month**. The current day is highlighted. Existing time entries appear on the corresponding days they were logged. Entry colors reflect the type of work package associated with the logged time. @@ -45,7 +45,7 @@ You can log time by selecting a time range anywhere on the calendar or by using You can drag and drop time entries to reposition them within the same day or move them to a different day. To adjust the duration of an entry, drag the top or bottom edge of the time entry up or down. -![Example of logging time in OpenProject My time tracking module](openproject-my-time-tracking-page1.gif) +![Example of logging time in OpenProject My time tracking module](openproject-my-time-tracking-page.gif) To edit a time entry, click it in the calendar, make your changes, and save. You can also delete it from the same menu. @@ -55,13 +55,15 @@ At the bottom of each day a sum of hours per day is displayed. If week or month ### List view -The *List* view opens by default if start and finish times for time entries are **disabled** in [System Administration](../../system-admin-guide/time-and-costs). Just like in the *Calendar* view, you can select the zoom level using the dropdown menu — options include **Day**, **Work week**, **Week**, or **Month**. +The *List* view opens by default if start and finish times for time entries are **disabled** in [System Administration](../../../system-admin-guide/time-and-costs). Just like in the *Calendar* view, you can select the zoom level using the dropdown menu — options include **Day**, **Work week**, **Week**, or **Month**. In this view, time entries are grouped by day. Each day displays the total number of entries and their combined duration on the right side of the header line. - When the **Day** zoom is selected, the view is expanded by default. -- When **Week** or **Month** zoom is selected, past days or weeks are collapsed by default. However, the current day (in Week view) or the current week (in Month view) is expanded, along with all future dates. +- When **Week** or **Work week** zoom is selected, past and future days are collapsed by default. However, the current day is expanded. + +- When **Month** zoom is selected, past days or weeks are collapsed by default. However, the current week is expanded, along with all future weeks of that month. > [!TIP] > If monthly level is chosen in the list view mode, time entries are aggregated by week and not by day. This is especially useful to get an overview of your tracked hours for each week. diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject-my-time-tracking-page.gif b/docs/user-guide/time-and-costs/my-time-tracking/openproject-my-time-tracking-page.gif new file mode 100644 index 00000000000..d26bb1b6238 Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject-my-time-tracking-page.gif differ diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_calendar_tab_total_sums.png b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_calendar_tab_total_sums.png new file mode 100644 index 00000000000..65143ed3d93 Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_calendar_tab_total_sums.png differ diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_filters_explained.png b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_filters_explained.png new file mode 100644 index 00000000000..ee104ccf4e9 Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_filters_explained.png differ diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_edit_icon.png b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_edit_icon.png new file mode 100644 index 00000000000..3dc7c5dca84 Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_edit_icon.png differ diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_overview.png b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_overview.png new file mode 100644 index 00000000000..939ec2c50cb Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_list_view_overview.png differ diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_logging_modal.png b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_logging_modal.png new file mode 100644 index 00000000000..4af58da90f4 Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_logging_modal.png differ diff --git a/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_overview.png b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_overview.png new file mode 100644 index 00000000000..d1dd3dff451 Binary files /dev/null and b/docs/user-guide/time-and-costs/my-time-tracking/openproject_user_guide_my_time_tracking_module_overview.png differ