diff --git a/src/components/caOnPeriod.vue b/src/components/caOnPeriod.vue
new file mode 100644
index 0000000..4e54c99
--- /dev/null
+++ b/src/components/caOnPeriod.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+ - {{ remuneration }} €
+ - Rémunération
+
+
+
+
+ - {{ caPersoUntouch }} €
+ - 13e mois
+
+
+
+
+
+
+
+
+
diff --git a/src/components/caRepartition.vue b/src/components/caRepartition.vue
new file mode 100644
index 0000000..4d059c9
--- /dev/null
+++ b/src/components/caRepartition.vue
@@ -0,0 +1,66 @@
+
+
+
+
+ - {{ caTheo }} €
+ - CA "séances effectuées"
+
+
+
+
+ - {{ notInvoiced }} €
+ - Non facturé
+
+
+
+
+ - {{ retrocession }} €
+ - Rétrocession
+
+
+
+
+
+
+
+
+
diff --git a/src/components/graphs/RepartitionChart.vue b/src/components/graphs/RepartitionChart.vue
new file mode 100644
index 0000000..a56722c
--- /dev/null
+++ b/src/components/graphs/RepartitionChart.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
diff --git a/src/lib/months.js b/src/lib/months.js
index 44e7e88..5f13a37 100644
--- a/src/lib/months.js
+++ b/src/lib/months.js
@@ -22,10 +22,10 @@ export function caTotal (months) {
}
export function caMean (months) {
+ // Mean of CA
return Math.floor(caTotal(months) / count(months))
}
-
export function caTheo (months) {
// Total theorical CA
return Object.values(months).map(a => a.ca_theo).reduce(
@@ -34,6 +34,11 @@ export function caTheo (months) {
)
}
+export function notInvoiced (months) {
+ // Total of not invoiced sessions
+ return caTheo(months) - caTotal(months)
+}
+
export function remuneration (months) {
// Total remuneration
return Object.values(months).map(a => a.remuneration).reduce(
diff --git a/src/style.css b/src/style.css
index 061518e..d622c90 100644
--- a/src/style.css
+++ b/src/style.css
@@ -55,3 +55,29 @@ button:hover {
border-radius: 10px;
background-color: white;
}
+
+.hightlights {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ grid-gap: 20px;
+}
+.hightlight > ul{
+ list-style-type: none;
+ display: flex;
+ flex-flow: column wrap;
+ padding-inline-start: 0;
+ margin-block-start: 0;
+ margin-block-end: 0;
+}
+.hightlight > ul > li {
+ margin: 5px;
+ flex-direction: column-reverse;
+}
+.hightlight > ul :first-child{
+ font-size: 3rem;
+ font-weight: bold;
+ text-align: center;
+}
+.hightlight > ul :last-child{
+ text-align: end;
+}
diff --git a/src/views/home.vue b/src/views/home.vue
index ee56145..ec2931f 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -8,8 +8,8 @@
@@ -19,16 +19,16 @@ import { mapActions } from 'vuex'
import MonthsList from '../components/MonthsUl.vue'
import CreateMonth from '../components/CreateMonth.vue'
import MonthSelector from '../components/monthSelector.vue'
-import Highlights from '../components/hightlights.vue'
-import RevenusChart from '../components/graphs/RevenusChart.vue'
+import caOnPeriod from '../components/caOnPeriod.vue'
+import caRepartition from '../components/caRepartition.vue'
export default {
name: 'home',
components: {
MonthsList: MonthsList,
CreateMonth: CreateMonth,
MonthSelector: MonthSelector,
- highlights: Highlights,
- RevenusChart: RevenusChart,
+ caOnPeriod: caOnPeriod,
+ caRepartition: caRepartition,
},
data () {
return {}
@@ -60,8 +60,6 @@ export default {
#content > * {
margin: 20px;
}
-#months {
-}
#stats {
}