github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-01 23:16:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: differentiate total and total for period on admin table report

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-06-21 22:46:53 +02:00 committed by GitHub
parent c2ddad696f
commit fed86225c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/admin/components/admin-table-report.js.es6 Normal file
View File

@ -0,0 +1,9 @@
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Component.extend({
@computed("model.sortedData")
totalForPeriod(data) {
const values = data.map(d => d.y);
return values.reduce((sum, v) => sum + v);
}
});

13
app/assets/javascripts/admin/templates/components/admin-table-report.hbs
View File

@ -14,10 +14,19 @@
</tr> </tr>
{{/each}} {{/each}}
<tr class="total-for-period">
<td class="x-value">
{{i18n 'admin.dashboard.reports.total_for_period'}}
</td>
<td>
{{totalForPeriod}}
</td>
</tr>
{{#if model.total}} {{#if model.total}}
<tr class="total-for-period"> <tr class="total">
<td class="x-value"> <td class="x-value">
{{i18n 'admin.dashboard.reports.total_for_period'}} {{i18n 'admin.dashboard.reports.total'}}
</td> </td>
<td> <td>
{{model.total}} {{model.total}}

3
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -178,7 +178,8 @@ $mobile-breakpoint: 700px;
} }
} }
tr.total-for-period { tr.total-for-period,
tr.total {
td { td {
font-weight: 700; font-weight: 700;
} }

1
config/locales/client.en.yml
View File

@ -2775,6 +2775,7 @@ en:
groups: "All groups" groups: "All groups"
disabled: "This report is disabled" disabled: "This report is disabled"
total_for_period: "Total for period" total_for_period: "Total for period"
total: "Total"
trending_search: trending_search:
more: '<a href="/admin/logs/search_logs">Search logs</a>' more: '<a href="/admin/logs/search_logs">Search logs</a>'
disabled: 'Trending search report is disabled. Enable <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> to collect data.' disabled: 'Trending search report is disabled. Enable <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> to collect data.'