Various layout fixes.

This commit is contained in:
James Cole
2021-12-19 06:56:11 +01:00
parent 36ecf25804
commit 19461020ef
11 changed files with 35 additions and 26 deletions

6
.github/mergify.yml vendored
View File

@@ -5,3 +5,9 @@ pull_request_rules:
actions:
merge:
method: merge
- name: Close all on main
conditions:
- base=main
actions:
close:
message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!

View File

@@ -28,6 +28,7 @@
<TransactionListLarge
:entries="rawTransactions"
:isEmpty="isEmpty"
:page="currentPage"
ref="list"
:total="total"
@@ -80,7 +81,8 @@ export default {
perPage: 51,
locale: 'en-US',
api: null,
nameLoading: false
nameLoading: false,
isEmpty: false
}
},
created() {
@@ -137,6 +139,9 @@ export default {
.then(response => {
// console.log('Now getTransactions() DONE!');
this.total = parseInt(response.data.meta.pagination.total);
if (0 === this.total) {
this.isEmpty = true;
}
// let transactions = response.data.data;
// console.log('Have downloaded ' + transactions.length + ' transactions');
// console.log(response.data);

View File

@@ -448,7 +448,7 @@ export default {
this.updateField(payload);
if('description' === payload.field) {
// jump to account
this.$refs.splitForms[payload.index].$refs.sourceAccount.giveFocus();
//this.$refs.splitForms[payload.index].$refs.sourceAccount.giveFocus();
}
},
storeDate: function (payload) {

View File

@@ -320,9 +320,11 @@ export default {
result.source_account_name = array.source_name;
result.source_account_type = array.source_type;
if (array.destination_type !== 'Cash account') {
result.destination_account_id = array.destination_id;
result.destination_account_name = array.destination_name;
result.destination_account_type = array.destination_type;
}
// amount:
result.amount = array.amount;

View File

@@ -391,7 +391,7 @@ export default {
// console.log('Jump to destination!');
this.$refs.destinationAccount.giveFocus();
}
}
},
},
computed: {
splitDate: function () {

View File

@@ -20,8 +20,6 @@
<template>
<div>
<span>Length: {{ this.transactions.length }}</span>
<div v-if="transactions.length > 1" class="row">
<div class="col">
<!-- tabs -->

View File

@@ -118,9 +118,7 @@ export default {
},
mounted: function () {
this.$nextTick(function () {
if (0 === this.index) {
this.$refs.inputThing.$refs.input.tabIndex = 2;
}
})
},
methods: {

View File

@@ -71,9 +71,7 @@ export default {
},
mounted: function () {
this.$nextTick(function () {
if (0 === this.index) {
this.$refs.input.tabIndex = 3;
}
})
},
methods: {

View File

@@ -69,12 +69,10 @@ export default {
this.timeStr = parts[1];
},
mounted: function () {
if (0 === this.index) {
this.$nextTick(function () {
this.$refs.date.tabIndex = 6;
this.$refs.time.tabIndex = 7;
});
}
},
data() {
return {

View File

@@ -67,10 +67,7 @@ export default {
.then(response => {
this.descriptions = response.data;
this.initialSet = response.data;
if(0===this.index) {
this.$refs.autoComplete.$refs.input.tabIndex = 1;
}
});
},

View File

@@ -225,6 +225,9 @@ export default {
entries: function (value) {
// console.log('detected new transactions! (' + value.length + ')');
this.parseTransactions();
if(this.isEmpty) {
this.loading=false;
}
},
// value: function (value) {
// // console.log('Watch value!');
@@ -406,6 +409,10 @@ export default {
type: Boolean,
default: true
},
isEmpty: {
type: Boolean,
default: false
},
total: {
type: Number,
default: 1