From 1d7c3a743cedc9eb75fdafe30bd12209e3f8fabe Mon Sep 17 00:00:00 2001
From: Hacene SI HADJ MOHAND <hacene.si-hadj-mohand@akka.eu>
Date: Thu, 12 Dec 2019 11:56:05 +0100
Subject: [PATCH] correcting #7320
---
js/app/views/CatalogUI.js | 17 ++++++++++-------
js/app/views/TimeTableUI.js | 10 +++++++---
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/js/app/views/CatalogUI.js b/js/app/views/CatalogUI.js
index 311f840..d74c4f9 100644
--- a/js/app/views/CatalogUI.js
+++ b/js/app/views/CatalogUI.js
@@ -161,8 +161,12 @@ Ext.define('amdaUI.CatalogUI', {
timeTabNode.editInModule();
});
},
- // Convert UTC date to client local date
+ // Convert UTC date to client local date
convertUTCDateToLocalDate: function (date) {
+ if (date == null) {
+ return date;
+ }
+ ;
var newDate = new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
var offset = date.getTimezoneOffset() / 60;
@@ -533,6 +537,7 @@ Ext.define('amdaUI.CatalogUI', {
*/
loadObject: function () {
// load object into form
+ this.object.set('created', this.convertUTCDateToLocalDate(this.object.get('created')));
this.formPanel.getForm().loadRecord(this.object);
this.status = null;
@@ -710,7 +715,6 @@ Ext.define('amdaUI.CatalogUI', {
init: function (config)
{
this.object = config.object;
- this.object.set('created', this.convertUTCDateToLocalDate(this.object.get('created')));
this.fieldName = new Ext.form.field.Text({
fieldLabel: 'Name',
allowBlank: false,
@@ -802,10 +806,10 @@ Ext.define('amdaUI.CatalogUI', {
// selType: 'cellmodel',
plugins: [cellEditing, {ptype: 'bufferedrenderer'}],
listeners: {
- afterrender: function () {
- this.TTGrid.headerCt.resizer.tracker.gridBugFix = true;
- },
- scope: this
+ afterrender: function () {
+ this.TTGrid.headerCt.resizer.tracker.gridBugFix = true;
+ },
+ scope: this
},
dockedItems: [{
xtype: 'toolbar',
@@ -974,7 +978,6 @@ Ext.define('amdaUI.CatalogUI', {
}]
},
-
//statistical info
{
xtype: 'toolbar',
diff --git a/js/app/views/TimeTableUI.js b/js/app/views/TimeTableUI.js
index 8adfe27..fcc3497 100755
--- a/js/app/views/TimeTableUI.js
+++ b/js/app/views/TimeTableUI.js
@@ -66,6 +66,7 @@ Ext.define('amdaUI.TimeTableUI', {
* load object timetable into this view
*/
loadObject: function () {
+ this.object.set('created', this.convertUTCDateToLocalDate(this.object.get('created')));
// load object into form
this.formPanel.getForm().loadRecord(this.object);
@@ -377,9 +378,13 @@ Ext.define('amdaUI.TimeTableUI', {
}
}
},
-
- // Convert UTC date to client local date
+
+ // Convert UTC date to client local date
convertUTCDateToLocalDate: function (date) {
+ if (date == null) {
+ return date;
+ }
+ ;
var newDate = new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
var offset = date.getTimezoneOffset() / 60;
@@ -393,7 +398,6 @@ Ext.define('amdaUI.TimeTableUI', {
init: function (config)
{
this.object = config.object;
- this.object.set('created', this.convertUTCDateToLocalDate(this.object.get('created')));
this.fieldName = new Ext.form.field.Text({
fieldLabel: 'Name*',
--
libgit2 0.21.2