You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2020/05/27 15:42:38 UTC
[atlas] 02/03: ATLAS-3789:- UI: Date format is not correct for
classfication validity periods.
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 0d10d6b91191af4db8f8de5aea1243898d38d25e
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Wed May 27 17:22:57 2020 +0530
ATLAS-3789:- UI: Date format is not correct for classfication validity periods.
---
dashboardv2/public/js/utils/CommonViewFunction.js | 4 ++--
dashboardv2/public/js/utils/Globals.js | 2 ++
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js | 4 ++--
.../public/js/views/entity/EntityBusinessMetaDataItemView.js | 11 ++++++-----
.../public/js/views/entity/EntityBusinessMetaDataView.js | 7 ++++---
dashboardv2/public/js/views/search/QueryBuilderView.js | 2 +-
dashboardv2/public/js/views/tag/AddTagModalView.js | 5 +++--
dashboardv2/public/js/views/tag/AddTimezoneItemView.js | 6 +++---
dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++--
dashboardv3/public/js/utils/Globals.js | 2 ++
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js | 4 ++--
.../public/js/views/entity/EntityBusinessMetaDataItemView.js | 11 ++++++-----
.../public/js/views/entity/EntityBusinessMetaDataView.js | 9 +++++----
dashboardv3/public/js/views/search/QueryBuilderView.js | 2 +-
dashboardv3/public/js/views/tag/AddTagModalView.js | 5 +++--
dashboardv3/public/js/views/tag/AddTimezoneItemView.js | 6 +++---
16 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index b8c6e7f..b4ee73f 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -631,13 +631,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
rule = {};
if (apiObj) {
rule = { attributeName: temp[0], operator: mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) }
- rule.attributeValue = rule.type === 'date' && formatDate && rule.attributeValue.length ? moment(parseInt(rule.attributeValue)).format('MM/DD/YYYY h:mm A') : rule.attributeValue;
+ rule.attributeValue = rule.type === 'date' && formatDate && rule.attributeValue.length ? moment(parseInt(rule.attributeValue)).format(Globals.dateTimeFormat) : rule.attributeValue;
} else {
rule = { id: temp[0], operator: temp[1], value: _.trim(temp[2]) }
if (temp[3]) {
rule['type'] = temp[3];
}
- rule.value = rule.type === 'date' && formatDate && rule.value.length ? moment(parseInt(rule.value)).format('MM/DD/YYYY h:mm A') : rule.value;
+ rule.value = rule.type === 'date' && formatDate && rule.value.length ? moment(parseInt(rule.value)).format(Globals.dateTimeFormat) : rule.value;
}
return rule;
}
diff --git a/dashboardv2/public/js/utils/Globals.js b/dashboardv2/public/js/utils/Globals.js
index 6ed423d..3ab33a5 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -40,5 +40,7 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2";
+ Globals.dateFormat = "YYYY/MM/DD";
+ Globals.dateTimeFormat = "YYYY/MM/DD HH:mm:ss";
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index d967728..2a70b36 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -595,9 +595,9 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
- entityValue = moment(dataValue).format("MM/DD/YYYY");
+ entityValue = moment(dataValue).format(Globals.dateFormat);
} else {
- entityValue = moment().format("MM/DD/YYYY");
+ entityValue = moment().format(Globals.dateFormat);
}
}
}
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataItemView.js b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataItemView.js
index 437a1fc..0220173 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataItemView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataItemView.js
@@ -19,8 +19,9 @@ define(['require',
'backbone',
'hbs!tmpl/entity/EntityBusinessMetaDataItemView_tmpl',
'moment',
+ 'utils/Globals',
'daterangepicker'
-], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment) {
+], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment, Globals) {
'use strict';
return Backbone.Marionette.ItemView.extend({
@@ -165,12 +166,12 @@ define(['require',
var dateStr = [];
_.each(val, function(selectedDate) {
selectedDate = parseInt(selectedDate);
- dateStr.push(moment(selectedDate).format("MM/DD/YYYY"));
+ dateStr.push(moment(selectedDate).format(Globals.dateFormat));
});
val = dateStr.join(',');
} else if (!isMultiValued && val) {
val = parseInt(val);
- val = moment(val).format("MM/DD/YYYY");
+ val = moment(val).format(Globals.dateFormat);
}
}
if (typeName.indexOf("string") > -1) {
@@ -188,7 +189,7 @@ define(['require',
if (val !== "") {
val += ", ";
}
- picker.element.val(val += picker.startDate.format('MM/DD/YYYY'));
+ picker.element.val(val += picker.startDate.format(Globals.dateFormat));
that.$el.find(".custom-col-1[data-id='value']>[data-key]").trigger('change');
});
}
@@ -263,7 +264,7 @@ define(['require',
var typeName = value.typeName,
value = value.value;
if (typeName === "date") {
- return moment(value).format("MM/DD/YYYY");
+ return moment(value).format(Globals.dateFormat);
} else {
return value;
}
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
index 0adabed..5dab509 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -25,8 +25,9 @@ define([
"utils/Utils",
"utils/Messages",
"utils/CommonViewFunction",
+ 'utils/Globals',
'moment'
-], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment) {
+], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, Globals, moment) {
"use strict";
return Backbone.Marionette.CompositeView.extend({
@@ -228,11 +229,11 @@ define([
newVal = val.value;
if (newVal.length > 0 && val.typeName.indexOf("date") > -1) {
newVal = _.map(newVal, function(dates) {
- return moment(dates).format("MM/DD/YYYY");
+ return moment(dates).format(Globals.dateFormat);
});
}
if (val.typeName === "date") {
- newVal = moment(newVal).format("MM/DD/YYYY");
+ newVal = moment(newVal).format(Globals.dateFormat);
}
}
diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js b/dashboardv2/public/js/views/search/QueryBuilderView.js
index 4be24f2..e250119 100644
--- a/dashboardv2/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv2/public/js/views/search/QueryBuilderView.js
@@ -270,7 +270,7 @@ define(['require',
"showDropdowns": true,
"timePicker": true,
locale: {
- format: 'MM/DD/YYYY h:mm A'
+ format: Globals.dateTimeFormat
}
};
if (rules) {
diff --git a/dashboardv2/public/js/views/tag/AddTagModalView.js b/dashboardv2/public/js/views/tag/AddTagModalView.js
index 5626edc..df280fb 100644
--- a/dashboardv2/public/js/views/tag/AddTagModalView.js
+++ b/dashboardv2/public/js/views/tag/AddTagModalView.js
@@ -28,9 +28,10 @@ define(['require',
'utils/Enums',
'utils/Messages',
'moment',
+ 'utils/Globals',
'moment-timezone',
'daterangepicker'
-], function(require, AddTagModalViewTmpl, AddTimezoneItemView, VTagList, VCommonList, Modal, VEntity, Utils, UrlLinks, Enums, Messages, moment) {
+], function(require, AddTagModalViewTmpl, AddTimezoneItemView, VTagList, VCommonList, Modal, VEntity, Utils, UrlLinks, Enums, Messages, moment, Globals) {
'use strict';
var AddTagModel = Backbone.Marionette.CompositeView.extend({
@@ -372,7 +373,7 @@ define(['require',
"showDropdowns": true,
"timePicker": true,
locale: {
- format: 'MM/DD/YYYY h:mm A'
+ format: Globals.dateTimeFormat
}
};
if (that.tagModel) {
diff --git a/dashboardv2/public/js/views/tag/AddTimezoneItemView.js b/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
index 00e5b3d..e16e520 100644
--- a/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
+++ b/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
@@ -81,7 +81,7 @@ define(['require',
"autoApply": true,
"autoUpdateInput": false,
"locale": {
- format: 'YYYY/MM/DD hh:mm:ss',
+ format: Globals.dateTimeFormat,
cancelLabel: 'Clear'
},
},
@@ -116,7 +116,7 @@ define(['require',
this.model.set('endTime', that.ui.endTime.val());
}
this.ui.startTime.daterangepicker(startDateObj).on('apply.daterangepicker', function(ev, picker) {
- that.ui.startTime.val(picker.startDate.format('YYYY/MM/DD hh:mm:ss'));
+ that.ui.startTime.val(picker.startDate.format(Globals.dateTimeFormat));
_.extend(endDateObj, { "minDate": that.ui.startTime.val() })
that.endDateInitialize(endDateObj);
that.model.set('startTime', that.ui.startTime.val());
@@ -152,7 +152,7 @@ define(['require',
endDateInitialize: function(option) {
var that = this;
this.ui.endTime.daterangepicker(option).on('apply.daterangepicker', function(ev, picker) {
- that.ui.endTime.val(picker.startDate.format('YYYY/MM/DD hh:mm:ss'));
+ that.ui.endTime.val(picker.startDate.format(Globals.dateTimeFormat));
that.model.set('endTime', that.ui.endTime.val());
that.buttonActive({ isButtonActive: true });
}).on('cancel.daterangepicker', function(ev, picker) {
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js b/dashboardv3/public/js/utils/CommonViewFunction.js
index 19792e6..06438f3 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -651,13 +651,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
rule = {};
if (apiObj) {
rule = { attributeName: temp[0], operator: mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) }
- rule.attributeValue = rule.type === 'date' && formatDate && rule.attributeValue.length ? moment(parseInt(rule.attributeValue)).format('MM/DD/YYYY h:mm A') : rule.attributeValue;
+ rule.attributeValue = rule.type === 'date' && formatDate && rule.attributeValue.length ? moment(parseInt(rule.attributeValue)).format(Globals.dateTimeFormat) : rule.attributeValue;
} else {
rule = { id: temp[0], operator: temp[1], value: _.trim(temp[2]) }
if (temp[3]) {
rule['type'] = temp[3];
}
- rule.value = rule.type === 'date' && formatDate && rule.value.length ? moment(parseInt(rule.value)).format('MM/DD/YYYY h:mm A') : rule.value;
+ rule.value = rule.type === 'date' && formatDate && rule.value.length ? moment(parseInt(rule.value)).format(Globals.dateTimeFormat) : rule.value;
}
return rule;
}
diff --git a/dashboardv3/public/js/utils/Globals.js b/dashboardv3/public/js/utils/Globals.js
index 6ed423d..3ab33a5 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -40,5 +40,7 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2";
+ Globals.dateFormat = "YYYY/MM/DD";
+ Globals.dateTimeFormat = "YYYY/MM/DD HH:mm:ss";
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
index 9e763d1..6492a6c 100644
--- a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
@@ -598,9 +598,9 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
- entityValue = moment(dataValue).format("MM/DD/YYYY");
+ entityValue = moment(dataValue).format(Globals.dateFormat);
} else {
- entityValue = moment().format("MM/DD/YYYY");
+ entityValue = moment().format(Globals.dateFormat);
}
}
}
diff --git a/dashboardv3/public/js/views/entity/EntityBusinessMetaDataItemView.js b/dashboardv3/public/js/views/entity/EntityBusinessMetaDataItemView.js
index 437a1fc..0220173 100644
--- a/dashboardv3/public/js/views/entity/EntityBusinessMetaDataItemView.js
+++ b/dashboardv3/public/js/views/entity/EntityBusinessMetaDataItemView.js
@@ -19,8 +19,9 @@ define(['require',
'backbone',
'hbs!tmpl/entity/EntityBusinessMetaDataItemView_tmpl',
'moment',
+ 'utils/Globals',
'daterangepicker'
-], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment) {
+], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment, Globals) {
'use strict';
return Backbone.Marionette.ItemView.extend({
@@ -165,12 +166,12 @@ define(['require',
var dateStr = [];
_.each(val, function(selectedDate) {
selectedDate = parseInt(selectedDate);
- dateStr.push(moment(selectedDate).format("MM/DD/YYYY"));
+ dateStr.push(moment(selectedDate).format(Globals.dateFormat));
});
val = dateStr.join(',');
} else if (!isMultiValued && val) {
val = parseInt(val);
- val = moment(val).format("MM/DD/YYYY");
+ val = moment(val).format(Globals.dateFormat);
}
}
if (typeName.indexOf("string") > -1) {
@@ -188,7 +189,7 @@ define(['require',
if (val !== "") {
val += ", ";
}
- picker.element.val(val += picker.startDate.format('MM/DD/YYYY'));
+ picker.element.val(val += picker.startDate.format(Globals.dateFormat));
that.$el.find(".custom-col-1[data-id='value']>[data-key]").trigger('change');
});
}
@@ -263,7 +264,7 @@ define(['require',
var typeName = value.typeName,
value = value.value;
if (typeName === "date") {
- return moment(value).format("MM/DD/YYYY");
+ return moment(value).format(Globals.dateFormat);
} else {
return value;
}
diff --git a/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js b/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
index 0adabed..75d210e 100644
--- a/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -25,8 +25,9 @@ define([
"utils/Utils",
"utils/Messages",
"utils/CommonViewFunction",
- 'moment'
-], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment) {
+ 'moment',
+ 'utils/Globals'
+], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment, Globals) {
"use strict";
return Backbone.Marionette.CompositeView.extend({
@@ -228,11 +229,11 @@ define([
newVal = val.value;
if (newVal.length > 0 && val.typeName.indexOf("date") > -1) {
newVal = _.map(newVal, function(dates) {
- return moment(dates).format("MM/DD/YYYY");
+ return moment(dates).format(Globals.dateFormat);
});
}
if (val.typeName === "date") {
- newVal = moment(newVal).format("MM/DD/YYYY");
+ newVal = moment(newVal).format(Globals.dateFormat);
}
}
diff --git a/dashboardv3/public/js/views/search/QueryBuilderView.js b/dashboardv3/public/js/views/search/QueryBuilderView.js
index 4be24f2..e250119 100644
--- a/dashboardv3/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv3/public/js/views/search/QueryBuilderView.js
@@ -270,7 +270,7 @@ define(['require',
"showDropdowns": true,
"timePicker": true,
locale: {
- format: 'MM/DD/YYYY h:mm A'
+ format: Globals.dateTimeFormat
}
};
if (rules) {
diff --git a/dashboardv3/public/js/views/tag/AddTagModalView.js b/dashboardv3/public/js/views/tag/AddTagModalView.js
index 5626edc..df280fb 100644
--- a/dashboardv3/public/js/views/tag/AddTagModalView.js
+++ b/dashboardv3/public/js/views/tag/AddTagModalView.js
@@ -28,9 +28,10 @@ define(['require',
'utils/Enums',
'utils/Messages',
'moment',
+ 'utils/Globals',
'moment-timezone',
'daterangepicker'
-], function(require, AddTagModalViewTmpl, AddTimezoneItemView, VTagList, VCommonList, Modal, VEntity, Utils, UrlLinks, Enums, Messages, moment) {
+], function(require, AddTagModalViewTmpl, AddTimezoneItemView, VTagList, VCommonList, Modal, VEntity, Utils, UrlLinks, Enums, Messages, moment, Globals) {
'use strict';
var AddTagModel = Backbone.Marionette.CompositeView.extend({
@@ -372,7 +373,7 @@ define(['require',
"showDropdowns": true,
"timePicker": true,
locale: {
- format: 'MM/DD/YYYY h:mm A'
+ format: Globals.dateTimeFormat
}
};
if (that.tagModel) {
diff --git a/dashboardv3/public/js/views/tag/AddTimezoneItemView.js b/dashboardv3/public/js/views/tag/AddTimezoneItemView.js
index 00e5b3d..e16e520 100644
--- a/dashboardv3/public/js/views/tag/AddTimezoneItemView.js
+++ b/dashboardv3/public/js/views/tag/AddTimezoneItemView.js
@@ -81,7 +81,7 @@ define(['require',
"autoApply": true,
"autoUpdateInput": false,
"locale": {
- format: 'YYYY/MM/DD hh:mm:ss',
+ format: Globals.dateTimeFormat,
cancelLabel: 'Clear'
},
},
@@ -116,7 +116,7 @@ define(['require',
this.model.set('endTime', that.ui.endTime.val());
}
this.ui.startTime.daterangepicker(startDateObj).on('apply.daterangepicker', function(ev, picker) {
- that.ui.startTime.val(picker.startDate.format('YYYY/MM/DD hh:mm:ss'));
+ that.ui.startTime.val(picker.startDate.format(Globals.dateTimeFormat));
_.extend(endDateObj, { "minDate": that.ui.startTime.val() })
that.endDateInitialize(endDateObj);
that.model.set('startTime', that.ui.startTime.val());
@@ -152,7 +152,7 @@ define(['require',
endDateInitialize: function(option) {
var that = this;
this.ui.endTime.daterangepicker(option).on('apply.daterangepicker', function(ev, picker) {
- that.ui.endTime.val(picker.startDate.format('YYYY/MM/DD hh:mm:ss'));
+ that.ui.endTime.val(picker.startDate.format(Globals.dateTimeFormat));
that.model.set('endTime', that.ui.endTime.val());
that.buttonActive({ isButtonActive: true });
}).on('cancel.daterangepicker', function(ev, picker) {