Skip to content

Commit 67c1dcf

Browse files
authored
Merge pull request #28839 from microsoftgraph/main
Merge to publish.
2 parents 729133f + 84cf2e5 commit 67c1dcf

14 files changed

Lines changed: 485 additions & 13 deletions

api-reference/beta/resources/enums.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,6 +2287,29 @@ Namespace: microsoft.graph
22872287
| darkPink |
22882288
| darkYellow |
22892289
| unknownFutureValue |
2290+
| darkRed |
2291+
| cranberry |
2292+
| darkOrange |
2293+
| bronze |
2294+
| peach |
2295+
| gold |
2296+
| lime |
2297+
| forest |
2298+
| lightGreen |
2299+
| jade |
2300+
| lightTeal |
2301+
| darkTeal |
2302+
| steel |
2303+
| skyBlue |
2304+
| blueGray |
2305+
| lavender |
2306+
| lilac |
2307+
| plum |
2308+
| magenta |
2309+
| darkBrown |
2310+
| beige |
2311+
| charcoal |
2312+
| silver |
22902313

22912314
### timeOffReasonIconType values
22922315

api-reference/beta/resources/openshiftitem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Inherits from [shiftItem](../resources/shiftitem.md).
2828
| notes | String | The shift notes for the **openShift**. Inherited from [shiftItem](../resources/shiftitem.md). |
2929
|openSlotCount|Int32| Count of the number of slots for the given open shift.|
3030
| startDateTime | DateTimeOffset | The start date and time for the **openShift**. Required. The timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Inherited from [shiftItem](../resources/shiftitem.md). |
31-
| theme | scheduleEntityTheme | The color of the open shift. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`. Inherited from [shiftItem](../resources/shiftitem.md). |
31+
| theme | scheduleEntityTheme | The color of the open shift. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Inherited from [shiftItem](../resources/shiftitem.md). |
3232

3333
## Relationships
3434

api-reference/beta/resources/plannertask.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ Represents a planner task in Microsoft 365. A planner task is contained in a [pl
5252
|isArchived|Boolean|Read-only. If set to `true`, the task is archived. An archived task is read-only.|
5353
|isOnMyDay|Boolean|Indicates whether to show this task in the MyDay view. If `true`, it shows the task.|
5454
|isOnMyDayLastModifiedDate|Date|Read-only. The date on which task is added to or removed from MyDay.|
55+
|lastModifiedBy|[identitySet](identityset.md)|Read-only. User ID by which this is last modified.|
56+
|lastModifiedDateTime|DateTimeOffset|Read-only. Date and time at which this is last modified. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`|
5557
|orderHint|String|The hint used to order items of this type in a list view. For more information, see [Using order hints in planner](planner-order-hint-format.md).|
5658
|percentComplete|Int32|The percentage of task completion. When set to `100`, the task is completed. |
5759
|priority|Int32|The priority of the task. Valid values are between `0` and `10`, inclusive. Larger values indicate lower priority. For example, `0` has the highest priority and `10` has the lowest priority. Currently, planner interprets values `0` and `1` as "urgent", `2` and `3` and `4` as "important", `5`, `6`, and `7` as "medium", and `8`, `9`, and `10` as "low". Currently, planner sets the value `1` for "urgent", `3` for "important", `5` for "medium", and `9` for "low".|
@@ -116,6 +118,8 @@ The following JSON representation shows the resource type.
116118
"id": "String (identifier)",
117119
"isOnMyDay": "Boolean",
118120
"isOnMyDayLastModifiedDate": "Date",
121+
"lastModifiedBy": {"@odata.type": "microsoft.graph.identitySet"},
122+
"lastModifiedDateTime": "String (timestamp)",
119123
"orderHint": "String",
120124
"percentComplete": "Int32",
121125
"planId": "String",

api-reference/beta/resources/shiftactivity.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Represents an activity in a [shift](shift.md).
2424
| endDateTime | `DateTimeOffset` | The end date and time for the `shiftActivity`. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Required. |
2525
| code | `string` | Customer defined code for the `shiftActivity`. Required. |
2626
| displayName | `string` | The name of the `shiftActivity`. Required. |
27+
| theme | `scheduleEntityTheme` | The color of the activity. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. |
2728

2829
## Relationships
2930

@@ -44,7 +45,8 @@ The following JSON representation shows the resource type.
4445
"startDateTime": "2019-03-11T15:00:00Z",
4546
"endDateTime": "2019-03-11T15:15:00Z",
4647
"code": "",
47-
"displayName": "Lunch"
48+
"displayName": "Lunch",
49+
"theme": "white"
4850
}
4951
```
5052

api-reference/beta/resources/shiftitem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Represents a version of a [shift](shift.md).
2323
| displayName | string | The shift label of the `shiftItem`. |
2424
| startDateTime | DateTimeOffset | The start date and time for the `shiftItem`. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Required. |
2525
| endDateTime | DateTimeOffset | The end date and time for the `shiftItem`. Required. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
26-
| theme | scheduleEntityTheme | Supported colors: white; blue; green; purple; pink; yellow; gray; darkBlue; darkGreen; darkPurple; darkPink; darkYellow. |
26+
| theme | scheduleEntityTheme | The color of the shift. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. |
2727
| activities | [shiftActivity](shiftactivity.md) collection | An incremental part of a shift which can cover details of when and where an employee is during their shift. For example, an assignment or a scheduled break or lunch. Required. |
2828

2929
## Relationships

api-reference/beta/resources/timeoffitem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Represents a version of the [timeOff](timeoff.md).
2222
| timeOffReasonId | string | ID of the `timeOffReason` for this **timeOffItem**. Required. |
2323
| startDateTime | DateTimeOffset | The start date and time for the **timeOffItem**. Required. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
2424
| endDateTime | DateTimeOffset | The end date and time for the **timeOffItem**. Required. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
25-
| theme | scheduleEntityTheme | Supported colors: white; blue; green; purple; pink; yellow; gray; darkBlue; darkGreen; darkPurple; darkPink; darkYellow. |
25+
| theme | scheduleEntityTheme | The color of the time off. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed` , `cranberry` , `darkOrange` , `bronze` , `peach` , `gold` , `lime` , `forest` , `lightGreen` , `jade` , `lightTeal` , `darkTeal` , `steel` , `skyBlue` , `blueGray` , `lavender` , `lilac` , `plum` , `magenta` , `darkBrown` , `beige` , `charcoal` , `silver`. |
2626

2727
## Relationships
2828

api-reference/v1.0/resources/enums.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,29 @@ Namespace: microsoft.graph
13191319
| darkPink |
13201320
| darkYellow |
13211321
| unknownFutureValue |
1322+
| darkRed |
1323+
| cranberry |
1324+
| darkOrange |
1325+
| bronze |
1326+
| peach |
1327+
| gold |
1328+
| lime |
1329+
| forest |
1330+
| lightGreen |
1331+
| jade |
1332+
| lightTeal |
1333+
| darkTeal |
1334+
| steel |
1335+
| skyBlue |
1336+
| blueGray |
1337+
| lavender |
1338+
| lilac |
1339+
| plum |
1340+
| magenta |
1341+
| darkBrown |
1342+
| beige |
1343+
| charcoal |
1344+
| silver |
13221345

13231346
### timeOffReasonIconType values
13241347

api-reference/v1.0/resources/openshiftitem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Inherits from [shiftItem](../resources/shiftitem.md).
2626
| notes | String | The shift notes for the **openShift**. Inherited from [shiftItem](../resources/shiftitem.md). |
2727
|openSlotCount|Int32| Count of the number of slots for the given open shift.|
2828
| startDateTime | DateTimeOffset | The start date and time for the **openShift**. Required. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Inherited from [shiftItem](../resources/shiftitem.md). |
29-
| theme | scheduleEntityTheme | The color of the open shift. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`. Inherited from [shiftItem](../resources/shiftitem.md). |
29+
| theme | scheduleEntityTheme | The color of the open shift. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Inherited from [shiftItem](../resources/shiftitem.md). |
3030

3131
## JSON representation
3232

api-reference/v1.0/resources/shiftactivity.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Represents an activity in a [shift](shift.md).
2323
| endDateTime | DateTimeOffset | The end date and time for the `shiftActivity`. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Required. |
2424
| isPaid | bool | Indicates whether the `microsoft.graph.user` should be paid for the activity during their `shift`. Required. |
2525
| startDateTime | DateTimeOffset | The start date and time for the `shiftActivity`. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Required. |
26+
| theme | scheduleEntityTheme | The color of the activity. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. |
2627

2728
## JSON representation
2829

@@ -36,12 +37,12 @@ The following JSON representation shows the resource type.
3637
```json
3738
{
3839
"@odata.type": "#microsoft.graph.shiftActivity",
39-
"code": "String",
40-
"displayName": "String",
41-
"endDateTime": "String (timestamp)",
42-
"isPaid": "Boolean",
43-
"startDateTime": "String (timestamp)",
44-
"theme": "String"
40+
"code": "",
41+
"displayName": "Lunch",
42+
"endDateTime": "2019-03-11T15:15:00Z",
43+
"isPaid": true,
44+
"startDateTime": "2019-03-11T15:00:00Z",
45+
"theme": "white"
4546
}
4647
```
4748

api-reference/v1.0/resources/shiftitem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Represents a version of a [shift](shift.md).
2222
| endDateTime | DateTimeOffset | The end date and time for the `shiftItem`. Required. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
2323
| notes | string | The shift notes for the `shiftItem`. |
2424
| startDateTime | DateTimeOffset | The start date and time for the `shiftItem`. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Required. |
25-
| theme | scheduleEntityTheme | Supported colors: white; blue; green; purple; pink; yellow; gray; darkBlue; darkGreen; darkPurple; darkPink; darkYellow. |
25+
| theme | scheduleEntityTheme | The color of the shift. The possible values are: `white`, `blue`, `green`, `purple`, `pink`, `yellow`, `gray`, `darkBlue`, `darkGreen`, `darkPurple`, `darkPink`, `darkYellow`, `unknownFutureValue`, `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `darkRed`, `cranberry`, `darkOrange`, `bronze`, `peach`, `gold`, `lime`, `forest`, `lightGreen`, `jade`, `lightTeal`, `darkTeal`, `steel`, `skyBlue`, `blueGray`, `lavender`, `lilac`, `plum`, `magenta`, `darkBrown`, `beige`, `charcoal`, `silver`. |
2626

2727

2828
## JSON representation

0 commit comments

Comments
 (0)