HOR-2894

workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php

@@ -646,7 +646,7 @@ class Consolidated
                     $editor = $this->removeLineBreaks($editor);
                     $width = $field->colWidth;
 
-                    $caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1");
+                    $caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1");
                     $caseReaderFields[] = array("name" => $field->name);
                     break;
                 case "date":
@@ -676,7 +676,7 @@ class Consolidated
                         $editor = null;
                     }
 
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
+                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
                     $caseReaderFields[] = array("name" => $field->name, "type" => "date");
                     break;
                 case "currency":
@@ -704,7 +704,7 @@ class Consolidated
                         $editor = null;
                     }
 
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
+                    $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);
                     break;
                 case "percentage":
@@ -735,7 +735,7 @@ class Consolidated
                         $editor = null;
                     }
 
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
+                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "align" => $align, "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
                     $caseReaderFields[] = array("name" => $field->name);
                     break;
                 case "textarea":
@@ -765,7 +765,7 @@ class Consolidated
                     $editor = $this->removeLineBreaks($editor);
                     $renderer = "* function (value) {  return (value);  } *";
                     $renderer = $this->removeLineBreaks($renderer);
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
+                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "align" => $align, "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
                     $caseReaderFields[] = array("name" => $field->name);
 
                     $hasTextArea = true;
@@ -793,7 +793,7 @@ class Consolidated
                                      return Ext.isDate(value)? value.dateFormat('{$dateFormat}') : value;
                                    } *";
                     $renderer = $this->removeLineBreaks($renderer);
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
+                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "editor" => $editor, "renderer" => $renderer, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
                     $caseReaderFields[] = array("name" => $field->name, "type" => "date");
                     break;
                 case "link":
@@ -812,7 +812,7 @@ class Consolidated
                                        return linkRenderer(value);
                                    } *";
                     $renderer = $this->removeLineBreaks($renderer);
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "renderer" => $renderer, "frame" => true, "hidden" => false, "hideable" => false, "clicksToEdit" => 1, "sortable" => true);
+                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "align" => $align, "editor" => $editor, "renderer" => $renderer, "frame" => true, "hidden" => false, "hideable" => false, "clicksToEdit" => 1, "sortable" => true);
                     $caseReaderFields[] = array("name" => $field->name);
                     break;
                 case "hidden":
@@ -827,7 +827,7 @@ class Consolidated
 
                     $editor = "* new Ext.form.TextField({ allowBlank: false }) *";
                     $editor = $this->removeLineBreaks($editor);
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)$width, "align" => $align, "editor" => $editor, "frame" => "true", "hidden" => "true", "hideable" => false, "clicksToEdit" => "1");
+                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) $width, "align" => $align, "editor" => $editor, "frame" => "true", "hidden" => "true", "hideable" => false, "clicksToEdit" => "1");
                     $caseReaderFields[] = array("name" => $field->name);
                     break;
                 case "yesno":
@@ -870,7 +870,7 @@ class Consolidated
                                  cls: \"\"
                                }) *";
                     $editor = $this->removeLineBreaks($editor);
-                    $caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1");
+                    $caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int) ($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1");
                     $caseReaderFields[] = array("name" => $field->name);
                     break;
                 case "checkbox":
@@ -885,9 +885,18 @@ 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);
+                    $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);
                     break;
                 case "text":
@@ -907,7 +916,7 @@ class Consolidated
                         $editor = null;
                     }
 
-                    $caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
+                    $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
      *

workflow/engine/templates/cases/casesListConsolidated.js

@@ -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 = '';
@@ -72,7 +129,7 @@ Ext.ux.renderer.ComboBoxRenderer = function (combo, gridId) {
             if (grdNumRows > 1 || grdNumRows == 0) {
                 return value;
             } else {
-                if (typeof(grdRowLabel[comboBoxField]) == "undefined") {
+                if (typeof (grdRowLabel[comboBoxField]) == "undefined") {
                     grdRowLabel[comboBoxField] = value;
                     return grdRowLabel[comboBoxField];
                 } else {
@@ -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) {
@@ -339,7 +395,7 @@ Ext.onReady(function () {
                                 for (fieldGrid in rowGrid) {
                                     if (fieldGrid != 'APP_UID' && fieldGrid != 'APP_NUMBER' && fieldGrid != 'APP_TITLE' && fieldGrid != 'DEL_INDEX') {
                                         fieldGridGral = fieldGrid;
-                                    fieldGridGralVal = (rowGrid[fieldGrid] != null ) ? rowGrid[fieldGrid] : '';
+                                        fieldGridGralVal = (rowGrid[fieldGrid] != null) ? rowGrid[fieldGrid] : '';
                                     }
                                 }
                                 if (selectedRow[i].data) {
@@ -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();
@@ -575,7 +631,7 @@ Ext.onReady(function () {
 });
 
 function msgBox(title, msg, type) {
-    if (typeof('type') == 'undefined') {
+    if (typeof ('type') == 'undefined') {
         type = 'info';
     }
 
@@ -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) {
 
@@ -776,7 +833,7 @@ function generateGridClassic(proUid, tasUid, dynUid) {
                                                 var dataResponse = eval("(" + response.responseText + ")");
 
                                                 if (dataResponse.status && dataResponse.status == "OK") {
-                                                    if (typeof(storeConsolidated.lastOptions.params) != "undefined") {
+                                                    if (typeof (storeConsolidated.lastOptions.params) != "undefined") {
                                                         pagei = storeConsolidated.lastOptions.params.start;
                                                     }
 
@@ -1016,7 +1073,7 @@ function generateGrid(proUid, tasUid, dynUid) {
                                                 var dataResponse = eval("(" + response.responseText + ")");
 
                                                 if (dataResponse.status && dataResponse.status == "OK") {
-                                                    if (typeof(storeConsolidated.lastOptions.params) != "undefined") {
+                                                    if (typeof (storeConsolidated.lastOptions.params) != "undefined") {
                                                         pagei = storeConsolidated.lastOptions.params.start;
                                                     }