azkaban-developers

diff --git a/azkaban-web-server/build.gradle b/azkaban-web-server/build.gradle
index 98c1958..e80332e 100644
--- a/azkaban-web-server/build.gradle
+++ b/azkaban-web-server/build.gradle
@@ -93,7 +93,7 @@ task movingJsTojsToPackage(dependsOn: ['npm_install']) {
       into "${buildDir}/jsToPackage"
     }
     copy {
-      from "node_modules/moment-timezone/builds/moment-timezone-with-data-2010-2020.min.js"
+      from "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"
       into "${buildDir}/jsToPackage"
     }
   }

diff --git a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/schedulepanel.vm b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/schedulepanel.vm
index ab7c0d5..27737c8 100644
--- a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/schedulepanel.vm
+++ b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/schedulepanel.vm
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="${context}/js/azkaban/view/schedule-panel.js?version=20161031"></script>
 <script type="text/javascript" src="${context}/js/moment.min.js" ></script>
 <script type="text/javascript" src="${context}/js/later.min.js"></script>
-<script type="text/javascript" src="${context}/js/moment-timezone-with-data-2010-2020.min.js"></script>
+<script type="text/javascript" src="${context}/js/moment-timezone-with-data.min.js"></script>
 <style type="text/css">
   .input-box { position: relative; }
   .input-box input { display: block; border: 1px solid #d7d6d6; background: #fff; padding: 10px 10px 10px 20px; width: 195px; }

diff --git a/azkaban-web-server/src/web/js/azkaban/test/test.js b/azkaban-web-server/src/web/js/azkaban/test/test.js
index 3ad742e..7bd9730 100644
--- a/azkaban-web-server/src/web/js/azkaban/test/test.js
+++ b/azkaban-web-server/src/web/js/azkaban/test/test.js
@@ -7,8 +7,11 @@ function addClass(el, newClass) {
 var rewire = require('rewire'),
     dateJs = rewire('../util/date.js');
 
-var chai = require('chai');
-var assert = chai.assert;
+var moment = require('moment-timezone');
+
+var chai = require('chai'),
+    assert = chai.assert;
+
 
 //Some Test instances
 describe('addClass', function() {
@@ -50,7 +53,7 @@ describe('CronTransformation', function() {
    assert.equal(testStrFromCronToQuartz('0 3 * * 1,3-5 2016'), '0 3 * * 0,2-4 2016');
    assert.equal(testStrFromCronToQuartz('0 3 * * 5#3'), '0 3 * * 4#3');
    assert.equal(testStrFromCronToQuartz('0 3 * * 5-7#3'), '0 3 * * 4-6#3');
-   assert.equal(testStrFromCronToQuartz('0 3 * * 1,3-5#3 2016'), '0 3 * * 0,2-4#3 2016'); 
+   assert.equal(testStrFromCronToQuartz('0 3 * * 1,3-5#3 2016'), '0 3 * * 0,2-4#3 2016');
   });
 });
 
@@ -73,3 +76,21 @@ describe('ValidateQuartzStr', function() {
 
   });
 });
+
+//Test moment js and moment timezone js
+describe('momentJSTest', function() {
+
+  var momentObj= moment();
+
+  it('momentJSTest', function() {
+    assert.equal(moment('20170411', 'YYYYMMDD').format('MM-YYYY'), '04-2017');
+  });
+
+  it('momentTimezoneTest', function() {
+
+    // Refer to https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/UTC
+    // month: 3 represents April
+    var dateTime = Date.UTC(2017, 3, 11, 11, 17, 0);
+    assert.equal(moment(dateTime).tz('America/Los_Angeles').format("LLL"), 'April 11, 2017 4:17 AM');
+  });
+});