From edd03c5a7e143d6a66279fa47dd9d3a21a79b5fc Mon Sep 17 00:00:00 2001 From: Simon Kellner Date: Sat, 6 Jun 2020 18:38:16 +0200 Subject: [PATCH] Add donut diagram for time by type paid for accounts with revenue calc display in tooltip --- frontend/src/views/About.vue | 2 +- frontend/src/views/StatisticOverview.vue | 10 +- frontend/src/views/charts/AccountPie.vue | 195 +++++++++++++++++++++ frontend/src/views/charts/WorkPausePie.vue | 2 +- 4 files changed, 205 insertions(+), 4 deletions(-) create mode 100644 frontend/src/views/charts/AccountPie.vue diff --git a/frontend/src/views/About.vue b/frontend/src/views/About.vue index b9dc0d8..0b74727 100644 --- a/frontend/src/views/About.vue +++ b/frontend/src/views/About.vue @@ -2,7 +2,7 @@

This is a ubiquitos computing project.

-

It was created by the team Tacoct.

+

It was created by the team TacocaT.

Team TacocaT

diff --git a/frontend/src/views/StatisticOverview.vue b/frontend/src/views/StatisticOverview.vue index 2eff2f8..d067f67 100644 --- a/frontend/src/views/StatisticOverview.vue +++ b/frontend/src/views/StatisticOverview.vue @@ -6,9 +6,12 @@ - + + + + @@ -17,12 +20,15 @@ import WeekSummary from "./charts/WeekSummary.vue"; import MonthSummary from "./charts/MonthSummary.vue"; import WorkPausePie from "./charts/WorkPausePie.vue"; +import AccountPie from "./charts/AccountPie.vue"; + export default { name: "StatisticOverview", components: { WeekSummary, MonthSummary, - WorkPausePie + WorkPausePie, + AccountPie } }; diff --git a/frontend/src/views/charts/AccountPie.vue b/frontend/src/views/charts/AccountPie.vue new file mode 100644 index 0000000..513ced6 --- /dev/null +++ b/frontend/src/views/charts/AccountPie.vue @@ -0,0 +1,195 @@ + + + + + + \ No newline at end of file diff --git a/frontend/src/views/charts/WorkPausePie.vue b/frontend/src/views/charts/WorkPausePie.vue index d85b215..1d1f75a 100644 --- a/frontend/src/views/charts/WorkPausePie.vue +++ b/frontend/src/views/charts/WorkPausePie.vue @@ -2,7 +2,7 @@

-

Working hours to pause hours

+

Times by type PAID and BREAK