correcting #7320

Hacene SI HADJ MOHAND
1 parent bad1e728
Showing 2 changed files with 17 additions and 10 deletions Show diff stats
js/app/views/CatalogUI.js
js/app/views/TimeTableUI.js
@@ -161,8 +161,12 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     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(&#39;amdaUI.CatalogUI&#39;, {
      */
     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(&#39;amdaUI.CatalogUI&#39;, {
     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(&#39;amdaUI.CatalogUI&#39;, {
             //	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(&#39;amdaUI.CatalogUI&#39;, {
                                 }]
                         },
  
-
                         //statistical info
                         {
                             xtype: 'toolbar',
@@ -66,6 +66,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
      * 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(&#39;amdaUI.TimeTableUI&#39;, {
             }
         }
     },
-    
-       // 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(&#39;amdaUI.TimeTableUI&#39;, {
     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*',