Ability to configure person/family notes to show in descending or asc…

…ending order of time
tbar0970 · Aug 24, 2016 · 074443c · 074443c
1 parent 351ffaf
commit 074443c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/conf.php.sample.au b/conf.php.sample.au
@@ -76,6 +76,9 @@ define('REQUIRE_INITIAL_NOTE', true);
 // Whether users restricted by congregation or group can add persons and families
 define('RESTRICTED_USERS_CAN_ADD', true);
 
+// Order to show person/family notes.  ASC for oldest notes first; DESC for newest notes first.
+define('NOTES_ORDER', 'ASC');
+
 // The order in which persons are listed when marking or reporting attendance for congregations or groups.
 // "status" means person status for congregational attendance, and group membership status for groups.
 // "person.status" means person status, even when marking attendance for a group.

diff --git a/conf.php.sample.in b/conf.php.sample.in
@@ -76,6 +76,9 @@ define('REQUIRE_INITIAL_NOTE', true);
 // Whether users restricted by congregation or group can add persons and families
 define('RESTRICTED_USERS_CAN_ADD', true);
 
+// Order to show person/family notes.  ASC for oldest notes first; DESC for newest notes first.
+define('NOTES_ORDER', 'ASC');
+
 // The order in which persons are listed when marking or reporting attendance for congregations or groups.
 // "status" means person status for congregational attendance, and group membership status for groups.
 // "person.status" means person status, even when marking attendance for a group.

diff --git a/conf.php.sample.uk b/conf.php.sample.uk
@@ -76,6 +76,9 @@ define('REQUIRE_INITIAL_NOTE', true);
 // Whether users restricted by congregation or group can add persons and families
 define('RESTRICTED_USERS_CAN_ADD', true);
 
+// Order to show person/family notes.  ASC for oldest notes first; DESC for newest notes first.
+define('NOTES_ORDER', 'ASC');
+
 // The order in which persons are listed when marking or reporting attendance for congregations or groups.
 // "status" means person status for congregational attendance, and group membership status for groups.
 // "person.status" means person status, even when marking attendance for a group.

diff --git a/conf.php.sample.usa b/conf.php.sample.usa
@@ -76,6 +76,9 @@ define('REQUIRE_INITIAL_NOTE', true);
 // Whether users restricted by congregation or group can add persons and families
 define('RESTRICTED_USERS_CAN_ADD', true);
 
+// Order to show person/family notes.  ASC for oldest notes first; DESC for newest notes first.
+define('NOTES_ORDER', 'ASC');
+
 // The order in which persons are listed when marking or reporting attendance for congregations or groups.
 // "status" means person status for congregational attendance, and group membership status for groups.
 // "person.status" means person status, even when marking attendance for a group.

diff --git a/db_objects/person.class.php b/db_objects/person.class.php
@@ -334,8 +334,11 @@ function getNotesHistory()
 
 	function _compareCreatedDates($a, $b)
 	{
-		return $a['created'] > $b['created'];
-
+		if (ifdef('NOTES_ORDER', 'ASC') == 'ASC') {
+			return $a['created'] > $b['created'];
+		} else {
+			return $a['created'] < $b['created'];
+		}
 	}
 
 	function validateFields()

diff --git a/templates/view_family.template.php b/templates/view_family.template.php
@@ -14,7 +14,8 @@
 		<li class="active"><a data-toggle="tab" href="#basic"><?php echo _('Basic Details')?></a></li>
 	<?php
 	if ($GLOBALS['user_system']->havePerm(PERM_VIEWNOTE)) {
-		$notes = $GLOBALS['system']->getDBObjectData('family_note', Array('familyid' => $family->id), 'OR', 'created');
+		$order =(ifdef('NOTES_ORDER', 'ASC') == 'ASC') ? 'ASC' : 'DESC';
+		$notes = $GLOBALS['system']->getDBObjectData('family_note', Array('familyid' => $family->id), 'OR', 'created '.$order);
 		?>
 		<li><a data-toggle="tab" href="#notes"><?php echo _('Notes')?> (<?php echo count($notes); ?>)</a></li>
 		<?php