From 4446717df04d8b205d890d990abe41f0917e3ca7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 13 Mar 2012 16:11:59 +0530 Subject: [PATCH] form section autohide --- css/legacy/forms.css | 8 +++++++- js/legacy/utils/datatype.js | 2 +- js/legacy/widgets/form/fields.js | 9 ++++++--- js/legacy/widgets/form/form.js | 19 +++++++++++++------ js/legacy/widgets/form/form_fields.js | 6 +++--- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/css/legacy/forms.css b/css/legacy/forms.css index b60b360c0f..d130b9b94d 100644 --- a/css/legacy/forms.css +++ b/css/legacy/forms.css @@ -1,7 +1,13 @@ /* FORMS */ div.form-section-head { - margin: 15px 0px 3px 0px; + margin: 11px 0px 3px 0px; + border-top: 1px solid #ccc; + padding-top: 11px; +} + +div.form-layout-row:first-child .form-section-head { + border-top: 0px solid #ccc !important; } div.form-section-head h3 { diff --git a/js/legacy/utils/datatype.js b/js/legacy/utils/datatype.js index 36e8991b86..c72b96b915 100644 --- a/js/legacy/utils/datatype.js +++ b/js/legacy/utils/datatype.js @@ -168,7 +168,7 @@ function flt(v,decimals) { if(isNaN(v)) v=0; if(decimals!=null) - return v.toFixed(decimals); + return parseFloat(v.toFixed(decimals)); return v; } diff --git a/js/legacy/widgets/form/fields.js b/js/legacy/widgets/form/fields.js index 0948dd78f0..21d7baadd5 100644 --- a/js/legacy/widgets/form/fields.js +++ b/js/legacy/widgets/form/fields.js @@ -400,7 +400,8 @@ DataField.prototype.make_input = function() { this.get_value= function() { var v = this.input.value; - if(this.validate)v = this.validate(v); + if(this.validate) + v = this.validate(v); return v; } @@ -811,7 +812,9 @@ IntField.prototype.format_input = function() { function FloatField() { } FloatField.prototype = new DataField(); FloatField.prototype.validate = function(v) { - var v= parseFloat(v); if(isNaN(v))return null; + var v= parseFloat(v); + if(isNaN(v)) + return null; return v; }; FloatField.prototype.format_input = function() { @@ -831,7 +834,7 @@ CurrencyField.prototype.format_input = function() { CurrencyField.prototype.validate = function(v) { if(v==null || v=='') - return 0; + return 0; return flt(v,2); } CurrencyField.prototype.set_disp = function(val) { diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js index d74056a6dc..40ab5e0053 100644 --- a/js/legacy/widgets/form/form.js +++ b/js/legacy/widgets/form/form.js @@ -78,8 +78,6 @@ _f.Frm = function(doctype, parent) { this.is_editable = {}; this.opendocs = {}; this.sections = []; - this.sections_by_label = {}; - this.section_count; this.grids = []; this.cscript = {}; this.pformat = {}; @@ -354,8 +352,10 @@ _f.Frm.prototype.setup_fields_std = function() { sec.fields.push(fld); } - if(f.fieldtype=='Section Break' && f.options != 'Simple') + if(f.fieldtype=='Section Break') { sec = fld; + this.sections.push(fld); + } // default col-break after sec-break if((f.fieldtype=='Section Break')&&(fl[i+1])&&(fl[i+1].fieldtype!='Column Break')&&!f.hidden) { @@ -657,7 +657,7 @@ _f.Frm.prototype.refresh_footer = function() { // -------------------------------------------------------------------------------------- _f.Frm.prototype.refresh_fields = function() { - // set fields + // refresh fields for(var i=0; i