Add some boxes.

This commit is contained in:
James Cole 2021-06-19 09:09:08 +02:00
parent 4ba55e8546
commit 3e31752a8f
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
3 changed files with 44 additions and 30 deletions

View File

@ -383,8 +383,7 @@ export default {
linkDirection = 'outward';
}
// add meta data to promise context.
promises.push(new Promise((resolve) => {
resolve(
promises.push(Promise.resolve(
{
link: link,
journalId: journalId,
@ -392,8 +391,8 @@ export default {
index: index,
direction: linkDirection
}
);
}));
));
// get stuff from the API:
promises.push(axios.get('./api/v1/transaction-journals/' + opposingId));
@ -700,9 +699,7 @@ export default {
// console.log(submission);
if (!shouldSubmit) {
// console.log('No need to submit transaction.');
return new Promise((resolve) => {
resolve({});
});
return Promise.resolve({});
}
const url = './api/v1/transactions/' + this.groupId;
return axios.put(url, submission);
@ -733,21 +730,13 @@ export default {
}
}
journals = journals.reverse();
return new Promise((resolve) => {
resolve(
{
journals: journals,
}
);
});
return Promise.resolve({journals:journals});
},
submitLinks: function (shouldSubmit) {
//console.log('submitLinks()');
if (!shouldSubmit) {
//console.log('no need!');
return new Promise((resolve) => {
resolve({});
});
return Promise.resolve({});
}
return this.deleteAllOriginalLinks().then(() => this.submitNewLinks());
},
@ -756,9 +745,7 @@ export default {
if (!shouldSubmit) {
// console.log('no need!');
this.submittedAttachments = 1;
return new Promise((resolve) => {
resolve({});
});
return Promise.resolve({});
}
//console.log('Do upload thing!');
//console.log(response);
@ -1074,9 +1061,7 @@ export default {
promises.push(this.deleteOriginalLinks(originalTransaction));
}
} else {
promises.push(new Promise((resolve) => {
resolve({});
}));
promises.push(Promise.resolve({}));
}
}
}

View File

@ -21,7 +21,23 @@
<template>
<div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="col">
<div class="card">
<div class="card-body">
Treemap categories?
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-body">
Treemap accounts?
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-8 col-md-6 col-sm-12 col-xs-12">
<b-pagination
v-model="currentPage"
:total-rows="total"
@ -29,19 +45,22 @@
aria-controls="my-table"
></b-pagination>
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
(refresh)
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="col-lg-8 col-md-12 col-sm-12 col-xs-12">
<div class="card">
<div class="card-body p-0">
<b-table id="my-table" striped hover responsive="md" primary-key="key" :no-local-sorting="false"
:items="transactionRows" :fields="fields"
:items="transactionRows"
:fields="fields"
:per-page="perPage"
sort-icon-left
ref="table"
:current-page="currentPage"
:busy.sync="loading"
:sort-by.sync="sortBy"
:sort-desc.sync="sortDesc"
:sort-compare="tableSortCompare"
>
@ -100,12 +119,12 @@
</div>
<div class="btn btn-light btn-sm" v-if="data.item.split && data.item.split_parent === null && data.item.collapsed === true"
v-on:click="toggleCollapse(data.item)">
<i class="fa fa-caret-down"></i>
<span class="fa fa-caret-down"></span>
{{ $t('firefly.transaction_expand_split') }}
</div>
<div class="btn btn-light btn-sm" v-else-if="data.item.split && data.item.split_parent === null && data.item.collapsed === false"
v-on:click="toggleCollapse(data.item)">
<i class="fa fa-caret-up"></i>
<span class="fa fa-caret-up"></span>
{{ $t('firefly.transaction_collapse_split') }}
</div>
</template>
@ -121,9 +140,16 @@
</div>
</div>
</div>
<div class="col-lg-4">
<div class="card">
<div class="card-body">
Box previous period
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="col-lg-8 col-md-6 col-sm-12 col-xs-12">
<b-pagination
v-model="currentPage"
:total-rows="total"
@ -131,6 +157,9 @@
aria-controls="my-table"
></b-pagination>
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
(refresh)
</div>
</div>
</div>
</template>