Merge pull request #76 from solocommand/reporting-dates

Change default report dates

.gitignore

@@ -24,3 +24,4 @@ package.json.ember-try
 .DS_Store
 coverage
 .nyc_output
+.env

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';

app/controllers/portal/campaigns/manage/report/summary.js

@@ -1,12 +1,27 @@
 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';
 
 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,
 

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
     }

app/templates/components/-report/campaign/creative.hbs

@@ -8,6 +8,8 @@
   <div class="col">
     {{-report/campaign/chart
       isLoading=isReportRunning
+      startDate=startDate
+      endDate=endDate
       rows=rows
       oninsert=(action "runByDayReport")
       onchange=(action "runByDayReport")

app/templates/portal/campaigns/manage/report/creative-breakdown.hbs

@@ -22,6 +22,8 @@
 
           <div class="col-lg-8">
             {{-report/campaign/creative
+              startDate=startDate
+              endDate=endDate
               campaignId=model.id
               creativeId=creative.id
             }}

app/templates/portal/campaigns/manage/report/summary.hbs

@@ -58,6 +58,8 @@
 
       <h4 class="text-muted px-3 mb-2">Metrics Over Time</h4>
       {{-report/campaign/chart
+        startDate=startDate
+        endDate=endDate
         isLoading=isReportRunning
         rows=rows
         oninsert=(action "runByDayReport")
@@ -66,4 +68,3 @@
     </div>
   </div>
 </div>
-