Compare commits
6 Commits
a021fe8093
...
passleouin
Author | SHA1 | Date | |
---|---|---|---|
7a1004a8f6 | |||
4a9e49fc20 | |||
0bd48159a4 | |||
b266e9de9b | |||
4d77e61b25 | |||
5683b57e24 |
0
jsconfig.json
Normal file
0
jsconfig.json
Normal file
@@ -15,6 +15,7 @@
|
||||
"dependencies": {
|
||||
"core-js": "^3.6.5",
|
||||
"date-fns": "^2.23.0",
|
||||
"papaparse": "^5.3.1",
|
||||
"vls": "^0.7.4",
|
||||
"vue": "^3.0.0",
|
||||
"vue-router": "^4.0.8",
|
||||
|
@@ -8,27 +8,27 @@
|
||||
<ul>
|
||||
<li>
|
||||
<label for="ca-theo">CA théorique</label>
|
||||
<input type="number" v-model="monthCopy.ca_theo" id="ca-theo" class="value" >
|
||||
<input type="number" v-model.number="monthCopy.ca_theo" id="ca-theo" class="value" >
|
||||
</li>
|
||||
<li>
|
||||
<label for="ca-retro">CA rétrocession</label>
|
||||
<input type="number" v-model="monthCopy.ca_retro" id="ca-retro" class="value" >
|
||||
<input type="number" v-model.number="monthCopy.ca_retro" id="ca-retro" class="value" >
|
||||
</li>
|
||||
<li>
|
||||
<label for="ca-react">CA réactualisé</label>
|
||||
<input type="number" v-model="monthCopy.ca_react" id="ca-react" class="value" >
|
||||
<input type="number" v-model.number="monthCopy.ca_react" id="ca-react" class="value" >
|
||||
</li>
|
||||
<li>
|
||||
<label for="nbr-seances">Nombre de séances effectuées</label>
|
||||
<input type="number" v-model="monthCopy.nbr_seances" id="nbr-seances" class="value" >
|
||||
<input type="number" v-model.number="monthCopy.nbr_seances" id="nbr-seances" class="value" >
|
||||
</li>
|
||||
<li>
|
||||
<label for="retro">Montant de la rétrocession</label>
|
||||
<input type="number" v-model="monthCopy.retro" id="retro" class="value" >
|
||||
<input type="number" v-model.number="monthCopy.retro" id="retro" class="value" >
|
||||
</li>
|
||||
<li>
|
||||
<label for="remuneration">Rémunération effectuée</label>
|
||||
<input type="number" v-model="monthCopy.remuneration" id="remuneration" class="value">
|
||||
<input type="number" v-model.number="monthCopy.remuneration" id="remuneration" class="value">
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
@@ -8,32 +8,32 @@
|
||||
<li>
|
||||
<label for="ca-theo">CA "Séances effectuées"</label>
|
||||
<span class="value" v-show="!editing">{{ TheMonth.ca_theo ?? "∅"}}€</span>
|
||||
<input type="number" v-model="monthCopy.ca_theo" id="ca-theo" class="value" v-show="editing">
|
||||
<input type="number" v-model.number="monthCopy.ca_theo" id="ca-theo" class="value" v-show="editing">
|
||||
</li>
|
||||
<li>
|
||||
<label for="ca-retro">CA "Séances facturées"</label>
|
||||
<span class="value" v-show="!editing">{{ TheMonth.ca_retro ?? "∅"}}€</span>
|
||||
<input type="number" v-model="monthCopy.ca_retro" id="ca-retro" class="value" v-show="editing">
|
||||
<input type="number" v-model.number="monthCopy.ca_retro" id="ca-retro" class="value" v-show="editing">
|
||||
</li>
|
||||
<li>
|
||||
<label for="ca-react">CA "Séances facturées" réactualisé</label>
|
||||
<span class="value" v-show="!editing">{{ TheMonth.ca_react ?? "∅"}}€</span>
|
||||
<input type="number" v-model="monthCopy.ca_react" id="ca-react" class="value" v-show="editing">
|
||||
<input type="number" v-model.number="monthCopy.ca_react" id="ca-react" class="value" v-show="editing">
|
||||
</li>
|
||||
<li>
|
||||
<label for="nbr-seances">Nombre de séances effectuées</label>
|
||||
<span class="value" v-show="!editing">{{ TheMonth.nbr_seances ?? "∅"}}</span>
|
||||
<input type="number" v-model="monthCopy.nbr_seances" id="nbr-seances" class="value" v-show="editing">
|
||||
<input type="number" v-model.number="monthCopy.nbr_seances" id="nbr-seances" class="value" v-show="editing">
|
||||
</li>
|
||||
<li>
|
||||
<label for="retro">Montant de la rétrocession</label>
|
||||
<span class="value" v-show="!editing">{{ TheMonth.retro ?? "∅"}}€</span>
|
||||
<input type="number" v-model="monthCopy.retro" id="retro" class="value" v-show="editing">
|
||||
<input type="number" v-model.number="monthCopy.retro" id="retro" class="value" v-show="editing">
|
||||
</li>
|
||||
<li>
|
||||
<label for="remuneration">Rémunération </label>
|
||||
<span class="value" v-show="!editing">{{ TheMonth.remuneration ?? "∅"}}€</span>
|
||||
<input type="number" v-model="monthCopy.remuneration" id="remuneration" class="value" v-show="editing">
|
||||
<input type="number" v-model.number="monthCopy.remuneration" id="remuneration" class="value" v-show="editing">
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -69,12 +69,15 @@ export default {
|
||||
methods: {
|
||||
...mapActions('travail', {
|
||||
'updateMonth': 'updateMonth',
|
||||
}),
|
||||
...mapActions('config', {
|
||||
'loadData': 'loadData',
|
||||
}),
|
||||
toggleEdit: function () {
|
||||
this.editing = !this.editing
|
||||
},
|
||||
save: function () {
|
||||
this.updateMonth({date: this.TheDate, month: this.monthCopy})
|
||||
this.updateMonth({date: this.TheDate, month: {...this.monthCopy}})
|
||||
this.toggleEdit()
|
||||
},
|
||||
cancel: function () {
|
||||
|
@@ -4,12 +4,12 @@
|
||||
<h2>Période</h2>
|
||||
</li>
|
||||
<li>
|
||||
<input type="month" v-model="range.start">
|
||||
<input type="month" v-model="range.end">
|
||||
<input type="month" @input="updateStart" v-model="start">
|
||||
<input type="month" @input="updateEnd" v-model="end">
|
||||
</li>
|
||||
<li>
|
||||
<button @click="setRange6months" :active='selected=="month"'>6 mois</button>
|
||||
<button @click="setRange1year" :active='selected=="year"'>1 an</button>
|
||||
<button @click="setRangeFromJanuary" :active='selected=="january"'>Depuis le début de l'année</button>
|
||||
<button @click="setRange1year" :active='selected=="year"'>Sur 1 an</button>
|
||||
<button @click="setRangeAll" :active='selected=="all"'>Tout</button>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -19,7 +19,7 @@
|
||||
<script>
|
||||
|
||||
import { mapGetters, mapActions } from 'vuex'
|
||||
import { addMonths, format, parseISO } from 'date-fns'
|
||||
import { setMonth, addMonths, format, parseISO } from 'date-fns'
|
||||
|
||||
const today = new Date();
|
||||
|
||||
@@ -30,25 +30,46 @@ export default {
|
||||
data () {
|
||||
return {
|
||||
selected: "",
|
||||
start: "",
|
||||
end: "",
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapGetters('travail', {
|
||||
range: "Range",
|
||||
range: "range",
|
||||
monthsDate: "MonthsDate",
|
||||
})
|
||||
},
|
||||
watch: {
|
||||
range: function () {
|
||||
this.start = this.range.start
|
||||
this.end = this.range.end
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.setRangeFromJanuary()
|
||||
this.start = this.range.start
|
||||
this.end = this.range.end
|
||||
},
|
||||
methods: {
|
||||
...mapActions('travail', {
|
||||
setRange: "setRange",
|
||||
}),
|
||||
setRange6months: function () {
|
||||
const start = addMonths(new Date(), -6)
|
||||
updateStart: function () {
|
||||
this.selected = "custom"
|
||||
this.setRange({start: this.start, end: this.end})
|
||||
},
|
||||
updateEnd: function () {
|
||||
this.selected = "custom"
|
||||
this.setRange({start: this.start, end: this.end})
|
||||
},
|
||||
setRangeFromJanuary: function () {
|
||||
const start = setMonth(today, 0)
|
||||
const range = {
|
||||
start: format(start, 'yyyy-MM'),
|
||||
end: format(today, 'yyyy-MM'),
|
||||
}
|
||||
this.selected = "month"
|
||||
this.selected = "january"
|
||||
this.setRange(range)
|
||||
},
|
||||
setRange1year: function () {
|
||||
@@ -111,5 +132,4 @@ button {
|
||||
background-color: white;
|
||||
|
||||
}
|
||||
|
||||
</style>
|
||||
|
42
src/store/config/index.js
Normal file
42
src/store/config/index.js
Normal file
@@ -0,0 +1,42 @@
|
||||
import path from 'path'
|
||||
import Papa from 'papaparse'
|
||||
|
||||
const config = {
|
||||
namespaced: true,
|
||||
state() {
|
||||
return {
|
||||
//userDir: '~/.config/sousmargot/',
|
||||
userDir: './userDir/',
|
||||
dataFile: 'datas.csv'
|
||||
}
|
||||
},
|
||||
getters: {
|
||||
userDir (state) { return state.userDir },
|
||||
dataFilePath (state) { return path.join(state.userDir, state.dataFile) },
|
||||
},
|
||||
mutations: {
|
||||
},
|
||||
actions: {
|
||||
loadConfig (context) {
|
||||
// load config file at ~/.config/sousmargot/config.json
|
||||
return context.state.userDir
|
||||
},
|
||||
loadData (context) {
|
||||
// load data in userDir on dataFile
|
||||
console.log("Loading data")
|
||||
console.log(context.getters.dataFilePath)
|
||||
},
|
||||
writeData (context) {
|
||||
// overwrite the dataFile with months datas
|
||||
console.log("Writing data")
|
||||
console.log(context.getters.dataFilePath)
|
||||
const months = context.rootGetters['travail/monthsAll']
|
||||
console.log(Object.keys(months).map(k => {return { ...months[k], date: k}}))
|
||||
const csv = Papa.unparse(context.rootGetters['travail/monthsAll'])
|
||||
console.log(csv)
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
export default config
|
||||
|
@@ -1,10 +1,12 @@
|
||||
import { createStore } from 'vuex'
|
||||
import travailStore from "./travail"
|
||||
import configStore from "./config"
|
||||
|
||||
// Create a new store instance.
|
||||
const store = createStore({
|
||||
modules:{
|
||||
travail: travailStore,
|
||||
config: configStore,
|
||||
}
|
||||
})
|
||||
|
||||
|
@@ -1,3 +1,4 @@
|
||||
|
||||
function monthCA(month) {
|
||||
if (month.ca_react) {
|
||||
return month.ca_react
|
||||
@@ -76,7 +77,7 @@ const travail = {
|
||||
},
|
||||
getters: {
|
||||
TheEmptyMonth(state) { return { ...state.empty } },
|
||||
Range(state) { return state.range },
|
||||
range(state) { return state.range },
|
||||
MonthsDate(state) {
|
||||
// Get months inside the range
|
||||
return Object.keys(state.months).filter(date => (date >= state.range.start) && (date <= state.range.end)).sort().reverse()
|
||||
@@ -94,6 +95,10 @@ const travail = {
|
||||
return acc;
|
||||
}, {})
|
||||
},
|
||||
monthsAll: (state) => {
|
||||
// Get in range months
|
||||
return state.months
|
||||
},
|
||||
getMonth: (state) => (date) => {
|
||||
return state.months[date]
|
||||
},
|
||||
@@ -101,9 +106,9 @@ const travail = {
|
||||
// Amount of mounts
|
||||
return Object.keys(getters.months).length
|
||||
},
|
||||
ca: (state) => {
|
||||
ca: (state, getters) => {
|
||||
// Total CA (ca_react if sets, ca_retro otherwise)
|
||||
return Object.values(state.months).map(a => monthCA(a)).reduce(
|
||||
return Object.values(getters.months).map(a => monthCA(a)).reduce(
|
||||
(acc, v) => acc + v,
|
||||
0
|
||||
)
|
||||
@@ -115,30 +120,30 @@ const travail = {
|
||||
0
|
||||
) / getters.count)
|
||||
},
|
||||
caTheo: (state) => {
|
||||
caTheo: (state, getters) => {
|
||||
// Total theorical CA
|
||||
return Object.values(state.months).map(a => a.ca_theo).reduce(
|
||||
return Object.values(getters.months).map(a => a.ca_theo).reduce(
|
||||
(acc, v) => acc + v,
|
||||
0
|
||||
)
|
||||
},
|
||||
remuneration: (state) => {
|
||||
remuneration: (state, getters) => {
|
||||
// Total remuneration
|
||||
return Object.values(state.months).map(a => a.remuneration).reduce(
|
||||
return Object.values(getters.months).map(a => a.remuneration).reduce(
|
||||
(acc, v) => acc + v,
|
||||
0
|
||||
)
|
||||
},
|
||||
remunerationMean: (state, getters) => {
|
||||
// Mean of remuneration
|
||||
return Math.floor(Object.values(state.months).map(a => a.remuneration).reduce(
|
||||
return Math.floor(Object.values(getters.months).map(a => a.remuneration).reduce(
|
||||
(acc, v) => acc + v,
|
||||
0
|
||||
) / getters.count)
|
||||
},
|
||||
retrocession: (state) => {
|
||||
retrocession: (state, getters) => {
|
||||
// Total retrocession
|
||||
return Object.values(state.months)
|
||||
return Object.values(getters.months)
|
||||
.map(a => a.retro)
|
||||
.reduce(
|
||||
(acc, v) => acc + v,
|
||||
@@ -148,7 +153,7 @@ const travail = {
|
||||
retrocessionMean: (state, getters) => {
|
||||
// Mean of retrocession
|
||||
return Math.floor(
|
||||
Object.values(state.months)
|
||||
Object.values(getters.months)
|
||||
.map(a => a.retro)
|
||||
.reduce(
|
||||
(acc, v) => acc + v,
|
||||
@@ -167,7 +172,6 @@ const travail = {
|
||||
setRange(state, range) {
|
||||
state.range = range
|
||||
},
|
||||
|
||||
},
|
||||
actions: {
|
||||
updateMonth(context, { date, month }) {
|
||||
@@ -191,7 +195,6 @@ actions: {
|
||||
setRange(context, range) {
|
||||
context.commit("setRange", range)
|
||||
},
|
||||
|
||||
},
|
||||
}
|
||||
|
||||
|
@@ -1,5 +1,6 @@
|
||||
<template>
|
||||
<h1>Home</h1>
|
||||
<button @click="writeData" ></button>
|
||||
<section id="selector">
|
||||
<month-selector>
|
||||
</month-selector>
|
||||
@@ -18,7 +19,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapGetters, mapActions } from 'vuex'
|
||||
import { mapActions } from 'vuex'
|
||||
import MonthsList from '../components/MonthsUl.vue'
|
||||
import CreateMonth from '../components/CreateMonth.vue'
|
||||
import MonthSelector from '../components/monthSelector.vue'
|
||||
@@ -35,13 +36,15 @@ export default {
|
||||
return {}
|
||||
},
|
||||
computed: {
|
||||
...mapGetters({
|
||||
count: "datas/count",
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
...mapActions({
|
||||
})
|
||||
...mapActions('config', {
|
||||
'loadData': 'loadData',
|
||||
'writeData': 'writeData',
|
||||
}),
|
||||
},
|
||||
mounted () {
|
||||
this.loadData()
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
1
userDir/datas.csv
Normal file
1
userDir/datas.csv
Normal file
@@ -0,0 +1 @@
|
||||
ca_theo, nbr_seances, ca_retro, ca_react, retro, remuneration,
|
|
7
vue.config.js
Normal file
7
vue.config.js
Normal file
@@ -0,0 +1,7 @@
|
||||
module.exports = {
|
||||
pluginOptions: {
|
||||
electronBuilder: {
|
||||
nodeIntegration: true
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user