Skip to content

A
atlas
Commit d6ba8569 by kevalbhatt
Options

ATLAS-3789:- UI: Date format is not correct for classfication validity periods.

(cherry picked from commit 0d10d6b91191af4db8f8de5aea1243898d38d25e)
parent 56ecce62
Showing with 49 additions and 37 deletions
dashboardv2/public/js/utils/CommonViewFunction.js
...@@ -631,13 +631,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -631,13 +631,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
rule = {}; rule = {};
if (apiObj) { if (apiObj) {
rule = { attributeName: temp[0], operator: mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) } 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 { } else {
rule = { id: temp[0], operator: temp[1], value: _.trim(temp[2]) } rule = { id: temp[0], operator: temp[1], value: _.trim(temp[2]) }
if (temp[3]) { if (temp[3]) {
rule['type'] = 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; return rule;
} }
......
dashboardv2/public/js/utils/Globals.js
...@@ -40,5 +40,7 @@ define(["require"], function(require) { ...@@ -40,5 +40,7 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {}; Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/"; Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2"; Globals.DEFAULT_UI = "v2";
Globals.dateFormat = "YYYY/MM/DD";
Globals.dateTimeFormat = "YYYY/MM/DD HH:mm:ss";
return Globals; return Globals;
}); });
\ No newline at end of file
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
...@@ -595,9 +595,9 @@ define(['require', ...@@ -595,9 +595,9 @@ define(['require',
} }
if (value.typeName === "date") { if (value.typeName === "date") {
if (dataValue) { if (dataValue) {
entityValue = moment(dataValue).format("MM/DD/YYYY"); entityValue = moment(dataValue).format(Globals.dateFormat);
} else { } else {
entityValue = moment().format("MM/DD/YYYY"); entityValue = moment().format(Globals.dateFormat);
} }
} }
} }
......
dashboardv2/public/js/views/entity/EntityBusinessMetaDataItemView.js
...@@ -19,8 +19,9 @@ define(['require', ...@@ -19,8 +19,9 @@ define(['require',
'backbone', 'backbone',
'hbs!tmpl/entity/EntityBusinessMetaDataItemView_tmpl', 'hbs!tmpl/entity/EntityBusinessMetaDataItemView_tmpl',
'moment', 'moment',
'utils/Globals',
'daterangepicker' 'daterangepicker'
], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment) { ], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment, Globals) {
'use strict'; 'use strict';
return Backbone.Marionette.ItemView.extend({ return Backbone.Marionette.ItemView.extend({
...@@ -165,12 +166,12 @@ define(['require', ...@@ -165,12 +166,12 @@ define(['require',
var dateStr = []; var dateStr = [];
_.each(val, function(selectedDate) { _.each(val, function(selectedDate) {
selectedDate = parseInt(selectedDate); selectedDate = parseInt(selectedDate);
dateStr.push(moment(selectedDate).format("MM/DD/YYYY")); dateStr.push(moment(selectedDate).format(Globals.dateFormat));
}); });
val = dateStr.join(','); val = dateStr.join(',');
} else if (!isMultiValued && val) { } else if (!isMultiValued && val) {
val = parseInt(val); val = parseInt(val);
val = moment(val).format("MM/DD/YYYY"); val = moment(val).format(Globals.dateFormat);
} }
} }
if (typeName.indexOf("string") > -1) { if (typeName.indexOf("string") > -1) {
...@@ -188,7 +189,7 @@ define(['require', ...@@ -188,7 +189,7 @@ define(['require',
if (val !== "") { if (val !== "") {
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'); that.$el.find(".custom-col-1[data-id='value']>[data-key]").trigger('change');
}); });
} }
...@@ -263,7 +264,7 @@ define(['require', ...@@ -263,7 +264,7 @@ define(['require',
var typeName = value.typeName, var typeName = value.typeName,
value = value.value; value = value.value;
if (typeName === "date") { if (typeName === "date") {
return moment(value).format("MM/DD/YYYY"); return moment(value).format(Globals.dateFormat);
} else { } else {
return value; return value;
} }
......
dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
...@@ -25,8 +25,9 @@ define([ ...@@ -25,8 +25,9 @@ define([
"utils/Utils", "utils/Utils",
"utils/Messages", "utils/Messages",
"utils/CommonViewFunction", "utils/CommonViewFunction",
'utils/Globals',
'moment' '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"; "use strict";
return Backbone.Marionette.CompositeView.extend({ return Backbone.Marionette.CompositeView.extend({
...@@ -228,11 +229,11 @@ define([ ...@@ -228,11 +229,11 @@ define([
newVal = val.value; newVal = val.value;
if (newVal.length > 0 && val.typeName.indexOf("date") > -1) { if (newVal.length > 0 && val.typeName.indexOf("date") > -1) {
newVal = _.map(newVal, function(dates) { newVal = _.map(newVal, function(dates) {
return moment(dates).format("MM/DD/YYYY"); return moment(dates).format(Globals.dateFormat);
}); });
} }
if (val.typeName === "date") { if (val.typeName === "date") {
newVal = moment(newVal).format("MM/DD/YYYY"); newVal = moment(newVal).format(Globals.dateFormat);
} }
} }
......
dashboardv2/public/js/views/search/QueryBuilderView.js
...@@ -270,7 +270,7 @@ define(['require', ...@@ -270,7 +270,7 @@ define(['require',
"showDropdowns": true, "showDropdowns": true,
"timePicker": true, "timePicker": true,
locale: { locale: {
format: 'MM/DD/YYYY h:mm A' format: Globals.dateTimeFormat
} }
}; };
if (rules) { if (rules) {
......
dashboardv2/public/js/views/tag/AddTagModalView.js
...@@ -28,9 +28,10 @@ define(['require', ...@@ -28,9 +28,10 @@ define(['require',
'utils/Enums', 'utils/Enums',
'utils/Messages', 'utils/Messages',
'moment', 'moment',
'utils/Globals',
'moment-timezone', 'moment-timezone',
'daterangepicker' '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'; 'use strict';
var AddTagModel = Backbone.Marionette.CompositeView.extend({ var AddTagModel = Backbone.Marionette.CompositeView.extend({
...@@ -372,7 +373,7 @@ define(['require', ...@@ -372,7 +373,7 @@ define(['require',
"showDropdowns": true, "showDropdowns": true,
"timePicker": true, "timePicker": true,
locale: { locale: {
format: 'MM/DD/YYYY h:mm A' format: Globals.dateTimeFormat
} }
}; };
if (that.tagModel) { if (that.tagModel) {
......
dashboardv2/public/js/views/tag/AddTimezoneItemView.js
...@@ -81,7 +81,7 @@ define(['require', ...@@ -81,7 +81,7 @@ define(['require',
"autoApply": true, "autoApply": true,
"autoUpdateInput": false, "autoUpdateInput": false,
"locale": { "locale": {
format: 'YYYY/MM/DD hh:mm:ss', format: Globals.dateTimeFormat,
cancelLabel: 'Clear' cancelLabel: 'Clear'
}, },
}, },
...@@ -116,7 +116,7 @@ define(['require', ...@@ -116,7 +116,7 @@ define(['require',
this.model.set('endTime', that.ui.endTime.val()); this.model.set('endTime', that.ui.endTime.val());
} }
this.ui.startTime.daterangepicker(startDateObj).on('apply.daterangepicker', function(ev, picker) { 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() }) _.extend(endDateObj, { "minDate": that.ui.startTime.val() })
that.endDateInitialize(endDateObj); that.endDateInitialize(endDateObj);
that.model.set('startTime', that.ui.startTime.val()); that.model.set('startTime', that.ui.startTime.val());
...@@ -152,7 +152,7 @@ define(['require', ...@@ -152,7 +152,7 @@ define(['require',
endDateInitialize: function(option) { endDateInitialize: function(option) {
var that = this; var that = this;
this.ui.endTime.daterangepicker(option).on('apply.daterangepicker', function(ev, picker) { 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.model.set('endTime', that.ui.endTime.val());
that.buttonActive({ isButtonActive: true }); that.buttonActive({ isButtonActive: true });
}).on('cancel.daterangepicker', function(ev, picker) { }).on('cancel.daterangepicker', function(ev, picker) {
......
dashboardv3/public/js/utils/CommonViewFunction.js
...@@ -651,13 +651,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -651,13 +651,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
rule = {}; rule = {};
if (apiObj) { if (apiObj) {
rule = { attributeName: temp[0], operator: mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) } 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 { } else {
rule = { id: temp[0], operator: temp[1], value: _.trim(temp[2]) } rule = { id: temp[0], operator: temp[1], value: _.trim(temp[2]) }
if (temp[3]) { if (temp[3]) {
rule['type'] = 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; return rule;
} }
......
dashboardv3/public/js/utils/Globals.js
...@@ -40,5 +40,7 @@ define(["require"], function(require) { ...@@ -40,5 +40,7 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {}; Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/"; Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2"; Globals.DEFAULT_UI = "v2";
Globals.dateFormat = "YYYY/MM/DD";
Globals.dateTimeFormat = "YYYY/MM/DD HH:mm:ss";
return Globals; return Globals;
}); });
\ No newline at end of file
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
...@@ -598,9 +598,9 @@ define(['require', ...@@ -598,9 +598,9 @@ define(['require',
} }
if (value.typeName === "date") { if (value.typeName === "date") {
if (dataValue) { if (dataValue) {
entityValue = moment(dataValue).format("MM/DD/YYYY"); entityValue = moment(dataValue).format(Globals.dateFormat);
} else { } else {
entityValue = moment().format("MM/DD/YYYY"); entityValue = moment().format(Globals.dateFormat);
} }
} }
} }
......
dashboardv3/public/js/views/entity/EntityBusinessMetaDataItemView.js
...@@ -19,8 +19,9 @@ define(['require', ...@@ -19,8 +19,9 @@ define(['require',
'backbone', 'backbone',
'hbs!tmpl/entity/EntityBusinessMetaDataItemView_tmpl', 'hbs!tmpl/entity/EntityBusinessMetaDataItemView_tmpl',
'moment', 'moment',
'utils/Globals',
'daterangepicker' 'daterangepicker'
], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment) { ], function(require, Backbone, EntityBusinessMetaDataItemViewTmpl, moment, Globals) {
'use strict'; 'use strict';
return Backbone.Marionette.ItemView.extend({ return Backbone.Marionette.ItemView.extend({
...@@ -165,12 +166,12 @@ define(['require', ...@@ -165,12 +166,12 @@ define(['require',
var dateStr = []; var dateStr = [];
_.each(val, function(selectedDate) { _.each(val, function(selectedDate) {
selectedDate = parseInt(selectedDate); selectedDate = parseInt(selectedDate);
dateStr.push(moment(selectedDate).format("MM/DD/YYYY")); dateStr.push(moment(selectedDate).format(Globals.dateFormat));
}); });
val = dateStr.join(','); val = dateStr.join(',');
} else if (!isMultiValued && val) { } else if (!isMultiValued && val) {
val = parseInt(val); val = parseInt(val);
val = moment(val).format("MM/DD/YYYY"); val = moment(val).format(Globals.dateFormat);
} }
} }
if (typeName.indexOf("string") > -1) { if (typeName.indexOf("string") > -1) {
...@@ -188,7 +189,7 @@ define(['require', ...@@ -188,7 +189,7 @@ define(['require',
if (val !== "") { if (val !== "") {
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'); that.$el.find(".custom-col-1[data-id='value']>[data-key]").trigger('change');
}); });
} }
...@@ -263,7 +264,7 @@ define(['require', ...@@ -263,7 +264,7 @@ define(['require',
var typeName = value.typeName, var typeName = value.typeName,
value = value.value; value = value.value;
if (typeName === "date") { if (typeName === "date") {
return moment(value).format("MM/DD/YYYY"); return moment(value).format(Globals.dateFormat);
} else { } else {
return value; return value;
} }
......
dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
...@@ -25,8 +25,9 @@ define([ ...@@ -25,8 +25,9 @@ define([
"utils/Utils", "utils/Utils",
"utils/Messages", "utils/Messages",
"utils/CommonViewFunction", "utils/CommonViewFunction",
'moment' 'moment',
], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment) { 'utils/Globals'
], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment, Globals) {
"use strict"; "use strict";
return Backbone.Marionette.CompositeView.extend({ return Backbone.Marionette.CompositeView.extend({
...@@ -228,11 +229,11 @@ define([ ...@@ -228,11 +229,11 @@ define([
newVal = val.value; newVal = val.value;
if (newVal.length > 0 && val.typeName.indexOf("date") > -1) { if (newVal.length > 0 && val.typeName.indexOf("date") > -1) {
newVal = _.map(newVal, function(dates) { newVal = _.map(newVal, function(dates) {
return moment(dates).format("MM/DD/YYYY"); return moment(dates).format(Globals.dateFormat);
}); });
} }
if (val.typeName === "date") { if (val.typeName === "date") {
newVal = moment(newVal).format("MM/DD/YYYY"); newVal = moment(newVal).format(Globals.dateFormat);
} }
} }
......
dashboardv3/public/js/views/search/QueryBuilderView.js
...@@ -270,7 +270,7 @@ define(['require', ...@@ -270,7 +270,7 @@ define(['require',
"showDropdowns": true, "showDropdowns": true,
"timePicker": true, "timePicker": true,
locale: { locale: {
format: 'MM/DD/YYYY h:mm A' format: Globals.dateTimeFormat
} }
}; };
if (rules) { if (rules) {
......
dashboardv3/public/js/views/tag/AddTagModalView.js
...@@ -28,9 +28,10 @@ define(['require', ...@@ -28,9 +28,10 @@ define(['require',
'utils/Enums', 'utils/Enums',
'utils/Messages', 'utils/Messages',
'moment', 'moment',
'utils/Globals',
'moment-timezone', 'moment-timezone',
'daterangepicker' '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'; 'use strict';
var AddTagModel = Backbone.Marionette.CompositeView.extend({ var AddTagModel = Backbone.Marionette.CompositeView.extend({
...@@ -372,7 +373,7 @@ define(['require', ...@@ -372,7 +373,7 @@ define(['require',
"showDropdowns": true, "showDropdowns": true,
"timePicker": true, "timePicker": true,
locale: { locale: {
format: 'MM/DD/YYYY h:mm A' format: Globals.dateTimeFormat
} }
}; };
if (that.tagModel) { if (that.tagModel) {
......
dashboardv3/public/js/views/tag/AddTimezoneItemView.js
...@@ -81,7 +81,7 @@ define(['require', ...@@ -81,7 +81,7 @@ define(['require',
"autoApply": true, "autoApply": true,
"autoUpdateInput": false, "autoUpdateInput": false,
"locale": { "locale": {
format: 'YYYY/MM/DD hh:mm:ss', format: Globals.dateTimeFormat,
cancelLabel: 'Clear' cancelLabel: 'Clear'
}, },
}, },
...@@ -116,7 +116,7 @@ define(['require', ...@@ -116,7 +116,7 @@ define(['require',
this.model.set('endTime', that.ui.endTime.val()); this.model.set('endTime', that.ui.endTime.val());
} }
this.ui.startTime.daterangepicker(startDateObj).on('apply.daterangepicker', function(ev, picker) { 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() }) _.extend(endDateObj, { "minDate": that.ui.startTime.val() })
that.endDateInitialize(endDateObj); that.endDateInitialize(endDateObj);
that.model.set('startTime', that.ui.startTime.val()); that.model.set('startTime', that.ui.startTime.val());
...@@ -152,7 +152,7 @@ define(['require', ...@@ -152,7 +152,7 @@ define(['require',
endDateInitialize: function(option) { endDateInitialize: function(option) {
var that = this; var that = this;
this.ui.endTime.daterangepicker(option).on('apply.daterangepicker', function(ev, picker) { 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.model.set('endTime', that.ui.endTime.val());
that.buttonActive({ isButtonActive: true }); that.buttonActive({ isButtonActive: true });
}).on('cancel.daterangepicker', function(ev, picker) { }).on('cancel.daterangepicker', function(ev, picker) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment