From d36b0fdcc1c5eda1182d0ea37f5a09c19e91e839 Mon Sep 17 00:00:00 2001
From: TJX2014 <xiaoxingstack@gmail.com>
Date: Wed, 24 Jun 2020 15:34:13 +0800
Subject: [PATCH 1/3] task lauch time format fix

---
 .../main/resources/org/apache/spark/ui/static/utils.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/org/apache/spark/ui/static/utils.js b/core/src/main/resources/org/apache/spark/ui/static/utils.js
index 6fc34a9e1f7ea..66f2c4adc4ad1 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/utils.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/utils.js
@@ -161,7 +161,15 @@ function setDataTableDefaults() {
 
 function formatDate(date) {
   if (date <= 0) return "-";
-  else return date.split(".")[0].replace("T", " ");
+  else return {
+     var d = new Date(date.replace("GMT","Z"))
+     return d.getFullYear() + '-' +
+            (d.getMonth() + 1) + '-' +
+            d.getDate() + " " +
+            d.getHours() + ":" +
+            d.getMinutes() + ":" +
+            d.getSeconds();
+  }
 }
 
 function createRESTEndPointForExecutorsPage(appId) {

From 3d99e7fc91217d8e7d058aac298329bbc491d2e2 Mon Sep 17 00:00:00 2001
From: TJX2014 <xiaoxingstack@gmail.com>
Date: Wed, 24 Jun 2020 15:40:33 +0800
Subject: [PATCH 2/3] code correct

---
 core/src/main/resources/org/apache/spark/ui/static/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/org/apache/spark/ui/static/utils.js b/core/src/main/resources/org/apache/spark/ui/static/utils.js
index 66f2c4adc4ad1..a75a4e69e998b 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/utils.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/utils.js
@@ -161,8 +161,8 @@ function setDataTableDefaults() {
 
 function formatDate(date) {
   if (date <= 0) return "-";
-  else return {
-     var d = new Date(date.replace("GMT","Z"))
+  else {
+     var d = new Date(date.replace("GMT", "Z"))
      return d.getFullYear() + '-' +
             (d.getMonth() + 1) + '-' +
             d.getDate() + " " +

From 698cae60d76988939c0c80bf9abcfc8eb8214bd2 Mon Sep 17 00:00:00 2001
From: TJX2014 <xiaoxingstack@gmail.com>
Date: Thu, 25 Jun 2020 23:47:16 +0800
Subject: [PATCH 3/3] format remove duplicate code and padZeroes

---
 .../resources/org/apache/spark/ui/static/utils.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/main/resources/org/apache/spark/ui/static/utils.js b/core/src/main/resources/org/apache/spark/ui/static/utils.js
index a75a4e69e998b..2e46111bf1ba0 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/utils.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/utils.js
@@ -56,13 +56,17 @@ function formatTimeMillis(timeMillis) {
     return "-";
   } else {
     var dt = new Date(timeMillis);
+    return formatDateString(dt);
+  }
+}
+
+function formatDateString(dt) {
     return dt.getFullYear() + "-" +
       padZeroes(dt.getMonth() + 1) + "-" +
       padZeroes(dt.getDate()) + " " +
       padZeroes(dt.getHours()) + ":" +
       padZeroes(dt.getMinutes()) + ":" +
       padZeroes(dt.getSeconds());
-  }
 }
 
 function getTimeZone() {
@@ -162,13 +166,8 @@ function setDataTableDefaults() {
 function formatDate(date) {
   if (date <= 0) return "-";
   else {
-     var d = new Date(date.replace("GMT", "Z"))
-     return d.getFullYear() + '-' +
-            (d.getMonth() + 1) + '-' +
-            d.getDate() + " " +
-            d.getHours() + ":" +
-            d.getMinutes() + ":" +
-            d.getSeconds();
+     var dt = new Date(date.replace("GMT", "Z"))
+     return formatDateString(dt);
   }
 }