diff options
author | Olena Horal-Koretska <ohoralkoretska@gitlab.com> | 2019-09-02 14:45:19 +0300 |
---|---|---|
committer | Olena Horal-Koretska <ohoralkoretska@gitlab.com> | 2019-09-02 14:45:19 +0300 |
commit | 8c90fb75f8e00fa9151a43fdac8d10415dde3584 (patch) | |
tree | 43c7ed04921aae371cbfe2497891351a0d75b1d1 | |
parent | 0f88b267af48749c41b390c6f0c1f67e5860d517 (diff) | |
download | gitlab-ce-63988-Contributors-graph-to-echarts.tar.gz |
Individual contributor graph basic view63988-Contributors-graph-to-echarts
-rw-r--r-- | app/assets/javascripts/contributors/components/contributors.vue | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue index eeef2e8c885..bcca0dfe8ef 100644 --- a/app/assets/javascripts/contributors/components/contributors.vue +++ b/app/assets/javascripts/contributors/components/contributors.vue @@ -63,20 +63,10 @@ export default { return [new Date(item.date), item.commits]; }); - debugger return [ { name: 'Commits', data - /* data: [ - ['Mon', 1220], - ['Tue', 932], - ['Wed', 901], - ['Thu', 934], - ['Fri', 1290], - ['Sat', 1330], - ['Sun', 1320], - ],*/ }, ]; }, @@ -92,6 +82,21 @@ export default { showChart() { return !this.loading && this.chartHasData(); }, + + contributors() { + const commitsByAuthor = ContributorsStatGraphUtil.get_author_data(this.parsedLog, 'commits').slice(0, 5); + return commitsByAuthor.map((item) => { + return { + ...item, + dates: [{ + name: 'Commits', + data: Object.keys(item.dates).map((date) => { + return [new Date(date), item.dates[date]]; + }), + }], + }; + }); + }, // chartOptions() { // return { // dataZoom: [ @@ -161,6 +166,14 @@ export default { <gl-area-chart v-if="!loading" :data="chartData2" :option="chartOptions"/> - This is just the beginning + <div class="contributors-list row" v-if="!loading"> + <div class="person col-6" v-for="contributor in contributors"> + <h4>{{contributor.author_name}}</h4> + <p>{{contributor.author_email}}</p> + <p>{{contributor.commits}}</p> + <gl-area-chart :data="contributor.dates" + :option="chartOptions"/> + </div> + </div> </div> </template> |