diff --git a/.gitignore b/.gitignore index 69b9746f..2702ce49 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ package.json.ember-try .DS_Store coverage .nyc_output +.env diff --git a/app/controllers/portal/campaigns/manage/report/creative-breakdown.js b/app/controllers/portal/campaigns/manage/report/creative-breakdown.js index b4818a20..ddb19c3b 100644 --- a/app/controllers/portal/campaigns/manage/report/creative-breakdown.js +++ b/app/controllers/portal/campaigns/manage/report/creative-breakdown.js @@ -1,9 +1,23 @@ import Controller from '@ember/controller'; import { computed } from '@ember/object'; import ImpressionDataMixin from 'fortnight/mixins/impression-data-mixin'; +import moment from 'moment'; export default Controller.extend(ImpressionDataMixin, { + startDate: computed('model.criteria.start', function() { + const start = this.get('model.criteria.start'); + if (start) return moment(start); + return moment().subtract(14, 'days'); + }), + + endDate: computed('model.criteria.end', function() { + const end = this.get('model.criteria.end'); + const now = moment(); + if (!end) return now; + return end > now ? now : moment(end); + }), + impressionSummaryTimeSeries: computed('model.creatives.@each', function() { return this.get('model.creatives').map(item => { const type = 'line'; diff --git a/app/controllers/portal/campaigns/manage/report/summary.js b/app/controllers/portal/campaigns/manage/report/summary.js index 24bff69f..936d22a9 100644 --- a/app/controllers/portal/campaigns/manage/report/summary.js +++ b/app/controllers/portal/campaigns/manage/report/summary.js @@ -1,5 +1,7 @@ import Controller from '@ember/controller'; import { inject } from '@ember/service'; +import { computed } from '@ember/object'; +import moment from 'moment'; import reportByDay from 'fortnight/gql/queries/campaign/reports/by-day'; import campaignMetrics from 'fortnight/gql/queries/campaign/metrics'; @@ -7,6 +9,19 @@ import campaignMetrics from 'fortnight/gql/queries/campaign/metrics'; export default Controller.extend({ apollo: inject(), + startDate: computed('model.criteria.start', function() { + const start = this.get('model.criteria.start'); + if (start) return moment(start); + return moment().subtract(14, 'days'); + }), + + endDate: computed('model.criteria.end', function() { + const end = this.get('model.criteria.end'); + const now = moment(); + if (!end) return now; + return end > now ? now : moment(end); + }), + isReportRunning: false, areMetricsLoading: false, diff --git a/app/gql/queries/portal/campaigns/manage/report/creative-breakdown.graphql b/app/gql/queries/portal/campaigns/manage/report/creative-breakdown.graphql index be016a36..5ebf7e9b 100644 --- a/app/gql/queries/portal/campaigns/manage/report/creative-breakdown.graphql +++ b/app/gql/queries/portal/campaigns/manage/report/creative-breakdown.graphql @@ -4,6 +4,10 @@ query PortalCampaignsManageReportCreativeBreakdown($input: CampaignHashInput!) { campaignHash(input: $input) { id hash + criteria { + start + end + } creatives { ...CampaignCreativeFragment } diff --git a/app/templates/components/-report/campaign/creative.hbs b/app/templates/components/-report/campaign/creative.hbs index 8f57260e..11d7e8ff 100644 --- a/app/templates/components/-report/campaign/creative.hbs +++ b/app/templates/components/-report/campaign/creative.hbs @@ -8,6 +8,8 @@
{{-report/campaign/chart isLoading=isReportRunning + startDate=startDate + endDate=endDate rows=rows oninsert=(action "runByDayReport") onchange=(action "runByDayReport") diff --git a/app/templates/portal/campaigns/manage/report/creative-breakdown.hbs b/app/templates/portal/campaigns/manage/report/creative-breakdown.hbs index 61be852d..89193b60 100644 --- a/app/templates/portal/campaigns/manage/report/creative-breakdown.hbs +++ b/app/templates/portal/campaigns/manage/report/creative-breakdown.hbs @@ -22,6 +22,8 @@
{{-report/campaign/creative + startDate=startDate + endDate=endDate campaignId=model.id creativeId=creative.id }} diff --git a/app/templates/portal/campaigns/manage/report/summary.hbs b/app/templates/portal/campaigns/manage/report/summary.hbs index 99b5f27c..114da685 100644 --- a/app/templates/portal/campaigns/manage/report/summary.hbs +++ b/app/templates/portal/campaigns/manage/report/summary.hbs @@ -58,6 +58,8 @@

Metrics Over Time

{{-report/campaign/chart + startDate=startDate + endDate=endDate isLoading=isReportRunning rows=rows oninsert=(action "runByDayReport") @@ -66,4 +68,3 @@
-