resolue

Hacene SI HADJ MOHAND
1 parent 70c8089a
Showing 5 changed files with 49 additions and 51 deletions Show diff stats
js/app/models/Catalog.js
js/app/views/CatalogUI.js
php/classes/AmdaAction.php
php/classes/CatalogCacheIntervalObject.php
php/classes/TimeUtils.php
@@ -37,7 +37,7 @@ Ext.define(&#39;amdaModel.Catalog&#39;, {
 //     	}
     	values.objName = this.get('objName');
     	values.objFormat = this.get('objFormat');
-        values.folderId = this.get('folderId');
+                    values.folderId = this.get('folderId');
     	values.nbIntervals = this.get('nbIntervals');
     	values.cacheToken = this.get('cacheToken');
    	values.parameters = this.get('parameters');
@@ -179,8 +179,8 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 return;
             }
             Ext.Array.each(result.intervals, function (item, index) {
-             starts[index] = (item.start);
-             stops[index] = (item.stop);
+             starts[index] = Ext.Date.format(item.start, 'Y-m-d\\TH:i:s.u');
+             stops[index] = Ext.Date.format(item.start, 'Y-m-d\\TH:i:s.u');
          });
          if(starts.length !== 0 || stops.length !== 0) {
@@ -274,8 +274,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     dateFormat: 'Y-m-d\\TH:i:s.u',
                     convert: function (value, rec) {
                         if (!Ext.isDate(value)) {
-                            var valueString = new String(value);
-                            return new Date(valueString.replace(/\-/g, '\/').replace(/[T|Z]/g, ' '));
+                            return new Date(value);
                         }
                         return value;
                     }
@@ -286,8 +285,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     dateFormat: 'Y-m-d\\TH:i:s.u',
                     convert: function (value, rec) {
                         if (!Ext.isDate(value)) {
-                            var valueString = new String(value);
-                            return new Date(valueString.replace(/\-/g, '\/').replace(/[T|Z]/g, ' '));
+                            return new Date(value);
                         }
                         return value;
                     }
@@ -365,40 +363,36 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     }
                 },
                 {
-                    xtype: 'datecolumn',
-                    text: 'Start Time',
-                    format: 'Y-m-d\\TH:i:s.u',
-                    sortable: true,
-                    dataIndex: 'start',
-                    width: 120,
-                    minWidth: 50,
-                    menuDisabled: false,
-                    editor: {
-                        xtype: 'datefield',
-                        allowBlank: false,
-                        hideTrigger: true,
-                        format: 'Y-m-d\\TH:i:s.u'
-                    },
-                    filter: {type: 'date', dateFormat: 'Y-m-d'}
+                    header: 'Start Time', dataIndex: 'start', width: 120,
+                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
+                    renderer: function (value) {
+                        if (value != null) {
+                            if (Ext.isDate(value)) {
+                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                            } else {
+                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
+                            }
+                        } else {
+                            return value;
+                        }
+                    }
                 },
                 {
-                    xtype: 'datecolumn',
-                    text: 'Stop Time',
-                    format: 'Y-m-d\\TH:i:s.u',
-                    sortable: true,
-                    dataIndex: 'stop',
-                    width: 120,
-                    minWidth: 50,
-                    menuDisabled: false,
-                    editor: {
-                        xtype: 'datefield',
-                        allowBlank: false,
-                        hideTrigger: true,
-                        format: 'Y-m-d\\TH:i:s.u'
-                    },
-                    filter: {type: 'date', dateFormat: 'Y-m-d'}
+                    header: 'Stop Time', dataIndex: 'stop', width: 120,
+                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
+                    renderer: function (value) {
+                        if (value != null) {
+                            if (Ext.isDate(value)) {
+                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                            } else {
+                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
+                            }
+                        } else {
+                            return value;
+                        }
+                    }
                 },
-                            {
+                    {
                     xtype: 'gridcolumn',
                     text: 'Duration (day)',
                     sortable: true,
@@ -894,7 +888,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             'isCatalog': true,
                             'data': {}
                         };
-                        obj['data'][activeColumn.dataIndex] = value;
+                        if(activeColumn.dataIndex == "start" ||  activeColumn.dataIndex == "stop")
+                                obj['data'][activeColumn.dataIndex] = Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                        else
+                                obj['data'][activeColumn.dataIndex] = value;
                         //Interval is modified on the server side
                         me.editing = true;
@@ -1068,7 +1065,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
  	                        emptyText: 'YYYY/MM/DDThh:mm:ss.fff',
                                             format: 'Y-m-d\\TH:i:s.u',
 		    enforceMaxLength: true,
-                                	    maxLength: 19,
+                                	    maxLength: 25,
                                             labelWidth: 60,
 		    labelAlign: 'left',
                                         listeners: {
@@ -1084,7 +1081,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                             format: 'Y-m-d\\TH:i:s.u',
                                             labelAlign: 'left',
                                             enforceMaxLength: true,
-                                	    maxLength: 19,
+                                	    maxLength: 25,
                                             labelWidth: 60,
                                             align: 'left',
                                             listeners: {
@@ -243,8 +243,8 @@ class AmdaAction
                                             $info .= "<br/>Time Range : depending on mission selection"; 
                                         else 
                                             $info .= "<br/>Time Range : undefined"; 
-                                        $child->setAttribute('dataStart', date("Y-m-d\TH:i:s\Z", strtotime(' -1 day')));
-                                        $child->setAttribute('dataStop', date("Y-m-d\TH:i:s\Z", time()));                                        
+                                        $child->setAttribute('dataStart', date("Y-m-d\TH:i:s.u\Z", strtotime(' -1 day')));
+                                        $child->setAttribute('dataStop', date("Y-m-d\TH:i:s.u\Z", time()));                                        
                                     } else {
                                         $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
                                     }
@@ -362,7 +362,7 @@ class AmdaAction
 									else {	
 										if (!empty($timeRestriction)) {
 											$disable = FALSE;
-											$formattedTimeRestriction = date("Y-m-d\TH:i:s\Z",strtotime($timeRestriction)+1);
+											$formattedTimeRestriction = date("Y-m-d\TH:i:s.u\Z",strtotime($timeRestriction)+1);
 											$info .= "<br/><b>After $formattedTimeRestriction data are restricted to group ".$child->getAttribute('group')."</b>";
 										}
 										else {
@@ -474,15 +474,15 @@ class AmdaAction
 							if ($child->tagName == 'parameter'){
 								if ($child->parentNode->hasAttribute('dataStart')){
-									$globalStart = date('Y-m-d\TH:i:s\Z', strtotime($child->parentNode->getAttribute('dataStart')));
-									$globalStop = date('Y-m-d\TH:i:s\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
+									$globalStart = date('Y-m-d\TH:i:s.u\Z', strtotime($child->parentNode->getAttribute('dataStart')));
+									$globalStop = date('Y-m-d\TH:i:s.u\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
 								}
 							}
 							if ( $child->tagName == 'component'){
 								if ($child->parentNode->parentNode->hasAttribute('dataStart')){
-									$globalStart = date('Y-m-d\TH:i:s\Z', strtotime($child->parentNode->getAttribute('dataStart')));
-									$globalStop = date('Y-m-d\TH:i:s\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
+									$globalStart = date('Y-m-d\TH:i:s.u\Z', strtotime($child->parentNode->getAttribute('dataStart')));
+									$globalStop = date('Y-m-d\TH:i:s.u\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
 								}
 							}
@@ -59,7 +59,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
 						fwrite($handle,pack('d', floatval($value)));
 					  break;
 					case 1: //date (timestamp)
-						fwrite($handle,pack('L', TimeUtils::iso2stamp($value)));
+						fwrite($handle,pack('d', TimeUtils::iso2stamp($value)));
 						break;
 					case 2: //string
 						fwrite($handle,pack('L', strlen($value)));
@@ -101,7 +101,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
 						$val = $res['val'];
 					  break;
 					case 1: //date (timestamp)
-						if (!$res = unpack('Lval',fread($handle,4))) {
+						if (!$res = unpack('dval',fread($handle,8))) {
 							break;
 						}
 						$val = TimeUtils::stamp2iso($res['val']);
@@ -18,7 +18,8 @@ class TimeUtils
                                         $intStamp = floor($stamp);
                                         $intMilli = round(($stamp-$intStamp)*1000);
                                         // c'est moche mais setTime de php ne prends pas en compte les ms 
-                                        $dateIso = date("Y-m-d\TH:i:s",$intStamp).'.'.strval($intMilli);
+                                        $strMilli = str_pad(strval($intMilli),3, '0', STR_PAD_LEFT);
+                                        $dateIso = date("Y-m-d\TH:i:s",$intStamp).'.'.$strMilli;
 		return $dateIso;
 	}
 }