CDPP / AMDA_IHM

Commit 217e6c35c15c514e934c7f164f848043827b1793

Authored by Hacene SI HADJ MOHAND
1 parent 48fdb91e
Exists in master and in 67 other branches 10098, 10178, 5390, 7616, 9014, 9016Bis, 9084, 9326, 9505, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, mlplasmas, openam, test-merge

affichage oki

Showing 3 changed files with 21 additions and 21 deletions   Show diff stats
Inline Side-by-side
js/app/views/CatalogUI.js
  Diff comments   View file @217e6c3
... ... @@ -205,7 +205,7 @@ Ext.define('amdaUI.CatalogUI', {
205 205 var timeTabNode = Ext.create('amdaModel.TimeTableNode', {leaf: true});
206 206 ttObj.set('relatedCatalogId', catId)
207 207 creatDate = new Date(this.object.get('created'));
208   - date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s');
  208 + date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s.u');
209 209 descr = 'Generated by CDPP/Amda Catalog Module \n' + 'From Catalog: ' + this.object.get('name') + '\nOn: ' + date + '\n';
210 210 ttObj.set('description', descr + this.object.get('description'));
211 211 ttObj.set('contact', this.object.get('contact'));
... ... @@ -271,7 +271,7 @@ Ext.define('amdaUI.CatalogUI', {
271 271 {
272 272 name: 'start',
273 273 type: 'date',
274   - dateFormat: 'Y-m-d\\TH:i:s',
  274 + dateFormat: 'Y-m-d\\TH:i:s.u',
275 275 convert: function (value, rec) {
276 276 if (!Ext.isDate(value)) {
277 277 var valueString = new String(value);
... ... @@ -283,7 +283,7 @@ Ext.define('amdaUI.CatalogUI', {
283 283 {
284 284 name: 'stop',
285 285 type: 'date',
286   - dateFormat: 'Y-m-d\\TH:i:s',
  286 + dateFormat: 'Y-m-d\\TH:i:s.u',
287 287 convert: function (value, rec) {
288 288 if (!Ext.isDate(value)) {
289 289 var valueString = new String(value);
... ... @@ -367,7 +367,7 @@ Ext.define('amdaUI.CatalogUI', {
367 367 {
368 368 xtype: 'datecolumn',
369 369 text: 'Start Time',
370   - format: 'Y-m-d\\TH:i:s',
  370 + format: 'Y-m-d\\TH:i:s.u',
371 371 sortable: true,
372 372 dataIndex: 'start',
373 373 width: 120,
... ... @@ -377,14 +377,14 @@ Ext.define('amdaUI.CatalogUI', {
377 377 xtype: 'datefield',
378 378 allowBlank: false,
379 379 hideTrigger: true,
380   - format: 'Y-m-d\\TH:i:s'
  380 + format: 'Y-m-d\\TH:i:s.u'
381 381 },
382 382 filter: {type: 'date', dateFormat: 'Y-m-d'}
383 383 },
384 384 {
385 385 xtype: 'datecolumn',
386 386 text: 'Stop Time',
387   - format: 'Y-m-d\\TH:i:s',
  387 + format: 'Y-m-d\\TH:i:s.u',
388 388 sortable: true,
389 389 dataIndex: 'stop',
390 390 width: 120,
... ... @@ -394,7 +394,7 @@ Ext.define('amdaUI.CatalogUI', {
394 394 xtype: 'datefield',
395 395 allowBlank: false,
396 396 hideTrigger: true,
397   - format: 'Y-m-d\\TH:i:s'
  397 + format: 'Y-m-d\\TH:i:s.u'
398 398 },
399 399 filter: {type: 'date', dateFormat: 'Y-m-d'}
400 400 },
... ... @@ -506,7 +506,7 @@ Ext.define('amdaUI.CatalogUI', {
506 506 case 1: //dateTime
507 507 field = Ext.apply({}, field, {
508 508 type: 'date',
509   - dateFormat: 'Y-m-d\\TH:i:s',
  509 + dateFormat: 'Y-m-d\\TH:i:s.u',
510 510 convert: function (value, rec) {
511 511 if (!Ext.isDate(value)) {
512 512 var valueString = new String(value);
... ... @@ -523,7 +523,7 @@ Ext.define('amdaUI.CatalogUI', {
523 523 xtype: 'datefield',
524 524 allowBlank: false,
525 525 hideTrigger: true,
526   - format: 'Y-m-d\\TH:i:s'
  526 + format: 'Y-m-d\\TH:i:s.u'
527 527 },
528 528 filter: {type: 'date', dateFormat: 'Y-m-d'}
529 529 });
... ... @@ -1065,8 +1065,8 @@ Ext.define('amdaUI.CatalogUI', {
1065 1065 items :[{
1066 1066 fieldLabel: 'Start Time',
1067 1067 name: 'surveyStart',
1068   - emptyText: 'YYYY/MM/DDThh:mm:ss',
1069   - format: 'Y-m-d\\TH:i:s',
  1068 + emptyText: 'YYYY/MM/DDThh:mm:ss.fff',
  1069 + format: 'Y-m-d\\TH:i:s.u',
1070 1070 enforceMaxLength: true,
1071 1071 maxLength: 19,
1072 1072 labelWidth: 60,
... ... @@ -1080,8 +1080,8 @@ Ext.define('amdaUI.CatalogUI', {
1080 1080 }, {
1081 1081 fieldLabel: 'Stop Time',
1082 1082 name: 'surveyStop',
1083   - emptyText: 'YYYY/MM/DDThh:mm:ss',
1084   - format: 'Y-m-d\\TH:i:s',
  1083 + emptyText: 'YYYY/MM/DDThh:mm:ss.fff',
  1084 + format: 'Y-m-d\\TH:i:s.u',
1085 1085 labelAlign: 'left',
1086 1086 enforceMaxLength: true,
1087 1087 maxLength: 19,
... ...
js/app/views/TimeTableUI.js
  Diff comments   View file @217e6c3
... ... @@ -298,7 +298,7 @@ Ext.define('amdaUI.TimeTableUI', {
298 298 var catNode = Ext.create('amdaModel.CatalogNode', {leaf: true});
299 299 catObj.set('relatedTimeTableId', id);
300 300 creatDate = new Date(this.object.get('created'));
301   - date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s');
  301 + date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s.u');
302 302 descr = 'Generated by CDPP/Amda Time Table Module \n' + 'From Time Table: ' + this.object.get('name') + ' which was generated on: ' + date + '\n';
303 303 catObj.set('description', descr + this.object.get('description'));
304 304 var nbParam = parseInt(text);
... ... @@ -612,13 +612,13 @@ Ext.define('amdaUI.TimeTableUI', {
612 612 },
613 613 {
614 614 header: 'Start Time', dataIndex: 'start', width: 120,
615   - editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s'},
  615 + editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
616 616 renderer: function (value) {
617 617 if (value != null) {
618 618 if (Ext.isDate(value)) {
619   - return Ext.Date.format(value, 'Y-m-d\\TH:i:s');
  619 + return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
620 620 } else {
621   - return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s');
  621 + return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
622 622 }
623 623 } else {
624 624 return value;
... ... @@ -627,13 +627,13 @@ Ext.define('amdaUI.TimeTableUI', {
627 627 },
628 628 {
629 629 header: 'Stop Time', dataIndex: 'stop', width: 120,
630   - editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s'},
  630 + editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
631 631 renderer: function (value) {
632 632 if (value != null) {
633 633 if (Ext.isDate(value)) {
634   - return Ext.Date.format(value, 'Y-m-d\\TH:i:s');
  634 + return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
635 635 } else {
636   - return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s');
  636 + return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
637 637 }
638 638 } else {
639 639 return value;
... ...
php/classes/AmdaAction.php
  Diff comments   View file @217e6c3
... ... @@ -674,7 +674,7 @@ class AmdaAction
674 674 $result = $this->executeRequest((Object) array(
675 675 'compression' => 'none',
676 676 'fileformat' => 'internal',
677   - 'timeformat' => 'YYYY-MM-DDThh:mm:ss',
  677 + 'timeformat' => 'YYYY-MM-DDThh:mm:ss.u',
678 678 'sendToSamp' => FALSE,
679 679 'list' => array(
680 680 (Object) array(
... ...