Merged in bugfix/HOR-2894 (pull request #5576)

HOR-2894

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2017-08-01 20:32:24 +00:00
committed by Julio Cesar Laura Avendaño
2 changed files with 142 additions and 77 deletions

View File

@@ -885,7 +885,16 @@ class Consolidated
$dropList[] = $field->name;
$comboBoxYesNoList[] = $field->name;
$editor = "* new Ext.form.Checkbox({ $fieldReadOnly $fieldRequired $fieldValidate cls: \"\"}) *";
$inputValue = "";
$uncheckedValue = "";
if (isset($field->value)) {
$inputValue = ",inputValue: '" . $field->value . "'";
}
if (isset($field->falseValue)) {
$uncheckedValue = ",uncheckedValue: '" . $field->falseValue . "'";
}
$editor = "* new Ext.form.CheckboxCustom({ $fieldReadOnly $fieldRequired $fieldValidate cls: \"\" " . $inputValue . $uncheckedValue . " }) *";
$editor = $this->removeLineBreaks($editor);
$caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "align" => $align, "editor" => $editor, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
$caseReaderFields[] = array("name" => $field->name);
@@ -935,7 +944,6 @@ class Consolidated
die();
}
/**
* Get Dropdown Label
*

View File

@@ -1,3 +1,60 @@
Ext.form.CheckboxCustom = Ext.extend(Ext.form.Checkbox, {
constructor: function (config) {
config = Ext.apply({
inputValue: 1,
uncheckedValue: 0
}, config);
Ext.form.CheckboxCustom.superclass.constructor.call(this, config);
},
getValue: function () {
if (this.rendered) {
if (this.el.dom.checked === true) {
return this.inputValue;
}
if (this.el.dom.checked === false) {
return this.uncheckedValue;
}
return this.el.dom.checked;
}
if (this.checked === true) {
return this.inputValue;
}
if (this.checked === false) {
return this.uncheckedValue;
}
return this.checked;
},
setValue: function (v) {
if (v === this.inputValue) {
v = true;
}
if (v === this.uncheckedValue) {
v = false;
}
var checked = this.checked,
inputVal = this.inputValue;
if (v === false) {
this.checked = false;
} else {
this.checked = (v === true || v === 'true' || v == '1' || (inputVal ? v == inputVal : String(v).toLowerCase() == 'on'));
}
if (this.rendered) {
this.el.dom.checked = this.checked;
this.el.dom.defaultChecked = this.checked;
}
if (checked != this.checked) {
this.fireEvent('check', this, this.checked);
if (this.handler) {
this.handler.call(this.scope || this, this, this.checked);
}
}
return this;
}
});
Ext.reg('checkboxCustom', Ext.form.CheckboxCustom);
var grdNumRows = 0;
var grdRowLabel = [];
var fieldGridGral = '';
@@ -101,8 +158,7 @@ var browserHeight = 0;
if (typeof window.innerWidth != "undefined") {
browserWidth = window.innerWidth;
browserHeight = window.innerHeight;
}
else {
} else {
//IE6 in standards compliant mode (i.e. with a valid doctype as the first line in the document)
if (typeof document.documentElement != "undefined" && typeof document.documentElement.clientWidth != "undefined" &&
document.documentElement.clientWidth != 0) {
@@ -541,7 +597,8 @@ Ext.onReady(function () {
function inArray(arr, obj) {
for (var i = 0; i < arr.length; i++) {
if (arr[i] == obj) return true;
if (arr[i] == obj)
return true;
}
return false;
}
@@ -559,8 +616,7 @@ Ext.onReady(function () {
start.setMaxValue(date);
start.validate();
this.dateRangeMax = date;
}
else if (field.endDateField && (!this.dateRangeMin || (date.getTime() != this.dateRangeMin.getTime()))) {
} else if (field.endDateField && (!this.dateRangeMin || (date.getTime() != this.dateRangeMin.getTime()))) {
var end = Ext.getCmp(field.endDateField);
end.setMinValue(date);
end.validate();
@@ -608,7 +664,8 @@ function renderSummary(val, p, r) {
var summaryIcon = '<img src="/images/ext/default/s.gif" class="x-tree-node-icon ss_layout_header" unselectable="off" id="extdd-17" ';
summaryIcon += 'onclick="openSummaryWindow(' + "'" + r.data['APP_UID'] + "'" + ', ' + r.data['DEL_INDEX'] + ')" title="' + _('ID_SUMMARY') + '" />';
return summaryIcon;
};
}
;
function generateGridClassic(proUid, tasUid, dynUid) {