🔀 Merge pull request #875 from cauterize/feat/public_holidays_widget_state_parameter

 Adds state option for PublicHolidays widget
This commit is contained in:
Alicia Sykes 2022-09-04 23:41:14 +01:00 committed by GitHub
commit 6fcb31f12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions

View File

@ -694,7 +694,8 @@ Counting down to the next day off work? This widget displays upcoming public hol
**Field** | **Type** | **Required** | **Description**
--- | --- | --- | ---
**`country`** | `string` | Required | The region to fetch holiday data for, specified as a country code, e.g. `GB` or `US`
**`country`** | `string` | Required | The country to fetch holiday data for, specified as a country code, e.g. `GB` or `US`
**`state`** | `string` | **Optional** | restrict a country to a specific state defined by [ISO_3166-2](https://en.wikipedia.org/wiki/ISO_3166-2), e.g. `LND`.
**`holidayType`** | `string` | **Optional** | The type of holidays to fetch. Can be: `all`, `public_holiday`, `observance`, `school_holiday`, `other_day` or `extra_working_day`. Defaults to `public_holiday`
**`monthsToShow`** | `number` | **Optional** | The number of months in advance to show. Min: `1`, max: `24`. Defaults to `12`
@ -704,6 +705,7 @@ Counting down to the next day off work? This widget displays upcoming public hol
- type: public-holidays
options:
country: GB
region: LND
holidayType: all
monthsToShow: 12
```

View File

@ -54,10 +54,17 @@ export default {
const then = new Date((now.setMonth(now.getMonth() + this.monthsToShow)));
return `${then.getDate()}-${then.getMonth() + 1}-${then.getFullYear()}`;
},
region() {
if (this.options?.state) {
return `&region=${this.options.state}`;
}
return '';
},
endpoint() {
return `${widgetApiEndpoints.holidays}`
+ `&fromDate=${this.startDate}&toDate=${this.endDate}`
+ `&country=${this.country}&holidayType=${this.holidayType}`;
+ `&country=${this.country}&holidayType=${this.holidayType}`
+ `${this.region}`;
},
},
methods: {