From f127bbc64d1ddf3bf21f078b8074e6c4487e02fe Mon Sep 17 00:00:00 2001
From: MatthewFlamm <39341281+MatthewFlamm@users.noreply.github.com>
Date: Sat, 16 Feb 2019 14:54:14 -0500
Subject: [PATCH] standardize more-info-weather and add hourly/daily (#2766)

---
 .../more-info/controls/more-info-weather.js   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/dialogs/more-info/controls/more-info-weather.js b/src/dialogs/more-info/controls/more-info-weather.js
index 38ee714986..cc47677f73 100644
--- a/src/dialogs/more-info/controls/more-info-weather.js
+++ b/src/dialogs/more-info/controls/more-info-weather.js
@@ -105,8 +105,11 @@ class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
             <template is="dom-if" if="[[_showValue(item.condition)]]">
               <iron-icon icon="[[getWeatherIcon(item.condition)]]"></iron-icon>
             </template>
-            <div class="main">[[computeDateTime(item.datetime)]]</div>
+            <template is="dom-if" if="[[!_showValue(item.templow)]]">
+              <div class="main">[[computeDateTime(item.datetime)]]</div>
+            </template>
             <template is="dom-if" if="[[_showValue(item.templow)]]">
+              <div class="main">[[computeDate(item.datetime)]]</div>
               <div class="templow">
                 [[item.templow]] [[getUnit('temperature')]]
               </div>
@@ -170,21 +173,8 @@ class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
     };
   }
 
-  computeDateTime(data) {
+  computeDate(data) {
     const date = new Date(data);
-    const provider = this.stateObj.attributes.attribution;
-    if (
-      provider === "Powered by Dark Sky" ||
-      provider === "Data provided by OpenWeatherMap"
-    ) {
-      if (new Date().getDay() === date.getDay()) {
-        return date.toLocaleTimeString(this.hass.language, { hour: "numeric" });
-      }
-      return date.toLocaleDateString(this.hass.language, {
-        weekday: "long",
-        hour: "numeric",
-      });
-    }
     return date.toLocaleDateString(this.hass.language, {
       weekday: "long",
       month: "short",
@@ -192,6 +182,14 @@ class MoreInfoWeather extends LocalizeMixin(PolymerElement) {
     });
   }
 
+  computeDateTime(data) {
+    const date = new Date(data);
+    return date.toLocaleDateString(this.hass.language, {
+      weekday: "long",
+      hour: "numeric",
+    });
+  }
+
   getUnit(measure) {
     const lengthUnit = this.hass.config.unit_system.length || "";
     switch (measure) {