Merge pull request #1105 from totaldebug/feature_branch

marksie1988 · web-flow · commit e1ede59602e2 · 2023-08-27T23:08:44.000+01:00
Next Version Improvements
diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh
@@ -9,6 +9,8 @@ yarn install
 
 # Install documentation dependencies
 pip3 install -r docs/requirements.txt
-pip3 install sphinx-autobuild
+pip3 install sphinx-autobuild pre-commit
+
+pre-commit install --hook-type commit-msg
 
 echo "Done!"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -35,4 +35,3 @@ Please delete options that are not relevant.
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings
 - [ ] Any dependent changes have been merged and published in downstream modules
-- [ ] I have updated the version in `package.json` following [semver](https://semver.org/)
diff --git a/.github/workflows/branching.yml b/.github/workflows/branching.yml
diff --git a/.github/workflows/hacs_validate.yml b/.github/workflows/hacs_validate.yml
@@ -2,7 +2,6 @@ name: Validate
 
 on:
   push:
-  pull_request:
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:
diff --git a/.github/workflows/update_docs.yml b/.github/workflows/update_docs.yml
@@ -1,11 +1,12 @@
 ---
-
-name: Sphinx Documentation Update
+name: 📚 Update Docs
 
 on:
   push:
-    tags:
-      - 'v*'
+    branches:
+      - master
+    paths:
+      - "docs/**"
   workflow_dispatch:
 
 jobs:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/compilerla/conventional-pre-commit
+    rev: v2.4.0
+    hooks:
+      - id: conventional-pre-commit
+        stages: [commit-msg]
+        args: []
diff --git a/docs/configuration/main.rst b/docs/configuration/main.rst
@@ -41,4 +41,6 @@ Main Options
  hoursOnSameLine           boolean   optional        v7.3.0     ``false`` if set true will move hours to show on the same line as the summary. NOTE using other options can mess up this style
  language                  string    optional        unknown    Not recommended to use, but can set the language code e.g. "gb" / "es"
  titleLength               integer   optional        v7.4.0     Sets the maximum length of the event titles
+ showAllDayEvents          boolean   optional                   ``true`` if set false will hide all events that are a full day
+ offsetHeaderDate          boolean   optional                   ``false`` if set true the header date will match the startDaysAhead offset date
 ========================= ========= =============== ========== ==========================================================================================================================================================================================================================
diff --git a/src/defaults.ts b/src/defaults.ts
@@ -111,6 +111,8 @@ export default {
 	showEventDate: true,
 	showDatePerEvent: false,
 	showAllDayHours: true,
+	showAllDayEvents: true,
+	offsetHeaderDate: false,
 
 	titleLength: 0,
 	descLength: 0
diff --git a/src/index-editor.ts b/src/index-editor.ts
@@ -186,6 +186,12 @@ export class AtomicCalendarReviveEditor extends ScopedRegistryHost(LitElement) i
 	get _hoursOnSameLine(): boolean {
 		return this._config?.hoursOnSameLine || false;
 	}
+	get _showAllDayEvents(): boolean {
+		return this._config?.showAllDayEvents || true;
+	}
+	get _offsetHeaderDate(): boolean {
+		return this._config?.offsetHeaderDate || false;
+	}
 
 	// MAIN SETTINGS END
 
@@ -714,6 +720,26 @@ export class AtomicCalendarReviveEditor extends ScopedRegistryHost(LitElement) i
 										<label class="mdc-label">${localize('main.fields.hoursOnSameLine')}</label>
 									</div>
 								</div>
+								<div class="side-by-side">
+									<div>
+										<mwc-switch
+											aria-label=${`Toggle ${this._showAllDayEvents ? 'on' : 'off'}`}
+											.checked=${this._showAllDayEvents !== false}
+											.configValue=${'showAllDayEvents'}
+											@change=${this._valueChanged}
+										></mwc-switch>
+										<label class="mdc-label">${localize('main.fields.showAllDayEvents')}</label>
+									</div>
+									<div>
+										<mwc-switch
+											aria-label=${`Toggle ${this._offsetHeaderDate ? 'on' : 'off'}`}
+											.checked=${this._offsetHeaderDate !== false}
+											.configValue=${'offsetHeaderDate'}
+											@change=${this._valueChanged}
+										></mwc-switch>
+										<label class="mdc-label">${localize('main.fields.offsetHeaderDate')}</label>
+									</div>
+								</div>
 							</div>
 
 					  `
diff --git a/src/index.ts b/src/index.ts
@@ -373,7 +373,7 @@ export class AtomicCalendarRevive extends LitElement {
 				const eventCalName =
 					event.entityConfig.name && this._config.showCalendarName
 						? html`<div class="event-cal-name" style="color: ${calColor};">
-								<ha-icon icon="mdi:calendar" class="event-cal-name-icon"></ha-icon>&nbsp;${event.entityConfig.name}
+								<ha-icon icon="mdi:calendar" class="event-cal-name-icon"></ha-icon>&nbsp;${event.originName}
 						  </div>`
 						: ``;
 
diff --git a/src/lib/common.html.ts b/src/lib/common.html.ts
@@ -1,4 +1,4 @@
-import dayjs from "dayjs";
+import dayjs, { Dayjs } from "dayjs";
 import { html } from "lit";
 import { atomicCardConfig } from "../types";
 import EventClass from "./event.class";
@@ -61,7 +61,10 @@ export function setNoEventDays(config: atomicCardConfig, singleEvents) {
 }
 
 export function getDate(config: atomicCardConfig) {
-	const date = dayjs().format(config.dateFormat);
+	let date = dayjs().format(config.dateFormat);
+	if (config.startDaysAhead && config.offsetHeaderDate) {
+		date = dayjs().add(config.startDaysAhead, 'day').format(config.dateFormat);
+	}
 	return html`${date}`;
 }
 
@@ -92,8 +95,9 @@ export function getCurrDayAndMonth(locale) {
  */
 export function getMultiDayEventParts(config: atomicCardConfig, event: EventClass) {
 	if (!config.showMultiDayEventParts == true || event.addDays == false && event.daysLong == undefined) {
-   return
- }
+		return
+	}
+
 	return html`(${event.addDays + 1}/${event.daysLong})`
 }
 
diff --git a/src/lib/event.class.ts b/src/lib/event.class.ts
@@ -11,6 +11,7 @@ export default class EventClass {
 	private _globalConfig: any;
 	private _startDateTime: dayjs.Dayjs | undefined;
 	private _endDateTime: dayjs.Dayjs | undefined;
+	private _customOriginName: string | undefined;
 
 	constructor(eventClass, globalConfig) {
 		this._eventClass = eventClass;
@@ -38,20 +39,27 @@ export default class EventClass {
 		return this._eventClass.entity || {};
 	}
 
+	set originName(value: string) {
+		this._customOriginName = value;
+	}
+
 	get originName() {
-		const {originCalendar} = this;
+		if (this._customOriginName !== undefined) {
+			return this._customOriginName;
+		}
+		const { originCalendar } = this;
 		if (originCalendar && originCalendar.name) {
-    return originCalendar.name;
-  }
+			return originCalendar.name;
+		}
 
-		const {entity} = this;
+		const { entity } = this;
 		if (entity && entity.attributes && entity.attributes.friendly_name) {
-    return entity.attributes.friendly_name;
-  }
+			return entity.attributes.friendly_name;
+		}
 
 		if (originCalendar && originCalendar.entity) {
-    return originCalendar.entity;
-  }
+			return originCalendar.entity;
+		}
 
 		return (entity && entity.entity) || entity || 'Unknown';
 	}
@@ -87,7 +95,9 @@ export default class EventClass {
 	}
 
 	get daysLong() {
-		return this.rawEvent.daysLong;
+		const fullDays = Math.round(this.endDateTime.subtract(1, 'minutes').endOf('day').diff(this.startDateTime.startOf('day'), 'hours') / 24)
+
+		return fullDays > 1 ? fullDays : undefined;
 	}
 
 	get isFirstDay() {
@@ -105,16 +115,16 @@ export default class EventClass {
 	 */
 	_processDate(date, isEndDate = false) {
 		if (!date) {
-    return date;
-  }
+			return date;
+		}
 
 		date = dayjs(date);
 
 		// add days to a start date for multi day event
 		if (this.addDays !== false) {
 			if (!isEndDate && this.addDays) {
-     date = date.add(this.addDays, 'days');
-   }
+				date = date.add(this.addDays, 'days');
+			}
 
 			// if not the last day and we are modifying the endDateTime then
 			// set end dateTimeDate as end of start day for that partial event
@@ -186,15 +196,15 @@ export default class EventClass {
 	get isMultiDay() {
 		// if more than 24 hours we automatically know it's multi day
 		if (this.endDateTime.diff(this.startDateTime, 'hours') > 24) {
-    return true;
-  }
+			return true;
+		}
 
 		// end date could be at midnight which is not multi day but is seen as the next day
 		// subtract one minute and if that made it one day then its NOT one day
 		const daysDifference = Math.abs(this.startDateTime.date() - this.endDateTime.subtract(1, 'minute').date());
 		if (daysDifference === 1 && this.endDateTime.hour() === 0 && this.endDateTime.minute() === 0) {
-    return false;
-  }
+			return false;
+		}
 
 		return !!daysDifference;
 	}
@@ -207,13 +217,13 @@ export default class EventClass {
 		const isMidnightStart = this.startDateTime.startOf('day').diff(this.startDateTime) === 0;
 		const isMidnightEnd = this.endDateTime.startOf('day').diff(this.endDateTime) === 0;
 		if (isMidnightStart && isMidnightEnd) {
-    return true;
-  }
+			return true;
+		}
 
 		// check for days that are between multi days - they ARE all day
 		if (!this.isFirstDay && !this.isLastDay && this.daysLong) {
-    return true;
-  }
+			return true;
+		}
 
 		return isMidnightStart && isMidnightEnd;
 	}
@@ -232,8 +242,8 @@ export default class EventClass {
 		const fullDays = Math.round(this.endDateTime.subtract(1, 'minutes').endOf('day').diff(this.startDateTime.startOf('day'), 'hours') / 24)
 
 		if (fullDays) {
-    daysLong = fullDays;
-  }
+			daysLong = fullDays;
+		}
 
 		for (let i = 0; i < daysLong; i++) {
 			// copy event then add the current day/total days to 'new' event
@@ -271,9 +281,9 @@ export default class EventClass {
 	get title() {
 		if (!this.rawEvent.summary) {
 			if (this.entityConfig.eventTitle) {
-			return this.entityConfig.eventTitle
+				return this.entityConfig.eventTitle
 			} else {
-			return this._globalConfig.eventTitle
+				return this._globalConfig.eventTitle
 			}
 		} else {
 			return this.rawEvent.summary;
@@ -310,8 +320,8 @@ export default class EventClass {
 
 	get address() {
 		if (!this.rawEvent.location) {
-    return '';
-  }
+			return '';
+		}
 
 		return this.rawEvent.location.split(',')[0];
 	}
diff --git a/src/lib/event.func.ts b/src/lib/event.func.ts
diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
