Commit 0f7460c197239a4a5413fc61312cd2511ff4b244

Authored by Elena.Budnik
1 parent 1209ddeb

redmine 5518

Showing 2 changed files with 13 additions and 11 deletions   Show diff stats
js/app/views/ParameterUI.js
... ... @@ -428,16 +428,17 @@ Ext.define('amdaUI.ParameterUI',
428 428 xtype:'component', width: 20
429 429 },
430 430 {
  431 + xtype : 'numberfield',
431 432 itemId: 'formParamTimeStep', fieldLabel: 'Time Step (sec)*', labelAlign: 'top',
432 433 allowBlank : false, blankText : 'Time Step is required',
433 434 name : 'timestep',
434   - regex : new RegExp('^[0-9]+$'),
435   - regexText : 'Time Step has to be a numeric value',
436   - width: 150, validateOnChange: false,
  435 + minValue : 0.001,
  436 + hideTrigger: true,
  437 + width: 150,
  438 + //validateOnChange: false,
437 439 validateOnBlur: false
438 440 },
439 441 {
440   - xtype: 'textfield',
441 442 itemId: 'formParamUnit',
442 443 fieldLabel: 'Units',
443 444 name : 'units',
... ... @@ -446,15 +447,13 @@ Ext.define('amdaUI.ParameterUI',
446 447 {
447 448 xtype:'component', width: 20
448 449 },
449   - {
450   - xtype: 'textfield',
  450 + {
451 451 itemId: 'formParamYTitle',
452 452 fieldLabel: 'Y Title for Plot',
453 453 name : 'ytitle',
454 454 width: 150
455 455 },
456 456 {
457   - xtype: 'textfield',
458 457 itemId: 'formParamDescription',
459 458 name: 'description',
460 459 xtype: 'textarea', fieldLabel:'Description',
... ...
js/app/views/SearchUI.js
... ... @@ -480,8 +480,11 @@ Ext.define('amdaUI.SearchUI',
480 480 },
481 481 {
482 482 xtype: 'numberfield', name: 'sampling',
483   - fieldLabel: 'Sampling Time Step (sec)*', minValue : 0,
484   - labelAlign: 'top', hideTrigger: true, width: 165
  483 + allowBlank : false, blankText : 'Time Step is required',
  484 + fieldLabel: 'Sampling Time Step (sec)*', minValue : 0.001,
  485 + labelAlign: 'top', hideTrigger: true, width: 165,
  486 + // validateOnChange: false,
  487 + validateOnBlur: false
485 488 },
486 489 { xtype: 'component', width: 45 },
487 490 {
... ... @@ -490,9 +493,9 @@ Ext.define('amdaUI.SearchUI',
490 493 labelAlign: 'top', hideTrigger : true, width: 165
491 494 },
492 495 {
493   - xtype: 'textfield',
  496 + xtype: 'textarea',
494 497 name: 'description',
495   - xtype: 'textarea', fieldLabel:'Description',
  498 + fieldLabel:'Description',
496 499 width: 375, height: 70,
497 500 colspan: 3
498 501 }
... ...