CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add loop load to print history

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-03-31 00:59:11 +02:00
parent b2055ed879
commit b2f36b84d9
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/panels/HistoryListPanel.vue
View File

@ -18,14 +18,6 @@
</v-menu>
</v-item-group>
</v-card-title>
<v-card-subtitle>
<v-tooltip top v-if="!boolAllData">
<template v-slot:activator="{ on, attrs }">
<span v-bind="attrs" v-on="on" @click="loadAllData" style="cursor: pointer;">{{ $t('History.Last14Days') }}</span>
</template>
<span>{{ $t('History.LoadAllHistoryData') }}</span>
</v-tooltip>
</v-card-subtitle>
<v-card-text>
<v-text-field
v-model="search"
@ -241,7 +233,6 @@
<script>
import {mapGetters, mapState} from 'vuex'
import VueLoadImage from 'vue-load-image'
import Vue from "vue";
export default {
components: {
@ -493,10 +484,6 @@ import Vue from "vue";
return 400
},
loadAllData() {
this.boolAllData = true
Vue.prototype.$socket.sendObj('server.history.list', { }, 'server/history/getHistory')
}
},
watch: {
hideColums: function(newVal) {

2
src/locales/en.js
View File

@ -137,8 +137,6 @@ export default {
FilamentUsage: "Filament usage",
PrinttimeAvg: "Printtime AVG",
PrintHistory: "Print History",
Last14Days: "Last 14 days",
LoadAllHistoryData: "Click to load all history data",
Search: "search",
Jobs: "Jobs",
Empty: "empty",

5
src/store/server/actions.js
View File

@ -59,10 +59,7 @@ export default {
Vue.prototype.$socket.sendObj('machine.update.status', {}, 'server/updateManager/getStatus')
if (payload.plugins.includes("history") !== false) {
// load the last 14 days
const since = new Date().getTime() / 1000 - 60 * 60 * 24 * 14
Vue.prototype.$socket.sendObj('server.history.list', { since: since}, 'server/history/getHistory')
Vue.prototype.$socket.sendObj('server.history.list', { start: 1, limit: 50 }, 'server/history/getHistory')
Vue.prototype.$socket.sendObj('server.history.totals', {}, 'server/history/getTotals')
}
}

18
src/store/server/history/actions.js
View File

@ -9,12 +9,24 @@ export default {
commit('setTotals', payload.job_totals)
},
getHistory({ commit }, payload) {
commit('resetJobs')
getHistory({ commit, state }, payload) {
if (
'requestParams' in payload &&
'start' in payload.requestParams &&
payload.requestParams.start === 0
) commit('resetJobs')
payload.jobs.forEach(job => {
commit('addJob', job)
if (state.jobs.findIndex(stateJob => stateJob.job_id === job.job_id) === -1) commit('addJob', job)
})
if (
'requestParams' in payload &&
'start' in payload.requestParams &&
'limit' in payload.requestParams &&
payload.requestParams.limit > 0 &&
payload.jobs.length === payload.requestParams.limit
) Vue.prototype.$socket.sendObj('server.history.list', { start: payload.requestParams.start + payload.requestParams.limit + 1, limit: payload.requestParams.limit }, 'server/history/getHistory')
},
getChanged({ commit }, payload) {