Merge branch 'master' of https://github.com/tbar0970/jethro-pmm

tbar0970 · Nov 25, 2016 · 5fd1da6 · 5fd1da6
2 parents 9885d67 + 012763b
commit 5fd1da6
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 12 deletions.
diff --git a/calls/call_csv.class.php b/calls/call_csv.class.php
@@ -20,6 +20,9 @@ function run()
 			case 'person':
 			default:
 				$merge_data = $GLOBALS['system']->getDBObjectData('person', Array('id' => (array)$_POST['personid']));
+				foreach (Person::getCustomMergeData($_POST['personid']) as $personid => $data) {
+					$merge_data[$personid] += $data;
+				}
 				$dummy = new Person();
 				$dummy_family = new Family();
 				break;
@@ -31,7 +34,8 @@ function run()
 		}
 		fputcsv($fp, $headerrow);
 
-		foreach ($merge_data as $id => $row) {
+		foreach ($_REQUEST['personid'] as $id) {
+			$row = array_get($merge_data, $id, Array());
 			@$dummy->populate($id, $row);
 			$outputrow = Array($id);
 			foreach ($row as $k => $v) {

diff --git a/calls/call_odf_merge.class.php b/calls/call_odf_merge.class.php
@@ -125,6 +125,10 @@ protected function getMergeData()
 			case 'person':
 			default:
 				$temp_merge_data = $GLOBALS['system']->getDBObjectData('person', Array('id' => $_POST['personid']));
+				foreach (Person::getCustomMergeData($_POST['personid']) as $personid => $data) {
+					$temp_merge_data[$personid] += $data;
+				}
+
 				$merge_data = Array();
 				foreach ($_REQUEST['personid'] as $id) {
 					$merge_data[$id] = $temp_merge_data[$id];

diff --git a/db_objects/person.class.php b/db_objects/person.class.php
@@ -281,7 +281,7 @@ protected function _printSummaryRows() {
 		$showDivider = TRUE; // always show before first field
 		$showHeading = '';
 		$dummyField = new Custom_Field();
-		foreach ($this->getCustomFields() as $fieldid => $fieldDetails) {
+		foreach (self::getCustomFields() as $fieldid => $fieldDetails) {
 			$dummyField->populate($fieldid, $fieldDetails);
 			if ($fieldDetails['divider_before']) {
 				$showDivider = TRUE;
@@ -534,7 +534,7 @@ function _saveCustomValues() {
 		$SQL = 'INSERT INTO custom_field_value
 				(personid, fieldid, value_text, value_date, value_optionid)
 				VALUES ';
-		$customFields = $this->getCustomFields();
+		$customFields = self::getCustomFields();
 		$sets = Array();
 		foreach ($this->_custom_values as $fieldid => $values) {
 			if (!is_array($values)) $values = empty($values) ? Array() : Array($values);
@@ -567,7 +567,7 @@ protected function _getChanges()
 	{
 		$res = parent::_getChanges();
 		if (!empty($this->_old_custom_values)) {
-			$customFields = $this->getCustomFields();
+			$customFields = self::getCustomFields();
 			$dummyField = new Custom_Field();
 			foreach ($this->_old_custom_values as $fieldid => $oldVal) {
 				$dummyField->populate($fieldid, $customFields[$fieldid]);
@@ -647,6 +647,38 @@ static function getStatusStats()
 		}
 		return $out;
 	}
+
+	/**
+	 * Get formatted custom field data indexed by personid and fieldname
+	 * @param type $personids
+	 * @return array
+	 */
+	static function getCustomMergeData($personids)
+	{
+		$db = $GLOBALS['db'];
+		$SQL = 'SELECT '.Custom_Field::getRawValueSQLExpr('v').' AS value, f.name, v.personid, v.fieldid
+				FROM custom_field_value v
+				JOIN custom_field f ON v.fieldid = f.id
+				WHERE v.personid IN ('.implode(',', array_map(Array($db, 'quote'), $personids)).')';
+		$qres = $db->queryAll($SQL);
+		$res = Array();
+
+		$customFields = self::getCustomFields();
+		foreach ($customFields as $fieldid => $fieldDetails) {
+			$customFields[$fieldid] = new Custom_Field();
+			$customFields[$fieldid]->populate($fieldid, $fieldDetails);
+		}
+		foreach ($qres as $row) {
+			$fname = strtoupper(str_replace(' ', '_', $row['name']));
+			$fVal = $customFields[$row['fieldid']]->formatValue($row['value']);
+			if (isset($res[$row['personid']][$fname])) {
+				$res[$row['personid']][$fname] .= ', '.$fVal;
+			} else {
+				$res[$row['personid']][$fname] = $fVal;
+			}
+		}
+		return $res;
+	}
 
 	function getInstancesQueryComps($params, $logic, $order)
 	{
@@ -684,7 +716,7 @@ function printForm($prefix='', $fields=NULL)
 
 		if (empty($fields) || in_array('custom', $fields)) {
 
-			$customFields = $this->getCustomFields();
+			$customFields = self::getCustomFields();
 			$dummyField = new Custom_Field();
 			if ($customFields) {
 				?>
@@ -785,17 +817,18 @@ public function setFeedUUID()
 		return $uuid;
 	}
 
-	private function &getCustomFields()
+	public static function &getCustomFields()
 	{
-		if (!isset($this->_tmp['custom_fields'])) {
-			$this->_tmp['custom_fields'] = $GLOBALS['system']->getDBObjectData('custom_field', Array(), 'OR', 'rank');
+		static $customFields = NULL;
+		if ($customFields === NULL) {
+			$customFields = $GLOBALS['system']->getDBObjectData('custom_field', Array(), 'OR', 'rank');
 		}
-		return $this->_tmp['custom_fields'];
+		return $customFields;
 	}
 
 	public function setCustomValue($fieldid, $newVal, $addToExisting=FALSE)
 	{
-		$fields = $this->getCustomFields();
+		$fields = self::getCustomFields();
 		$oldVal = array_get($this->_custom_values, $fieldid, '');
 		if ((!empty($oldVal) || !empty($newVal)) && ($addToExisting || ($oldVal != $newVal))) {
 			$this->_old_custom_values[$fieldid] = $oldVal;

diff --git a/scripts/date_reminder.php b/scripts/date_reminder.php
@@ -48,10 +48,12 @@
 			)';
 }
 $SQL .= '
-		WHERE cfv.value_date  = CURDATE() + INTERVAL '.(int)$ini['REMINDER_OFFSET'].' DAY';
+		WHERE cfv.value_date  = CURDATE() + INTERVAL '.(int)$ini['REMINDER_OFFSET'].' DAY
+		AND p.status <> "archived"';
 $res = $GLOBALS['db']->queryAll($SQL);
 check_db_result($res);
 foreach ($res as $row) {
+	if (empty($row['first_name'])) continue; // no matches = empty row
 	send_reminder($row);
 }
 

diff --git a/views/view_2_families__4_contact_list.class.php b/views/view_2_families__4_contact_list.class.php
@@ -4,7 +4,7 @@ class View_Families__Contact_List extends View
 
 	static function getMenuPermissionLevel()
 	{
-		return PERM_SYSADMIN;
+		return PERM_RUNREPORT;
 	}
 
 	function processView()