Skip to content

Commit 78670cb

Browse files
authored
Merge pull request #715 from OfficeDev/main
[admin] Publish
2 parents be1880c + e4d7b0a commit 78670cb

10 files changed

+18
-16
lines changed

docs/develop/power-automate-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Run Office Scripts with Power Automate
33
description: How to get Office Scripts for Excel working with a Power Automate workflow.
44
ms.topic: integration
5-
ms.date: 01/19/2024
5+
ms.date: 02/08/2024
66
ms.localizationpriority: medium
77
---
88

docs/images/punch-clock-sample-2.png

1.11 KB
Loading

docs/images/punch-clock-sample-3.png

-17.6 KB
Binary file not shown.

docs/includes/platform-requirements.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ To use Office Scripts, you'll need the following.
99
- Office 365 Business Premium
1010
- Office 365 ProPlus
1111
- Office 365 ProPlus for Devices
12-
- Office 365 Enterprise E3
13-
- Office 365 Enterprise E5
1412
- Office 365 A3
1513
- Office 365 A5
14+
- Office 365 Enterprise E1
15+
- Office 365 Enterprise E3
16+
- Office 365 Enterprise E5
17+
- Office 365 F3
1618
1. Internet connectivity with [connected experiences](/deployoffice/privacy/connected-experiences) enabled.
1719

1820
# [For personal and family](#tab/home)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
> [!IMPORTANT]
2-
> To use Office Scripts in [Power Automate](https://make.powerautomate.com), you must have a [business license of Microsoft 365](../testing/platform-limits.md?tabs=business).
2+
> To use Office Scripts in [Power Automate](https://make.powerautomate.com), you must have a [business license of Microsoft 365](../testing/platform-limits.md?tabs=business). The Office 365 Enterprise E1 and Office 365 F3 licenses can use Scripts with Power Automate, but don't have Power Automate integrations directly in Excel.

docs/resources/samples/convert-csv.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Convert CSV files to Excel workbooks
33
description: Learn how to use Office Scripts and Power Automate to create .xlsx files from .csv files.
4-
ms.date: 01/17/2024
4+
ms.date: 02/07/2024
55
ms.localizationpriority: medium
66
---
77

@@ -34,7 +34,9 @@ function main(workbook: ExcelScript.Workbook, csv: string) {
3434
csv = csv.replace(/\r/g, "");
3535

3636
// Split each line into a row.
37+
// NOTE: This will split values that contain new line characters.
3738
let rows = csv.split("\n");
39+
3840
/*
3941
* For each row, match the comma-separated sections.
4042
* For more information on how to use regular expressions to parse CSV files,

docs/resources/samples/report-day-to-day-changes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ function main(workbook: ExcelScript.Workbook, newData: string): string {
3333
// Add a row with the date, new value, and a formula calculating the difference.
3434
const currentDate = new Date(Date.now()).toLocaleDateString();
3535
const newRow = [currentDate, newData, "=[@Reading]-OFFSET([@Reading],-1,0)"];
36-
table.addRow(-1, newRow,);
36+
table.addRow(-1, newRow);
3737

3838
// Return the difference between the newData and the previous entry.
3939
const difference = Number.parseFloat(newData) - previousValue;
4040
console.log(difference);
41-
return difference;
41+
return difference.toString();
4242
}
4343
```
4444

docs/resources/scenarios/punch-clock.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 'Office Scripts sample scenario: Punch clock button'
33
description: This sample adds a punch clock button and allows a user to clock in and clock out using the current time.
4-
ms.date: 10/01/2022
4+
ms.date: 02/07/2024
55
ms.localizationpriority: medium
66
---
77

@@ -11,7 +11,7 @@ The scenario idea and script used in this sample was contributed by Office Scrip
1111

1212
In this scenario, you'll create a time sheet for an employee that allows them to record their start and end times with a [button](../../develop/script-buttons.md). Based on what's previously been recorded, selecting the button will either start their day (clock in) or end their day (clock out).
1313

14-
:::image type="content" source="../../images/punch-clock-sample-3.png" alt-text="A table with three columns ('Clock In', 'Clock Out', and 'Duration') and a button labeled 'Punch clock' in the workbook.":::
14+
:::image type="content" source="../../images/punch-clock-sample-2.png" alt-text="A table with three columns ('Clock In', 'Clock Out', and 'Duration') and a button labeled 'Punch clock' in the workbook.":::
1515

1616
## Setup instructions
1717

@@ -122,17 +122,15 @@ In this scenario, you'll create a time sheet for an employee that allows them to
122122

123123
1. In the workbook, select cell **E2**.
124124

125-
1. Add a script button. Go to the **More options (…)** menu in the **Script details** page and select **Add button**.
126-
127-
:::image type="content" source="../../images/punch-clock-sample-2.png" alt-text="The 'More options' menu and the 'Add button' button.":::
125+
1. Add a script button. Go to the **More options (…)** menu in the **Script details** page and select **Add in workbook**.
128126

129127
1. Save the workbook.
130128

131129
## Run the script
132130

133131
Select the **Punch clock** button to run the script. It either logs the current time under "Clock In" or "Clock Out", depending on what was previously entered.
134132

135-
:::image type="content" source="../../images/punch-clock-sample-3.png" alt-text="The table and the 'Punch clock' button in the workbook.":::
133+
:::image type="content" source="../../images/punch-clock-sample-2.png" alt-text="The table and the 'Punch clock' button in the workbook.":::
136134

137135
> [!NOTE]
138136
> The duration is only recorded if it's longer than a minute. Manually edit the "Clock In" time to test larger durations.

docs/testing/platform-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Platform limits and requirements with Office Scripts
33
description: Resource limits and browser support for Office Scripts when used with Excel.
44
ms.topic: limits-and-quotas
5-
ms.date: 12/22/2023
5+
ms.date: 02/08/2024
66
ms.localizationpriority: medium
77
---
88

@@ -17,7 +17,7 @@ There are some platform limitations of which you should be aware when developing
1717
> [!NOTE]
1818
> If you meet these requirements and are still not seeing the **Automate** tab, it's possible that your admin has disabled the feature or there's some other problem with your environment. Please follow the steps under [Automate tab not appearing or Office Scripts unavailable](../testing/troubleshooting.md#automate-tab-not-appearing-or-office-scripts-unavailable) to start using Office Scripts.
1919
20-
To use Office Scripts in [Power Automate](https://make.powerautomate.com), you must have a business license of Microsoft 365.
20+
[!INCLUDE [Power Automate license support](../includes/power-automate-needs-business.md)]
2121

2222
## Data limits
2323

docs/testing/power-automate-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Troubleshoot Office Scripts running in Power Automate
33
description: Tips, platform information, and known issues with the integration between Office Scripts and Power Automate.
44
ms.topic: troubleshooting-general
5-
ms.date: 11/29/2023
5+
ms.date: 02/08/2024
66
ms.localizationpriority: medium
77
---
88

0 commit comments

Comments
 (0)