Skip to content

Commit ea0dfd0

Browse files
authored
Merge branch 'master' into mints-errorfix
2 parents 5a7b4ee + 31a5d27 commit ea0dfd0

15 files changed

+322
-262
lines changed

.acrolinx-config.edn

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{:allowed-branchname-matches ["^master$"]
22
:allowed-filename-matches ["powerapps-docs"]
3+
:targets
4+
{
5+
:scores
6+
{
7+
:qualityscore 80
8+
}
9+
}
310
:guidance-profile "dc59e3ef-24fd-46d7-9156-0491aaae6bef" ;; Profile ID for "BAG-specific"
411
:acrolinx-check-settings
512
{

powerapps-docs/developer/model-driven-apps/customize-entity-forms.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ Forms provide the user interface (UI) that people use to create, view, or edit e
8181
To open the main form in a dialog using client API, you need to invoke the call using the [Xrm.Navigation.navigateTo](https://docs.microsoft.com/powerapps/developer/model-driven-apps/clientapi/reference/xrm-navigation/navigateto) method. The [Xrm.Navigation.navigateTo](https://docs.microsoft.com/powerapps/developer/model-driven-apps/clientapi/reference/xrm-navigation/navigateto) API method allows you to open the dialog with several options, including the size and position.
8282

8383

84-
> [!IMPORTANT]
85-
> - Open main form in a dialog using client API is still in preview.
86-
> - Preview features aren't meant for production use and may have restricted functionality. These features are available before an official release so that customers can get early access and provide feedback.
87-
8884
> [!NOTE]
8985
> [Xrm.Navigation.openForm](https://docs.microsoft.com/powerapps/developer/model-driven-apps/clientapi/reference/xrm-navigation/openform) method is not supported to open a main form as a dialog.
9086

powerapps-docs/sample-apps/return-to-workplace/app-for-employee.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ This article provides step-by-step instructions about how to use the Employee Re
2424

2525
- Ensure that your organization has deployed and configured the Employee Return to the Workplace app, as described in [Deploy the solution](deploy.md).
2626

27-
## Getting started with the app
27+
## Get started with the app
2828

29-
Open the app from your device and sign in with your company's Azure Active Directory account. You can view all apps shared with you by your organization after you sign in. More information: [Power Apps mobile device sign in](https://docs.microsoft.com/powerapps/user/run-app-client#open-power-apps-and-sign-in), [Power Apps web browser sign in](https://docs.microsoft.com/powerapps/user/run-app-browser)
29+
Open the app from your device and sign in with your company's Azure Active Directory account. You can view all apps shared by your organization after you sign in. More information: [Power Apps mobile device sign in](https://docs.microsoft.com/powerapps/user/run-app-client#open-power-apps-and-sign-in), [Power Apps web browser sign in](https://docs.microsoft.com/powerapps/user/run-app-browser)
3030

31-
When you successfully sign in and open the **Return to the Workplace** app, you can get a day pass, lookup facility status, or answer the employee sentiment question.
31+
When you successfully sign in and open the **Return to the Workplace** app, you can get a day pass, look up facility status, or answer the employee sentiment question.
3232

3333
> [!div class="mx-imgBorder"]
3434
> ![Welcome screen](media/employee-welcome2.png "Welcome screen")
3535
3636
## See the reopen status of a facility
3737

38-
You can find all available facilities and see the reopen status for them. Select **Look Up Status** to look for facilities and view details such as whether the facility is open and what phase of reopening it's in.
38+
You can find all available facilities and see their reopen status. Select **Look Up Status** to look for facilities and view details such as whether the facility is open and what phase of reopening it's in.
3939

4040
> [!div class="mx-imgBorder"]
4141
> ![List of facilities](media/employee-facility-list2.png "List of facilities")
4242
43-
When you select a facility from the facility list, the current status of the facility and associated details are displayed. You can also book a space directly from the **LOOK UP STATUS** screen. When a facility isn't available, the **BOOK A SPACE** button is disabled. Select **<** to return back to the previous screen.
43+
When you select a facility from the facility list, the current status of the facility and associated details are displayed. You can also book a space directly from the **LOOK UP STATUS** screen. When a facility isn't available, the **BOOK A SPACE** button is disabled. Select **<** to return to the previous screen.
4444

4545
> [!div class="mx-imgBorder"]
4646
> ![Facility details](media/employee-facility-details2.png "Facility details")
@@ -55,42 +55,42 @@ If you're eligible, you'll be given a pass to your selected building for that da
5555

5656
1. Select **GET DAY PASS**.
5757

58-
2. Select an available facility from the facility list or select from the **Saved** facility shortcut if applicable. In the Recent section, you'll find the facilities you most recently used. The **Saved facilities** and the **Recent facilities** section show the available facilities based on their phase and the earlier bookings. When a facility isn't available, the two sections get disable when a booking isn't available.
58+
2. Select an available facility from the facility list or select from the **Saved** facility shortcut if applicable. In the **Recent** section, you'll find the facilities you most recently used. The **Saved facilities** and the **Recent facilities** section show the available facilities based on their phase and the earlier bookings. When a facility isn't available, the two sections get disabled when a booking isn't available.
5959

6060
3. Select **BOOK A SPACE** to continue with the check-in process.
6161

6262
> [!div class="mx-imgBorder"]
63-
> ![Select Facility](media/employee-select-facility.png "Select facility")
63+
> ![Select facility](media/employee-select-facility.png "Select facility")
6464
65-
4. Select an available area within that facility. Select **See All Available** option to show the available areas. Select **Save as default for future check ins** to save the area to reuse on future check ins. Select **NEXT** to continue with the check-in process.
65+
4. Select an available area within that facility. Select **See All Available** to show the available areas. Select **Save as default for future check ins** to save the area to reuse on future check-ins. Select **NEXT** to continue with the check-in process.
6666

6767
> [!div class="mx-imgBorder"]
68-
> ![Select Area](media/employee-select-area.png "Select area")
68+
> ![Select area](media/employee-select-area.png "Select area")
6969
7070
> [!NOTE]
71-
> When a facility doesn't have any available areas to reserve, the area booking screen is skipped for the user. The pass is generated only for that facility and not the area.
71+
> When a facility has no available areas to reserve, the area booking screen is skipped for the user. The pass is generated only for that facility and not the area.
7272
73-
5. Select time window for arrival at the facility. Select **NEXT** to continue with the check-in process.
73+
5. Select a time window for arrival at the facility. Select **NEXT** to continue with the check-in process.
7474

7575
> [!div class="mx-imgBorder"]
7676
> ![Select Time](media/employee-select-time.png "Select time")
7777
7878
> [!NOTE]
79-
> On a facility you can indicate a time window in which people can check in, it is possible to select 30 minutes, 1 hour or none. When the time window is not filled or none, this screen will be skipped.
79+
> For a facility, you can indicate a time window in which people can check in30 minutes, 1 hour, or none. When the time window is not filled or is none, this screen will be skipped.
8080
8181
6. Accept the terms and agreements.
8282

8383
> [!div class="mx-imgBorder"]
8484
> ![Terms and agreements](media/employee-termandagreement.png "Terms and agreements")
8585
86-
7. Review the list of symptom check statements. Select **I AGREE** if you agree with the statements, and **I DISAGREE** if you don't.
86+
7. Review the list of symptom check statements. Select **I AGREE** if you agree with the statements, and **I DISAGREE** if you don't.
8787

8888
> [!div class="mx-imgBorder"]
8989
> ![Symptom check](media/employee-agreement.png "Symptom check")
9090
9191
### Employee pass
9292

93-
If your responses to the symptom check statements show that you're healthy, you'll receive a pass to enter the selected facility. The pass is valid until the end of the day. When you create a pass for a facility where you already created a pass for earlier that day, the pass earlier that day will be canceled automatically.
93+
If your responses to the symptom check statements show that you're healthy, you'll receive a pass to enter the selected facility. The pass is valid until the end of the day. If you create a pass for a facility for which you already created a pass earlier that day, the earlier pass will be canceled automatically.
9494

9595
> [!NOTE]
9696
> An administrator can disable the use of QR codes in the solution settings. This applies to both employee and guest passes.
@@ -100,31 +100,31 @@ If the administrator enabled QR codes in the solution settings, a QR code will b
100100
> [!div class="mx-imgBorder"]
101101
> ![Employee pass](media/employee-pass.png "Employee pass")
102102
103-
To cancel your pass, select the **CANCEL PASS** button. Select **YES, CANCEL** to proceed with canceling the pass or **NO** to keep the pass.
103+
To cancel your pass, select **CANCEL PASS**. Select **YES, CANCEL** to proceed with canceling the pass or **NO** to keep the pass.
104104

105105
> [!div class="mx-imgBorder"]
106106
> ![Employee cancel pass](media/employee-cancel-pass.png "Employee cancel pass")
107107
108-
If your responses show you aren't healthy, you'll not receive a pass and provided with contact information for the company health and safety department if you need.
108+
If your responses show you aren't healthy, you won't receive a pass. You'll be provided with contact information for the company health and safety department.
109109

110110
> [!div class="mx-imgBorder"]
111111
> ![Not feeling well](media/employee-pass-negative.png "Not feeling well")
112112
113113
> [!NOTE]
114-
> Currently negative attestations are also stored in the solution settings. You can turn off this option if you don't want to store them.
114+
> Currently, negative attestations are also stored in the solution settings. You can turn off this option if you don't want to store them.
115115
116116
## Create a guest pass
117117

118-
After an employee creates a pass, **REGISTER A GUEST** option becomes available. If the employee does not have a valid pass, the **REGISTER A GUEST** option is disabled. An employee can create multiple guest passes.
118+
After an employee creates a pass, the **REGISTER A GUEST** option becomes available. If the employee does not have a valid pass, the **REGISTER A GUEST** option is disabled. An employee can create multiple guest passes.
119119

120120
> [!NOTE]
121-
> In the solution settings an administrator can disable the **REGISTER A GUEST** option. This removes the option from the screen as well.
121+
> In the solution settings, an administrator can disable the **REGISTER A GUEST** option. This removes the option from the screen as well.
122122
123123
To create a guest pass:
124124

125-
1. Create a pass for yourself as described in the above section.
126-
1. Select **REGISTER A GUEST**
127-
1. If a user has registered a guest before, recent five guest names are displayed. Select one of the recent guests or enter new guest details. To register a new guest, enter the details in the fields:
125+
1. Create a pass for yourself as described in the previous section.
126+
1. Select **REGISTER A GUEST**.
127+
1. If a user has registered a guest before, five recent guest names are displayed. Select one of the recent guests or enter new guest details. To register a new guest, enter the details in the fields:
128128

129129
|Field|Description|
130130
|------|----------|
@@ -134,21 +134,21 @@ To create a guest pass:
134134
|Email Address|Enter the email address of the guest.|
135135
|Phone Number|Enter the phone number of the guest.|
136136

137-
1. Select **NEXT** after you entered all the details in the required fields.
138-
1. The **Review Disclosure and Instructions** screen show information about privacy discloses, health requirements, and instructions for the guests. Both fields can be expanded with the **+** icon. Select **NEXT** to continue, to see the generated guest pass with details.
139-
1. Select **X** icon to return back to the home page.
137+
1. Select **NEXT** after you have entered all the details in the required fields.
138+
1. The **Review Disclosure and Instructions** screen shows information about privacy disclosures, health requirements, and instructions for the guests. Both fields can be expanded with the **+** icon. Select **NEXT** to see the generated guest pass with details.
139+
1. Select the **X** icon to return to the home page.
140140

141-
You can also access guest passes from the home screen by selecting the **PASS** icon on top of the screen. Both the employee and guest passes can be seen on the screen. You can also share the guest passes by selecting the **SHARE PASS** button available on the guest pass.
141+
You can also access guest passes from the home screen by selecting the **PASS** icon at the top of the screen. Both the employee and guest passes can be seen on the screen. You can also share the guest passes by selecting the **SHARE PASS** button available on the guest pass.
142142

143143
### Email guest pass
144144

145-
When a guest pass is created, you can share the pass with the guest through email by selecting the **SHARE PASS** button available on the guest pass. This sends the guest an email with the host name, facility, date, and hour of the reservation with QR code.
145+
When a guest pass is created, you can share the pass with the guest through email by selecting the **SHARE PASS** button available on the guest pass. This sends the guest an email with the host name, facility, date, and hour of the reservation with a QR code.
146146

147147
> [!div class="mx-imgBorder"]
148148
> ![Share guest pass](media/employee-share-pass-email.png "Share guest pass")
149149
150150
> [!NOTE]
151-
> In the solution settings, you can turn off sending email option if you don't want to email guest passes.
151+
> In the solution settings, you can turn off the option to send email if you don't want to email guest passes.
152152
153153
## Share sentiment
154154

@@ -167,7 +167,7 @@ You can say how you're feeling about returning to the workplace. On the home pag
167167
168168
## Facility access not available
169169

170-
Sometimes the case manager can inform you about the facility that the access is no longer available for you. You'll see a banner appearing on the home screen, which indicates the **Facility access is not available**. A message is shown with further instructions when you select the banner.
170+
It's possible for the case manager to inform you that access to the facility is no longer available. In that case, you'll see a banner on the home screen that indicates the **Facility access is not available**. You'll see a message with further instructions when you select the banner.
171171

172172
> [!div class="mx-imgBorder"]
173173
> ![Facility access is not available](media/facility-access-not-available.png "Facility access is not available")

0 commit comments

Comments
 (0)