Deal with some column changes.
Change-Id: I3253cd791518f1503d54011af8265ecfeac9af8c
diff --git a/tools/kpis/project_activity.inc b/tools/kpis/project_activity.inc
index 7c79c42..193a6a0 100644
--- a/tools/kpis/project_activity.inc
+++ b/tools/kpis/project_activity.inc
@@ -19,15 +19,11 @@
->query('dashboard', "
select
period,
- projects,
- activeProjects as active,
- activeCompanies as companies
+ projects
from MonthlySummary
where period >= :start and period <= :end")
->column('Month', 'period', 'string', function($value) {return asYearMonth($value);})
->column('Projects', 'projects', 'number')
- ->column('Active Projects', 'active', 'number')
- ->column('Active Companies', 'companies', 'number')
->substitute(':startMY', $context->getStart()->format('M Y'))
->substitute(':endMY', $context->getEnd()->format('M Y'))
->substitute(':start', $context->getStart()->format('Ym'))
diff --git a/tools/kpis/project_committer.inc b/tools/kpis/project_committer.inc
index 87035d5..f922c72 100644
--- a/tools/kpis/project_committer.inc
+++ b/tools/kpis/project_committer.inc
@@ -20,14 +20,12 @@
select
period,
committers,
- participatingCommitters as participating,
- activeCommitters as active
+ companies,
from MonthlySummary
where period >= :start and period <= :end")
->column('Month', 'period', 'string', function($value) {return asYearMonth($value);})
->column('Committers', 'committers', 'number')
- ->column('Participating', 'participating', 'number')
- ->column('Active', 'active', 'number')
+ ->column('Companies', 'companies', 'number')
->substitute(':startMY', $context->getStart()->format('M Y'))
->substitute(':endMY', $context->getEnd()->format('M Y'))
->substitute(':start', $context->getStart()->format('Ym'))
diff --git a/tools/kpis/project_contributor.inc b/tools/kpis/project_contributor.inc
index 6240196..8b3d0d4 100644
--- a/tools/kpis/project_contributor.inc
+++ b/tools/kpis/project_contributor.inc
@@ -19,7 +19,7 @@
->query('dashboard', "
select
period,
- activeAuthors - monthlyCommitters as contributors
+ authors - committers as contributors
from MonthlySummary
where period >= :start and period <= :end")
->column('Month', 'period', 'string', function($value) {return asYearMonth($value);})
