github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 21:41:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Pie chart option for poll results (#8352)

Browse Source
This commit is contained in:
Mark VanLandingham
2019-11-25 11:51:01 -06:00
committed by GitHub
parent 720101b3ee
commit b92a8131c0
23 changed files with 947 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
View File

@ -2,9 +2,12 @@ import Controller from "@ember/controller";
import {
default as computed,
observes
} from "ember-addons/ember-computed-decorators";
} from "discourse-common/utils/decorators";
import EmberObject from "@ember/object";
export const BAR_CHART_TYPE = "bar";
export const PIE_CHART_TYPE = "pie";
export default Controller.extend({
regularPollType: "regular",
numberPollType: "number",
@ -14,6 +17,10 @@ export default Controller.extend({
votePollResult: "on_vote",
closedPollResult: "on_close",
staffPollResult: "staff_only",
pollChartTypes: [
{ name: BAR_CHART_TYPE.capitalize(), value: BAR_CHART_TYPE },
{ name: PIE_CHART_TYPE.capitalize(), value: PIE_CHART_TYPE }
],
init() {
this._super(...arguments);
@ -38,6 +45,11 @@ export default Controller.extend({
];
},
@computed("chartType", "pollType", "numberPollType")
isPie(chartType, pollType, numberPollType) {
return pollType !== numberPollType && chartType === PIE_CHART_TYPE;
},
@computed(
"alwaysPollResult",
"votePollResult",
@ -173,6 +185,7 @@ export default Controller.extend({
"pollMax",
"pollStep",
"autoClose",
"chartType",
"date",
"time"
)
@ -187,6 +200,7 @@ export default Controller.extend({
pollMax,
pollStep,
autoClose,
chartType,
date,
time
) {
@ -212,6 +226,8 @@ export default Controller.extend({
if (pollMax) pollHeader += ` max=${pollMax}`;
if (isNumber) pollHeader += ` step=${step}`;
if (publicPoll) pollHeader += ` public=true`;
if (chartType && pollType !== "number")
pollHeader += ` chartType=${chartType}`;
if (autoClose) {
let closeDate = moment(
date + " " + time,
@ -306,6 +322,7 @@ export default Controller.extend({
pollMax: null,
pollStep: 1,
autoClose: false,
chartType: BAR_CHART_TYPE,
date: moment()
.add(1, "day")
.format("YYYY-MM-DD"),