From 2a9bace5ceaf51a7f0d952796b38148f4b8264e5 Mon Sep 17 00:00:00 2001 From: Peter Nijssen Date: Tue, 30 Apr 2019 20:33:01 +0200 Subject: [PATCH] fix a bug when there is no letter image --- postnl-card.js | 35 +++++++++++++++++++++++++---------- tracker.json | 4 ++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/postnl-card.js b/postnl-card.js index 8ccebf5..aa72a04 100755 --- a/postnl-card.js +++ b/postnl-card.js @@ -241,7 +241,7 @@ class PostNL extends LitElement {

Letters

- ${this.renderSingleLetter()} + ${this.renderLetterImage()}
@@ -253,13 +253,7 @@ class PostNL extends LitElement { ${Object.entries(this.letters.attributes.letters).sort((a, b) => new Date(b[1].delivery_date) - new Date(a[1].delivery_date)).map(([key, letter]) => { - return html` - - - - - - ` + return this.renderLetter(letter) })}
${letter.id}${(letter.status_message != null) ? letter.status_message : "Unknown"}${(new Date(letter.delivery_date)).toLocaleDateString((navigator.language) ? navigator.language : navigator.userLanguage)}
@@ -267,9 +261,11 @@ class PostNL extends LitElement { ` } - renderSingleLetter() { + renderLetterImage() { if (this._hide.first_letter) return '' + if (this.letters.attributes.letters[0].image == null) return '' + return html`
@@ -277,6 +273,26 @@ class PostNL extends LitElement { ` } + renderLetter(letter) { + if (letter.image == null) { + return html` + + ${letter.id} + ${(letter.status_message != null) ? letter.status_message : "Unknown"} + ${(new Date(letter.delivery_date)).toLocaleDateString((navigator.language) ? navigator.language : navigator.userLanguage)} + + ` + } else { + return html` + + ${letter.id} + ${(letter.status_message != null) ? letter.status_message : "Unknown"} + ${(new Date(letter.delivery_date)).toLocaleDateString((navigator.language) ? navigator.language : navigator.userLanguage)} + + ` + } + } + renderDeliveryInfo() { if (!this.delivery) return '' @@ -342,7 +358,6 @@ class PostNL extends LitElement { ` } - renderDistribution() { // Distribution disabled if (!this.distribution ) return '' diff --git a/tracker.json b/tracker.json index 5cd3226..0301524 100644 --- a/tracker.json +++ b/tracker.json @@ -1,9 +1,9 @@ { "postnl-card": { - "version": "0.8.0", + "version": "0.8.1", "updated_at": "2019-04-30", "visit_repo": "https://github.com/peternijssen/lovelace-postnl", - "remote_location": "https://github.com/peternijssen/lovelace-postnl/releases/download/0.8.0/postnl-card.js", + "remote_location": "https://github.com/peternijssen/lovelace-postnl/releases/download/0.8.1/postnl-card.js", "changelog": "https://github.com/peternijssen/lovelace-postnl/releases/latest" } }