diff --git a/docs/integration/hrms/e-claim/app-usage.md b/docs/integration/hrms/e-claim/app-usage.md index faf922b..affcecc 100644 --- a/docs/integration/hrms/e-claim/app-usage.md +++ b/docs/integration/hrms/e-claim/app-usage.md @@ -25,9 +25,13 @@ Prorated year claim limit will be applied to user whose Join Year = Current Year | Claim | Description | | ------------------- | ------------------------------------------------------------- | | **Default Claim** | Select expense type, claim date, amount and description | + | **Receipt Scan** | Select attachment of a receipt | | **E-Invoice Claim** | Select attachment that includes a **VALID** E-Invoice QR code | - User can view the MTD limit, YTD limit and claim balance for each selected expenses type + - For Receipt Scan, + - Rescan: Resubmit attachment for reanalyzing if the scan result is incorrect + - Refresh Status: Refresh scan status after attachment is uploaded if scanning is still in progress - For E-Invoice Claim, post date, ref 1 and ref 2 will be filled in based on the E-Invoice and are not editable - User need to allow Camera and Photos (only for iOS device) permission in order to continue the service (refer [Android Permission](../permission.md#android-2) and [iOS Permission](../permission.md#ios-2)) diff --git a/docs/integration/hrms/e-leave/app-usage.md b/docs/integration/hrms/e-leave/app-usage.md index 7313294..e0896d7 100644 --- a/docs/integration/hrms/e-leave/app-usage.md +++ b/docs/integration/hrms/e-leave/app-usage.md @@ -35,7 +35,13 @@ apply ![leave-app-employee](../../../../static/img/integration/hrms/e-leave/leave-app-employee.png) 1. Select leave duration type: Full Day, Half Day, Custom Time -2. Select leave date, leave time, leave type, description - User can view year balance and leave taken for the selected leave type - **_'I'm taking leave' checkbox_** : - Checked: Normal leave application - Unchecked: Apply leave as OT replacement - User need to allow Camera and Photos (only for iOS device) permission to continue the service (refer [Android Permission](../permission.md#android-2) and [iOS Permission](../permission.md#ios-2)) +2. Select leave date, leave time, leave type, description + - User can view leave type advanced period, year balance and leave taken for the selected leave type + - Advanced Period: Hours in advanced employee must apply for leave before it starts + - **_'I'm taking leave' checkbox_** : + - Checked: Normal leave application + - Unchecked: Apply leave as OT replacement + - User need to allow Camera and Photos (only for iOS device) permission to continue the service (refer [Android Permission](../permission.md#android-2) and [iOS Permission](../permission.md#ios-2)) 3. Submit :::info @@ -212,7 +218,7 @@ Batch Leave Approval will undergo the same checkings as Leave Approval and warni ### Leave Approval Notification -#### Leave Approval Notify Message +#### Leave Approved User will receive the following notification once manager approves his leave: @@ -226,16 +232,9 @@ User will receive the following notification once manager approves his leave: #### Leave Approval Failed -User will receive the following notification if manager fails to approve his leave (exceed year limit): - -1. App Notification - +User will receive an app notification if manager fails to approve his leave (exceed year limit): ![leave-approval-failed-app-noti](../../../../static/img/integration/hrms/e-leave/leave-approval-failed-app-noti.png) -2. Email Notification - - ![leave-approval-failed-email-noti](../../../../static/img/integration/hrms/e-leave/leave-approval-failed-email-noti.png) - #### Leave Rejected User will receive the following notification once manager rejects his leave: diff --git a/docs/integration/hrms/e-tms/app-usage.md b/docs/integration/hrms/e-tms/app-usage.md index ef2ebaa..91c4bc8 100644 --- a/docs/integration/hrms/e-tms/app-usage.md +++ b/docs/integration/hrms/e-tms/app-usage.md @@ -181,6 +181,7 @@ Shows the employee's OT entitlement - User can view his own time attendance summary - User can tap on the card to direct to [**Attendance Log**](#log) to view detailed summary +- Last processed summary date will be displayed at the bottom ### Team Summary @@ -196,6 +197,7 @@ Shows the employee's OT entitlement - No Out - OT - Leave +- Last processed summary date will be displayed at the bottom ### Clock On Behalf (Manager only) @@ -203,6 +205,7 @@ Managers are allowed to clock in on behalf for his team by tapping on the **_'Cl ![clock-on-behalf1](../../../../static/img/integration/hrms/e-tms/clock-on-behalf1.png) +- The **_'Clock on Behalf' button_** will only be visible on dates after the last summary processed date until today - After choosing an employee, the manager is directed to the [**Attendance Log**](#log) where a Right Arrow icon on each log and a **_'Clock In' button_** is visible - Tap on the Right Arrow icon to direct to Attendance Log Detail @@ -266,47 +269,19 @@ The notification will appear after employee clocked in and has **_'GPS Monitorin ### Clock On Behalf -- The manager themselves and other managers managing the same employee will receive the following notifications once they clock on behalf for an employee +- The manager themselves and other managers managing the same employee will receive an app notification once they clock on behalf for an employee + ![clock-on-behalf-notification1](../../../../static/img/integration/hrms/e-tms/clock-on-behalf-notification1.png) - - App Notification - - ![clock-on-behalf-notification1](../../../../static/img/integration/hrms/e-tms/clock-on-behalf-notification1.png) - - - Email Notification - - ![clock-on-behalf-notification2](../../../../static/img/integration/hrms/e-tms/clock-on-behalf-notification2.png) - -- The employee will receive the following notifications once their manager clock on behalf for them - - - App Notification - - ![clock-on-behalf-notification3](../../../../static/img/integration/hrms/e-tms/clock-on-behalf-notification3.png) - - - Email Notification - - ![clock-on-behalf-notification4](../../../../static/img/integration/hrms/e-tms/clock-on-behalf-notification4.png) +- The employee will receive an app notification once their manager clock on behalf for them + ![clock-on-behalf-notification2](../../../../static/img/integration/hrms/e-tms/clock-on-behalf-notification2.png) ### Adjusted Attendance Log -- The manager themselves and other managers managing the same employee will receive the following notifications once they adjusted an employee's attendance log - - - App Notification - - ![adjusted-log-notification1](../../../../static/img/integration/hrms/e-tms/adjusted-log-notification1.png) - - - Email Notification - - ![adjusted-log-notification2](../../../../static/img/integration/hrms/e-tms/adjusted-log-notification2.png) - -- The employee will receive the following notifications once their manager adjusted their attendance log - - - App Notification - - ![adjusted-log-notification3](../../../../static/img/integration/hrms/e-tms/adjusted-log-notification3.png) - - - Email Notification +- The manager themselves and other managers managing the same employee will receive an app notification once they adjusted an employee's attendance log + ![adjusted-log-notification1](../../../../static/img/integration/hrms/e-tms/adjusted-log-notification1.png) - ![adjusted-log-notification4](../../../../static/img/integration/hrms/e-tms/adjusted-log-notification4.png) +- The employee will receive an app notification once their manager adjusted their attendance log + ![adjusted-log-notification2](../../../../static/img/integration/hrms/e-tms/adjusted-log-notification2.png) ### Employee login from a different device diff --git a/docs/integration/hrms/e-tms/payroll-setup.md b/docs/integration/hrms/e-tms/payroll-setup.md index f21669f..ead669a 100644 --- a/docs/integration/hrms/e-tms/payroll-setup.md +++ b/docs/integration/hrms/e-tms/payroll-setup.md @@ -87,7 +87,7 @@ For more Public Holiday options, user may click on the **_'≣'_** on the grid t :::info - Only one clock method can be selected. However, if none of the clock method is selected, then the clock in / out button in SQL HRMS app will be disabled and employee does not require to clock in / out. - - Clock Method on days without work session, public holiday and rest day is by default **GPS**. + - Clock Method on days without work session, public holiday and rest day is by default **GPS**. User may update to their desire clock method in [Maintain Calendar](#maintain-calendar). ::: @@ -184,12 +184,13 @@ Make sure that the work session is set based on the time zone maintained in Comp - **Black font:** Work Day with Session - **Grey font:** No schedule is assigned -**Set Work Session:** +**Set Work Session / Clock Method:** -- User may click on **_'R' button_** or **_'W' button_** and select date from calendar +- User may click on **_'R' button_**, **_'W' button_** or **_'M' button_** and select date from calendar - Use **_'C' button_** to clear Work Session/Rest Day - Alternatively, user may use **_'Clear All' button_** to clear all Rest Day and Work Session within the date range -- User cannot assign work sessions or change work sessions on dates before summary last processed date + - Note that clock method will also be reset back to **'GPS'** +- User cannot assign work sessions, change work sessions or change clock method on dates before summary last processed date - On days without work session assigned, no summary will be processed unless there are clock in/clock out logs on that day ### Wizard @@ -230,7 +231,15 @@ Make sure that the work session is set based on the time zone maintained in Comp | By Weeks | Assign to every selected day of every selected weeks of the year | | Custom | Assign to selected dates | -5. Process +5. Next, select a Clock Method + + ![calendar-wizard3](../../../../static/img/integration/hrms/e-tms/calendar-wizard3.png) + + - Selected clock method will only be assigned to Rest Day, Public Holiday and Work Day without session on allowable dates within the selected date range + +6. Select a date range + +7. Process :::warning User cannot assign work sessions or change work sessions on dates before summary last processed date @@ -259,7 +268,8 @@ Date From need to be after summary last processed date to future dates (dates be **Explanation:** Delete all schedule (Work Session and Rest Day) of Employee 00006 from 20/5/2024 to 31/12/2024 :::info -Date From need to be after summary last processed date to future dates (dates before summary last processed date are not allowed to delete) +1. Date From need to be after summary last processed date to future dates (dates before summary last processed date are not allowed to delete) +2. When schedule is cleared, clock method will be reset back to **'GPS'** ::: ## Maintain Traveller Location diff --git a/static/img/integration/hrms/e-claim/claim-approval-email-noti.png b/static/img/integration/hrms/e-claim/claim-approval-email-noti.png index 1b918b5..9acdaa4 100644 Binary files a/static/img/integration/hrms/e-claim/claim-approval-email-noti.png and b/static/img/integration/hrms/e-claim/claim-approval-email-noti.png differ diff --git a/static/img/integration/hrms/e-claim/claim-approval-rejected-email-noti.png b/static/img/integration/hrms/e-claim/claim-approval-rejected-email-noti.png index 177c9fc..ff61401 100644 Binary files a/static/img/integration/hrms/e-claim/claim-approval-rejected-email-noti.png and b/static/img/integration/hrms/e-claim/claim-approval-rejected-email-noti.png differ diff --git a/static/img/integration/hrms/e-claim/claim-detail.png b/static/img/integration/hrms/e-claim/claim-detail.png index b035cfd..47f17fc 100644 Binary files a/static/img/integration/hrms/e-claim/claim-detail.png and b/static/img/integration/hrms/e-claim/claim-detail.png differ diff --git a/static/img/integration/hrms/e-claim/claim-submission.png b/static/img/integration/hrms/e-claim/claim-submission.png index 7b6c648..fdad8dc 100644 Binary files a/static/img/integration/hrms/e-claim/claim-submission.png and b/static/img/integration/hrms/e-claim/claim-submission.png differ diff --git a/static/img/integration/hrms/e-leave/apply-on-behalf.png b/static/img/integration/hrms/e-leave/apply-on-behalf.png index f853ca9..9a5e151 100644 Binary files a/static/img/integration/hrms/e-leave/apply-on-behalf.png and b/static/img/integration/hrms/e-leave/apply-on-behalf.png differ diff --git a/static/img/integration/hrms/e-leave/leave-app-employee.png b/static/img/integration/hrms/e-leave/leave-app-employee.png index 1b8095f..2d1e89c 100644 Binary files a/static/img/integration/hrms/e-leave/leave-app-employee.png and b/static/img/integration/hrms/e-leave/leave-app-employee.png differ diff --git a/static/img/integration/hrms/e-leave/leave-approval-email-noti.png b/static/img/integration/hrms/e-leave/leave-approval-email-noti.png index 82605ef..ac2ae9c 100644 Binary files a/static/img/integration/hrms/e-leave/leave-approval-email-noti.png and b/static/img/integration/hrms/e-leave/leave-approval-email-noti.png differ diff --git a/static/img/integration/hrms/e-leave/leave-approval-failed-email-noti.png b/static/img/integration/hrms/e-leave/leave-approval-failed-email-noti.png deleted file mode 100644 index fcbbbe7..0000000 Binary files a/static/img/integration/hrms/e-leave/leave-approval-failed-email-noti.png and /dev/null differ diff --git a/static/img/integration/hrms/e-leave/leave-approval-rejected-email-noti.png b/static/img/integration/hrms/e-leave/leave-approval-rejected-email-noti.png index 342cd3f..5193acf 100644 Binary files a/static/img/integration/hrms/e-leave/leave-approval-rejected-email-noti.png and b/static/img/integration/hrms/e-leave/leave-approval-rejected-email-noti.png differ diff --git a/static/img/integration/hrms/e-leave/leave-detail.png b/static/img/integration/hrms/e-leave/leave-detail.png index ed50b6a..ff892e0 100644 Binary files a/static/img/integration/hrms/e-leave/leave-detail.png and b/static/img/integration/hrms/e-leave/leave-detail.png differ diff --git a/static/img/integration/hrms/e-tms/adjusted-log-notification2.png b/static/img/integration/hrms/e-tms/adjusted-log-notification2.png index ee64b94..7bc7fc6 100644 Binary files a/static/img/integration/hrms/e-tms/adjusted-log-notification2.png and b/static/img/integration/hrms/e-tms/adjusted-log-notification2.png differ diff --git a/static/img/integration/hrms/e-tms/adjusted-log-notification3.png b/static/img/integration/hrms/e-tms/adjusted-log-notification3.png deleted file mode 100644 index 7bc7fc6..0000000 Binary files a/static/img/integration/hrms/e-tms/adjusted-log-notification3.png and /dev/null differ diff --git a/static/img/integration/hrms/e-tms/adjusted-log-notification4.png b/static/img/integration/hrms/e-tms/adjusted-log-notification4.png deleted file mode 100644 index 917c5ba..0000000 Binary files a/static/img/integration/hrms/e-tms/adjusted-log-notification4.png and /dev/null differ diff --git a/static/img/integration/hrms/e-tms/calendar-wizard1.png b/static/img/integration/hrms/e-tms/calendar-wizard1.png index 7728052..cf3de42 100644 Binary files a/static/img/integration/hrms/e-tms/calendar-wizard1.png and b/static/img/integration/hrms/e-tms/calendar-wizard1.png differ diff --git a/static/img/integration/hrms/e-tms/calendar-wizard2.png b/static/img/integration/hrms/e-tms/calendar-wizard2.png index e1a92a6..eff9d94 100644 Binary files a/static/img/integration/hrms/e-tms/calendar-wizard2.png and b/static/img/integration/hrms/e-tms/calendar-wizard2.png differ diff --git a/static/img/integration/hrms/e-tms/calendar-wizard3.png b/static/img/integration/hrms/e-tms/calendar-wizard3.png new file mode 100644 index 0000000..e15a3e7 Binary files /dev/null and b/static/img/integration/hrms/e-tms/calendar-wizard3.png differ diff --git a/static/img/integration/hrms/e-tms/clock-on-behalf-notification2.png b/static/img/integration/hrms/e-tms/clock-on-behalf-notification2.png index 8e4f15f..02f8c7e 100644 Binary files a/static/img/integration/hrms/e-tms/clock-on-behalf-notification2.png and b/static/img/integration/hrms/e-tms/clock-on-behalf-notification2.png differ diff --git a/static/img/integration/hrms/e-tms/clock-on-behalf-notification3.png b/static/img/integration/hrms/e-tms/clock-on-behalf-notification3.png deleted file mode 100644 index 02f8c7e..0000000 Binary files a/static/img/integration/hrms/e-tms/clock-on-behalf-notification3.png and /dev/null differ diff --git a/static/img/integration/hrms/e-tms/clock-on-behalf-notification4.png b/static/img/integration/hrms/e-tms/clock-on-behalf-notification4.png deleted file mode 100644 index 176bd88..0000000 Binary files a/static/img/integration/hrms/e-tms/clock-on-behalf-notification4.png and /dev/null differ diff --git a/static/img/integration/hrms/e-tms/clock-on-behalf1.png b/static/img/integration/hrms/e-tms/clock-on-behalf1.png index 1adf608..8ad9c98 100644 Binary files a/static/img/integration/hrms/e-tms/clock-on-behalf1.png and b/static/img/integration/hrms/e-tms/clock-on-behalf1.png differ diff --git a/static/img/integration/hrms/e-tms/my-summary.png b/static/img/integration/hrms/e-tms/my-summary.png index 484937f..6dc53b9 100644 Binary files a/static/img/integration/hrms/e-tms/my-summary.png and b/static/img/integration/hrms/e-tms/my-summary.png differ diff --git a/static/img/integration/hrms/e-tms/processed-log1.png b/static/img/integration/hrms/e-tms/processed-log1.png index a31036f..b1044ad 100644 Binary files a/static/img/integration/hrms/e-tms/processed-log1.png and b/static/img/integration/hrms/e-tms/processed-log1.png differ diff --git a/static/img/integration/hrms/e-tms/team-summary.png b/static/img/integration/hrms/e-tms/team-summary.png index 7f9d92f..ec12c9b 100644 Binary files a/static/img/integration/hrms/e-tms/team-summary.png and b/static/img/integration/hrms/e-tms/team-summary.png differ diff --git a/static/img/integration/hrms/e-tms/unprocessed-log.png b/static/img/integration/hrms/e-tms/unprocessed-log.png index d7bad38..e08e006 100644 Binary files a/static/img/integration/hrms/e-tms/unprocessed-log.png and b/static/img/integration/hrms/e-tms/unprocessed-log.png differ diff --git a/static/img/integration/hrms/e-tms/view-schedule.png b/static/img/integration/hrms/e-tms/view-schedule.png index ac0219e..9427c76 100644 Binary files a/static/img/integration/hrms/e-tms/view-schedule.png and b/static/img/integration/hrms/e-tms/view-schedule.png differ