Skip to content

Commit

Permalink
Fix wrong current month showing on Membership Dashboard
Browse files Browse the repository at this point in the history
Remove stray dash after Last Month name

dev/core#511
  • Loading branch information
aydun committed Nov 8, 2018
1 parent 3a32761 commit 4b5f2d8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CRM/Member/Page/DashBoard.php
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public function preProcess() {

$this->assign('membershipSummary', $membershipSummary);
$this->assign('totalCount', $totalCount);
$this->assign('month', CRM_Utils_Date::customFormat($monthStartTs, '%B'));
$this->assign('month', CRM_Utils_Date::customFormatTs($monthStartTs, '%B'));
$this->assign('year', date('Y', $monthStartTs));
$this->assign('premonth', CRM_Utils_Date::customFormat($preMonth, '%B'));
$this->assign('currentMonth', date('F'));
Expand Down
17 changes: 17 additions & 0 deletions CRM/Utils/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,23 @@ public static function customFormat($dateString, $format = NULL, $dateParts = NU
}
}

/**
* Wrapper for customFormat that takes a timestamp
*
* @param int $timestamp
* Date and time in timestamp format.
* @param string $format
* The output format.
* @param array $dateParts
* An array with the desired date parts.
*
* @return string
* the $format-formatted $date
*/
public static function customFormatTs($timestamp, $format = NULL, $dateParts = NULL) {
return CRM_Utils_Date::customFormat(date("Y-m-d H:i:s", $timestamp), $format, $dateParts);
}

/**
* Converts the date/datetime from MySQL format to ISO format
*
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Member/Page/DashBoard.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr class="columnheader-dark">
<th scope="col" rowspan="2">{ts}Members by Type{/ts}</th>
{if $preMonth}
<th scope="col" colspan="3">{$premonth} &ndash; {ts}(Last Month){/ts}</th>
<th scope="col" colspan="3">{$premonth} {ts}(Last Month){/ts}</th>
{/if}
<th scope="col" colspan="3">{$month}{if $isCurrent}{ts} (MTD){/ts}{/if}</th>
<th scope="col" colspan="3">
Expand Down

0 comments on commit 4b5f2d8

Please sign in to comment.