CDPP / AMDA_IHM

Commit e5ea39d50c786631d75d30ce9e275c45b276cd05

Authored by Hacene SI HADJ MOHAND
1 parent 79a60955
Exists in master and in 65 other branches 10098, 10178, 5390, 7616, 9014, 9016Bis, 9084, 9326, 9505, 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

ms ok

Showing 1 changed file with 9 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/app/models/AmdaTimeObject.js
  Diff comments   View file @e5ea39d
... ... @@ -43,7 +43,9 @@ Ext.define('amdaModel.AmdaTimeObject', {
43 43 defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
44 44 convert: function(value,rec) {
45 45 if (!Ext.isDate(value)) {
46   - return new Date(value);
  46 + var valueString = new String(value).replaceAll('\/','\-');
  47 + var date = new Date(valueString);
  48 + return date;
47 49 }
48 50 return value;
49 51 }
... ... @@ -52,12 +54,14 @@ Ext.define('amdaModel.AmdaTimeObject', {
52 54 name: 'stopDate',
53 55 type: 'date',
54 56 defaultValue: Ext.Date.clearTime (new Date()), persist: false,
55   - convert: function(value,rec) {
56   - if (!Ext.isDate(value)){
57   - return new Date(value);
  57 + convert: function(value,rec) {
  58 + if (!Ext.isDate(value)) {
  59 + var valueString = new String(value).replaceAll('\/','\-');
  60 + var date = new Date(valueString);
  61 + return date;
58 62 }
59 63 return value;
60   - }
  64 + }
61 65 },
62 66 {
63 67 name: 'durationDay', type: 'int',
... ...