Skip to content

feat: reorder activity table columns #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anonymoususer72041 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: reorder activity table columns #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/candidates/Show.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,9 +626,9 @@ use OpenCATS\UI\CandidateDuplicateQuickActionMenu;
<tr>
<th align="left" width="125">Date</th>
<th align="left" width="90">Type</th>
<th align="left" width="90">Entered By</th>
<th align="left" width="250">Regarding</th>
<th align="left">Notes</th>
<th align="left" width="90">Entered By</th>
<?php if (!$this->isPopup): ?>
<th align="left" width="40">Action</th>
<?php endif; ?>
Expand All @@ -638,9 +638,9 @@ use OpenCATS\UI\CandidateDuplicateQuickActionMenu;
<tr class="<?php TemplateUtility::printAlternatingRowClass($rowNumber); ?>">
<td align="left" valign="top" id="activityDate<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['dateCreated']) ?></td>
<td align="left" valign="top" id="activityType<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['typeDescription']) ?></td>
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']) ?></td>
<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>
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br(htmlspecialchars($activityData['notes'], ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING))); ?></td>
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']) ?></td>
<?php if (!$this->isPopup): ?>
<td align="center" >
<?php if ($this->getUserAccessLevel('candidates.edit') >= ACCESS_LEVEL_EDIT): ?>
Expand Down
8 changes: 4 additions & 4 deletions modules/companies/Show.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,17 +423,18 @@ use OpenCATS\UI\QuickActionMenu;
<tr>
<th align="left" width="125">Date</th>
<th align="left" width="90">Type</th>
<th align="left" width="140">Contact</th>
<th align="left" width="90">Entered By</th>
<th align="left" width="250">Regarding</th>
<th align="left" width="140">Contact</th>
<th align="left">Notes</th>
<th align="left" width="90">Entered By</th>
<th align="left" width="40">Action</th>
</tr>

<?php foreach ($this->activityRS as $rowNumber => $activityData): ?>
<tr class="<?php TemplateUtility::printAlternatingRowClass($rowNumber); ?>">
<td align="left" valign="top" id="activityDate<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['dateCreated']); ?></td>
<td align="left" valign="top" id="activityType<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['typeDescription']); ?></td>
<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>
<td align="left" valign="top">
<?php if (!empty($activityData['contactID'])): ?>
<a href="<?php echo(CATSUtility::getIndexName()); ?>?m=contacts&amp;a=show&amp;contactID=<?php $this->_($activityData['contactID']); ?>">
Expand All @@ -443,9 +444,8 @@ use OpenCATS\UI\QuickActionMenu;
<?php $this->_($activityData['contactFullName']); ?>
<?php endif; ?>
</td>
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']); ?></td>
<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>
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br(htmlspecialchars($activityData['notes'], ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING))); ?></td>
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']); ?></td>
<td align="center">
<?php if ($this->getUserAccessLevel('contacts.editActivity') >= ACCESS_LEVEL_EDIT): ?>
<a href="#" id="editActivity<?php echo($activityData['activityID']); ?>" onclick="Activity_editEntry(<?php echo($activityData['activityID']); ?>, <?php echo($activityData['contactID']); ?>, <?php echo(DATA_ITEM_CONTACT); ?>, '<?php echo($this->sessionCookie); ?>'); return false;">
Expand Down
4 changes: 2 additions & 2 deletions modules/contacts/Show.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,19 +277,19 @@ use OpenCATS\UI\QuickActionMenu;
<tr>
<th align="left" width="125">Date</th>
<th align="left" width="90">Type</th>
<th align="left" width="90">Entered By</th>
<th align="left" width="250">Regarding</th>
<th align="left">Notes</th>
<th align="left" width="90">Entered By</th>
<th align="left" width="40">Action</th>
</tr>

<?php foreach ($this->activityRS as $rowNumber => $activityData): ?>
<tr class="<?php TemplateUtility::printAlternatingRowClass($rowNumber); ?>">
<td align="left" valign="top" id="activityDate<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['dateCreated']) ?></td>
<td align="left" valign="top" id="activityType<?php echo($activityData['activityID']); ?>"><?php $this->_($activityData['typeDescription']) ?></td>
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']) ?></td>
<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>
<td align="left" valign="top" id="activityNotes<?php echo($activityData['activityID']); ?>"><?php echo(nl2br(htmlspecialchars($activityData['notes'], ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING))); ?></td>
<td align="left" valign="top"><?php $this->_($activityData['enteredByAbbrName']) ?></td>
<td align="center" >
<?php if ($this->getUserAccessLevel('contacts.editActivity') >= ACCESS_LEVEL_EDIT): ?>
<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;">
Expand Down
Loading