Skip to content

A
atlas
Commit b5c4a56f by kevalbhatt
Options

ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date'

parent 177b01bc
Showing with 48 additions and 14 deletions
dashboardv2/public/css/scss/business-metadata.scss
......@@ -200,9 +200,11 @@
color: #686868 !important;
}
.business-metadata-detail-attr-key {
width: 30%;
td {
word-break: break-word;
}
.business-metadata-detail-attr-key {
width: 30%;
}
}
\ No newline at end of file
dashboardv2/public/css/scss/override.scss
......@@ -417,7 +417,8 @@ div.columnmanager-dropdown-container {
max-height: 400px;
min-height: 70px;
overflow: auto;
border-top: 1px solid #DEDEDE
border-top: 1px solid #DEDEDE;
word-break: break-word;
}
.ui-pnotify-action-bar {
......@@ -490,4 +491,10 @@ div.columnmanager-dropdown-container {
.form-control {
z-index: 1;
}
}
.ui-pnotify-container {
.ui-pnotify-text {
word-break: break-word;
}
}
\ No newline at end of file
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
......@@ -436,9 +436,15 @@ define(['require',
var that = this;
this.$('input[data-type="date"]').each(function() {
if (!$(this).data('daterangepicker')) {
var dateObj = { "singleDatePicker": true, "showDropdowns": true };
var dateObj = {
"singleDatePicker": true,
"showDropdowns": true,
locale: {
format: Globals.dateFormat
}
};
if (that.guid) {
dateObj["startDate"] = this.value
dateObj["startDate"] = new Date(Number(this.value));
}
$(this).daterangepicker(dateObj);
}
......@@ -598,7 +604,7 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
entityValue = moment(dataValue).format(Globals.dateFormat);
entityValue = moment(dataValue);
} else {
entityValue = moment().format(Globals.dateFormat);
}
......
dashboardv2/public/js/views/import/ImportLayoutView.js
......@@ -123,7 +123,7 @@ define([
if (response.failedImportInfoList.length > 1) {
var modalTitle = '<div class="back-button importBackBtn" title="Back to import file"><i class="fa fa-angle-left "></i> </div> <div class="modal-name">Error Details</div>';
_.each(response.failedImportInfoList, function(err_obj) {
errorStr += '<li>' + err_obj.remarks + '</li>';
errorStr += '<li>' + _.escape(err_obj.remarks) + '</li>';
});
that.ui.errorDetails.append(errorStr);
that.toggleErrorAndDropZoneView({ title: modalTitle, isErrorView: true });
......
dashboardv3/public/css/scss/business-metadata.scss
......@@ -200,9 +200,11 @@
color: #686868 !important;
}
.business-metadata-detail-attr-key {
width: 30%;
td {
word-break: break-word;
}
.business-metadata-detail-attr-key {
width: 30%;
}
}
\ No newline at end of file
dashboardv3/public/css/scss/override.scss
......@@ -421,7 +421,8 @@ div.columnmanager-dropdown-container {
max-height: 400px;
min-height: 70px;
overflow: auto;
border-top: 1px solid #DEDEDE
border-top: 1px solid #DEDEDE;
word-break: break-word;
}
.ui-pnotify-action-bar {
......@@ -494,4 +495,10 @@ div.columnmanager-dropdown-container {
.form-control {
z-index: 1;
}
}
.ui-pnotify-container {
.ui-pnotify-text {
word-break: break-word;
}
}
\ No newline at end of file
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
......@@ -439,9 +439,15 @@ define(['require',
var that = this;
this.$('input[data-type="date"]').each(function() {
if (!$(this).data('daterangepicker')) {
var dateObj = { "singleDatePicker": true, "showDropdowns": true };
var dateObj = {
"singleDatePicker": true,
"showDropdowns": true,
locale: {
format: Globals.dateFormat
}
};
if (that.guid) {
dateObj["startDate"] = this.value
dateObj["startDate"] = new Date(Number(this.value));
}
$(this).daterangepicker(dateObj);
}
......@@ -601,7 +607,7 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
entityValue = moment(dataValue).format(Globals.dateFormat);
entityValue = moment(dataValue);
} else {
entityValue = moment().format(Globals.dateFormat);
}
......
dashboardv3/public/js/views/import/ImportLayoutView.js
......@@ -123,7 +123,7 @@ define([
if (response.failedImportInfoList.length > 1) {
var modalTitle = '<div class="back-button importBackBtn" title="Back to import file"><i class="fa fa-angle-left "></i> </div> <div class="modal-name">Error Details</div>';
_.each(response.failedImportInfoList, function(err_obj) {
errorStr += '<li>' + err_obj.remarks + '</li>';
errorStr += '<li>' + _.escape(err_obj.remarks) + '</li>';
});
that.ui.errorDetails.append(errorStr);
that.toggleErrorAndDropZoneView({ title: modalTitle, isErrorView: true });
......
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