Skip to content

Commit 319ad64

Browse files
Render status change activity note highlights
1 parent 4d136ad commit 319ad64

5 files changed

Lines changed: 34 additions & 3 deletions

File tree

lib/TemplateUtility.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,32 @@ public static function getAlternatingRowClass($rowNumber)
10791079
}
10801080
}
10811081

1082+
/**
1083+
* Highlights status change activity notes for HTML output.
1084+
*
1085+
* @param string activity note text
1086+
* @return string updated activity note
1087+
*/
1088+
public static function highlightStatusChangeActivityNote($notes)
1089+
{
1090+
$prefix = 'Status change: ';
1091+
if (strpos($notes, $prefix) !== 0)
1092+
{
1093+
return htmlspecialchars($notes, ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING);
1094+
}
1095+
1096+
$statusText = ltrim(substr($notes, strlen($prefix)));
1097+
if ($statusText === '')
1098+
{
1099+
return htmlspecialchars($notes, ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING);
1100+
}
1101+
1102+
return htmlspecialchars($prefix, ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING) .
1103+
'<span class="statusChangeHighlight">' .
1104+
htmlspecialchars($statusText, ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING) .
1105+
'</span>';
1106+
}
1107+
10821108
/**
10831109
* Removes from $text everything from starting block through ending block.
10841110
* Optionally also removes a following piece of text indicated by closing

main.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,11 @@ span.jobLinkSubmitted
905905
color: #ff6c00;
906906
}
907907

908+
span.statusChangeHighlight
909+
{
910+
color: #ff6c00;
911+
}
912+
908913
a.jobLinkSubmitted:hover
909914
{
910915
text-decoration: underline;

modules/activity/Search.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</td>
7878

7979
<td align="left" valign="top" >
80-
<?php echo(nl2br($activityData['notes'])); ?>
80+
<?php echo(nl2br(TemplateUtility::highlightStatusChangeActivityNote($activityData['notes']))); ?>
8181
</td>
8282

8383
<td align="left" valign="top">

modules/candidates/Show.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ use OpenCATS\UI\CandidateDuplicateQuickActionMenu;
640640
<td align="left" valign="top" id="activityType<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['typeDescription']) ?></td>
641641
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']) ?></td>
642642
<td align="left" valign="top" id="activityRegarding<?php echo($activityData['activityID']); ?>" data-joborder-id="<?php echo(isset($activityData['jobOrderID']) ? $activityData['jobOrderID'] : ''); ?>"><?php $this->_($activityData['regarding']) ?></td>
643-
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br($activityData['notes'])); ?></td>
643+
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br(TemplateUtility::highlightStatusChangeActivityNote($activityData['notes']))); ?></td>
644644
<?php if (!$this->isPopup): ?>
645645
<td align="center" >
646646
<?php if ($this->getUserAccessLevel('candidates.edit') >= ACCESS_LEVEL_EDIT): ?>

modules/contacts/Show.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ use OpenCATS\UI\QuickActionMenu;
289289
<td align="left" valign="top" id="activityType<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['typeDescription']) ?></td>
290290
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']) ?></td>
291291
<td align="left" valign="top" id="activityRegarding<?php echo($activityData['activityID']); ?>" data-joborder-id="<?php echo(isset($activityData['jobOrderID']) ? $activityData['jobOrderID'] : ''); ?>"><?php $this->_($activityData['regarding']) ?></td>
292-
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br(htmlspecialchars($activityData['notes'], ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING))); ?></td>
292+
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br(TemplateUtility::highlightStatusChangeActivityNote($activityData['notes']))); ?></td>
293293
<td align="center" >
294294
<?php if ($this->getUserAccessLevel('contacts.editActivity') >= ACCESS_LEVEL_EDIT): ?>
295295
<a href="#" id="editActivity<?php echo($activityData['activityID']); ?>" onclick="Activity_editEntry(<?php echo($activityData['activityID']); ?>, <?php echo($this->contactID); ?>, <?php echo(DATA_ITEM_CONTACT); ?>, '<?php echo($this->sessionCookie); ?>'); return false;">

0 commit comments

Comments
 (0)