Feat: add unit and percent to real percent
This commit is contained in:
parent
d690bcac56
commit
cdbc5f9d51
@ -17,7 +17,7 @@
|
||||
<ul v-show="!editing">
|
||||
<li v-for="cara in monthDesc" :key='cara.name'>
|
||||
<label :for='cara.name'>{{ cara.desc }}</label>
|
||||
<span class="value" >{{ TheMonth.[cara.name] ?? "∅"}}€</span>
|
||||
<span class="value" >{{ TheMonth.[cara.name] ?? "∅"}} {{cara.unit}}</span>
|
||||
</li>
|
||||
</ul>
|
||||
<ul v-show="editing">
|
||||
|
@ -15,12 +15,12 @@ export function notInvoiced (month) {
|
||||
|
||||
export function caPro (month) {
|
||||
// Compute the part of the CA to go pro usage
|
||||
return ca(month) * month.proPercentage
|
||||
return ca(month) * month.proPercentage / 100
|
||||
}
|
||||
|
||||
export function caPerso (month) {
|
||||
// Compute the part of the CA to go personnal usage
|
||||
return ca(month) * (1 - month.proPercentage)
|
||||
return ca(month) * (1 - month.proPercentage / 100)
|
||||
}
|
||||
|
||||
export function caPersoUntouch (month) {
|
||||
|
@ -16,42 +16,49 @@ const config = {
|
||||
desc: 'CA "scéances effectuées"',
|
||||
type: 'base',
|
||||
name: 'caTheo',
|
||||
unit: '€',
|
||||
},
|
||||
{
|
||||
color: '',
|
||||
desc: 'CA "Séances facturées"',
|
||||
type: 'base',
|
||||
name: 'caRetro',
|
||||
unit: '€',
|
||||
},
|
||||
{
|
||||
color: '',
|
||||
desc: 'CA "Séances facturées" réactualisé',
|
||||
type: 'base',
|
||||
name: 'caReact',
|
||||
unit: '€',
|
||||
},
|
||||
{
|
||||
color: '',
|
||||
desc: 'Nombre de séances effectuées',
|
||||
type: 'base',
|
||||
name: 'sessionQty',
|
||||
unit: '',
|
||||
},
|
||||
{
|
||||
color: '',
|
||||
desc: 'Montant de la rétrocession',
|
||||
type: 'base',
|
||||
name: 'retro',
|
||||
unit: '€',
|
||||
},
|
||||
{
|
||||
color: '',
|
||||
desc: 'Rémuneration',
|
||||
type: 'base',
|
||||
name: 'remu',
|
||||
name: 'remueration',
|
||||
unit: '€',
|
||||
},
|
||||
{
|
||||
color: '',
|
||||
desc: 'Pourcentage du CA pour la partie pro',
|
||||
type: 'base',
|
||||
name: 'proPercentage',
|
||||
unit: '%',
|
||||
},
|
||||
],
|
||||
}
|
||||
|
@ -13,6 +13,7 @@ const travail = {
|
||||
caReact: null, // ca réactualisé
|
||||
retro: 0, // montant de la rétrocession
|
||||
remuneration: 0, // rémunération décidée
|
||||
proPercentage: 50, // Pourcentage du CA pour la partie pro
|
||||
},
|
||||
months: {
|
||||
},
|
||||
|
@ -1,8 +1,8 @@
|
||||
caTheo,sessionQty,caRetro,caReact,retro,remuneration,date,proPercentage
|
||||
7000,,6747,,893,2000,2021-01,0.5
|
||||
5200,,5183,,665,1500,2021-02,0.5
|
||||
7100,,7088,,855,2000,2021-03,0.5
|
||||
5700,,4194,5630,627,2000,2021-04,0.5
|
||||
6500,,5564,6335,699,2800,2021-05,0.5
|
||||
6725,235,5442,6376,638,2800,2021-06,0.5
|
||||
2176,81,1274,,172,2000,2021-07,0.5
|
||||
7000,,6747,,893,2000,2021-01,50
|
||||
5200,,5183,,665,1500,2021-02,50
|
||||
7100,,7088,,855,2000,2021-03,50
|
||||
5700,,4194,5630,627,2000,2021-04,50
|
||||
6500,,5564,6335,699,2800,2021-05,50
|
||||
6725,235,5442,6376,638,2800,2021-06,50
|
||||
2176,81,1274,,172,2000,2021-07,50
|
||||
|
|
Loading…
Reference in New Issue
Block a user