| Index: branches/wmf-deployment/extensions/ContributionReporting/FundraiserStatistics_body.php |
| — | — | @@ -131,7 +131,9 @@ |
| 132 | 132 | Xml::element( 'td', $tdLabelAttributes, wfMsg( 'fundraiserstats-contributions' ) ) . |
| 133 | 133 | Xml::element( 'td', $tdValueAttributes, $wgLang->formatNum( number_format( $day[2] ) ) ) . |
| 134 | 134 | Xml::element( 'td', $tdLabelAttributes, wfMsg( 'fundraiserstats-avg' ) ) . |
| 135 | | - Xml::element( 'td', $tdValueAttributes, $wgLang->formatNum( number_format( $day[3], 2 ) ) ) |
| | 135 | + Xml::element( 'td', $tdValueAttributes, $wgLang->formatNum( number_format( $day[3], 2 ) ) ) . |
| | 136 | + Xml::element( 'td', $tdLabelAttributes, wfMsg( 'fundraiserstats-ytd' ) ) . |
| | 137 | + Xml::element( 'td', $tdValueAttributes, $wgLang->formatNum( number_format( $day[5], 2 ) ) ) |
| 136 | 138 | ) |
| 137 | 139 | ) |
| 138 | 140 | ); |
| — | — | @@ -215,7 +217,9 @@ |
| 216 | 218 | ) |
| 217 | 219 | ); |
| 218 | 220 | $totals = array(); |
| | 221 | + $ytd = 0; |
| 219 | 222 | while ( $row = $dbr->fetchRow( $res ) ) { |
| | 223 | + $row[] = $ytd += $row[1]; |
| 220 | 224 | $totals[] = $row; |
| 221 | 225 | } |
| 222 | 226 | return $totals; |
| Index: branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.i18n.php |
| — | — | @@ -76,6 +76,7 @@ |
| 77 | 77 | 'fundraiserstats-contributions' => 'Contributions', |
| 78 | 78 | 'fundraiserstats-total' => 'Total (USD)', |
| 79 | 79 | 'fundraiserstats-avg' => 'Average (USD)', |
| | 80 | + 'fundraiserstats-ytd' => 'YTD Total (USD)', |
| 80 | 81 | // 'fundraiserstats-med' => 'Median (USD)', |
| 81 | 82 | 'fundraiserstats-max' => 'Maximum (USD)', |
| 82 | 83 | 'fundraiserstats-tab-totals' => 'Totals (USD)', |
| Property changes on: branches/wmf-deployment/extensions/ContributionReporting |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 83 | 84 | - /branches/REL1_15/phase3/extensions/ContributionReporting:51646 |
| /trunk/extensions/ContributionReporting:56151-57449,58684,58687-59049,59134-59163,59165-59752 |
| /trunk/extensions/ContributionTracking:58684 |
| /trunk/phase3/extensions/ContributionReporting:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57541,57916,58151,58219,58633,58816 |
| 84 | 85 | + /branches/REL1_15/phase3/extensions/ContributionReporting:51646 |
| /trunk/extensions/ContributionReporting:56151-57449,58684,58687-59049,59134-59163,59165-59752,59944 |
| /trunk/extensions/ContributionTracking:58684 |
| /trunk/phase3/extensions/ContributionReporting:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57541,57916,58151,58219,58633,58816 |