diff --git a/content/applications/hr/time_off/management.rst b/content/applications/hr/time_off/management.rst index a53cd24deb..22248298a0 100644 --- a/content/applications/hr/time_off/management.rst +++ b/content/applications/hr/time_off/management.rst @@ -6,10 +6,10 @@ Management Time off and allocation requests undergo an approval process before being granted. Requests either need one or two approvals, if any, depending on how the specific type of time off is configured. All -these configurations can be found under the *Management* section of the *Time Off* application. +these configurations can be found under the *Management* section of the **Time Off** application. -Only people who can approve allocation and time off requests have the :guilabel:`Management` section -visible in the *Time Off* application. +Only people who can :ref:`approve allocation and time off requests ` have +the :guilabel:`Management` section visible in the **Time Off** application. .. _time_off/manage-time-off: @@ -20,13 +20,12 @@ To view time off requests that need approval, navigate to :menuselection:`Time O Management --> Time Off`. Doing so reveals the :guilabel:`All Time Off` page. The only time off requests that are visible on this page belong to employees the user either has -:guilabel:`Time Off Officer` or :guilabel:`Administrator` access rights for in the *Time Off* +:guilabel:`Time Off Officer` or :guilabel:`Administrator` access rights for in the **Time Off** application. -The default filter on the :guilabel:`All Time Off` page is `Waiting For Me`. - -This filter only presents time off requests that need to be approved for current employees on the -user's team, with a status of either :guilabel:`To Approve` or :guilabel:`Second Approval`. +The default filter on the :guilabel:`All Time Off` page is :icon:`fa-filter` :guilabel:`Waiting For +Me`. This filter only presents time off requests that need to be approved for current employees on +the user's team, with a status of either :guilabel:`To Approve` or :guilabel:`Second Approval`. On the left side of the :guilabel:`All Time Off` page, there are various grouping options that can be used to narrow down the presented time off requests, located beneath the :guilabel:`Status` and @@ -39,8 +38,8 @@ The various departments the user is a member of, and manages employees under, al left side of the page, under :guilabel:`Departments`. .. note:: - If there are no requests that fall under one of the status options or departments, that status - or department is **not** visible on the left-side menu. + If no requests fall under one of the status options or departments, that status or department is + **not** visible on the left-side menu. To only display time off requests for specific departments, click on the :guilabel:`Department` on the left-hand side of the page. Only requests within the selected department are then presented. @@ -51,7 +50,7 @@ color. The :guilabel:`To Approve` and :guilabel:`Second Approval` requests are highlighted in yellow, and are the only ones that appear in the list by default. -If the `Waiting For Me` filter is removed, all statuses appear. +If the :icon:`fa-filter` :guilabel:`Waiting For Me` filter is removed, all statuses appear. :guilabel:`Approved` requests are highlighted in green, :guilabel:`To Submit` (drafts) requests are highlighted in blue, and the :guilabel:`Refused` requests are highlighted in gray. @@ -66,7 +65,6 @@ To refuse a request, click the :icon:`fa-times` :guilabel:`Refuse` button at the line. .. image:: management/time-off-requests.png - :align: center :alt: Time off requests with the filter, groupings, and status sections highlighted. For more details, click anywhere on the time off request line (except for the :icon:`fa-thumbs-up` @@ -89,11 +87,11 @@ To view allocations that need approval, navigate to :menuselection:`Time Off app Allocations`. Doing so reveals the :guilabel:`Allocations` page. The user is only presented with allocations for employees they have either :guilabel:`Time Off -Officer` or :guilabel:`Administrator` access rights for in the *Time Off* application. +Officer` or :guilabel:`Administrator` access rights for in the **Time Off** application. -The default filters configured on the :guilabel:`Allocations` page are :guilabel:`My Team` and -:guilabel:`Active Employee`. These default filters *only* present employees on the user's team (who -they manage) and active employees. Inactive records are not shown. +The default filters configured on the :guilabel:`Allocations` page are :guilabel:`First Approval` +and :guilabel:`My Team`. These default filters only present employees that the user manages and are +awaiting their first approval. Approved and refused allocation requests are not shown. The left side of the :guilabel:`Allocations` page has various grouping options to narrow down the presented allocation requests. @@ -125,25 +123,23 @@ allocations for that specific department. :icon:`fa-times` :guilabel:`(remove)` icon on the specific filter to remove it. The status column displays the status of each request, with the status highlighted in a specific -color. - -The :guilabel:`To Approve` requests are highlighted in yellow, :guilabel:`Approved` requests are -highlighted in green, and the :guilabel:`Refused` requests are highlighted in gray. +color. The :guilabel:`To Approve` requests are highlighted in yellow, and if the default +:guilabel:`First Approval` filter is removed, the :guilabel:`Approved` requests are highlighted in +green, and the :guilabel:`Refused` requests are highlighted in gray. -To approve an allocation request, click the :icon:`fa-check` :guilabel:`Validate` button at the end -of the line. To refuse a request, click the :icon:`fa-times` :guilabel:`Refuse` button. +To approve an allocation request, click the :icon:`fa-thumbs-up` :guilabel:`Approve` button at the +end of the line. To refuse a request, click the :icon:`fa-times` :guilabel:`Refuse` button. .. image:: management/allocations.png - :align: center :alt: Allocations with the filter, groupings, and status sections highlighted. If more details are needed, click anywhere on the allocation request line (except for the -:icon:`fa-check` :guilabel:`Validate` or :icon:`fa-times` :guilabel:`Refuse` buttons) to view the +:icon:`fa-thumbs-up` :guilabel:`Approve` or :icon:`fa-times` :guilabel:`Refuse` buttons) to view the specific request in detail, via the allocation request form. Depending on the rights of the user, changes can be made to the allocation request form that appears. To modify the request, make any desired changes to the form. All changes are automatically saved. -It is also possible to approve or refuse the request from this form. Click the :guilabel:`Validate` +It is also possible to approve or refuse the request from this form. Click the :guilabel:`Approve` button to approve, or the :guilabel:`Refuse` button to refuse the request. diff --git a/content/applications/hr/time_off/management/allocations.png b/content/applications/hr/time_off/management/allocations.png index d4df92adad..30465bfa46 100644 Binary files a/content/applications/hr/time_off/management/allocations.png and b/content/applications/hr/time_off/management/allocations.png differ diff --git a/content/applications/hr/time_off/management/time-off-requests.png b/content/applications/hr/time_off/management/time-off-requests.png index b2a24767a5..70467200d9 100644 Binary files a/content/applications/hr/time_off/management/time-off-requests.png and b/content/applications/hr/time_off/management/time-off-requests.png differ