Improve support for "other" options in reports

tbar0970 · Jul 14, 2017 · 8092499 · 8092499
1 parent 9d1e344
commit 8092499
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/db_objects/person_query.class.php b/db_objects/person_query.class.php
@@ -290,6 +290,9 @@ class="select-rule-toggle"
 											'data-select-rule-type' => 'contains'
 										)
 									);
+									if (!empty($fieldDetails['params']['allow_other'])) {
+										$vparams['options'][0] = '[Other]';
+									}
 									print_widget(
 										'params_custom_field_'.$fieldid.'_val',
 										$vparams,
@@ -937,13 +940,18 @@ function getSQL($select_fields=NULL)
 					switch (array_get($values, 'criteria', 'contains')) {
 						case 'contains':
 							$ids = implode(',', array_map(Array($db, 'quote'), $values['val']));
-							$customFieldWheres[] = '(pd'.$fieldid.'.value_optionid IN ('.$ids.'))';
+							$xrule = '(pd'.$fieldid.'.value_optionid IN ('.$ids.'))';
+							if (in_array(0, $values['val'])) {
+								// 'other' option
+								$xrule = '('.$xrule.' OR (pd'.$fieldid.'.value_text IS NOT NULL))';
+							}
+							$customFieldWheres[] = $xrule;
 							break;
 						case 'any':
-							$customFieldWheres[] = '(pd'.$fieldid.'.value_optionid IS NOT NULL)';
+							$customFieldWheres[] = '(pd'.$fieldid.'.value_optionid IS NOT NULL OR pd'.$fieldid.'.value_text IS NOT NULL)';
 							break;
 						case 'empty':
-							$customFieldWheres[] = '(pd'.$fieldid.'.value_optionid IS NULL)';
+							$customFieldWheres[] = '(pd'.$fieldid.'.value_optionid IS NULL AND pd'.$fieldid.'.value_text IS NULL)';
 							break;
 					}
 					break;
@@ -1335,7 +1343,8 @@ function _printResultGroups($res, $params, $format)
 	{
 		foreach ($res as $i => $v) {
 			if (0 === strpos($params['group_by'], 'custom-')) {
-				$field = $GLOBALS['system']->getDBObject('custom_field', end(explode('-', $params['group_by'])));
+				$gb_bits = explode('-', $params['group_by']);
+				$field = $GLOBALS['system']->getDBObject('custom_field', end($gb_bits));
 				$heading = $field->formatValue($i);
 				if (!strlen($heading)) $heading = '(Blank)';
 			} else if ($params['group_by'] == 'groupid') {