Skip to content
This repository has been archived by the owner on Jul 5, 2023. It is now read-only.

Commit

Permalink
fix a bug when there is no letter image
Browse files Browse the repository at this point in the history
  • Loading branch information
peternijssen committed Apr 30, 2019
1 parent 908340f commit 2a9bace
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 12 deletions.
35 changes: 25 additions & 10 deletions postnl-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class PostNL extends LitElement {
<ha-icon class="header__icon" icon="mdi:email"></ha-icon>
<h2 class="header__title">Letters</h2>
</header>
${this.renderSingleLetter()}
${this.renderLetterImage()}
<section class="detail-body">
<table>
<thead>
Expand All @@ -253,30 +253,46 @@ class PostNL extends LitElement {
</thead>
<tbody>
${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`
<tr>
<td class="name"><a href="${letter.image}" target="_blank">${letter.id}</a></td>
<td>${(letter.status_message != null) ? letter.status_message : "Unknown"}</td>
<td>${(new Date(letter.delivery_date)).toLocaleDateString((navigator.language) ? navigator.language : navigator.userLanguage)}</td>
</tr>
`
return this.renderLetter(letter)
})}
</tbody>
</table>
</section>
`
}

renderSingleLetter() {
renderLetterImage() {
if (this._hide.first_letter) return ''

if (this.letters.attributes.letters[0].image == null) return ''

return html`
<section class="img-body">
<img src="${this.letters.attributes.letters[0].image}&width=400&height=300" />
</section>
`
}

renderLetter(letter) {
if (letter.image == null) {
return html`
<tr>
<td class="name">${letter.id}</td>
<td>${(letter.status_message != null) ? letter.status_message : "Unknown"}</td>
<td>${(new Date(letter.delivery_date)).toLocaleDateString((navigator.language) ? navigator.language : navigator.userLanguage)}</td>
</tr>
`
} else {
return html`
<tr>
<td class="name"><a href="${letter.image}" target="_blank">${letter.id}</a></td>
<td>${(letter.status_message != null) ? letter.status_message : "Unknown"}</td>
<td>${(new Date(letter.delivery_date)).toLocaleDateString((navigator.language) ? navigator.language : navigator.userLanguage)}</td>
</tr>
`
}
}

renderDeliveryInfo() {
if (!this.delivery) return ''

Expand Down Expand Up @@ -342,7 +358,6 @@ class PostNL extends LitElement {
`
}


renderDistribution() {
// Distribution disabled
if (!this.distribution ) return ''
Expand Down
4 changes: 2 additions & 2 deletions tracker.json
Original file line number Diff line number Diff line change
@@ -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"
}
}

0 comments on commit 2a9bace

Please sign in to comment.